From 0890e6422b88d9ed64ea2502b676b94a3acf88ce Mon Sep 17 00:00:00 2001
From: Dede Fuji Abdul <defuj.official@gmail.com>
Date: Tue, 26 Mar 2024 15:58:57 +0700
Subject: [PATCH] Refactor code: Update posko value based on condition, remove
 console.log, and add setMonth function

---
 .../Gangguan/Rekap/RGangguan_AlihPosko.vue    |   2 +-
 .../Pages/Gangguan/Rekap/RGangguan_CTTM.vue   |  34 +-
 .../Gangguan/Rekap/RGangguan_PerPosko.vue     |   1 -
 .../MonalisaGR_DispatchingTimeGangguan.vue    | 322 +++++++++---
 .../Gangguan/Rekap/MonalisaGR_ENSGangguan.vue | 315 +++++++++---
 .../Rekap/MonalisaGR_GangguanBelumSelesai.vue | 475 ++++++++++++++----
 .../MonalisaGR_GangguanPerJenisGangguan.vue   | 114 +++--
 .../MonalisaGR_JumlahDDRPTRCTGangguan.vue     | 136 +++--
 .../Rekap/MonalisaGR_JumlahKaliGangguan.vue   | 411 +++++++++++----
 .../Gangguan/Rekap/MonalisaGR_LaporUlang.vue  | 395 +++++++++++----
 .../Rekap/MonalisaGR_RecoveryTimeGangguan.vue | 324 +++++++++---
 .../Rekap/MonalisaGR_ResponseTimeGangguan.vue | 324 +++++++++---
 .../MonalisaKR_GangguanPerJenisKeluhan.vue    | 134 +++--
 .../MonalisaKR_JumlahDDRPTRCTKeluhan.vue      | 147 +++---
 .../Rekap/MonalisaKR_JumlahKaliKeluhan.vue    | 397 +++++++++++----
 .../Rekap/MonalisaKR_RecoveryTimeKeluhan.vue  | 421 ++++++++++++----
 .../Rekap/MonalisaKR_ResponseTimeKeluhan.vue  | 451 ++++++++++++-----
 src/utils/api/api.graphql.ts                  |  71 +--
 src/utils/texts.ts                            |  59 ++-
 19 files changed, 3383 insertions(+), 1150 deletions(-)

diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue
index be50b13..7af236f 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue
@@ -550,7 +550,7 @@ const getDetail = () => {
     dateTo: dateValue[1]
       ? dateValue[1].split('-').reverse().join('-')
       : new Date().toISOString().slice(0, 10),
-    posko: ref.id_posko,
+    posko: ref.posko_in != ref.posko_out ? ref.posko_out : ref.posko_in,
     idUid: ref.id_uid,
     idUp3: ref.id_up3
   }
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_CTTM.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_CTTM.vue
index 1a315b6..9fd4513 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_CTTM.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_CTTM.vue
@@ -148,19 +148,13 @@
       </DxColumn>
 
       <template #formatText="{ data }">
-        <p class="text-left">
+        <p class="text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
 
-      <template #formatPercentage="{ data }">
-        <p class="text-right">
-          {{ isNumber(data.text) ? formatPercentage(data.text) : data.text }}
-        </p>
-      </template>
-
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer" @click="setMonth(data.column.caption)">
           {{
             isNumber(data.text)
               ? data.column.caption == '%'
@@ -170,12 +164,6 @@
           }}
         </p>
       </template>
-
-      <template #formatTime="{ data }">
-        <p class="!text-right cursor-pointer">
-          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
-        </p>
-      </template>
     </DxDataGrid>
   </div>
 
@@ -449,6 +437,7 @@ import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
 import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { apolloClient } from '@/utils/api/api.graphql'
 import { provideApolloClient } from '@vue/apollo-composable'
+import { getMonthNumber } from '@/utils/texts'
 
 const client = apolloClient()
 provideApolloClient(client)
@@ -464,6 +453,11 @@ const dialogDetail = ref(false)
 const closedialogDetail = () => (dialogDetail.value = false)
 const loadingData = ref(false)
 const loadingSubData = ref(false)
+const monthSelected = ref(1)
+
+const setMonth = (month: any) => {
+  monthSelected.value = getMonthNumber(month)
+}
 
 const filterData = (params: any) => {
   const dateValue = params.periode.split(' s/d ')
@@ -548,10 +542,14 @@ const showDetail = () => {
 }
 
 const onDataSelectionChanged = ({ selectedRowsData }: any) => {
-  if (selectedRowsData[0] != undefined) {
-    dataSelected.value = selectedRowsData[0]
-    showDetail()
-  }
+  // wait for 2 seconds
+  setTimeout(() => {
+    if (selectedRowsData[0] != undefined) {
+      console.log('monthSelected', monthSelected.value)
+      dataSelected.value = selectedRowsData[0]
+      showDetail()
+    }
+  }, 2000)
 }
 
 const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue
index ee4733f..6898bfa 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue
@@ -1012,7 +1012,6 @@ const filterData = (params: any) => {
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       const result: any[] = [...queryResult.data.rekapitulasiGangguanPerPosko]
-      console.table(result)
       data.value = result.sort((a: any, b: any) => a?.nama_up3.localeCompare(b?.nama_up3))
     }
 
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
index 01d6c98..2566d75 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
@@ -1,21 +1,49 @@
 <template>
-  <Filters @reset-form="data = []" :report-button="true" @run-search="() => filterData(filters)" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    :report-button="true"
+    @run-search="() => filterData(filters)"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
 
   <div id="data">
-    <DxDataGrid ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
       <!-- <DxColumn
@@ -28,62 +56,145 @@
         :group-index="0"
         name="namaUlp"
       /> -->
-      <DxColumn alignment="center" :min-width="170" data-type="text" data-field="nama_ulp" caption="Nama Unit"
-        css-class="custom-table-column" cell-template="formatText" />
-      <DxColumn alignment="center" caption="Jumlah Dispatching Time Gangguan" css-class="custom-table-column">
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        cell-template="formatText"
+      />
+      <DxColumn
+        alignment="center"
+        caption="Jumlah Dispatching Time Gangguan"
+        css-class="custom-table-column"
+      >
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <DxSummary>
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="nama_ulp"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="mom_bulan_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_mom" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="yoy_tahun_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_yoy" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="nama_ulp"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -94,7 +205,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -118,9 +229,15 @@ import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -129,6 +246,13 @@ const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
@@ -159,52 +283,96 @@ const onExporting = (e: any) => {
   }
 }
 
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.dispatchingTimeGangguan,
-  {
-    // regional: 0,
-    idUp3: 0,
-    idUid: 0,
-    idUlp: 0,
-    bulan: currentMonth.value,
-    tahun: currentYear.value
-  }
-)
-
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.dispatchingTimeGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      idUlp: ulp ? ulp.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
-  refetch({
-    // regional: regional,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    idUlp: ulp ? ulp.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaDispatchingTimeGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
index a5b9d9b..46333b2 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
@@ -1,80 +1,185 @@
 <template>
-  <Filters @reset-form="data = []" @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 ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @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 shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn alignment="center" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column"
-        cell-template="formatText" />
+      <DxColumn
+        alignment="center"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        cell-template="formatText"
+      />
       <DxColumn alignment="center" caption="ENS Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
 
       <DxSummary>
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="nama_ulp"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="mom_bulan_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_mom" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="nama_ulp"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
 
-        <DxTotalItem column="yoy_tahun_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_yoy" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
     </DxDataGrid>
   </div>
@@ -83,7 +188,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -106,8 +211,15 @@ import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
+
+const client = apolloClient()
+provideApolloClient(client)
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -116,45 +228,49 @@ const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
 const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
 const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.rekapitulasiEnsGangguan,
-  {
-    bulan: 10,
-    tahun: 2023,
-    regional: '',
-    idUlp: 0,
-    idUid: 0,
-    idUp3: 0
-  }
-)
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
-  refetch({
-    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
-  })
+
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.rekapitulasiEnsGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      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
+    }
+  )
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaRekapitulasiEnsGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
     const doc = new jsPDF()
