diff --git a/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_KDADPelaporan.vue b/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_KDADPelaporan.vue
index 1daeed4..c3f1509 100755
--- a/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_KDADPelaporan.vue
+++ b/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_KDADPelaporan.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"
@@ -38,11 +44,40 @@
       <DxColumnFixing :enabled="true" />
 
       <DxColumn
-        :min-width="250"
         alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_regional"
+        caption="Nama Regional"
+        css-class="custom-table-column"
+        :group-index="0"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_uid"
+        caption="Nama UID"
+        css-class="custom-table-column"
+        :group-index="1"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_up3"
+        caption="Nama UP3"
+        css-class="custom-table-column"
+        :group-index="2"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
         data-field="nama_ulp"
         caption="Nama Unit"
         css-class="custom-table-column"
+        name="namaULP"
         cell-template="formatText"
       />
       <DxColumn
@@ -58,6 +93,7 @@
             data-type="number"
             caption="Jan 2020"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -66,16 +102,18 @@
             data-type="number"
             caption="Total Gangguan"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Keluhan Berulang" css-class="custom-table-column">
           <DxColumn
             :width="150"
             alignment="center"
-            data-field="komplain_pelanggan"
+            data-field="keluhan_berulang"
             data-type="number"
             caption="Jan 2020"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -84,6 +122,7 @@
             data-type="number"
             caption="Total Keluhan"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -94,15 +133,134 @@
         data-type="number"
         caption="Komplain Pelanggan %"
         css-class="custom-table-column"
-        cell-template="percent"
+        cell-template="formatPercentage"
       />
 
