From 195976344ea8427f2792cbf0a4cf959b2a4cd03f Mon Sep 17 00:00:00 2001
From: Titan Hadiyan <titanhadiyan@gmail.com>
Date: Wed, 7 Jun 2023 05:32:14 +0700
Subject: [PATCH] Penyesuaian Icon dan drp pengadaan

---
 src/components/icons/IconAttach.vue      |  6 +++
 src/components/icons/IconDocDetail.vue   |  5 +++
 src/views/drp/drp-pengadaan.vue          |  7 +++-
 src/views/drp/drp-penyusunan.vue         | 49 +++++++++++++++++-------
 src/views/master-config/roles-config.vue |  2 +-
 5 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 src/components/icons/IconAttach.vue
 create mode 100644 src/components/icons/IconDocDetail.vue

diff --git a/src/components/icons/IconAttach.vue b/src/components/icons/IconAttach.vue
new file mode 100644
index 0000000..78e71e6
--- /dev/null
+++ b/src/components/icons/IconAttach.vue
@@ -0,0 +1,6 @@
+<template>
+  <svg width="12" height="14" viewBox="0 0 12 14" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="width: 14px; height: 14px; color: orange;">
+    <path d="M1.99984 13.6673C1.63317 13.6673 1.31939 13.5369 1.0585 13.276C0.79717 13.0147 0.666504 12.7007 0.666504 12.334V1.66732C0.666504 1.30065 0.79717 0.986651 1.0585 0.725318C1.31939 0.464429 1.63317 0.333984 1.99984 0.333984H7.99984L11.3332 3.66732V12.334C11.3332 12.7007 11.2027 13.0147 10.9418 13.276C10.6805 13.5369 10.3665 13.6673 9.99984 13.6673H1.99984ZM1.99984 12.334H9.99984V4.33398H7.33317V1.66732H1.99984V12.334ZM5.99984 11.6673C6.74428 11.6673 7.37495 11.4062 7.89184 10.884C8.40828 10.3618 8.6665 9.73398 8.6665 9.00065V6.33398H7.33317V9.00065C7.33317 9.36732 7.20539 9.68132 6.94984 9.94265C6.69428 10.2035 6.37762 10.334 5.99984 10.334C5.63317 10.334 5.31939 10.2035 5.0585 9.94265C4.79717 9.68132 4.6665 9.36732 4.6665 9.00065V5.33398C4.6665 5.23398 4.69984 5.15332 4.7665 5.09198C4.83317 5.0311 4.91095 5.00065 4.99984 5.00065C5.09984 5.00065 5.1805 5.0311 5.24184 5.09198C5.30273 5.15332 5.33317 5.23398 5.33317 5.33398V9.00065H6.6665V5.33398C6.6665 4.86732 6.50539 4.47287 6.18317 4.15065C5.86095 3.82843 5.4665 3.66732 4.99984 3.66732C4.53317 3.66732 4.13873 3.82843 3.8165 4.15065C3.49428 4.47287 3.33317 4.86732 3.33317 5.33398V9.00065C3.33317 9.73398 3.59428 10.3618 4.1165 10.884C4.63873 11.4062 5.2665 11.6673 5.99984 11.6673Z" fill="#DBD203"/>
+  </svg>
+</template>
+  
\ No newline at end of file
diff --git a/src/components/icons/IconDocDetail.vue b/src/components/icons/IconDocDetail.vue
new file mode 100644
index 0000000..419ec0d
--- /dev/null
+++ b/src/components/icons/IconDocDetail.vue
@@ -0,0 +1,5 @@
+<template>
+    <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path d="M13.3332 11.6673L11.3332 9.66732V11.0007H8.6665V12.334H11.3332V13.6673L13.3332 11.6673ZM7.19984 13.6673H1.99984C1.2665 13.6673 0.666504 13.0673 0.666504 12.334V1.66732C0.666504 0.933984 1.2665 0.333984 1.99984 0.333984H7.33317L11.3332 4.33398V7.73398C11.1332 7.66732 10.8665 7.66732 10.6665 7.66732C10.4665 7.66732 10.1998 7.66732 9.99984 7.73398V5.00065H6.6665V1.66732H1.99984V12.334H6.73317C6.79984 12.8007 6.99984 13.2673 7.19984 13.6673ZM3.33317 7.00065H8.6665V8.20065C8.59984 8.26732 8.53317 8.26732 8.4665 8.33398H3.33317V7.00065ZM3.33317 9.66732H6.6665V11.0007H3.33317V9.66732Z" fill="#0996C2"/>
+    </svg>
+</template>
\ No newline at end of file
diff --git a/src/views/drp/drp-pengadaan.vue b/src/views/drp/drp-pengadaan.vue
index 04ff917..ea3cfe0 100644
--- a/src/views/drp/drp-pengadaan.vue
+++ b/src/views/drp/drp-pengadaan.vue
@@ -9,6 +9,9 @@
     <div class="content-block">
       <div class="dx-card responsive-paddings">
         <div id="app-container">