@@ -183,14 +299,65 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
index ce46ac5..d509edb 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
@@ -1,40 +1,94 @@
 <template>
-  <Filters @reset-form="data = []" @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 ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="true" :show-row-lines="false" :show-borders="true"
-      :row-alternation-enabled="true" :hover-state-enabled="true" @selection-changed="onDataSelectionChanged"
-      @exporting="onExporting" :allow-column-resizing="true" column-resizing-mode="widget" :word-wrap-enabled="true">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @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 shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn alignment="center" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column"
-        cell-template="formatText" />
+      <DxColumn
+        alignment="center"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        cell-template="formatText"
+      />
       <DxColumn alignment="center" caption="Tahun" css-class="custom-table-column">
-        <DxColumn :width="150" alignment="center" data-field="jumlah_gangguan" data-type="number" caption="Gangguan"
-          css-class="custom-table-column" cell-template="formatNumber" />
-        <DxColumn :width="150" alignment="center" data-field="jumlah_informasi" data-type="number" caption="Informasi"
-          css-class="custom-table-column" cell-template="formatNumber" />
-        <DxColumn :width="150" alignment="center" data-field="total" data-type="number" caption="Total"
-          css-class="custom-table-column" cell-template="formatNumber" />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="jumlah_gangguan"
+          data-type="number"
+          caption="Gangguan"
+          css-class="custom-table-column"
+          cell-template="formatNumber"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="jumlah_informasi"
+          data-type="number"
+          caption="Informasi"
+          css-class="custom-table-column"
+          cell-template="formatNumber"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+          cell-template="formatNumber"
+        />
       </DxColumn>
       <template #formatNumber="{ data }">
         <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
@@ -45,67 +99,228 @@
       </template>
 
       <DxSummary>
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="nama_ulp"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="jumlah_gangguan" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="jumlah_informasi" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="total" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="nama_ulp"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="jumlah_gangguan"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="jumlah_informasi"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="total"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
       </DxSummary>
     </DxDataGrid>
   </div>
 
-  <DetailDialog :open="dialogDetail" title="Detail Gangguan Belum Selesai" @on-close="closeDialog" :full-width="true">
+  <DetailDialog
+    :open="dialogDetail"
+    title="Detail Gangguan Belum Selesai"
+    @on-close="closeDialog"
+    :full-width="true"
+  >
     <div class="w-full mb-4 lg:w-[70%] lg:float-left">
       <div class="p-4 bg-white rounded-xl lg:mr-4">
-        <DxDataGrid :allow-column-reordering="true" class="max-h-[calc(100vh-140px)]" :data-source="dataSub"
-          :show-column-lines="true" :show-row-lines="false" :show-borders="true" :row-alternation-enabled="true"
-          :hover-state-enabled="true" @selection-changed="onDataSubSelectionChanged" :column-width="100"
-          @exporting="onExporting" :allow-column-resizing="true" column-resizing-mode="widget">
+        <DxDataGrid
+          :allow-column-reordering="true"
+          class="max-h-[calc(100vh-140px)]"
+          :data-source="dataSub"
+          :show-column-lines="true"
+          :show-row-lines="false"
+          :show-borders="true"
+          :row-alternation-enabled="true"
+          :hover-state-enabled="true"
+          @selection-changed="onDataSubSelectionChanged"
+          :column-width="100"
+          @exporting="onExporting"
+          :allow-column-resizing="true"
+          column-resizing-mode="widget"
+        >
           <DxSelection mode="single" />
           <DxPaging :page-size="20" :enabled="true" />
-          <DxPager :visible="true" :allowed-page-sizes="[20, 50, 100]" display-mode="full"
-            :show-page-size-selector="true" :show-info="true" :show-navigation-buttons="true" />
-          <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-            :show-pane="showPane" :shading="shading" v-model:visible="loadingSubData" :enabled="true" />
+          <DxPager
+            :visible="true"
+            :allowed-page-sizes="[20, 50, 100]"
+            display-mode="full"
+            :show-page-size-selector="true"
+            :show-info="true"
+            :show-navigation-buttons="true"
+          />
+          <DxLoadPanel
+            shading-color="rgba(0,0,0,0.4)"
+            :position="position"
+            :show-indicator="showIndicator"
+            :show-pane="showPane"
+            :shading="shading"
+            v-model:visible="loadingSubData"
+            :enabled="true"
+          />
           <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-          <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+          <DxExport
+            :enabled="true"
+            :formats="['pdf', 'xlsx', 'document']"
+            :allow-export-selected-data="false"
+          />
 
-          <DxColumn css-class="custom-table-column" :width="50" alignment="center"
-            :calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1" data-type="number" caption="No"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="No Laporan" css-class="custom-table-column"
-            cell-template="formatText" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="UID/UIW" css-class="custom-table-column"
-            cell-template="formatText" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="UP3" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="ULP" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="ID Pelanggan" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="200" alignment="center" data-field="" caption="Nama Pelapor" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="200" alignment="center" data-field="" caption="Alamat Pelapor" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="No Telp Pelapor" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="200" alignment="center" data-field="" caption="Keterangan Pelapor" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="200" alignment="center" data-field="" caption="Penyebab" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="Kode Gangguan" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="200" alignment="center" data-field="" caption="Jenis Gangguan" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="Durasi Response Time" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatTime" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="Durasi Recoery Time:" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatTime" />
-          <DxColumn :width="150" alignment="center" data-field="" caption="Tgl Lapor" :allow-resizing="false"
-            css-class="custom-table-column" cell-template="formatText" />
+          <DxColumn
+            css-class="custom-table-column"
+            :width="50"
+            alignment="center"
+            :calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
+            data-type="number"
+            caption="No"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="No Laporan"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="UID/UIW"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="UP3"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="ULP"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="ID Pelanggan"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="200"
+            alignment="center"
+            data-field=""
+            caption="Nama Pelapor"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="200"
+            alignment="center"
+            data-field=""
+            caption="Alamat Pelapor"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="No Telp Pelapor"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="200"
+            alignment="center"
+            data-field=""
+            caption="Keterangan Pelapor"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="200"
+            alignment="center"
+            data-field=""
+            caption="Penyebab"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="Kode Gangguan"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="200"
+            alignment="center"
+            data-field=""
+            caption="Jenis Gangguan"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="Durasi Response Time"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatTime"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="Durasi Recoery Time:"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatTime"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field=""
+            caption="Tgl Lapor"
+            :allow-resizing="false"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
 
           <template #formatText="{ data }">
             <p class="text-left cursor-pointer">
