Add new queries for monalisaJumlahKaliKeluhan and monalisaRecoveryTimeKeluhan

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

@@ -3,100 +3,42 @@
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div id="data">
-    <DxDataGrid
+    <DxDataGrid class="max-h-[calc(100vh-140px)] mb-10" :data-source="data" :show-column-lines="true"
-      class="max-h-[calc(100vh-140px)] mb-10"
+      :show-row-lines="false" :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
-      :data-source="data"
+      @selection-changed="onSelectionChanged" @exporting="onExporting" :allow-column-resizing="true"
-      :show-column-lines="true"
+      column-resizing-mode="widget" :word-wrap-enabled="true">
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel
+      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
-        :position="position"
+        v-if="loading" v-model:visible="loading" :enabled="true" />
-        :show-indicator="showIndicator"
-        :show-pane="showPane"
-        :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
-        :enabled="true"
-      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport
+      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
-        :enabled="true"
-        :formats="['pdf', 'xlsx', 'document']"
-        :allow-export-selected-data="false"
-      />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn
+      <DxColumn :width="200" alignment="center" data-field="nama_ulp" caption="Nama Unit"
-        alignment="center"
+        css-class="custom-table-column" />
-        data-field="nama_posko"
-        caption="Nama Unit"
-        css-class="custom-table-column"
-      />
       <DxColumn alignment="center" caption="Jumlah Kali Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :width="150"
+            :caption="`${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
-            alignment="center"
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            data-field="jumlah_bulan"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
-            data-type="number"
+          <DxColumn :width="150" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunLalu}`"
+            css-class="custom-table-column" cell-template="percent" />
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="jumlah_bulan_n_1"
-            data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="persen_bulan"
-            data-type="number"
-            caption="%"
-            css-class="custom-table-column"
-          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :width="150"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
-            alignment="center"
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            data-field="jumlah_tahun"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
-            data-type="number"
+          <DxColumn :width="150" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunLalu}`"
+            css-class="custom-table-column" cell-template="percent" />
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="jumlah_tahun_n_1"
-            data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="persen_tahun"
-            data-type="number"
-            caption="%"
-            css-class="custom-table-column"
-          />
         </DxColumn>
       </DxColumn>
+      <template #percent="{ data }">
+        {{ data.text }}%
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -124,6 +66,7 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
 import { getMonthName } from '@/utils/texts'
+import { queries } from '@/utils/graphql'
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -158,57 +101,30 @@ const onExporting = (e: any) => {
   }
 }
 
