Merge branch 'dev-defuj' of github.com:defuj/eis into dev-bagus

src/components/Pages/Gangguan/Daftar/DGangguan_BM.vue

@@ -182,17 +182,38 @@
     </DxDataGrid>
   </div>
 
-  <DetailDialog
-    :open="dialogDetail"
-    title="Daftar Gangguan Berdasarkan Media"
-    @on-close="closeDialog"
-  >
+  <DetailDialog :open="dialogDetail" title="Detail Gangguan" @on-close="closeDialog">
     <div class="w-full p-4 space-y-2 bg-white rounded-xl">
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">No Laporan:</h3>
         <InputText :readonly="true" :value="dataSelected.no_laporan" class-name="flex-1" />
       </div>
 
+      <div class="flex flex-row items-center justify-between w-full">
+        <h3 class="text-sm font-medium w-[170px] text-gray-800">Nama Pelapor:</h3>
+        <InputText :readonly="true" :value="dataSelected?.nama_pelapor" class-name="flex-1" />
+      </div>
+
+      <div class="flex flex-row items-center justify-between w-full">
+        <h3 class="text-sm font-medium w-[170px] text-gray-800">No Telp Pelapor:</h3>
+        <InputText :readonly="true" :value="dataSelected?.no_telp_pelapor" class-name="flex-1" />
+      </div>
+
+      <div class="flex flex-row items-center justify-between w-full">
+        <h3 class="text-sm font-medium w-[170px] text-gray-800">Alamat Pelapor:</h3>
+        <InputText :readonly="true" :value="dataSelected?.alamat_pelapor" class-name="flex-1" />
+      </div>
+
+      <div class="flex flex-row items-center justify-between w-full">
+        <h3 class="text-sm font-medium w-[170px] text-gray-800">Keterangan Pelapor:</h3>
+        <InputText :readonly="true" :value="dataSelected?.keterangan_pelapor" class-name="flex-1" />
+      </div>
+
+      <div class="flex flex-row items-center justify-between w-full">
+        <h3 class="text-sm font-medium w-[170px] text-gray-800">Status :</h3>
+        <InputText :readonly="true" :value="dataSelected?.status_akhir" class-name="flex-1" />
+      </div>
+
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Tgl Lapor:</h3>
         <InputText :readonly="true" :value="dataSelected?.waktu_lapor" class-name="flex-1" />
@@ -234,36 +255,6 @@
         />
       </div>
 
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Status :</h3>
-        <InputText :readonly="true" :value="dataSelected?.status_akhir" class-name="flex-1" />
-      </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">IDPEL/NOMETER:</h3>
-        <InputText :readonly="true" :value="dataSelected?.idpel_nometer" class-name="flex-1" />
-      </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Nama Pelapor:</h3>
-        <InputText :readonly="true" :value="dataSelected?.nama_pelapor" class-name="flex-1" />
-      </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Alamat Pelapor:</h3>
-        <InputText :readonly="true" :value="dataSelected?.alamat_pelapor" class-name="flex-1" />
-      </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">No Telp Pelapor:</h3>
-        <InputText :readonly="true" :value="dataSelected?.no_telp_pelapor" class-name="flex-1" />
-      </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Keterangan Pelapor:</h3>
-        <InputText :readonly="true" :value="dataSelected?.keterangan_pelapor" class-name="flex-1" />
-      </div>
-
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Sumper Lapor:</h3>
         <InputText :readonly="true" :value="dataSelected?.media" class-name="flex-1" />

src/components/Pages/Gangguan/Daftar/DGangguan_DMAPKT.vue

@@ -182,11 +182,7 @@
     </DxDataGrid>
   </div>
 
-  <DetailDialog
-    :open="dialogDetail"
-    title="Daftar Gangguan Diselesaikan Mobile APKT"
-    @on-close="closeDialog"
-  >
+  <DetailDialog :open="dialogDetail" title="Detail Gangguan" @on-close="closeDialog">
     <div class="w-full p-4 space-y-2 bg-white rounded-xl">
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">No Laporan:</h3>
@@ -278,26 +274,6 @@
           class-name="flex-1"
         />
       </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Penyebab:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataSelected?.penyebab"
-          class-name="flex-1"
-        />
-      </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Tindakan:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataSelected?.tindakan"
-          class-name="flex-1"
-        />
-      </div>
     </div>
   </DetailDialog>
 </template>