@@ -217,7 +432,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -243,6 +458,11 @@ import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
 import DetailDialog from '@/components/Dialogs/DetailDialog.vue'
 import InputText from '@/components/InputText.vue'
 import { formatWaktu } from '@/components/Form/FiltersType/reference'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
+
+const client = apolloClient()
+provideApolloClient(client)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -255,56 +475,47 @@ const dataSub = ref<any[]>([])
 const dataSelected = ref<any>()
 const dataSubSelected = ref<any>()
 const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
 const loadingSubData = ref(false)
 
-const dataGridRef = ref<DxDataGrid | null>(null)
-const clearSelection = () => {
-  const dataGrid = dataGridRef.value!.instance!
-  dataGrid.clearSelection()
-}
-const showDetail = () => {
-  clearSelection()
-  dialogDetail.value = true
-}
-
 const closeDialog = () => {
   dialogDetail.value = false
 }
 
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.gangguanBelumSelesai,
-  {
-    regional: '',
-    idUlp: 0,
-    idUid: 0,
-    idUp3: 0,
-    bulan: 10,
-    tahun: 2023
-  }
-)
 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,
-    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
-  })
+
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.gangguanBelumSelesai,
+    {
+      regional: regional.name == 'Semua Regional' ? null : regional.id,
+      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
+    }
+  )
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaGangguanBelumSelesai
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
     const doc = new jsPDF()
@@ -334,18 +545,64 @@ const onExporting = (e: any) => {
   }
 }
 
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
+const dataGridRef = ref<DxDataGrid | null>(null)
+const clearSelection = () => {
+  const dataGrid = dataGridRef.value!.instance!
+  dataGrid.clearSelection()
+}
+const showDetail = () => {
+  clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
 const onDataSelectionChanged = ({ selectedRowsData }: any) => {
   if (selectedRowsData[0] != undefined) {
     dataSelected.value = selectedRowsData[0]
+    showDetail()
   }
-  console.log(data)
 }
 
 const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
-  if (selectedRowsData[0] != undefined) {
-    dataSubSelected.value = selectedRowsData[0]
-  }
-  console.log(data)
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
index becf276..3d5031c 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
@@ -19,7 +19,7 @@
       :show-borders="true"
       :row-alternation-enabled="true"
       :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
+      @selection-changed="onDataSelectionChanged"
       @exporting="onExporting"
       :allow-column-resizing="true"
       column-resizing-mode="widget"
@@ -34,8 +34,7 @@
         :show-indicator="showIndicator"
         :show-pane="showPane"
         :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
+        v-model:visible="loadingData"
         :enabled="true"
       />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
@@ -123,7 +122,7 @@
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
             isNumber(data.text)
               ? data.column.caption == '%'
@@ -135,7 +134,7 @@
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -146,7 +145,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -168,6 +167,11 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
+
+const client = apolloClient()
+provideApolloClient(client)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -176,42 +180,44 @@ const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
 const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
 const dialogDetail = ref(false)
-
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.gangguanPerJenisGangguan,
-  {
-    bulan: 10,
-    tahun: 2023,
-    regional: '',
-    idUid: 0,
-    idUp3: 0,
-    idUlp: 0
-  }
-)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
 
-  refetch({
-    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
-  })
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.gangguanPerJenisGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      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
+    }
+  )
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaGangguanPerJenisGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
     const doc = new jsPDF()
@@ -240,14 +246,64 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
index 8fc89af..c9a2249 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
@@ -18,7 +18,7 @@
       :show-borders="true"
       :row-alternation-enabled="true"
       :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
+      @selection-changed="onDataSelectionChanged"
       @exporting="onExporting"
       :allow-column-resizing="true"
       column-resizing-mode="widget"
@@ -34,8 +34,7 @@
         :show-indicator="showIndicator"
         :show-pane="showPane"
         :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
+        v-model:visible="loadingData"
         :enabled="true"
       />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
@@ -235,6 +234,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="total_durasi_response_time_bulan_ini"
+          column="total_durasi_response_time_bulan_ini"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -243,6 +243,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="jumlah_gangguan_rpt_bulan"
+          column="jumlah_gangguan_rpt_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -251,6 +252,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="rpt_gangguan_bulan"
+          column="rpt_gangguan_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -259,6 +261,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="total_rct_bulan"
+          column="total_rct_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -267,6 +270,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="jumlah_gangguan_rct_bulan"
+          column="jumlah_gangguan_rct_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -275,6 +279,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="rct_gangguan_bulan"
+          column="rct_gangguan_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -283,6 +288,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="total_durasi_response_time_tahun_ini"
+          column="total_durasi_response_time_tahun_ini"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -291,6 +297,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="jumlah_gangguan_rpt_sampai_bulan"
+          column="jumlah_gangguan_rpt_sampai_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -299,6 +306,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="rpt_gangguan_sampai_bulan"
+          column="rpt_gangguan_sampai_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -307,6 +315,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="total_durasi_recovery_time_tahun_ini"
+          column="total_durasi_recovery_time_tahun_ini"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -315,6 +324,7 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="jumlah_gangguan_rct_sampai_bulan"
+          column="jumlah_gangguan_rct_sampai_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
@@ -323,13 +333,14 @@
           :align-by-column="true"
           summary-type="sum"
           show-in-column="rch_gangguan_sampai_bulan"
+          column="rch_gangguan_sampai_bulan"
           css-class="!text-right"
           :customize-text="(e: any) => formatNumber(e.value)"
         />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
             isNumber(data.text)
               ? data.column.caption == '%'
@@ -341,7 +352,7 @@
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -352,7 +363,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -376,7 +387,11 @@ import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const position = { of: '#data' }
@@ -384,50 +399,46 @@ const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
 const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
 const dialogDetail = ref(false)
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.jumlahDurasiRptRctGangguan,
-  {
-    bulan: 10,
-    tahun: 2023,
-    // regional: '',
-    idUlp: 0,
-    idUid: 0,
-    idUp3: 0
-  }
-)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
+
 const filterData = (params: any) => {
-  const {
-    // regional,
-    ulp,
-    uid,
-    up3,
-    bulan,
-    tahun
-  } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.jumlahDurasiRptRctGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      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
+    }
+  )
 
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
 
-  refetch({
-    // 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
-  })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaJumlahDurasiRptRctGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
     const doc = new jsPDF()
