fix: alignment and summary in monalisa rekapitulasi keluhan per jenis keluhan

package-lock.json

@@ -4894,9 +4894,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.5",
+      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",

src/assets/css/style.css

@@ -1526,10 +1526,6 @@ body {
   display: inline-flex;
 }
 
-.table {
-  display: table;
-}
-
 .grid {
   display: grid;
 }

src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue

@@ -1,7 +1,13 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
+
   <div id="data">
     <DxDataGrid
       class="max-h-[calc(100vh-140px)] mb-10"

src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue

@@ -1,5 +1,10 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div id="data">

src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue

@@ -1,7 +1,13 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
+
   <div id="data">
     <DxDataGrid
       class="max-h-[calc(100vh-140px)] mb-10"
@@ -169,6 +175,7 @@ const showPane = ref(true)
 const data = ref<any[]>([])
 const dataDetail = ref<any>()
 const showDetail = ref(false)
+
 const { onResult, onError, loading, refetch } = useQuery(
   queries.monalisa.gangguan.rekap.gangguanPerJenisGangguan,
   {
@@ -180,6 +187,7 @@ const { onResult, onError, loading, refetch } = useQuery(
     idUlp: 0
   }
 )
+
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
 

src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue

@@ -1,5 +1,10 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div>

src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue

@@ -1,7 +1,13 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
+
   <div id="data">
     <DxDataGrid
       class="max-h-[calc(100vh-140px)] mb-10"

src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue

@@ -1,5 +1,10 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
 
@@ -43,18 +48,21 @@
         :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
         caption="NO"
         css-class="custom-table-column"
+        cell-template="formatNumber"
       />
       <DxColumn
         alignment="center"
         data-field="id_jenis_keluhan"
         caption="ID Keluhan"
         css-class="custom-table-column"
+        cell-template="formatText"
       />
       <DxColumn
         alignment="center"
         data-field="nama_jenis_keluhan"
         caption="Jenis Keluhan"
         css-class="custom-table-column"
+        cell-template="formatText"
       />
       <DxColumn
         :width="170"
@@ -62,6 +70,7 @@
         data-field="jumlah"
         caption="Jumlah"
         css-class="custom-table-column"
+        cell-template="formatNumber"
       />
       <DxColumn
         :width="70"
@@ -69,15 +78,55 @@
         data-field="persen"
         caption="%"
         css-class="custom-table-column"
-        cell-template="percent"
+        cell-template="formatNumber"
       />
-      <template #percent="{ data }"> {{ data.text }}% </template>
+
+      <DxSummary>
+        <DxTotalItem
+          summary-type="sum"
+          display-format="TOTAL"
+          show-in-column="id_jenis_keluhan"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="jumlah"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxTotalItem
+          column="persen"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
+        />
+      </DxSummary>
+
+      <template #formatNumber="{ data }">
+        <p class="text-right">
+          {{
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
+        </p>
+      </template>
+
+      <template #formatText="{ data }">
+        <p class="!text-left">
+          {{ data.text }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
 import { DxDataGrid } from 'devextreme-vue'
@@ -89,7 +138,9 @@ import {
   DxPaging,
   DxScrolling,
   DxSearchPanel,
-  DxSelection
+  DxSelection,
+  DxSummary,
+  DxTotalItem
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
@@ -97,14 +148,18 @@ import { exportDataGrid as exportToExcel } from 'devextreme/excel_exporter'
 import { saveAs } from 'file-saver'
 import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
+import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
 import gql from 'graphql-tag'
+
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
-const dataDetail = ref<any>()
+const filters = ref()
-const showDetail = ref(false)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth() + 1)
+const lastYear = ref(new Date().getFullYear() - 1)
 
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
@@ -164,24 +219,29 @@ const monalisaGangguanPerJenisKeluhan = gql`
   }
 `
 const { onResult, onError, loading, refetch } = useQuery(monalisaGangguanPerJenisKeluhan, {
-  bulan: 10,
+  bulan: currentMonth.value,
-  tahun: 2023,
+  tahun: currentYear.value,
+  // regional: '',
   idUlp: 0,
-  regional: '',
   idUid: 0,
   idUp3: 0
 })
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
 
+  currentYear.value = tahun.id
+  currentMonth.value = bulan.id
+  lastYear.value = tahun.id - 1
+
   refetch({
-    regional: regional,
+    // regional: regional,
     idUlp: ulp ? ulp.id : 0,
     idUid: uid ? uid.id : 0,
     idUp3: up3 ? up3.id : 0,
-    bulan: bulan ? bulan.id : 10,
+    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : 2023
+    tahun: bulan ? tahun.id : currentYear.value
   })
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaGangguanPerJenisKeluhan
@@ -190,9 +250,22 @@ const filterData = (params: any) => {
     console.log(queryResult.loading)
     console.log(queryResult.networkStatus)
   })
+
   onError((error) => {
     console.log(error)
   })
 }
-const filters = ref()
+
+onMounted(() => {
+  if (import.meta.env.DEV) {
+    data.value = [
+      {
+        id_jenis_keluhan: 1,
+        nama_jenis_keluhan: 'Umum',
+        jumlah: 802596,
+        persen: 100
+      }
+    ]
+  }
+})
 </script>