src/components/Pages/Gangguan/Daftar/DGangguan_MLD1K.vue

@@ -359,7 +359,7 @@
           <DxColumn
             :width="200"
             alignment="center"
-            data-field=""
+            data-field="create_date"
             caption="Create Date"
             css-class="custom-table-column"
             cell-template="formatText"
@@ -367,7 +367,7 @@
           <DxColumn
             :width="200"
             alignment="center"
-            data-field=""
+            data-field="create_by"
             caption="User"
             :allow-resizing="false"
             css-class="custom-table-column"
@@ -375,7 +375,7 @@
           />
           <DxColumn
             alignment="center"
-            data-field=""
+            data-field="keterangan"
             caption="Keterangan"
             :allow-resizing="false"
             css-class="custom-table-column"
@@ -406,17 +406,17 @@
 
         <div class="flex flex-row items-center justify-between w-full">
           <h3 class="text-sm font-medium w-[135px] text-gray-800">Create Date:</h3>
-          <InputText :readonly="true" value="" class-name="flex-1" />
+          <InputText :readonly="true" :value="dataSubSelected?.create_date" class-name="flex-1" />
         </div>
 
         <div class="flex flex-row items-center justify-between w-full">
           <h3 class="text-sm font-medium w-[135px] text-gray-800">User:</h3>
-          <InputText :readonly="true" value="" class-name="flex-1" />
+          <InputText :readonly="true" :value="dataSubSelected?.create_by" class-name="flex-1" />
         </div>
 
         <div class="flex flex-row items-center justify-between w-full">
           <h3 class="text-sm font-medium w-[135px] text-gray-800">Keterangan:</h3>
-          <InputText :readonly="true" value="" class-name="flex-1" />
+          <InputText :readonly="true" :value="dataSubSelected?.keterangan" class-name="flex-1" />
         </div>
       </div>
     </div>
@@ -488,21 +488,13 @@ const getDetail = async () => {
   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
+    noLaporan: selected?.no_laporan ? selected?.no_laporan : ''
   }
   loadingSubData.value = false
-  await requestGraphQl(queries.keluhan.rekap.rekapKeluhanAllDetail, query)
+  await requestGraphQl(queries.gangguan.daftar.melaporLebihDariSatuKaliDetail, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        dataSub.value = result.data.data.detailKeluhanAll
+        dataSub.value = result.data.data.detailGangguanLaporLebihDariSatuKali
       } else {
         dataSub.value = []
       }

src/components/Pages/Gangguan/Daftar/DGangguan_RecoveryTime.vue

@@ -265,6 +265,11 @@
         <InputText :readonly="true" :value="dataSelected?.status_akhir" class-name="flex-1" />
       </div>
 
+      <div class="flex flex-row items-center justify-between w-full">
+        <h3 class="text-sm font-medium w-[170px] text-gray-800">Referensi Marking :</h3>
+        <InputText :readonly="true" :value="dataSelected?.referensi_marking" class-name="flex-1" />
+      </div>
+
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">IDPEL/NOMETER:</h3>
         <InputText :readonly="true" :value="dataSelected?.idpel_nometer" class-name="flex-1" />

src/components/Pages/Gangguan/Daftar/DGangguan_ResponseTime.vue

@@ -242,6 +242,11 @@
         <InputText :readonly="true" :value="dataSelected?.status_akhir" class-name="flex-1" />
       </div>
 
+      <div class="flex flex-row items-center justify-between w-full">
+        <h3 class="text-sm font-medium w-[170px] text-gray-800">Referensi Marking :</h3>
+        <InputText :readonly="true" :value="dataSelected?.referensi_marking" class-name="flex-1" />
+      </div>
+
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">IDPEL/NOMETER:</h3>
         <InputText :readonly="true" :value="dataSelected?.idpel_nometer" class-name="flex-1" />

src/components/Pages/Gangguan/Daftar/DGangguan_STIDP.vue

@@ -278,26 +278,6 @@
           class-name="flex-1"
         />
       </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Penyebab:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataSelected?.penyebab"
-          class-name="flex-1"
-        />
-      </div>
-
-      <div class="flex flex-row items-center justify-between w-full">
-        <h3 class="text-sm font-medium w-[170px] text-gray-800">Tindakan:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataSelected?.tindakan"
-          class-name="flex-1"
-        />
-      </div>
     </div>
   </DetailDialog>
 </template>