@@ -456,19 +467,68 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref<any>({
-  // regional: '',
-  // posko: '',
+  regional: '',
   uid: 0,
   up3: 0,
   bulan: 2,
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
index 39e9d21..607a676 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
@@ -1,31 +1,88 @@
 <template>
-  <Filters :report-button="true" @reset-form="data = []" @run-search="filterData(filters)" class="mb-4">
+  <Filters
+    :report-button="true"
+    @reset-form="data = []"
+    @run-search="filterData(filters)"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
 
   <div id="data">
-    <DxDataGrid ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible.sync="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible.sync="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
-      <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 alignment="center" :min-width="170" data-type="text" data-field="nama_regional" caption="Regional"
-        css-class="custom-table-column" :group-index="0" />
-      <DxColumn alignment="center" :min-width="170" data-type="text" data-field="nama_uid" caption="UID"
-        css-class="custom-table-column" :group-index="1" />
-      <DxColumn alignment="center" :min-width="170" data-type="text" data-field="nama_up3" caption="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
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_regional"
+        caption="Regional"
+        css-class="custom-table-column"
+        :group-index="0"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_uid"
+        caption="UID"
+        css-class="custom-table-column"
+        :group-index="1"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_up3"
+        caption="UP3"
+        css-class="custom-table-column"
+        :group-index="2"
+      />
       <!-- <DxColumn
         alignment="center"
         :min-width="170"
@@ -37,71 +94,179 @@
       /> -->
       <DxColumn alignment="center" caption="Jumlah Kali Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <DxSummary>
-        <DxGroupItem :align-by-column="true" column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="mom_bulan_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_mom" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_yoy" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
 
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="namaULP"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="mom_bulan_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_mom" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="yoy_tahun_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_yoy" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="namaULP"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -112,7 +277,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import { getMonthName } from '@/utils/texts'
 import {
@@ -137,12 +302,23 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
@@ -173,56 +349,105 @@ const onExporting = (e: any) => {
   }
 }
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
 
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.jumlahKaliGangguan,
-  {
-    // regional: 0,
-    idUp3: 0,
-    idUid: 0,
-    idUlp: 0,
-    bulan: currentMonth.value,
-    tahun: currentYear.value
-  }
-)
-
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
-  refetch({
-    // regional: regional,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    idUlp: ulp ? ulp.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.jumlahKaliGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      idUlp: ulp ? ulp.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaJumlahKaliGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
index 1d64293..29e9e0f 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
@@ -1,102 +1,250 @@
 <template>
-  <Filters @reset-form="data = []" @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 ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping :context-menu-enabled="true" expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn alignment="center" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column"
-        cell-template="formatText" />
-      <DxColumn alignment="center" data-field="nama_uid" caption="UID" css-class="custom-table-column"
-        cell-template="formatText" :group-index="0" />
+      <DxColumn
+        alignment="center"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        cell-template="formatText"
+      />
+      <DxColumn
+        alignment="center"
+        data-field="nama_uid"
+        caption="UID"
+        css-class="custom-table-column"
+        cell-template="formatText"
+        :group-index="0"
+      />
       <DxColumn alignment="center" caption="Lapor Ulang Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
 
       <DxSummary>
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="nama_ulp"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="mom_bulan_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_mom" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="nama_ulp"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
 
-        <DxTotalItem column="yoy_tahun_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_yoy" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
 
-        <DxGroupItem :show-in-group-footer="false" :align-by-column="true" summary-type="sum" display-format="{0}"
-          show-in-column="mom_bulan_kemarin" column="mom_bulan_kemarin" css-class="!text-right" />
-        <DxGroupItem :show-in-group-footer="false" :align-by-column="true" summary-type="sum"
-          show-in-column="mom_bulan_ini" column="mom_bulan_ini" css-class="!text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :show-in-group-footer="false" :align-by-column="true" summary-type="sum"
-          show-in-column="persen_mom" column="persen_mom" css-class="!text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxGroupItem :show-in-group-footer="false" :align-by-column="true" summary-type="sum"
-          show-in-column="yoy_tahun_kemarin" column="yoy_tahun_kemarin" css-class="!text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :show-in-group-footer="false" :align-by-column="true" summary-type="sum"
-          show-in-column="yoy_tahun_ini" column="yoy_tahun_ini" css-class="!text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :show-in-group-footer="false" :align-by-column="true" summary-type="sum"
-          show-in-column="persen_yoy" column="persen_yoy" css-class="!text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxGroupItem
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          summary-type="sum"
+          display-format="{0}"
+          show-in-column="mom_bulan_kemarin"
+          column="mom_bulan_kemarin"
+          css-class="!text-right"
+        />
+        <DxGroupItem
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          summary-type="sum"
+          show-in-column="mom_bulan_ini"
+          column="mom_bulan_ini"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          summary-type="sum"
+          show-in-column="persen_mom"
+          column="persen_mom"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxGroupItem
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          summary-type="sum"
+          show-in-column="yoy_tahun_kemarin"
+          column="yoy_tahun_kemarin"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          summary-type="sum"
+          show-in-column="yoy_tahun_ini"
+          column="yoy_tahun_ini"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :show-in-group-footer="false"
+          :align-by-column="true"
+          summary-type="sum"
+          show-in-column="persen_yoy"
+          column="persen_yoy"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
     </DxDataGrid>
   </div>
@@ -105,7 +253,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -130,8 +278,15 @@ import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
+
+const client = apolloClient()
+provideApolloClient(client)
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -140,43 +295,47 @@ const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
 const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
 const dialogDetail = ref(false)
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.laporUlangGangguan,
-  {
-    bulan: 10,
-    tahun: 2023,
-    regional: '',
-    idUlp: 0,
-    idUid: 0,
-    idUp3: 0
-  }
-)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
+
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
-  refetch({
-    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
-  })
+
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.laporUlangGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      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
+    }
+  )
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaRekapitulasiLaporUlangGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
@@ -206,14 +365,64 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
index c8e666c..6000ec8 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
@@ -1,21 +1,49 @@
 <template>
-  <Filters :report-button="true" @reset-form="data = []" @run-search="() => filterData(filters)" class="mb-4">
+  <Filters
+    :report-button="true"
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
 
   <div id="data">
-    <DxDataGrid ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
       <!-- <DxColumn
@@ -28,62 +56,145 @@
         :group-index="0"
         name="namaUlp"
       /> -->
