From e99601c91041102ed48114b3535b898f5d206ded Mon Sep 17 00:00:00 2001
From: Titan Hadiyan <titanhadiyan@gmail.com>
Date: Sun, 4 Jun 2023 07:03:41 +0700
Subject: [PATCH] Pre Drp Cetak, Revisi, Perbaikan Approval dan Pengadaan

---
 src/components/icons/IconDocChecked.vue  |  5 ++++
 src/router.js                            | 22 +++++++++++++++++-
 src/views/drp/drp-approval.vue           | 29 ++++++++++++------------
 src/views/drp/drp-cetak.vue              | 13 +++++++++++
 src/views/drp/drp-pengadaan.vue          | 21 ++++++++++++++---
 src/views/drp/drp-revisi.vue             | 13 +++++++++++
 src/views/master-config/users-config.vue |  6 ++---
 7 files changed, 88 insertions(+), 21 deletions(-)
 create mode 100644 src/components/icons/IconDocChecked.vue
 create mode 100644 src/views/drp/drp-cetak.vue
 create mode 100644 src/views/drp/drp-revisi.vue

diff --git a/src/components/icons/IconDocChecked.vue b/src/components/icons/IconDocChecked.vue
new file mode 100644
index 0000000..d371fca
--- /dev/null
+++ b/src/components/icons/IconDocChecked.vue
@@ -0,0 +1,5 @@
+<template>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 16" fill="currentColor" style="width: 14px; height: 14px; color: #0996C2;">
+        <path d="M7.293 0H2C1.46957 0 0.960859 0.210714 0.585786 0.585786C0.210714 0.960859 0 1.46957 0 2V14C0 14.5304 0.210714 15.0391 0.585786 15.4142C0.960859 15.7893 1.46957 16 2 16H10C10.5304 16 11.0391 15.7893 11.4142 15.4142C11.7893 15.0391 12 14.5304 12 14V4.707C11.9999 4.4418 11.8945 4.18749 11.707 4L8 0.293C7.81251 0.105451 7.5582 5.66374e-05 7.293 0ZM7.5 3.5V1.5L10.5 4.5H8.5C8.23478 4.5 7.98043 4.39464 7.79289 4.20711C7.60536 4.01957 7.5 3.76522 7.5 3.5ZM8.854 7.854L5.854 10.854C5.80755 10.9006 5.75238 10.9375 5.69163 10.9627C5.63089 10.9879 5.56577 11.0009 5.5 11.0009C5.43423 11.0009 5.36911 10.9879 5.30837 10.9627C5.24762 10.9375 5.19245 10.9006 5.146 10.854L3.646 9.354C3.59951 9.30751 3.56264 9.25232 3.53748 9.19158C3.51232 9.13084 3.49937 9.06574 3.49937 9C3.49937 8.93426 3.51232 8.86916 3.53748 8.80842C3.56264 8.74768 3.59951 8.69249 3.646 8.646C3.73989 8.55211 3.86722 8.49937 4 8.49937C4.06574 8.49937 4.13084 8.51232 4.19158 8.53748C4.25232 8.56264 4.30751 8.59951 4.354 8.646L5.5 9.793L8.146 7.146C8.23989 7.05211 8.36722 6.99937 8.5 6.99937C8.63278 6.99937 8.76011 7.05211 8.854 7.146C8.94789 7.23989 9.00063 7.36722 9.00063 7.5C9.00063 7.63278 8.94789 7.76011 8.854 7.854Z" fill="#0996C2"/>
+    </svg>
+</template>
\ No newline at end of file
diff --git a/src/router.js b/src/router.js
index e212a22..b2b8c45 100644
--- a/src/router.js
+++ b/src/router.js
@@ -30,6 +30,8 @@ import DrpDokumen from './views/drp/drp-dokumen';
 import DrpApproval from './views/drp/drp-approval'
 import RecomendationList from './views/drp/recomendation-list.vue'
 import DrpList from './views/drp/drp-list.vue';
+import DrpRevisi from './views/drp/drp-revisi';
+import DrpCetak from './views/drp/drp-cetak';
 
 /* General */
 import auth from "./auth";
@@ -352,7 +354,25 @@ const router = new createRouter({
         layout: defaultLayout
       },
       component: DrpList
-    },
+    }, 
+    {
+      path: "/drp/drp-revisi",
+      name: "drp-revisi",
+      meta: {
+        requiresAuth: true,
+        layout: defaultLayout
+      },
+      component: DrpRevisi
+    }, 
+    {
+      path: "/drp/drp-cetak",
+      name: "drp-cetak",
+      meta: {
+        requiresAuth: true,
+        layout: defaultLayout
+      },
+      component: DrpCetak
+    }
   ],
   history: createWebHashHistory()
 });
diff --git a/src/views/drp/drp-approval.vue b/src/views/drp/drp-approval.vue
index d942c35..d79e035 100644
--- a/src/views/drp/drp-approval.vue
+++ b/src/views/drp/drp-approval.vue
@@ -74,23 +74,22 @@
             <DxColumn data-field="" caption="Direktur Utama"></DxColumn>
             <DxColumn type="buttons" caption="Aksi" :fixed="true">
               <DxButton
-                text="Detail"
-                hint="Detail"
-                :on-click="linkDetail"
+                text="Dokumen"
+                hint="Dokumen Pendukung DRP"
+                :on-click="linkDokumen"
               >
                 <template #default>
                   <IconEye />
                 </template>
               </DxButton>
               <DxButton