src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue

@@ -69,10 +69,13 @@
         :width="120"
         alignment="center"
         data-field="sub_kelompok"
-        caption="Kelompok"
         css-class="custom-table-column"
-        group-index="0"
+        :group-index="0"
+        caption=""
         cell-template="formatText"
+        :calculate-group-value="
+          (rowData: any) => `${rowData.sub_kelompok} (${rowData.nama_sub_kelompok})`
+        "
       />
       <DxColumn
         :width="150"
@@ -562,6 +565,7 @@ const filterData = async (params: any) => {
             return {
               no: ++index,
               sub_kelompok: item.sub_kelompok,
+              nama_sub_kelompok: item.nama_sub_kelompok,
               kode: item.kode,
               jenisGangguan: item.tipe_permasalahan,
               laporan: {
@@ -620,119 +624,125 @@ onMounted(() => {
   if (import.meta.env.DEV) {
     data.value = [
       {
-        id: 0,
-        kode: '01a',
+        nama_sub_kelompok: 'Kelompok sambungan tenaga listrik dan APP ',
+        sub_kelompok: '00',
+        avg_durasi_recovery: 0.0,
+        avg_durasi_response: 0.0,
+        max_durasi_recovery: 0,
+        max_durasi_response: 0,
+        min_durasi_recovery: 0,
+        min_durasi_response: 0,
+        persen_inproses: 0.0,
+        persen_selesai: 0.0,
         tipe_permasalahan: 'Pelebur pembatas putus/rusak',
         total: 0,
-        total_selesai: 0,
-        persen_selesai: 0,
-        total_inproses: 0,
-        persen_inproses: 0,
-        total_durasi_response: 0,
-        avg_durasi_response: 0,
-        min_durasi_response: 0,
-        max_durasi_response: 0,
-        total_dibawah_sla_response: 0,
-        total_diatas_sla_response: 0,
+        kode: '01a',
         total_durasi_recovery: 0,
-        avg_durasi_recovery: 0,
-        min_durasi_recovery: 0,
-        max_durasi_recovery: 0,
+        total_durasi_response: 0,
+        total_diatas_sla_recovery: 0,
+        total_diatas_sla_response: 0,
         total_dibawah_sla_recovery: 0,
-        total_diatas_sla_recovery: 0
+        total_dibawah_sla_response: 0,
+        total_inproses: 0,
+        total_selesai: 0
       },
       {
-        id: 1,
-        kode: '01b',
+        nama_sub_kelompok: 'Kelompok sambungan tenaga listrik dan APP ',
+        sub_kelompok: '00',
+        avg_durasi_recovery: 0.0,
+        avg_durasi_response: 0.0,
+        max_durasi_recovery: 0,
+        max_durasi_response: 0,
+        min_durasi_recovery: 0,
+        min_durasi_response: 0,
+        persen_inproses: 0.0,
+        persen_selesai: 0.0,
         tipe_permasalahan: 'MCB pembatas rusak',
         total: 0,
-        total_selesai: 0,
-        persen_selesai: 0,
-        total_inproses: 0,
-        persen_inproses: 0,
-        total_durasi_response: 0,
-        avg_durasi_response: 0,
-        min_durasi_response: 0,
-        max_durasi_response: 0,
-        total_dibawah_sla_response: 0,
-        total_diatas_sla_response: 0,
+        kode: '01b',
         total_durasi_recovery: 0,
-        avg_durasi_recovery: 0,
-        min_durasi_recovery: 0,
-        max_durasi_recovery: 0,
+        total_durasi_response: 0,
+        total_diatas_sla_recovery: 0,
+        total_diatas_sla_response: 0,
         total_dibawah_sla_recovery: 0,
-        total_diatas_sla_recovery: 0
+        total_dibawah_sla_response: 0,
+        total_inproses: 0,
+        total_selesai: 0
       },
       {
-        id: 2,
-        kode: '01c',
+        nama_sub_kelompok: 'Kelompok sambungan tenaga listrik dan APP ',
+        sub_kelompok: '00',
+        avg_durasi_recovery: 0.0,
+        avg_durasi_response: 0.0,
+        max_durasi_recovery: 0,
+        max_durasi_response: 0,
+        min_durasi_recovery: 0,
+        min_durasi_response: 0,
+        persen_inproses: 0.0,
+        persen_selesai: 0.0,
         tipe_permasalahan: 'RELAY dan / atau CB rusak',
         total: 0,
-        total_selesai: 0,
-        persen_selesai: 0,
-        total_inproses: 0,
-        persen_inproses: 0,
-        total_durasi_response: 0,
-        avg_durasi_response: 0,
-        min_durasi_response: 0,
-        max_durasi_response: 0,
-        total_dibawah_sla_response: 0,
-        total_diatas_sla_response: 0,
+        kode: '01c',
         total_durasi_recovery: 0,
-        avg_durasi_recovery: 0,
-        min_durasi_recovery: 0,
-        max_durasi_recovery: 0,
+        total_durasi_response: 0,
+        total_diatas_sla_recovery: 0,
+        total_diatas_sla_response: 0,
         total_dibawah_sla_recovery: 0,
-        total_diatas_sla_recovery: 0
+        total_dibawah_sla_response: 0,
+        total_inproses: 0,
+        total_selesai: 0
       },
       {
-        id: 3,
-        kode: '01d',
+        nama_sub_kelompok: 'Kelompok sambungan tenaga listrik dan APP ',
+        sub_kelompok: '00',
+        avg_durasi_recovery: 0.0,
+        avg_durasi_response: 0.0,
+        max_durasi_recovery: 0,
+        max_durasi_response: 0,
+        min_durasi_recovery: 0,
+        min_durasi_response: 0,
+        persen_inproses: 0.0,
+        persen_selesai: 0.0,
         tipe_permasalahan: 'Pelebur putus dan LBS jatuh atau rusak',
         total: 0,
-        total_selesai: 0,
-        persen_selesai: 0,
-        total_inproses: 0,
-        persen_inproses: 0,
-        total_durasi_response: 0,
-        avg_durasi_response: 0,
-        min_durasi_response: 0,
-        max_durasi_response: 0,
-        total_dibawah_sla_response: 0,
-        total_diatas_sla_response: 0,
+        kode: '01d',
         total_durasi_recovery: 0,
-        avg_durasi_recovery: 0,
-        min_durasi_recovery: 0,
-        max_durasi_recovery: 0,
+        total_durasi_response: 0,
+        total_diatas_sla_recovery: 0,
+        total_diatas_sla_response: 0,
         total_dibawah_sla_recovery: 0,
-        total_diatas_sla_recovery: 0
+        total_dibawah_sla_response: 0,
+        total_inproses: 0,
+        total_selesai: 0
       },
       {
-        id: 4,
-        kode: '06a',
+        nama_sub_kelompok: 'Kelompok sambungan tenaga listrik dan APP ',
+        sub_kelompok: '00',
+        avg_durasi_recovery: 0.0,
+        avg_durasi_response: 0.0,
+        max_durasi_recovery: 0,
+        max_durasi_response: 0,
+        min_durasi_recovery: 0,
+        min_durasi_response: 0,
+        persen_inproses: 0.0,
+        persen_selesai: 0.0,
         tipe_permasalahan: 'Kubikel APP/komponennya rusak atau gagal bekerja',
         total: 0,
-        total_selesai: 0,
-        persen_selesai: 0,
-        total_inproses: 0,
-        persen_inproses: 0,
-        total_durasi_response: 0,
-        avg_durasi_response: 0,
-        min_durasi_response: 0,
-        max_durasi_response: 0,
-        total_dibawah_sla_response: 0,
-        total_diatas_sla_response: 0,
+        kode: '06a',
         total_durasi_recovery: 0,
-        avg_durasi_recovery: 0,
-        min_durasi_recovery: 0,
-        max_durasi_recovery: 0,
+        total_durasi_response: 0,
+        total_diatas_sla_recovery: 0,
+        total_diatas_sla_response: 0,
         total_dibawah_sla_recovery: 0,
-        total_diatas_sla_recovery: 0
+        total_dibawah_sla_response: 0,
+        total_inproses: 0,
+        total_selesai: 0
       }
     ].map((item: any, index: number) => {
       return {
         no: ++index,
         sub_kelompok: item.sub_kelompok,
+        nama_sub_kelompok: item.nama_sub_kelompok,
         kode: item.kode,
         jenisGangguan: item.tipe_permasalahan,
         laporan: {