From bf9a6ff23ccdae4cd2884a3b7d783f1082e90953 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Mon, 22 Apr 2024 13:57:27 +0700 Subject: [PATCH] Update version.json to 0.0.136-vm --- package.json | 2 +- public/version.json | 2 +- src/components/Pages/Cico/LaporanCICO.vue | 12 +++- .../Pages/Ctt/CTT_LaporanCttKwhPeriksa.vue | 14 ++-- .../Rekap/RKeluhan_PerFungsiBidang.vue | 22 +++--- .../Rekap/RKeluhan_PerKelompokKeluhan.vue | 2 +- .../MonalisaGR_DispatchingTimeGangguan.vue | 70 +++++++++++++------ 7 files changed, 81 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 0fce453..0853fc8 100755 --- a/package.json +++ b/package.json @@ -1 +1 @@ -{"name":"eis","version":"0.0.130-vm","private":true,"scripts":{"dev":"vite","host":"vite --host","tailwind":"tailwindcss -i ./src/assets/css/tailwind.css -o ./src/assets/css/style.css --watch","build":"run-p type-check build-only","preview":"vite preview --host","test:unit":"vitest","build-only":"vite build","type-check":"vue-tsc --noEmit -p tsconfig.vitest.json --composite false","lint":"eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore","format":"prettier --write src/","deploy":"node deploy.js"},"dependencies":{"@apollo/client":"^3.8.10","@apollo/link-context":"^2.0.0-beta.3","@flavorly/vanilla-components":"^0.7.65","@headlessui/tailwindcss":"^0.2.0","@headlessui/vue":"^1.7.19","@heroicons/vue":"^2.0.18","@lottiefiles/lottie-player":"^2.0.4","@phosphor-icons/vue":"^2.1.6","@types/qs":"^6.9.12","@types/uuid":"^9.0.8","@types/vue-select":"^3.16.8","@vue/apollo-components":"^4.0.0","@vue/apollo-composable":"^4.0.1","@vue/apollo-option":"^4.0.0","axios":"^1.6.7","devextreme":"23.2.4","devextreme-vue":"23.2.4","docx":"^8.5.0","dotenv":"^16.3.1","encrypt-storage":"^2.12.22","exceljs":"^4.4.0","file-saver":"^2.0.5","graphql":"^16.8.1","graphql-tag":"^2.12.6","jspdf":"^2.5.1","jspdf-autotable":"^3.8.2","pinia":"^2.1.3","qs":"^6.11.2","uuid":"^9.0.1","vue":"^3.3.4","vue-html-to-paper":"^2.0.3","vue-router":"^4.2.2","vue-tailwind-datepicker":"^1.6.1","vue3-star-ratings":"^3.0.5"},"devDependencies":{"@rushstack/eslint-patch":"^1.5.1","@tailwindcss/aspect-ratio":"^0.4.2","@tailwindcss/container-queries":"^0.1.1","@tailwindcss/forms":"^0.5.7","@tailwindcss/typography":"^0.5.10","@tsconfig/node18":"^2.0.1","@types/file-saver":"^2.0.6","@types/jsdom":"^21.1.1","@types/node":"^18.16.17","@vitejs/plugin-vue":"^4.2.3","@vitejs/plugin-vue-jsx":"^3.0.1","@vue/eslint-config-prettier":"^8.0.0","@vue/eslint-config-typescript":"^12.0.0","@vue/test-utils":"^2.3.2","@vue/tsconfig":"^0.4.0","autoprefixer":"^10.4.14","eslint":"^8.39.0","eslint-plugin-vue":"^9.11.0","jsdom":"^22.1.0","npm-run-all":"^4.1.5","postcss":"^8.4.24","prettier":"^3.0.3","tailwindcss":"^3.3.2","typescript":"~5.2.2","vite":"^4.3.9","vitest":"^1.3.1","vue-tsc":"^2.0.5"}} \ No newline at end of file +{"name":"eis","version":"0.0.136-vm","private":true,"scripts":{"dev":"vite","host":"vite --host","tailwind":"tailwindcss -i ./src/assets/css/tailwind.css -o ./src/assets/css/style.css --watch","build":"run-p type-check build-only","preview":"vite preview --host","test:unit":"vitest","build-only":"vite build","type-check":"vue-tsc --noEmit -p tsconfig.vitest.json --composite false","lint":"eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore","format":"prettier --write src/","deploy":"node deploy.js"},"dependencies":{"@apollo/client":"^3.8.10","@apollo/link-context":"^2.0.0-beta.3","@flavorly/vanilla-components":"^0.7.65","@headlessui/tailwindcss":"^0.2.0","@headlessui/vue":"^1.7.19","@heroicons/vue":"^2.0.18","@lottiefiles/lottie-player":"^2.0.4","@phosphor-icons/vue":"^2.1.6","@types/qs":"^6.9.12","@types/uuid":"^9.0.8","@types/vue-select":"^3.16.8","@vue/apollo-components":"^4.0.0","@vue/apollo-composable":"^4.0.1","@vue/apollo-option":"^4.0.0","axios":"^1.6.7","devextreme":"23.2.4","devextreme-vue":"23.2.4","docx":"^8.5.0","dotenv":"^16.3.1","encrypt-storage":"^2.12.22","exceljs":"^4.4.0","file-saver":"^2.0.5","graphql":"^16.8.1","graphql-tag":"^2.12.6","jspdf":"^2.5.1","jspdf-autotable":"^3.8.2","pinia":"^2.1.3","qs":"^6.11.2","uuid":"^9.0.1","vue":"^3.3.4","vue-html-to-paper":"^2.0.3","vue-router":"^4.2.2","vue-tailwind-datepicker":"^1.6.1","vue3-star-ratings":"^3.0.5"},"devDependencies":{"@rushstack/eslint-patch":"^1.5.1","@tailwindcss/aspect-ratio":"^0.4.2","@tailwindcss/container-queries":"^0.1.1","@tailwindcss/forms":"^0.5.7","@tailwindcss/typography":"^0.5.10","@tsconfig/node18":"^2.0.1","@types/file-saver":"^2.0.6","@types/jsdom":"^21.1.1","@types/node":"^18.16.17","@vitejs/plugin-vue":"^4.2.3","@vitejs/plugin-vue-jsx":"^3.0.1","@vue/eslint-config-prettier":"^8.0.0","@vue/eslint-config-typescript":"^12.0.0","@vue/test-utils":"^2.3.2","@vue/tsconfig":"^0.4.0","autoprefixer":"^10.4.14","eslint":"^8.39.0","eslint-plugin-vue":"^9.11.0","jsdom":"^22.1.0","npm-run-all":"^4.1.5","postcss":"^8.4.24","prettier":"^3.0.3","tailwindcss":"^3.3.2","typescript":"~5.2.2","vite":"^4.3.9","vitest":"^1.3.1","vue-tsc":"^2.0.5"}} \ No newline at end of file diff --git a/public/version.json b/public/version.json index a2fb404..fbbbb1e 100644 --- a/public/version.json +++ b/public/version.json @@ -1 +1 @@ -{"version":"0.0.130-vm"} \ No newline at end of file +{"version":"0.0.136-vm"} \ No newline at end of file diff --git a/src/components/Pages/Cico/LaporanCICO.vue b/src/components/Pages/Cico/LaporanCICO.vue index 956d718..ce76c2a 100755 --- a/src/components/Pages/Cico/LaporanCICO.vue +++ b/src/components/Pages/Cico/LaporanCICO.vue @@ -1204,6 +1204,8 @@ const isGangguanIndividual = ref(false) const isDialogEnabled = ref(false) const onCellClicked = (e: any) => { + console.log(e) + if (e.rowType == 'data' || e.rowType == 'totalFooter') { isTotal.value = e.rowType == 'totalFooter' if ( @@ -1212,6 +1214,9 @@ const onCellClicked = (e: any) => { ) { isGangguanIndividual.value = e.column.dataField == 'jumlah_wo_gangguan_individual' isDialogEnabled.value = true + if (e.rowType == 'totalFooter') { + showDetail() + } } else { isDialogEnabled.value = false } @@ -1223,6 +1228,7 @@ const closedialogDetail = () => (dialogDetail.value = false) const getDetail = async () => { const dateValue = filters.value.periode.split(' s/d ') const selected = dataSelected.value + const { posko, uid, up3 } = filters.value const query = { dateFrom: dateValue[0] @@ -1231,9 +1237,9 @@ const getDetail = async () => { dateTo: dateValue[1] ? dateValue[1].split('-').reverse().join('-') : new Date().toISOString().slice(0, 10), - idPosko: selected?.id_posko ? selected?.id_posko : 0, - idUid: selected?.id_uid ? selected?.id_uid : 0, - idUp3: selected?.id_up3 ? selected?.id_up3 : 0, + idPosko: posko ? posko.id : 0, + idUid: uid ? uid.id : 0, + idUp3: up3 ? up3.id : 0, personilYantek: isTotal.value ? '' : selected?.personil_yantek ? selected?.personil_yantek : '' } diff --git a/src/components/Pages/Ctt/CTT_LaporanCttKwhPeriksa.vue b/src/components/Pages/Ctt/CTT_LaporanCttKwhPeriksa.vue index c3b7fdb..3492ad1 100755 --- a/src/components/Pages/Ctt/CTT_LaporanCttKwhPeriksa.vue +++ b/src/components/Pages/Ctt/CTT_LaporanCttKwhPeriksa.vue @@ -980,9 +980,11 @@ const grouping = ref([ const setRequirementData = (data: any) => (requirementData.value = data) const onCellClicked = (e: any) => { - if (e.rowType == 'group') { - groupDialog.value = true - groupIndex.value = e.row.groupIndex + if (e.rowType == 'group' || e.rowType == 'data') { + if (e.rowType == 'group') { + groupDialog.value = true + groupIndex.value = e.row.groupIndex + } isDialogEnabled.value = true if (e.column.dataField == 'wo_cc123') { @@ -1045,8 +1047,10 @@ const onCellClicked = (e: any) => { isDialogEnabled.value = false } - groupData.value = getDataRowGroup(e.data) - showDetail() + if (e.rowType == 'group') { + groupData.value = getDataRowGroup(e.data) + showDetail() + } } else { groupDialog.value = false } diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue index 5a1638a..7fbaa37 100755 --- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue +++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue @@ -722,7 +722,7 @@ Dalam Proses Bidang: @@ -889,7 +889,7 @@

Selesai Bidang Unit:

@@ -965,7 +965,7 @@

Rayon:

- +
@@ -983,7 +983,7 @@
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue index 0199969..1920c73 100755 --- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue +++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue @@ -579,7 +579,7 @@ caption="Status" :allow-resizing="false" css-class="custom-table-column" - cell-template="formatTime" + cell-template="formatText" />

Durasi Penugasan Regu:

- +

Durasi Perjalanan Regu:

- +

Dispatch Oleh:

- +
@@ -940,12 +956,16 @@

Sumber Lapor:

- +

Diselesaikan Oleh:

- +
@@ -955,22 +975,30 @@

Referensi Marking:

- +

Kode Gangguan:

- +

Janis Gangguan:

- +

Tindakan:

- +