-      <DxColumn alignment="center" :min-width="170" data-type="text" data-field="nama_ulp" caption="Nama Unit"
-        css-class="custom-table-column" cell-template="formatText" />
-      <DxColumn alignment="center" caption="Jumlah RCT Kali Gangguan" css-class="custom-table-column">
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        cell-template="formatText"
+      />
+      <DxColumn
+        alignment="center"
+        caption="Jumlah RCT Kali Gangguan"
+        css-class="custom-table-column"
+      >
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <DxSummary>
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="nama_ulp"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="mom_bulan_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_mom" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="yoy_tahun_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_yoy" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="nama_ulp"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -94,7 +205,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -118,8 +229,15 @@ import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
+
+const client = apolloClient()
+provideApolloClient(client)
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -128,43 +246,47 @@ const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
-
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.recoveryTimeGangguan,
-  {
-    // regional: 0,
-    idUp3: 0,
-    idUid: 0,
-    idUlp: 0,
-    bulan: currentMonth.value,
-    tahun: currentYear.value
-  }
-)
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
-  refetch({
-    // regional: regional,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    idUlp: ulp ? ulp.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.recoveryTimeGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      idUlp: ulp ? ulp.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaRecoveryTimeGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
 
 const onExporting = (e: any) => {
@@ -195,14 +317,64 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
index 1d591eb..3550f2d 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
@@ -1,21 +1,49 @@
 <template>
-  <Filters @reset-form="data = []" :report-button="true" @run-search="() => filterData(filters)" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    :report-button="true"
+    @run-search="() => filterData(filters)"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
 
   <div id="data">
-    <DxDataGrid ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
       <!-- <DxColumn
@@ -28,62 +56,145 @@
         :group-index="0"
         name="namaUlp"
       /> -->
-      <DxColumn alignment="center" :min-width="170" data-type="text" data-field="nama_ulp" caption="Nama Unit"
-        css-class="custom-table-column" cell-template="formatText" />
-      <DxColumn alignment="center" caption="Jumlah RPT Kali Gangguan" css-class="custom-table-column">
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        cell-template="formatText"
+      />
+      <DxColumn
+        alignment="center"
+        caption="Jumlah RPT Kali Gangguan"
+        css-class="custom-table-column"
+      >
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <DxSummary>
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="nama_ulp"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="mom_bulan_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_mom" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="yoy_tahun_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_yoy" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="nama_ulp"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -94,7 +205,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -118,8 +229,15 @@ import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
+
+const client = apolloClient()
+provideApolloClient(client)
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -128,43 +246,47 @@ const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
-
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.gangguan.rekap.responseTimeGangguan,
-  {
-    // regional: 0,
-    idUp3: 0,
-    idUid: 0,
-    idUlp: 0,
-    bulan: currentMonth.value,
-    tahun: currentYear.value
-  }
-)
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
-  refetch({
-    // regional: regional,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    idUlp: ulp ? ulp.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.gangguan.rekap.responseTimeGangguan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      idUlp: ulp ? ulp.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
+
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaResponseTimeGangguan
     }
-    console.log(queryResult.data)
   })
+
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
 
 const onExporting = (e: any) => {
@@ -195,14 +317,64 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue
index a1af733..1fdd075 100755
--- a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue
+++ b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue
@@ -19,7 +19,7 @@
       :show-borders="true"
       :row-alternation-enabled="true"
       :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
+      @selection-changed="onDataSelectionChanged"
       @exporting="onExporting"
       :allow-column-resizing="true"
       column-resizing-mode="widget"
@@ -34,7 +34,7 @@
         :show-indicator="showIndicator"
         :show-pane="showPane"
         :shading="shading"
-        v-model:visible="loading"
+        v-model:visible="loadingData"
         :enabled="true"
       />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
@@ -108,7 +108,7 @@
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
             isNumber(data.text)
               ? data.column.caption == '%'
@@ -120,7 +120,7 @@
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -129,7 +129,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
 import { DxDataGrid } from 'devextreme-vue'
@@ -152,13 +152,24 @@ 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'
+import { queries } from '@/utils/api/api.graphql'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 const filters = ref()
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth() + 1)
@@ -192,73 +203,98 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
 }
-const monalisaGangguanPerJenisKeluhan = gql`
-  query DaftarmonalisaGangguanPerJenisKeluhan(
-    #$regional: String
-    $idUlp: Int
-    $idUid: Int
-    $idUp3: Int
-    $bulan: Int
-    $tahun: Int
-  ) {
-    monalisaGangguanPerJenisKeluhan(
-      #regional: $regional
-      idUlp: $idUlp
-      idUid: $idUid
-      idUp3: $idUp3
-      bulan: $bulan
-      tahun: $tahun
-    ) {
-      id_jenis_keluhan
-      nama_jenis_keluhan
-      jumlah
-      persen
-    }
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
   }
-`
-const { onResult, onError, loading, refetch } = useQuery(monalisaGangguanPerJenisKeluhan, {
-  bulan: currentMonth.value,
-  tahun: currentYear.value,
-  // regional: '',
-  idUlp: 0,
-  idUid: 0,
-  idUp3: 0
-})
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
+}
+
 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,
-    idUlp: ulp ? ulp.id : 0,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.keluhan.rekap.gangguanPerJenisKeluhan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUlp: ulp ? ulp.id : 0,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
 
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaGangguanPerJenisKeluhan
     }
-    console.log(queryResult.data)
   })
 
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
 
 onMounted(() => {
diff --git a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahDDRPTRCTKeluhan.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahDDRPTRCTKeluhan.vue
index d4f304b..33c484f 100755
--- a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahDDRPTRCTKeluhan.vue
+++ b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahDDRPTRCTKeluhan.vue
@@ -19,7 +19,7 @@
       :show-borders="true"
       :row-alternation-enabled="true"
       :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
+      @selection-changed="onDataSelectionChanged"
       :column-width="100"
       @exporting="onExporting"
       :allow-column-resizing="true"
@@ -36,8 +36,7 @@
         :show-indicator="showIndicator"
         :show-pane="showPane"
         :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
+        v-model:visible="loadingData"
         :enabled="true"
       />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
@@ -331,7 +330,7 @@
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
             isNumber(data.text)
               ? data.column.caption == '%'
@@ -343,7 +342,7 @@
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -354,7 +353,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -377,13 +376,24 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
-import gql from 'graphql-tag'
+import { queries } from '@/utils/api/api.graphql'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth() + 1)
 const lastYear = ref(new Date().getFullYear() - 1)
@@ -416,61 +426,66 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
 }
-const monalisaJumlahDurasiRptRctKeluhan = gql`
-  query DaftarmonalisaJumlahDurasiRptRctKeluhan(
-    #$regional: String
-    $idUlp: Int
-    $idUid: Int
-    $idUp3: Int
-    $bulan: Int
-    $tahun: Int
-  ) {
-    monalisaJumlahDurasiRptRctKeluhan(
-      #regional: $regional
-      idUlp: $idUlp
-      idUid: $idUid
-      idUp3: $idUp3
-      bulan: $bulan
-      tahun: $tahun
-    ) {
-      id_uid
-      nama_uid
-      id_up3
-      nama_up3
-      id_ulp
-      nama_ulp
-      total_durasi_response_time_bulan_ini
-      count_durasi_response_time_bulan_ini
-      avg_durasi_response_time_bulan_ini
-      total_durasi_recovery_time_bulan_ini
-      count_durasi_recovery_time_bulan_ini
-      avg_durasi_recovery_time_bulan_ini
-      total_durasi_response_time_tahun_ini
-      count_durasi_response_time_tahun_ini
-      avg_durasi_response_time_tahun_ini
-      total_durasi_recovery_time_tahun_ini
-      count_durasi_recovery_time_tahun_ini
-      avg_durasi_recovery_time_tahun_ini
-    }
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
   }
-`
-const { onResult, onError, loading, refetch } = useQuery(monalisaJumlahDurasiRptRctKeluhan, {
-  bulan: currentMonth.value,
-  tahun: currentYear.value,
-  // regional: '',
-  idUlp: 0,
-  idUid: 0,
-  idUp3: 0
-})
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
+}
+
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
 