-      <template #percent="{ data }">
-        <p>{{ data.text }}%</p>
+      <DxSummary>
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="nama_ulp"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="gangguan_berulang"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxTotalItem
+          column="gangguan_total"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxTotalItem
+          column="keluhan_berulang"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxTotalItem
+          column="keluhan_total"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxTotalItem
+          column="komplain_pelanggan"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="
+            (e: any) =>
+              parseFloat(e.value.toString())
+                ? formatPercentage(parseFloat(e.value.toString()))
+                : '0%'
+          "
+        />
+
+        <DxGroupItem
+          css-class="!text-right"
+          show-in-column="gangguan_berulang"
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          column="gangguan_berulang"
+          summary-type="sum"
+          display-format="{0}"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxGroupItem
+          css-class="!text-right"
+          show-in-column="gangguan_total"
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          column="gangguan_total"
+          summary-type="sum"
+          display-format="{0}"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxGroupItem
+          css-class="!text-right"
+          show-in-column="keluhan_berulang"
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          column="keluhan_berulang"
+          summary-type="sum"
+          display-format="{0}"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxGroupItem
+          css-class="!text-right"
+          show-in-column="keluhan_total"
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          column="keluhan_total"
+          summary-type="sum"
+          display-format="{0}"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
+        />
+        <DxGroupItem
+          css-class="!text-right"
+          show-in-column="komplain_pelanggan"
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          column="komplain_pelanggan"
+          summary-type="sum"
+          display-format="{0}"
+          :customize-text="
+            (e: any) =>
+              parseFloat(e.value.toString())
+                ? formatPercentage(parseFloat(e.value.toString()))
+                : '0%'
+          "
+        />
+      </DxSummary>
+
+      <template #formatNumber="{ data }">
+        <p class="text-right cursor-pointer">
+          {{
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
+        </p>
+      </template>
+
+      <template #formatPercentage="{ data }">
+        <p class="text-right cursor-pointer">
+          {{ parseFloat(data.text) ? formatPercentage(data.text) : '0%' }}
+        </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="text-left">
+        <p class="text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -113,7 +271,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -123,7 +281,10 @@ import {
   DxPaging,
   DxScrolling,
   DxSearchPanel,
-  DxSelection
+  DxSelection,
+  DxSummary,
+  DxTotalItem,
+  DxGroupItem
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
@@ -132,13 +293,18 @@ import { saveAs } from 'file-saver'
 import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import { queries } from '@/utils/api/api.graphql'
+import { getMonthName } from '@/utils/texts'
+import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
-const dataDetail = ref<any>()
-const showDetail = ref(false)
 const data = ref<any[]>([])
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
+const filters = ref()
 
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
@@ -177,25 +343,31 @@ const onSelectionChanged = ({ selectedRowsData }: any) => {
 const { onResult, onError, loading, refetch } = useQuery(
   queries.monalisa.laporan.kumulatif.kepatuhandanAkurasiDalamPelaporanKumulatif,
   {
-    regional: '',
+    // regional: '',
     idUlp: 0,
     idUid: 0,
     idUp3: 0,
-    bulan: 10,
-    tahun: 2023
+    bulan: currentMonth.value,
+    tahun: currentYear.value
   }
 )
+
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
 
+  currentMonth.value = bulan.id
+  currentYear.value = tahun.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,
-    tahun: bulan ? tahun.id : 2023
+    bulan: bulan ? bulan.id : currentMonth.value,
+    tahun: bulan ? tahun.id : currentYear.value
   })
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.kepatuhandanAkurasiDalamPelaporanKumulatif
@@ -204,9 +376,88 @@ 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) {
+    getMonthName(filters.value.bulan.id)
+
+    data.value = [
+      {
+        nama_regional: '',
+        id_uid: 0,
+        nama_uid: '',
+        id_up3: 0,
+        nama_up3: '',
+        id_ulp: 0,
+        nama_ulp: 'CONTACT CENTER 123',
+        gangguan_berulang: 30.2,
+        gangguan_total: 180,
+        keluhan_berulang: 0.4,
+        keluhan_total: 0.4,
+        komplain_pelanggan: 0.5838888888888889
+      },
+      {
+        nama_regional: 'REGIONAL SUMKAL',
+        id_uid: 120,
+        nama_uid: 'WILAYAH SUMATERA UTARA',
+        id_up3: 12100,
+        nama_up3: 'UP3 PEMATANG SIANTAR',
+        id_ulp: 12102,
+        nama_ulp: 'ULP LIMA PULUH',
+        gangguan_berulang: 30.2,
+        gangguan_total: 180,
+        keluhan_berulang: 0.4,
+        keluhan_total: 0.4,
+        komplain_pelanggan: 0.5838888888888889
+      },
+      {
+        nama_regional: 'REGIONAL SULMAPANA',
+        id_uid: 41,
+        nama_uid: 'WILAYAH MALUKU DAN MALUKU UTARA',
+        id_up3: 412,
+        nama_up3: 'UP3 TERNATE',
+        id_ulp: 41230,
+        nama_ulp: 'ULP BACAN',
+        gangguan_berulang: 30.2,
+        gangguan_total: 180,
+        keluhan_berulang: 0.4,
+        keluhan_total: 0.4,
+        komplain_pelanggan: 0.5838888888888889
+      },
+      {
+        nama_regional: 'REGIONAL JMB',
+        id_uid: 101,
+        nama_uid: 'DISTRIBUSI JAWA TENGAH & DIY',
+        id_up3: 52150,
+        nama_up3: 'UP3 MAGELANG',
+        id_ulp: 52156,
+        nama_ulp: 'ULP PARAKAN',
+        gangguan_berulang: 30.2,
+        gangguan_total: 180,
+        keluhan_berulang: 0.4,
+        keluhan_total: 0.4,
+        komplain_pelanggan: 0.5838888888888889
+      },
+      {
+        nama_regional: 'REGIONAL SULMAPANA',
+        id_uid: 41,
+        nama_uid: 'WILAYAH MALUKU DAN MALUKU UTARA',
+        id_up3: 412,
+        nama_up3: 'UP3 TERNATE',
+        id_ulp: 41230,
+        nama_ulp: 'ULP BACAN',
+        gangguan_berulang: 30.2,
+        gangguan_total: 180,
+        keluhan_berulang: 0.4,
+        keluhan_total: 0.4,
+        komplain_pelanggan: 0.5838888888888889
+      }
+    ]
+  }
+})
 </script>