From 7fa97a3ce46fbab6733560245256ece01bfc4ab4 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Mon, 1 Apr 2024 10:38:11 +0700 Subject: [PATCH 1/3] Update GraphQL and REST endpoints in .env.development file --- .env.development | 3 --- 1 file changed, 3 deletions(-) diff --git a/.env.development b/.env.development index 76d9508..be32c90 100755 --- a/.env.development +++ b/.env.development @@ -3,8 +3,5 @@ VITE_BASE_DIRECTORY=/ VITE_APP_VERSION=0.0.1 VITE_APP_NAME='Executive Information System' # VITE_APP_GRAPHQL_ENDPOINT=http://10.8.0.13:32169/graphql -# VITE_APP_REST_ENDPOINT=http://192.168.191.163:32180 VITE_APP_GRAPHQL_ENDPOINT=http://10.1.50.173:32180/graphql - -# VITE_APP_GRAPHQL_ENDPOINT=http://192.168.137.46:32169/graphql VITE_APP_REST_ENDPOINT=http://10.1.50.173:32181 \ No newline at end of file From e97805be5aeea751e1996a697593b7511a3f71c2 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Mon, 1 Apr 2024 10:39:36 +0700 Subject: [PATCH 2/3] Update Anomali_LAPPGU.vue and Anomali_LAPPKU_LPT.vue components --- .../Pages/Anomali/Gangguan/Anomali_LAPPGU.vue | 2 +- .../Anomali/Gangguan/Anomali_LAPPGU_LPT.vue | 693 +++++++++++++++++- .../Anomali/Keluhan/Anomali_LAPPKU_LPT.vue | 52 +- src/utils/api/api.graphql.ts | 464 ++++++++++++ 4 files changed, 1157 insertions(+), 54 deletions(-) diff --git a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU.vue b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU.vue index e0e9184..0364bf5 100644 --- a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU.vue +++ b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU.vue @@ -10,7 +10,7 @@ /> - + diff --git a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU_LPT.vue b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU_LPT.vue index 7dae95a..9713096 100755 --- a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU_LPT.vue +++ b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGU_LPT.vue @@ -151,7 +151,7 @@ data-type="number" caption="Marking" css-class="custom-table-column" - cell-template="formatNumber" + cell-template="formatNumberPLNMobileMarking" /> @@ -173,7 +173,7 @@ data-type="number" caption="Marking" css-class="custom-table-column" - cell-template="formatNumber" + cell-template="formatNumberCCMarking" /> @@ -195,7 +195,7 @@ data-type="number" caption="Marking" css-class="custom-table-column" - cell-template="formatNumber" + cell-template="formatNumberTotalMarking" /> @@ -283,8 +283,80 @@ + + + + + + + + + + + + @@ -452,6 +524,492 @@ /> + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+

Posko:

+ +
+ +
+

No Laporan:

+ +
+ +
+

Tgl/Jam Lapor:

+ +
+ +
+

Tgl/Jam Datang:

+ +
+ +
+

Tgl/Jam Nyala:

+ +
+ +
+

Durasi Response Time:

+ +
+ +
+

Durasi Recovery Time:

+ +
+ +
+

Durasi Penugasan Regu:

+ +
+ +
+

Durasi Perjalanan Regu:

+ +
+ +
+

Jarak Closing (m):

+ +
+ +
+

Dispatch Oleh:

+ +
+ +
+

IDPEL/NO METER:

+ +
+ +
+

Nama Pelapor:

+ +
+ +
+

Alamat Pelapor:

+ +
+ +
+

NO Telp Pelapor:

+ +
+ +
+

Keterangan Pelapor:

+ +
+ +
+

Sumber Lapor:

+ +
+ +
+

Diselesaikan Oleh:

+ +
+ +
+

Status:

+ +
+ +
+

Referensi Marking:

+ +
+ +
+

Kode Gangguan:

+ +
+ +
+

Jenis Gangguan:

+ +
+ +
+

Penyebab:

+ +
+ +
+

Tindakan:

+ +
+
+
+ diff --git a/src/components/Pages/Anomali/Keluhan/Anomali_LAPPKU_LPT.vue b/src/components/Pages/Anomali/Keluhan/Anomali_LAPPKU_LPT.vue index 1bd83ff..63412cb 100755 --- a/src/components/Pages/Anomali/Keluhan/Anomali_LAPPKU_LPT.vue +++ b/src/components/Pages/Anomali/Keluhan/Anomali_LAPPKU_LPT.vue @@ -145,7 +145,7 @@ @@ -293,7 +290,7 @@ - + + diff --git a/src/utils/api/api.graphql.ts b/src/utils/api/api.graphql.ts index 47ed41a..26cd82e 100755 --- a/src/utils/api/api.graphql.ts +++ b/src/utils/api/api.graphql.ts @@ -3001,6 +3001,61 @@ export const queries = { }, anomali: { gangguan: { + unitBerulangDetail: gql` + query detailAnomaliPenangananPengaduanGangguanUnitBerulang( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + $isMarking: Int! + ) { + detailAnomaliPenangananPengaduanGangguanUnitBerulang( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + isMarking: $isMarking + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_response_time + durasi_recovery_time + durasi_dispatch_time + durasi_perjalanan + distance + dispatch_by + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + media + diselesaikan_oleh + status_akhir + kode_gangguan + jenis_gangguan + penyebab + tindakan + } + } + `, unitBerulang: gql` query anomaliPenangananPengaduanGangguanUnitBerulang( $dateFrom: Date! @@ -3044,6 +3099,61 @@ export const queries = { } } `, + unitRatingNegatifDetail: gql` + query detailAnomaliPenangananPengaduanGangguanUnitRatingNegatif( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + $isMarking: Int! + ) { + detailAnomaliPenangananPengaduanGangguanUnitRatingNegatif( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + isMarking: $isMarking + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_response_time + durasi_recovery_time + durasi_dispatch_time + durasi_perjalanan + distance + dispatch_by + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + media + diselesaikan_oleh + status_akhir + kode_gangguan + jenis_gangguan + penyebab + tindakan + } + } + `, unitRatingNegatif: gql` query anomaliPenangananPengaduanGangguanUnitRatingNegatif( $dateFrom: Date! @@ -3087,6 +3197,61 @@ export const queries = { } } `, + unitSkipStepDetail: gql` + query detailAnomaliPenangananPengaduanGangguanUnitSkipStep( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + $isMarking: Int! + ) { + detailAnomaliPenangananPengaduanGangguanUnitSkipStep( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + isMarking: $isMarking + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_response_time + durasi_recovery_time + durasi_dispatch_time + durasi_perjalanan + distance + dispatch_by + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + media + diselesaikan_oleh + status_akhir + kode_gangguan + jenis_gangguan + penyebab + tindakan + } + } + `, unitSkipStep: gql` query anomaliPenangananPengaduanGangguanUnitSkipStep( $dateFrom: Date! @@ -3130,6 +3295,57 @@ export const queries = { } } `, + petugasBerulangDetail: gql` + query detailAnomaliPenangananPengaduanGangguanPetugasBerulang( + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + $isMarking: Int! + ) { + detailAnomaliPenangananPengaduanGangguanPetugasBerulang( + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + isMarking: $isMarking + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_response_time + durasi_recovery_time + durasi_dispatch_time + durasi_perjalanan + distance + dispatch_by + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + media + diselesaikan_oleh + status_akhir + kode_gangguan + jenis_gangguan + penyebab + tindakan + } + } + `, petugasBerulang: gql` query anomaliPenangananPengaduanGangguanPetugasBerulang( $dateFrom: Date! @@ -3169,6 +3385,61 @@ export const queries = { } } `, + petugasRatingNegatifDetail: gql` + query detailAnomaliPenangananPengaduanGangguanPetugasRatingNegatif( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + $isMarking: Int! + ) { + detailAnomaliPenangananPengaduanGangguanPetugasRatingNegatif( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + isMarking: $isMarking + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_response_time + durasi_recovery_time + durasi_dispatch_time + durasi_perjalanan + distance + dispatch_by + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + media + diselesaikan_oleh + status_akhir + kode_gangguan + jenis_gangguan + penyebab + tindakan + } + } + `, petugasRatingNegatif: gql` query anomaliPenangananPengaduanGangguanPetugasRatingNegatif( $dateFrom: Date! @@ -3208,6 +3479,61 @@ export const queries = { } } `, + petugasSkipStepDetail: gql` + query detailAnomaliPenangananPengaduanGangguanPetugasSkipStep( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + $isMarking: Int! + ) { + detailAnomaliPenangananPengaduanGangguanPetugasSkipStep( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + isMarking: $isMarking + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_response_time + durasi_recovery_time + durasi_dispatch_time + durasi_perjalanan + distance + dispatch_by + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + media + diselesaikan_oleh + status_akhir + kode_gangguan + jenis_gangguan + penyebab + tindakan + } + } + `, petugasSkipStep: gql` query anomaliPenangananPengaduanGangguanPetugasSkipStep( $dateFrom: Date! @@ -3249,6 +3575,51 @@ export const queries = { ` }, keluhan: { + unitBerulangDetail: gql` + query detailAnomaliLaporanPenangananPengaduanKeluhanUnitBerulang( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + ) { + detailAnomaliLaporanPenangananPengaduanKeluhanUnitBerulang( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_recovery_time + durasi_response_time + status_akhir + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + uraian + respon_pelanggan + } + } + `, unitBerulang: gql` query anomaliLaporanPenangananPengaduanKeluhanUnitBerulang( $dateFrom: Date! @@ -3283,6 +3654,52 @@ export const queries = { total_anomali persen_anomali_pln_mobile persen_anomali_cc123 + total_persen_anomali + } + } + `, + unitSkipStepDetail: gql` + query detailAnomaliLaporanPenangananPengaduanKeluhanUnitSkipStep( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + ) { + detailAnomaliLaporanPenangananPengaduanKeluhanUnitSkipStep( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_recovery_time + durasi_response_time + status_akhir + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + uraian + respon_pelanggan } } `, @@ -3320,6 +3737,52 @@ export const queries = { total_anomali persen_anomali_pln_mobile persen_anomali_cc123 + total_persen_anomali + } + } + `, + unitRatingNegatifDetail: gql` + query detailAnomaliLaporanPenangananPengaduanKeluhanUnitRatingNegatif( + $dateFrom: Date! + $dateTo: Date! + $namaRegional: String! + $idUlp: Int! + $idUid: Int! + $idUp3: Int! + $media: String + ) { + detailAnomaliLaporanPenangananPengaduanKeluhanUnitRatingNegatif( + dateFrom: $dateFrom + dateTo: $dateTo + namaRegional: $namaRegional + idUlp: $idUlp + idUid: $idUid + idUp3: $idUp3 + media: $media + ) { + id + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + no_laporan + referensi_marking + waktu_lapor + waktu_response + waktu_recovery + durasi_recovery_time + durasi_response_time + status_akhir + idpel_nometer + nama_pelapor + alamat_pelapor + no_telp_pelapor + keterangan_pelapor + uraian + respon_pelanggan } } `, @@ -3357,6 +3820,7 @@ export const queries = { total_anomali persen_anomali_pln_mobile persen_anomali_cc123 + total_persen_anomali } } ` From 948895dfb5c55324ba325ad8481a32616e6f1a29 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Mon, 1 Apr 2024 10:41:35 +0700 Subject: [PATCH 3/3] Update import statement for getDataRowGroup in RGangguan_ALL and RGangguan_KTI --- .../Pages/Gangguan/Rekap/RGangguan_ALL.vue | 3 +- .../Pages/Gangguan/Rekap/RGangguan_KTI.vue | 3 +- src/utils/helper.ts | 39 +++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/utils/helper.ts diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue index f596087..3b67b02 100755 --- a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue +++ b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue @@ -1081,7 +1081,7 @@ import { exportDetailToPDF, exportDetailToXLSX } from '@/report/Gangguan/Rekap/RGangguan_ALL' -import { getDataRowGroup } from '@/utils/data' +import { getDataRowGroup } from '@/utils/helper' const client = apolloClient() provideApolloClient(client) @@ -1561,3 +1561,4 @@ onMounted(() => { } }) +@/utils/helper diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_KTI.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_KTI.vue index bb8bcd4..cb9b92b 100755 --- a/src/components/Pages/Gangguan/Rekap/RGangguan_KTI.vue +++ b/src/components/Pages/Gangguan/Rekap/RGangguan_KTI.vue @@ -1134,7 +1134,7 @@ import { exportDetailToXLSX } from '@/report/Gangguan/Rekap/RGangguan_KTI' import { getMonthNumber } from '@/utils/texts' -import { getDataRowGroup } from '@/utils/data' +import { getDataRowGroup } from '@/utils/helper' const client = apolloClient() provideApolloClient(client) const position = { of: '#data' } @@ -1659,3 +1659,4 @@ onMounted(() => { } }) +@/utils/helper diff --git a/src/utils/helper.ts b/src/utils/helper.ts new file mode 100644 index 0000000..0f38f66 --- /dev/null +++ b/src/utils/helper.ts @@ -0,0 +1,39 @@ +export const getDataRowGroup = (data: any): any => { + if (Array.isArray(data)) { + if (data[0].items) { + if (Array.isArray(data[0].items)) { + return getDataRowGroup(data[0].items[0]) + } else { + return getDataRowGroup(data[0].items) + } + } else if (data[0].collapsedItems) { + if (Array.isArray(data[0].collapsedItems)) { + return getDataRowGroup(data[0].collapsedItems[0]) + } else { + return getDataRowGroup(data[0].collapsedItems) + } + } else { + if (Array.isArray(data[0])) { + return getDataRowGroup(data[0]) + } else { + return getDataRowGroup(data) + } + } + } else { + if (data.items) { + if (Array.isArray(data.items)) { + return getDataRowGroup(data.items[0]) + } else { + return getDataRowGroup(data.items) + } + } else if (data.collapsedItems) { + if (Array.isArray(data.collapsedItems)) { + return getDataRowGroup(data.collapsedItems[0]) + } else { + return getDataRowGroup(data.collapsedItems) + } + } else { + return data + } + } +}