@@ -478,25 +493,31 @@ const filterData = (params: any) => {
   currentMonth.value = bulan.id
   lastYear.value = tahun.id - 1
 
-  refetch({
-    // regional: regional,
-    idUlp: ulp ? ulp.id : 0,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.keluhan.rekap.jumlahDurasiRptRctKeluhan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUlp: ulp ? ulp.id : 0,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
 
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaJumlahDurasiRptRctKeluhan
     }
-    console.log(queryResult.data)
   })
 
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahKaliKeluhan.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahKaliKeluhan.vue
index f8ec0d3..08830a2 100755
--- a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahKaliKeluhan.vue
+++ b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahKaliKeluhan.vue
@@ -1,96 +1,254 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" @reset-form="data = []" class="mb-4">
+  <Filters
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    @reset-form="data = []"
+    class="mb-4"
+  >
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
 
   <div id="data">
-    <DxDataGrid ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
-      <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 alignment="center" :min-width="170" data-type="text" data-field="nama_uid" caption="Nama UID"
-        css-class="custom-table-column" :group-index="0" />
-      <DxColumn alignment="center" :min-width="170" data-type="text" data-field="nama_up3" caption="Nama UP3"
-        css-class="custom-table-column" :group-index="1" />
+      <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
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_uid"
+        caption="Nama UID"
+        css-class="custom-table-column"
+        :group-index="0"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_up3"
+        caption="Nama UP3"
+        css-class="custom-table-column"
+        :group-index="1"
+      />
       <DxColumn alignment="center" caption="Jumlah Kali Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <DxSummary>
-        <DxGroupItem :align-by-column="true" column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="mom_bulan_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_mom" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_yoy" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
 
-        <DxTotalItem summary-type="sum" display-format="Total" show-in-column="namaULP"
-          css-class="text-white !text-left" />
-        <DxTotalItem column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="mom_bulan_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_mom" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="yoy_tahun_ini" summary-type="sum" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem column="persen_yoy" summary-type="avg" display-format="{0}" css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="namaULP"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -101,7 +259,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import { getMonthName } from '@/utils/texts'
 import {
@@ -126,14 +284,27 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -166,54 +337,100 @@ const onExporting = (e: any) => {
     e.cancel = true
   }
 }
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.keluhan.rekap.jumlahKaliKeluhan,
-  {
-    // regional: 0,
-    idUlp: 0,
-    idUid: 0,
-    idUp3: 0,
-    bulan: currentMonth.value,
-    tahun: currentYear.value
-  }
-)
 
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
 
-  refetch({
-    // regional: regional,
-    idUlp: ulp ? ulp.id : 0,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.keluhan.rekap.jumlahKaliKeluhan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUlp: ulp ? ulp.id : 0,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
 
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaJumlahKaliKeluhan
     }
-    console.log(queryResult.data)
   })
 
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_RecoveryTimeKeluhan.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_RecoveryTimeKeluhan.vue
index e1597c5..0945720 100755
--- a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_RecoveryTimeKeluhan.vue
+++ b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_RecoveryTimeKeluhan.vue
@@ -1,98 +1,273 @@
 <template>
-  <Filters @reset-form="data = []" @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 ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn 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 alignment="center" caption="Jumlah RCT Kali Keluhan" css-class="custom-table-column">
+      <DxColumn
+        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
+        alignment="center"
+        caption="Jumlah RCT Kali Keluhan"
+        css-class="custom-table-column"
+      >
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <DxSummary>
-        <DxGroupItem :align-by-column="true" column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="mom_bulan_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_mom" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_yoy" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
 
-        <DxTotalItem summary-type="sum" display-format="RATA-RATA" show-in-column="namaULP"
-          css-class="text-white !text-left" />
-        <DxTotalItem :align-by-column="true" column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="mom_bulan_ini" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="persen_mom" summary-type="avg" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem :align-by-column="true" column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="yoy_tahun_ini" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="persen_yoy" summary-type="avg" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="RATA-RATA"
+          show-in-column="namaULP"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -103,7 +278,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -128,14 +303,27 @@ import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { queries } from '@/utils/api/api.graphql'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
+import { apolloClient } from '@/utils/api/api.graphql'
+import { provideApolloClient } from '@vue/apollo-composable'
 
+const client = apolloClient()
+provideApolloClient(client)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
@@ -169,54 +357,99 @@ const onExporting = (e: any) => {
   }
 }
 
-const { onResult, onError, loading, refetch } = useQuery(
-  queries.monalisa.keluhan.rekap.recoveryTimeKeluhan,
-  {
-    // regional: 0,
-    idUp3: 0,
-    idUid: 0,
-    idUlp: 0,
-    bulan: currentMonth.value,
-    tahun: currentYear.value
-  }
-)
-
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
 
-  refetch({
-    // regional: regional,
-    idUlp: ulp ? ulp.id : 0,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.keluhan.rekap.recoveryTimeKeluhan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUlp: ulp ? ulp.id : 0,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
 
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaRecoveryTimeKeluhan
     }
-    console.log(queryResult.data)
   })
 
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_ResponseTimeKeluhan.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_ResponseTimeKeluhan.vue
index 8701c3b..3842c03 100755
--- a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_ResponseTimeKeluhan.vue
+++ b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_ResponseTimeKeluhan.vue
@@ -1,98 +1,273 @@
 <template>
-  <Filters @reset-form="data = []" @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 ref="dataGridRef" :allow-column-reordering="true" class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data" :show-column-lines="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">
+    <DxDataGrid
+      ref="dataGridRef"
+      :allow-column-reordering="true"
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :data-source="data"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onDataSelectionChanged"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxGrouping expand-mode="rowClick" />
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel shading-color="rgba(0,0,0,0.4)" :position="position" :show-indicator="showIndicator"
-        :show-pane="showPane" :shading="shading" v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        shading-color="rgba(0,0,0,0.4)"
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-model:visible="loadingData"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn 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 alignment="center" caption="Jumlah RPT Kali Keluhan" css-class="custom-table-column">
+      <DxColumn
+        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
+        alignment="center"
+        caption="Jumlah RPT Kali Keluhan"
+        css-class="custom-table-column"
+      >
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_mom" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_kemarin"
+            data-type="number"
+            :caption="`${getMonthName(lastMonth)} ${lastYearMoM}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_mom"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column"
-            cell-template="formatNumber" />
-          <DxColumn :width="70" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
-            css-class="custom-table-column" cell-template="formatNumber" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_kemarin"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="formatNumber"
+          />
         </DxColumn>
       </DxColumn>
 
       <DxSummary>