-const tahunSekarang = ref(new Date().getFullYear())
+const currentYear = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
+const currentMonth = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const lastYear = ref(currentYear.value - 1)
-const MONALISAJUMLAHKALIKELUHAN = gql`
+const { onResult, onError, loading, refetch } = useQuery(queries.monalisa.keluhan.rekap.jumlahKaliKeluhan, {
-  query DaftarMonalisaJumlahKaliKeluhan(
-    $regional: String
-    $posko: Int
-    $idUid: Int
-    $idUp3: Int
-    $bulan: Int
-    $tahun: Int
-  ) {
-    monalisaJumlahKaliKeluhan(
-      regional: $regional
-      posko: $posko
-      idUid: $idUid
-      idUp3: $idUp3
-      bulan: $bulan
-      tahun: $tahun
-    ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
-    }
-  }
-`
-const { onResult, onError, loading, refetch } = useQuery(MONALISAJUMLAHKALIKELUHAN, {
   regional: '',
-  posko: '',
+  idUlp: 0,
   idUid: 0,
   idUp3: 0,
-  bulan: bulanSekarang.value,
+  bulan: currentMonth.value,
-  tahun: tahunSekarang.value
+  tahun: currentYear.value
 })
 
 const filterData = (params: any) => {
-  const { regional, posko, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
+  currentMonth.value = bulan.id
-  tahunSekarang.value = tahun.id
+  currentYear.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  lastYear.value = tahun.id - 1
   refetch({
     regional: regional,
-    posko: posko ? posko.id : 0,
+    idUlp: ulp ? ulp.id : 0,
-    idUid: idUid ? idUid.id : 0,
+    idUid: uid ? uid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUp3: up3 ? up3.id : 0,
-    bulan: bulan ? bulan.id : bulanSekarang.value,
+    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : tahunSekarang.value
+    tahun: bulan ? tahun.id : currentYear.value
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
@@ -227,7 +143,7 @@ const onSelectionChanged = ({ selectedRowsData }: any) => {
   console.log(data)
 }
 onMounted(() => {
-  console.log(bulanSekarang.value)
+  console.log(currentMonth.value)
 })
 const filters = ref()
 </script>

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

@@ -3,104 +3,42 @@
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div id="data">
-    <DxDataGrid
+    <DxDataGrid class="max-h-[calc(100vh-140px)] mb-10" :data-source="data" :show-column-lines="true"
-      class="max-h-[calc(100vh-140px)] mb-10"
+      :show-row-lines="false" :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
-      :data-source="data"
+      @selection-changed="onSelectionChanged" @exporting="onExporting" :allow-column-resizing="true"
-      :show-column-lines="true"
+      column-resizing-mode="widget" :word-wrap-enabled="true">
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel
+      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
-        :position="position"
+        v-if="loading" v-model:visible="loading" :enabled="true" />
-        :show-indicator="showIndicator"
-        :show-pane="showPane"
-        :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
-        :enabled="true"
-      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport
+      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
-        :enabled="true"
-        :formats="['pdf', 'xlsx', 'document']"
-        :allow-export-selected-data="false"
-      />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn
+      <DxColumn :width="200" alignment="center" data-field="nama_ulp" caption="Nama Unit"
-        alignment="center"
+        css-class="custom-table-column" />
-        data-field="nama_posko"
+      <DxColumn alignment="center" caption="Jumlah RCT Kali Keluhan" css-class="custom-table-column">
-        caption="Nama Unit"
-        css-class="custom-table-column"
-      />
-      <DxColumn
-        alignment="center"
-        caption="Jumlah RCT Kali Keluhan"
-        css-class="custom-table-column"
-      >
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :width="150"
+            :caption="`${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
-            alignment="center"
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            data-field="jumlah_bulan"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
-            data-type="number"
+          <DxColumn :width="150" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunLalu}`"
+            css-class="custom-table-column" cell-template="percent" />
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="jumlah_bulan_n_1"
-            data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="persen_bulan"
-            data-type="number"
-            caption="%"
-            css-class="custom-table-column"
-          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :width="150"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
-            alignment="center"
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            data-field="jumlah_tahun"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
-            data-type="number"
+          <DxColumn :width="150" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunLalu}`"
+            css-class="custom-table-column" cell-template="percent" />
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="jumlah_tahun_n_1"
-            data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="persen_tahun"
-            data-type="number"
-            caption="%"
-            css-class="custom-table-column"
-          />
         </DxColumn>
       </DxColumn>
+      <template #percent="{ data }">
+        {{ data.text }}%
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -128,14 +66,15 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
 import { getMonthName } from '@/utils/texts'
+import { queries } from '@/utils/graphql'
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
-const tahunSekarang = ref(new Date().getFullYear())
+const currentYear = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
+const currentMonth = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const lastYear = ref(currentYear.value - 1)
 const dataDetail = ref<any>()
 const showDetail = ref(false)
 const onExporting = (e: any) => {
@@ -166,64 +105,31 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
-const monalisaDispatchingTimeKeluhan = gql`
+
-  query DaftarmonalisaDispatchingTimeKeluhan(
+const { onResult, onError, loading, refetch } = useQuery(queries.monalisa.keluhan.rekap.recoveryTimeKeluhan, {
-    $regional: String
-    $posko: Int
-    $idUid: Int
-    $idUp3: Int
-    $bulan: Int
-    $tahun: Int
-  ) {
-    monalisaDispatchingTimeKeluhan(
-      regional: $regional
-      posko: $posko
-      idUid: $idUid
-      idUp3: $idUp3
-      bulan: $bulan
-      tahun: $tahun
-    ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
-    }
-  }
-`
-const { onResult, onError, loading, refetch } = useQuery(monalisaDispatchingTimeKeluhan, {
   regional: '',
-  posko: '',
+  idUlp: 0,
   idUid: 0,
   idUp3: 0,
   bulan: 10,
   tahun: 2023
 })
 const filterData = (params: any) => {
-  const { regional, posko, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
+  currentMonth.value = bulan.id
-  tahunSekarang.value = tahun.id
+  currentYear.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  lastYear.value = tahun.id - 1
   refetch({
     regional: regional,
-    posko: posko ? posko.id : 0,
+    idUlp: ulp ? ulp.id : 0,
-    idUid: idUid ? idUid.id : 0,
+    idUid: uid ? uid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUp3: up3 ? up3.id : 0,
     bulan: bulan ? bulan.id : 10,
     tahun: bulan ? tahun.id : 2023
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaDispatchingTimeKeluhan.forEach((item: any) => {
+      data.value = queryResult.data.monalisaRecoveryTimeKeluhan
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)

src/utils/graphql.ts

@@ -298,36 +298,74 @@ export const queries = {
     },
     keluhan: {
       rekap: {
-
+        jumlahKaliKeluhan: gql`
+          query DaftarMonalisaJumlahKaliKeluhan(
+            #$regional: String
+            $idUlp: Int
+            $idUid: Int
+            $idUp3: Int
+            $bulan: Int
+            $tahun: Int
+          ) {
+            monalisaJumlahKaliKeluhan(
+              #regional: $regional
+              idUlp: $idUlp
+              idUid: $idUid
+              idUp3: $idUp3
+              bulan: $bulan
+              tahun: $tahun
+            ) {
+              nama_regional
+              id_uid
+              nama_uid
+              id_up3
+              nama_up3
+              id_ulp
+              nama_ulp
+              mom_bulan_ini
+              mom_bulan_kemarin
+              persen_mom
+              yoy_tahun_ini
+              yoy_tahun_kemarin
+              persen_yoy
+            }
+          }
+        `,
+        recoveryTimeKeluhan: gql`
+          query DaftarmonalisaRecoveryTimeKeluhan(
+            #$regional: String
+            $idUlp: Int
+            $idUid: Int
+            $idUp3: Int
+            $bulan: Int
+            $tahun: Int
+          ) {
+            monalisaRecoveryTimeKeluhan(
+              #regional: $regional
+              idUlp: $idUlp
+              idUid: $idUid
+              idUp3: $idUp3
+              bulan: $bulan
+              tahun: $tahun
+            ) {
+              nama_regional
+              id_uid
+              nama_uid
+              id_up3
+              nama_up3
+              id_ulp
+              nama_ulp
+              mom_bulan_ini
+              mom_bulan_kemarin
+              persen_mom
+              yoy_tahun_ini
+              yoy_tahun_kemarin
+              persen_yoy
+            }
+          }
+        `
       }
     }
   },
 
-  MONALISAJUMLAHKALIKELUHAN: gql`
-  query DaftarMonalisaJumlahKaliKeluhan(
-    #$regional: String
-    $idUlp: Int
-    $idUid: Int
-    $idUp3: Int
-    $bulan: Int
-    $tahun: Int
-  ) {
-    monalisaJumlahKaliKeluhan(
-      #regional: $regional
-      idUlp: $idUlp
-      idUid: $idUid
-      idUp3: $idUp3
-      bulan: $bulan
-      tahun: $tahun
-    ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
-    }
-  }
-`
 }