-                text="Detail"
-                icon="file"
-                hint="Detail"
-                :on-click="linkDetail"
-              />
-            </DxColumn>
-            <DxColumn type="adaptive" :width="50">
-              <DxButton hint="detail" icon="copy" />
+                text="Detil"
+                hint="Detil/Konten DRP"
+                :on-click="linkDetail">
+                <template #default>
+                  <IconDocChecked />
+                </template>
+              </DxButton>
             </DxColumn>
             <template #row-cell-template="{ data }">
               <DxText>{{ data.rowIndex + 1 }}</DxText>
@@ -125,8 +124,9 @@ import DxDataGrid, {
 } from "devextreme-vue/data-grid";
 import CustomStore from "devextreme/data/custom_store";
 import IconEye from '../../components/icons/IconEye.vue';
+import IconDocChecked from '../../components/icons/IconDocChecked.vue';
 
-const URL = process.env.VUE_APP_ROOT_API + "/drp";
+const URL = process.env.VUE_APP_ROOT_API + "/drp/approval";
 
 const dataSource = new CustomStore({
   key: "id",
@@ -189,10 +189,11 @@ export default {
     DxTexts,
     DxButton,
     IconEye,
+    IconDocChecked
   },
   methods: {
-    linkDetail: function () {
-      location.href = "master-data/strategi-pengadaan";
+    linkDetail(e) {
+      location.href='#/drp/drp-pengadaan?drpid='+e.row.data.id;
     },
   },
   data() {
diff --git a/src/views/drp/drp-cetak.vue b/src/views/drp/drp-cetak.vue
new file mode 100644
index 0000000..91411c7
--- /dev/null
+++ b/src/views/drp/drp-cetak.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <h2 class="content-block">Drp Cetak</h2>
+    <div class="content-block">
+      <div class="dx-card responsive-paddings">
+        Put your content here
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+</style>
diff --git a/src/views/drp/drp-pengadaan.vue b/src/views/drp/drp-pengadaan.vue
index 6993695..b17e58f 100644
--- a/src/views/drp/drp-pengadaan.vue
+++ b/src/views/drp/drp-pengadaan.vue
@@ -184,7 +184,7 @@ import {
 } from "devextreme-vue/data-grid";
 import CustomStore from "devextreme/data/custom_store";
 
-const URL = process.env.VUE_APP_ROOT_API+'/drp/pengadaan';
+const URL = process.env.VUE_APP_ROOT_API+'/drp/pengadaan/list';
 const URL_metodepenyampaian = process.env.VUE_APP_ROOT_API+'/metodepenyampaian';
 const URL_supplypositioningmatrix = process.env.VUE_APP_ROOT_API+'/supplypositioningmatrix';
 const URL_unitinisiator = process.env.VUE_APP_ROOT_API+'/unitinisiator';
@@ -343,7 +343,22 @@ const dataSource = new CustomStore({
   key: 'id',
 
   load: () => {
-      return fetch(URL+process.env.VUE_APP_PAGE_SIZE)
+    let uri = window.location.href.split('?');
+    let drpid = '';
+    if(uri.length == 2) {
+      let vars = uri[1].split('&');
+      let getVars = {};
+      let tmp = '';
+      vars.forEach(function(v) {
+        tmp = v.split('=');
+        if(tmp.length == 2)
+          getVars[tmp[0]] = tmp[1];
+      });
+      //console.log(getVars['drpid']);
+      drpid = getVars['drpid'];
+    }
+    
+      return fetch(URL+'/'+drpid)
       .then(response => response.json())
       .then(response => {
         return {
@@ -400,7 +415,7 @@ export default {
     DxColumnFixing,
     DxFormat
   },
-  
+
   data() {
       return {
           //jsonUrl: URL,
diff --git a/src/views/drp/drp-revisi.vue b/src/views/drp/drp-revisi.vue
new file mode 100644
index 0000000..d61e600
--- /dev/null
+++ b/src/views/drp/drp-revisi.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <h2 class="content-block">Drp Revisi</h2>
+    <div class="content-block">
+      <div class="dx-card responsive-paddings">
+        Put your content here
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+</style>
diff --git a/src/views/master-config/users-config.vue b/src/views/master-config/users-config.vue
index 827e147..6538dd5 100644
--- a/src/views/master-config/users-config.vue
+++ b/src/views/master-config/users-config.vue
@@ -47,7 +47,7 @@
                     <DxRequiredRule message="Isikan alamat email yang valid" />
                     <DxEmailRule message="Email tidak valid"/>
                   </DxItem>
-                  <DxItem dataField="noTelepon" :editor-options="{ placeholder: 'Masukan No. Telepon' }">
+                  <DxItem dataField="telepon" :editor-options="{ placeholder: 'Masukan No. Telepon' }">
                     <DxRequiredRule message="Isikan no telepon" />
                   </DxItem>
                 </DxForm>
@@ -55,7 +55,7 @@
                     :hide-on-outside-click="true"
                     :show-title="true"
                     :width="600"
-                    :height="550"
+                    :height="580"
                     title="Form Manajemen User"
                 />
             </DxEditing>
@@ -93,7 +93,7 @@
               <DxLookup display-expr="role" value-expr="id" :data-source="roles" :search-enabled="true" />
             </DxColumn>
             <DxColumn data-field="email" caption="Email"></DxColumn>
-            <DxColumn data-field="noTelepon" caption="No. Telepon"></DxColumn>
+            <DxColumn data-field="telepon" caption="No. Telepon"></DxColumn>
             <DxColumn data-field="isActive" caption="Status"></DxColumn>
             <DxColumn type="buttons" caption="Aksi">
               <DxButton name="edit"/>