-        <DxGroupItem :align-by-column="true" column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="mom_bulan_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_mom" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="yoy_tahun_ini" summary-type="sum" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxGroupItem :align-by-column="true" column="persen_yoy" summary-type="avg" display-format="{0}"
-          css-class="!text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxGroupItem
+          :align-by-column="true"
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="!text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
 
-        <DxTotalItem summary-type="sum" display-format="RATA-RATA" show-in-column="namaULP"
-          css-class="text-white !text-left" />
-        <DxTotalItem :align-by-column="true" column="mom_bulan_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="mom_bulan_ini" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="persen_mom" summary-type="avg" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
-        <DxTotalItem :align-by-column="true" column="yoy_tahun_kemarin" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="yoy_tahun_ini" summary-type="sum" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatNumber(e.value)" />
-        <DxTotalItem :align-by-column="true" column="persen_yoy" summary-type="avg" display-format="{0}"
-          css-class="text-white !text-right" :customize-text="(e: any) => formatPercentage(e.value)" />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="RATA-RATA"
+          show-in-column="namaULP"
+          css-class="text-white !text-left"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="persen_mom"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
+        />
+        <DxTotalItem
+          :align-by-column="true"
+          column="persen_yoy"
+          summary-type="avg"
+          display-format="{0}"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(e.value)"
+        />
       </DxSummary>
 
       <template #formatNumber="{ data }">
-        <p class="text-right">
+        <p class="text-right cursor-pointer">
           {{
-    isNumber(data.text)
-      ? data.column.caption == '%'
-        ? formatPercentage(data.text)
-        : formatNumber(data.text)
-      : data.text
-  }}
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
         </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="!text-left">
+        <p class="!text-left cursor-pointer">
           {{ data.text }}
         </p>
       </template>
@@ -103,7 +278,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -127,53 +302,29 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
-import gql from 'graphql-tag'
+import { queries } from '@/utils/api/api.graphql'
 
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
+const dataSub = ref<any[]>([])
+const dataSelected = ref<any>()
+const dataSubSelected = ref<any>()
+const dialogDetail = ref(false)
+const closedialogDetail = () => (dialogDetail.value = false)
+const loadingData = ref(false)
+const loadingSubData = ref(false)
+
 const lastMonth = ref(new Date().getMonth() == 1 ? 12 : new Date().getMonth() - 1)
-const lastYearMoM = ref(new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear())
+const lastYearMoM = ref(
+  new Date().getMonth() == 1 ? new Date().getFullYear() - 1 : new Date().getFullYear()
+)
 const currentYear = ref(new Date().getFullYear())
 const currentMonth = ref(new Date().getMonth())
 const lastYear = ref(currentYear.value - 1)
 
-const monalisaResponseTimeKeluhan = gql`
-  query DaftarmonalisaResponseTimeKeluhan(
-    #$regional: regional
-    $idUlp: Int
-    $idUid: Int
-    $idUp3: Int
-    $bulan: Int
-    $tahun: Int
-  ) {
-    monalisaResponseTimeKeluhan(
-      #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
-    }
-  }
-`
-
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
     const doc = new jsPDF()
@@ -203,51 +354,99 @@ const onExporting = (e: any) => {
   }
 }
 
-const { onResult, onError, loading, refetch } = useQuery(monalisaResponseTimeKeluhan, {
-  // regional: 0,
-  idUp3: 0,
-  idUid: 0,
-  idUlp: 0,
-  bulan: currentMonth.value,
-  tahun: currentYear.value
-})
-
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1;
-  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id;
+  lastMonth.value = bulan.id == 1 ? 12 : bulan.id - 1
+  lastYearMoM.value = bulan.id == 1 ? tahun.id - 1 : tahun.id
   currentMonth.value = bulan.id
   currentYear.value = tahun.id
   lastYear.value = tahun.id - 1
 
-  refetch({
-    // regional: regional,
-    idUlp: ulp ? ulp.id : 0,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    bulan: bulan ? bulan.id : currentMonth.value,
-    tahun: bulan ? tahun.id : currentYear.value
-  })
+  const { onResult, onError, loading, refetch } = useQuery(
+    queries.monalisa.keluhan.rekap.responseTimeKeluhan,
+    {
+      namaRegional: regional.name == 'Semua Regional' ? '' : regional.name,
+      idUlp: ulp ? ulp.id : 0,
+      idUid: uid ? uid.id : 0,
+      idUp3: up3 ? up3.id : 0,
+      bulan: bulan ? bulan.id : currentMonth.value,
+      tahun: bulan ? tahun.id : currentYear.value
+    }
+  )
 
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.monalisaResponseTimeKeluhan
     }
-    console.log(queryResult.data)
   })
 
   onError((error) => {
     console.log(error)
   })
+
+  watch(loading, (value) => {
+    loadingData.value = value
+  })
 }
+
+const getDetail = () => {
+  const dateValue = filters.value.periode.split(' s/d ')
+  const selected = dataSelected.value
+
+  const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
+    idUid: selected?.id_uid ? selected?.id_uid : 0,
+    idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+  }
+
+  const { onResult, onError, loading } = useQuery(
+    queries.keluhan.rekap.rekapKeluhanAllDetail,
+    query
+  )
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      dataSub.value = queryResult.data.detailKeluhanAll
+    }
+  })
+
+  onError((error) => {
+    console.log(error)
+  })
+
+  watch(loading, (value) => {
+    loadingSubData.value = value
+  })
+}
+
 const dataGridRef = ref<DxDataGrid | null>(null)
 const clearSelection = () => {
   const dataGrid = dataGridRef.value!.instance!
   dataGrid.clearSelection()
 }
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
+const showDetail = () => {
   clearSelection()
+  dataSubSelected.value = null
+  dialogDetail.value = true
+  getDetail()
+}
+
+const onDataSelectionChanged = ({ selectedRowsData }: any) => {
+  if (selectedRowsData[0] != undefined) {
+    dataSelected.value = selectedRowsData[0]
+    showDetail()
+  }
+}
+
+const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  dataSubSelected.value = data
 }
 
 const filters = ref()
