diff --git a/package.json b/package.json
index 6a469b8..b356d59 100755
--- a/package.json
+++ b/package.json
@@ -1 +1 @@
-{"name":"eis","version":"0.0.176-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","set-version":"node version.js","version":"echo $npm_package_version"},"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.177-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","set-version":"node version.js","version":"echo $npm_package_version"},"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 cb49d82..11a28b6 100644
--- a/public/version.json
+++ b/public/version.json
@@ -1 +1 @@
-{"version":"0.0.176-vm"}
\ No newline at end of file
+{"version":"0.0.177-vm"}
\ No newline at end of file
diff --git a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue
index 79e803e..0781711 100755
--- a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue
+++ b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue
@@ -65,6 +65,14 @@
name="namaUID"
:calculate-group-value="(rowData: any) => rowData.nama_up3"
/> -->
+
+
-
@@ -259,14 +253,7 @@ import { ref, onMounted } from 'vue'
import { DxDataGrid } from 'devextreme-vue'
import DetailDialog from '@/components/Dialogs/DetailDialog.vue'
import InputText from '@/components/InputText.vue'
-import {
- DxColumn,
- DxExport,
- DxPager,
- DxPaging,
- DxSearchPanel,
- DxSelection
-} from 'devextreme-vue/data-grid'
+import { DxColumn, DxPager, DxPaging, DxSearchPanel, DxSelection } from 'devextreme-vue/data-grid'
import { Type15 } from '@/components/Form/FiltersType'
import Filters from '@/components/Form/Filters.vue'
import { queries, requestGraphQl } from '@/utils/api/api.graphql'
diff --git a/src/report/Anomali/Gangguan/Anomali_LAPPGP_LPP.ts b/src/report/Anomali/Gangguan/Anomali_LAPPGP_LPP.ts
index 4243186..7a5edb3 100644
--- a/src/report/Anomali/Gangguan/Anomali_LAPPGP_LPP.ts
+++ b/src/report/Anomali/Gangguan/Anomali_LAPPGP_LPP.ts
@@ -14,43 +14,21 @@ const detailFontSize = 3
const formatData = (rawData: any) => {
const formattedData: any = []
- const total: any = {
- wo_total: 0,
- anomali_pln_mobile_marking: 0,
- anomali_cc123_marking: 0
- // total_anomali_marking: 0
- // persen_anomali_pln_mobile_marking: 0
- // persen_anomali_cc123_marking
- // persen_anomali_marking
- }
rawData.forEach((item: any) => {
- total.wo_total += item.wo_total
- total.anomali_pln_mobile_marking += item.anomali_pln_mobile_marking
- total.anomali_cc123_marking += item.anomali_cc123_marking
+ formattedData.push([
+ item.nama_unit,
+ item.nama_petugas,
+ formatNumber(item.wo_total),
+ formatNumber(item.wo_pln_mobile),
+ formatNumber(item.wo_cc123),
+ formatNumber(item.wo_pln_mobile + item.wo_cc123),
+ formatPercentage(item.persen_anomali_pln_mobile),
+ formatPercentage(item.persen_anomali_cc123),
+ formatPercentage(item.persen_anomali_pln_mobile + item.persen_anomali_cc123)
+ ])
})
- const total_anomali_marking = total.anomali_pln_mobile_marking + total.anomali_cc123_marking
- const persen_anomali_pln_mobile_marking = total.anomali_pln_mobile_marking / total.wo_total
- const persen_anomali_cc123_marking = total.anomali_cc123_marking / total.wo_total
- const persen_anomali_marking = persen_anomali_pln_mobile_marking + persen_anomali_cc123_marking
-
- formattedData.push([
- {
- content: 'Semua Unit',
- colSpan: 2
- },
- formatNumber(total.wo_total),
- formatNumber(total.anomali_pln_mobile_marking),
- formatNumber(total.anomali_cc123_marking),
- formatNumber(total_anomali_marking),
- formatPercentage(
- !persen_anomali_pln_mobile_marking ? 0 : persen_anomali_pln_mobile_marking * 100
- ),
- formatPercentage(!persen_anomali_cc123_marking ? 0 : persen_anomali_cc123_marking * 100),
- formatPercentage(!persen_anomali_marking ? 0 : persen_anomali_marking * 100)
- ])
-
return formattedData
}
@@ -84,8 +62,8 @@ const exportToPDF = (reportMeta: any, rawData: any, preview: boolean = false) =>
const date = new Date().getDate()
const month = new Date().toLocaleString('id-ID', { month: 'long' })
const year = new Date().getFullYear()
- const data = formatData(rawData)
const meta = formatMetaData(reportMeta)
+ const data = formatData(rawData)
const doc = new jsPDF({
orientation: 'landscape'
})
diff --git a/src/utils/api/api.graphql.ts b/src/utils/api/api.graphql.ts
index dda506d..3695619 100755
--- a/src/utils/api/api.graphql.ts
+++ b/src/utils/api/api.graphql.ts
@@ -4009,6 +4009,7 @@ export const queries = {
pembuatLaporan: $pembuatLaporan
) {
id
+ keterangan_pelapor
keterangan_dlpd
no_laporan
idpel_nometer
@@ -4020,6 +4021,7 @@ export const queries = {
nama_up3
nama_ulp
nama_posko
+ #nama_petugas
id_regu
nama_regu
waktu_lapor
@@ -4050,6 +4052,7 @@ export const queries = {
pembuatLaporan: $pembuatLaporan
) {
id
+ keterangan_pelapor
keterangan_dlpd
no_laporan
idpel_nometer
@@ -4775,7 +4778,7 @@ export const queries = {
nama_up3
id_ulp
nama_ulp
- no_laporan
+ no_laporan_anomali
referensi_marking
waktu_lapor
waktu_response