From 9089bf310003ed4a7b8ed93bad23a86dfd92c2f4 Mon Sep 17 00:00:00 2001 From: kur0nek-o Date: Fri, 22 Mar 2024 10:57:12 +0700 Subject: [PATCH 1/2] fix: avg field color in rekapitulasi gangguan all --- .../Pages/Gangguan/Rekap/RGangguan_ALL.vue | 101 +++++++++++++----- 1 file changed, 73 insertions(+), 28 deletions(-) diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue index 7ae89c4..1280732 100755 --- a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue +++ b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue @@ -173,7 +173,7 @@ caption="Rata-Rata" :allow-resizing="false" css-class="custom-table-column" - cell-template="formatNumber" + cell-template="formatDPT" /> - - - - - - + + + + + + + + + + + + @@ -572,7 +617,7 @@ css-class="custom-table-column" :width="50" alignment="center" - :calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1" + :calculateCellValue="(item: any) => dataSub.findIndex((i: any) => i == item) + 1" data-type="number" caption="No" cell-template="formatNumber" From fa6e11f25a7f04a39721c50a72c70a67ca8bd185 Mon Sep 17 00:00:00 2001 From: kur0nek-o Date: Fri, 22 Mar 2024 11:12:16 +0700 Subject: [PATCH 2/2] fix: export pdf in rekapitulasi gangguan all --- src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue | 1 - src/report/Gangguan/Rekap/RGangguan_ALL.ts | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue index 1280732..17bfbd1 100755 --- a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue +++ b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue @@ -1081,7 +1081,6 @@ import DetailDialog from '@/components/Dialogs/DetailDialog.vue' import InputText from '@/components/InputText.vue' import { apolloClient } from '@/utils/api/api.graphql' import { provideApolloClient } from '@vue/apollo-composable' -import autoTable from 'jspdf-autotable' import { exportToPDF } from '@/report/Gangguan/Rekap/RGangguan_ALL' const client = apolloClient() diff --git a/src/report/Gangguan/Rekap/RGangguan_ALL.ts b/src/report/Gangguan/Rekap/RGangguan_ALL.ts index 922f73c..7c0aa49 100644 --- a/src/report/Gangguan/Rekap/RGangguan_ALL.ts +++ b/src/report/Gangguan/Rekap/RGangguan_ALL.ts @@ -170,8 +170,8 @@ const formatData = (rawData: any) => { summary.total_selesai != summary.total ? formatPercentage((summary.total_selesai / summary.total) * 100) : '100%', - summary.total_inproses, - '0%', + formatNumber(summary.total_inproses), + formatPercentage((summary.total_inproses / summary.total) * 100), formatNumber(avgDurasiDispatch), formatWaktu(summary.max_durasi_dispatch), formatWaktu(summary.min_durasi_dispatch), @@ -220,8 +220,8 @@ const formatData = (rawData: any) => { formatNumber(total.total), formatNumber(total.total_selesai), formatPercentage((total.total_selesai / total.total) * 100), - total.total_inproses, - '0%', + formatNumber(total.total_inproses), + formatPercentage((total.total_inproses / total.total) * 100), formatNumber( total.avg_durasi_dispatch.length ? total.avg_durasi_dispatch.reduce((a: any, b: any) => a + b) /