+          <DxForm id="form">
+            
+          </DxForm>
           <DxPopup
             v-model:visible="isPopupDokumenPengadaan"
             :drag-enabled="false"
@@ -91,7 +94,7 @@
                     :width="400"
                     :height="400"
                     title="Form DRP Pengadaan"
-                ></DxPopup>
+                  />
             </DxEditing>
             <DxToolbar>
                 <DxItem name="groupPanel" />
@@ -100,7 +103,7 @@
                   <DxTexts add-row="Tambah"></DxTexts>
                 </DxItem>
             </DxToolbar>
-            <DxPaging :page-size="5" />
+            <DxPaging :page-size="10" />
             <DxPager 
             :visible="true"
             :allowed-page-sizes="[5, 10, 50]" 
diff --git a/src/views/drp/drp-penyusunan.vue b/src/views/drp/drp-penyusunan.vue
index 1fc8fc7..824e2bb 100644
--- a/src/views/drp/drp-penyusunan.vue
+++ b/src/views/drp/drp-penyusunan.vue
@@ -56,6 +56,13 @@
                   <DxRequiredRule message="Tahun harus diisi" />
                 </DxItem>
               </DxForm>
+              <DxPopup
+                    :hide-on-outside-click="true"
+                    :show-title="true"
+                    :width="400"
+                    :height="400"
+                    title="Tahun DRP"
+               ></DxPopup>
             </DxEditing>
             <DxToolbar>
               <DxItem name="groupPanel" />
@@ -63,8 +70,6 @@
               <DxItem name="addRowButton" show-text="always" css-class="">
                 <DxTexts add-row="Tambah"></DxTexts>
               </DxItem>
-              <DxItem name="exportButton" />
-              <DxItem name="columnChooserButton" />
             </DxToolbar>
             <DxPaging :page-size="5" />
             <DxPager
@@ -100,22 +105,31 @@
             <DxColumn type="buttons" caption="Aksi">
               <DxButton
                 text="Dokumen"
-                icon="attach"
                 hint="Dokumen Pendukung DRP"
                 :on-click="linkDokumen"
-              />
+              >
+                <template #default>
+                  <IconAttach />
+                </template>
+              </DxButton>
               <DxButton
-                text="Detil"
-                icon="search"
-                hint="Detil/Konten DRP"
+                text="View"
+                hint="Detail DRP"
+                :on-click="linkDokumen"
+              >
+                <template #default>
+                  <IconEye />
+                </template>
+              </DxButton>
+              <DxButton
+                text="Detail"
+                hint="Detail/Konten DRP"
                 :on-click="linkDetail"
-              />
-              <DxButton
-                text="Kirim"
-                icon="movetofolder"
-                hint="Kirim DRP"
-                :on-click="linkKirim"
-              />
+              >
+                <template #default>
+                  <IconDocDetail />
+                </template>
+              </DxButton>
             </DxColumn>
             <DxColumn type="adaptive" :width="50">
               <DxButton hint="detail" icon="copy" />
@@ -153,6 +167,10 @@ import DxDataGrid, {
   // DxLookup,
 } from "devextreme-vue/data-grid";
 import CustomStore from "devextreme/data/custom_store";
+import IconAttach from '../../components/icons/IconAttach.vue';
+import IconEye from '../../components/icons/IconEye.vue';
+import IconDocDetail from '../../components/icons/IconDocDetail.vue';
+
 import DxPopup, { DxToolbarItem } from 'devextreme-vue/popup';
 
 import PopUpUploadDokumenPendukung from './drp-upload-dokumen-pendukung.vue'
@@ -239,6 +257,9 @@ export default {
     DxPopup,
     DxToolbarItem,
     PopUpUploadDokumenPendukung,
+    IconAttach, 
+    IconEye,
+    IconDocDetail
   },
   methods: {
     linkDokumen(e) {
diff --git a/src/views/master-config/roles-config.vue b/src/views/master-config/roles-config.vue
index a9b7558..00d7a6a 100644
--- a/src/views/master-config/roles-config.vue
+++ b/src/views/master-config/roles-config.vue
@@ -50,7 +50,7 @@
                 <DxItem name="exportButton" />
                 <DxItem name="columnChooserButton" />
             </DxToolbar>
-            <DxPaging :page-size="5" />
+            <DxPaging :page-size="10" />
             <DxPager 
             :visible="true"
             :allowed-page-sizes="[5, 10, 50]"