diff --git a/src/utils/api/api.graphql.ts b/src/utils/api/api.graphql.ts
index a1b19f7..6149b46 100755
--- a/src/utils/api/api.graphql.ts
+++ b/src/utils/api/api.graphql.ts
@@ -1866,7 +1866,7 @@ export const queries = {
       rekap: {
         dispatchingTimeGangguan: gql`
           query monalisaDispatchingTimeGangguan(
-            #$regional: String
+            $namaRegional: String
             $idUid: Int
             $idUp3: Int
             $idUlp: Int
@@ -1874,13 +1874,20 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaDispatchingTimeGangguan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUid: $idUid
               idUp3: $idUp3
               idUlp: $idUlp
               bulan: $bulan
               tahun: $tahun
             ) {
+              id
+              nama_regional
+              id_uid
+              nama_uid
+              id_up3
+              nama_up3
+              id_ulp
               nama_ulp
               mom_bulan_ini
               mom_bulan_kemarin
@@ -1893,7 +1900,7 @@ export const queries = {
         `,
         rekapitulasiEnsGangguan: gql`
           query monalisaRekapitulasiEnsGangguan(
-            #$regional: String
+            $namaRegional: String
             $idUlp: Int
             $idUid: Int
             $idUp3: Int
@@ -1901,7 +1908,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaRekapitulasiEnsGangguan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUlp: $idUlp
               idUid: $idUid
               idUp3: $idUp3
@@ -1927,7 +1934,7 @@ export const queries = {
         `,
         gangguanBelumSelesai: gql`
           query monalisaGangguanBelumSelesai(
-            #$regional: String
+            $namaRegional: String
             $idUlp: Int
             $idUid: Int
             $idUp3: Int
@@ -1935,7 +1942,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaGangguanBelumSelesai(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUlp: $idUlp
               idUid: $idUid
               idUp3: $idUp3
@@ -1957,7 +1964,7 @@ export const queries = {
         `,
         gangguanPerJenisGangguan: gql`
           query monalisaGangguanPerJenisGangguan(
-            #$nama_regional: String
+            $namaRegional: String
             $idUid: Int
             $idUp3: Int
             $idUlp: Int
@@ -1965,7 +1972,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaGangguanPerJenisGangguan(
-              #nama_regional: $regional
+              namaRegional: $namaRegional
               idUid: $idUid
               idUp3: $idUp3
               idUlp: $idUlp
@@ -1981,7 +1988,7 @@ export const queries = {
         `,
         jumlahDurasiRptRctGangguan: gql`
           query monalisaJumlahDurasiRptRctGangguan(
-            #$regional: String
+            $namaRegional: String
             $idUlp: Int
             $idUid: Int
             $idUp3: Int
@@ -1989,7 +1996,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaJumlahDurasiRptRctGangguan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUlp: $idUlp
               idUid: $idUid
               idUp3: $idUp3
@@ -2019,24 +2026,28 @@ export const queries = {
         `,
         jumlahKaliGangguan: gql`
           query monalisaJumlahKaliGangguan(
-            #$regional: String
-            $idUid: Int
-            $idUp3: Int
-            $idUlp: Int
-            $bulan: Int
-            $tahun: Int
+            $bulan: Int!
+            $tahun: Int!
+            $namaRegional: String!
+            $idUlp: Int!
+            $idUid: Int!
+            $idUp3: Int!
           ) {
             monalisaJumlahKaliGangguan(
-              #regional: $regional
-              idUid: $idUid
-              idUp3: $idUp3
-              idUlp: $idUlp
               bulan: $bulan
               tahun: $tahun
+              namaRegional: $namaRegional
+              idUlp: $idUlp
+              idUid: $idUid
+              idUp3: $idUp3
             ) {
+              id
               nama_regional
+              id_uid
               nama_uid
+              id_up3
               nama_up3
+              id_ulp
               nama_ulp
               mom_bulan_ini
               mom_bulan_kemarin
@@ -2049,7 +2060,7 @@ export const queries = {
         `,
         laporUlangGangguan: gql`
           query monalisaRekapitulasiLaporUlangGangguan(
-            #$regional: String
+            $namaRegional: String
             $idUlp: Int
             $idUid: Int
             $idUp3: Int
@@ -2057,7 +2068,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaRekapitulasiLaporUlangGangguan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUlp: $idUlp
               idUid: $idUid
               idUp3: $idUp3
@@ -2082,7 +2093,7 @@ export const queries = {
         `,
         recoveryTimeGangguan: gql`
           query monalisaRecoveryTimeGangguan(
-            #$regional: regional
+            $namaRegional: String
             $idUid: Int
             $idUp3: Int
             $idUlp: Int
@@ -2090,7 +2101,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaRecoveryTimeGangguan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUid: $idUid
               idUp3: $idUp3
               idUlp: $idUlp
@@ -2109,7 +2120,7 @@ export const queries = {
         `,
         responseTimeGangguan: gql`
           query monalisaResponseTimeGangguan(
-            #regional: String
+            $namaRegional: String
             $idUid: Int
             $idUp3: Int
             $idUlp: Int
@@ -2117,7 +2128,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaResponseTimeGangguan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUid: $idUid
               idUp3: $idUp3
               idUlp: $idUlp
@@ -2140,7 +2151,7 @@ export const queries = {
       rekap: {
         jumlahKaliKeluhan: gql`
           query monalisaJumlahKaliKeluhan(
-            #$regional: String
+            $namaRegional: String
             $idUlp: Int
             $idUid: Int
             $idUp3: Int
@@ -2148,7 +2159,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaJumlahKaliKeluhan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUlp: $idUlp
               idUid: $idUid
               idUp3: $idUp3
@@ -2173,7 +2184,7 @@ export const queries = {
         `,
         recoveryTimeKeluhan: gql`
           query monalisaRecoveryTimeKeluhan(
-            #$regional: String
+            $namaRegional: String
             $idUlp: Int
             $idUid: Int
             $idUp3: Int
@@ -2181,7 +2192,7 @@ export const queries = {
             $tahun: Int
           ) {
             monalisaRecoveryTimeKeluhan(
-              #regional: $regional
+              namaRegional: $namaRegional
               idUlp: $idUlp
               idUid: $idUid
               idUp3: $idUp3
diff --git a/src/utils/texts.ts b/src/utils/texts.ts
index b6bc719..8524300 100755
--- a/src/utils/texts.ts
+++ b/src/utils/texts.ts
@@ -13,20 +13,53 @@ const splitRoutePath = (routePath: string): string[] => {
 }
 const getMonthName = (monthNumber: number) => {
   const months = [
-    'Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
-    'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
-  ];
-  return months[monthNumber - 1] || '';
+    'Januari',
+    'Februari',
+    'Maret',
+    'April',
+    'Mei',
+    'Juni',
+    'Juli',
+    'Agustus',
+    'September',
+    'Oktober',
+    'November',
+    'Desember'
+  ]
+  return months[monthNumber - 1] || ''
 }
 const getMonthNameShort = (monthNumber: number) => {
   const months = [
-    'Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun',
-    'Jul', 'Agu', 'Sep', 'Okt', 'Nov', 'Des'
-  ];
-  return months[monthNumber - 1] || '';
-
-
+    'Jan',
+    'Feb',
+    'Mar',
+    'Apr',
+    'Mei',
+    'Jun',
+    'Jul',
+    'Agu',
+    'Sep',
+    'Okt',
+    'Nov',
+    'Des'
+  ]
+  return months[monthNumber - 1] || ''
 }
-export {
-  splitRoutePath, getMonthName, getMonthNameShort
-}
\ No newline at end of file
+const getMonthNumber = (monthName: string) => {
+  const months = [
+    'Januari',
+    'Februari',
+    'Maret',
+    'April',
+    'Mei',
+    'Juni',
+    'Juli',
+    'Agustus',
+    'September',
+    'Oktober',
+    'November',
+    'Desember'
+  ]
+  return months.indexOf(monthName) + 1
+}
+export { splitRoutePath, getMonthName, getMonthNameShort, getMonthNumber }