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

src/components/Form/FiltersType/Type13.vue

@@ -96,7 +96,7 @@ onMounted(() => {
         {{
           uid.id != 0
             ? up3.id != 0
-              ? 'Unit Layanan Pelanggan'
+              ? 'Unit Layanan Pelanggan/Posko'
               : 'Unit Pelaksanaan Pelayanan Pelanggan'
             : 'Kode Unit Distribusi'
         }}:</label

src/components/Form/FiltersType/Type9.vue

@@ -70,14 +70,23 @@ onMounted(() => {
     <div class="flex flex-col flex-1 space-y-2">
       <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-      <Select @update:selected="setUp3($event)" :data="itemsUp3" :placeholder="uppPlaceholder" :selected="uppp" />
+      <Select
+        @update:selected="setUp3($event)"
+        :data="itemsUp3"
+        :placeholder="uppPlaceholder"
+        :selected="uppp"
+      />
     </div>
 
     <div class="flex flex-col flex-1 space-y-2">
       <label class="filter-input-label">Posko:</label>
 
-      <Select @update:selected="setPosko($event)" :data="itemsPosko" :placeholder="poskoPlaceholder"
-        :selected="posko" />
+      <Select
+        @update:selected="setPosko($event)"
+        :data="itemsPosko"
+        :placeholder="poskoPlaceholder"
+        :selected="posko"
+      />
     </div>
 
     <div class="flex flex-col flex-1 space-y-2">
@@ -86,14 +95,25 @@ onMounted(() => {
       <DatePicker @update:date-value="(value) => (data.periode = value)" />
     </div>
 
-    <div class="flex flex-col flex-1 space-y-2">
-      <label class="filter-input-label">Group By Kode Unit Distribusi:</label>
+    <div class="flex flex-col flex-1 space-y-2" v-if="posko.id == 0">
+      <label class="filter-input-label"
+        >Group By
+        {{
+          uid.id != 0
+            ? uppp.id != 0
+              ? 'Unit Layanan Pelanggan/Posko'
+              : 'Unit Pelaksanaan Pelayanan Pelanggan'
+            : 'Kode Unit Distribusi'
+        }}:</label
+      >
 
-      <InlineRadioGroup @update:group-value="(value) => (data.groupBy = value.id === 2)" :radio-items="[
-        { id: 1, title: 'Tidak', checked: true },
-        { id: 2, title: 'Ya, Grupkan' }
-      ]" />
+      <InlineRadioGroup
+        @update:group-value="(value) => (data.groupBy = value.id === 2)"
+        :radio-items="[
+          { id: 1, title: 'Tidak', checked: true },
+          { id: 2, title: 'Ya, Grupkan' }
+        ]"
+      />
     </div>
   </div>
-
 </template>

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

@@ -40,9 +40,8 @@
       <DxColumnFixing :enabled="true" />
 
       <DxColumn
-        :width="60"
+        :width="50"
         alignment="center"
-        data-field="no"
         caption="NO"
         css-class="custom-table-column"
         cell-template="formatNumber"
@@ -559,15 +558,15 @@
         />
       </DxSummary>
 
-      <template #cellCenter="{ data }">
-        <p class="cursor-pointer">
+      <template #formatText="{ data }">
+        <p class="text-left cursor-pointer" @click="setAgreementDialog(false, 0)">
           {{ data.text }}
         </p>
       </template>
 
-      <template #formatText="{ data }">
-        <p class="text-left cursor-pointer" @click="setAgreementDialog(false, 0)">
-          {{ data.text }}
+      <template #formatNumbering="{ data }">
+        <p class="text-right cursor-pointer" @click="setAgreementDialog(false, 0)">
+          {{ data.rowIndex }}
         </p>
       </template>
 
@@ -1246,8 +1245,8 @@ const filterData = async (params: any) => {
       if (up3.id != 0 || posko.id != 0) {
         grouping.value = [
           {
-            data: 'nama_ulp',
-            caption: 'ULP'
+            data: 'nama_posko',
+            caption: 'Posko'
           }
         ]
       }
@@ -1279,8 +1278,8 @@ const filterData = async (params: any) => {
         if (posko.id != 0) {
           grouping.value = [
             {
-              data: 'nama_ulp',
-              caption: 'ULP'
+              data: 'nama_posko',
+              caption: 'Posko'
             }
           ]
         }
@@ -1310,9 +1309,14 @@ const filterData = async (params: any) => {
   loadingData.value = true
   await requestGraphQl(queries.gangguan.rekap.gangguanPerRegu, query)
     .then((result) => {
-      
       if (result.data.data != undefined) {
-        data.value = result.data.data.rekapitulasiGangguanPerRegu
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = [...result.data.data.rekapitulasiGangguanPerRegu].sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = result.data.data.rekapitulasiGangguanPerRegu
+        }
       } else {
         data.value = []
       }

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

@@ -979,8 +979,8 @@ const filterData = async (params: any) => {
       if (up3.id != 0 || posko.id != 0) {
         grouping.value = [
           {
-            data: 'nama_ulp',
-            caption: 'ULP'
+            data: 'nama_posko',
+            caption: 'Posko'
           }
         ]
       }
@@ -1012,8 +1012,8 @@ const filterData = async (params: any) => {
         if (posko.id != 0) {
           grouping.value = [
             {
-              data: 'nama_ulp',
-              caption: 'ULP'
+              data: 'nama_posko',
+              caption: 'Posko'
             }
           ]
         }
@@ -1044,7 +1044,13 @@ const filterData = async (params: any) => {
   await requestGraphQl(queries.gangguan.rekap.gangguanPerTanggal, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        data.value = result.data.data.rekapitulasiGangguanPerTanggal
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = [...result.data.data.rekapitulasiGangguanPerTanggal].sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = result.data.data.rekapitulasiGangguanPerTanggal
+        }
       } else {
         data.value = []
       }

src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue

@@ -1076,18 +1076,12 @@ const filterData = async (params: any) => {
   await requestGraphQl(queries.keluhan.rekap.keluhanPenyelesaianPerFungsiBIidang, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        if (filters.value.groupBy) {
-          data.value = [...result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang]
-            .sort((a, b) => a.nama_uid.localeCompare(b.nama_uid))
-            .map((item, index) => {
-              return { ...item, number: index + 1 }
-            })
-        } else {
-          data.value = [...result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang].map(
-            (item, index) => {
-              return { ...item, number: index + 1 }
-            }
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = [...result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang].sort(
+            (a, b) => a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
           )
+        } else {
+          data.value = result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang
         }
 
         reportMeta.value = {

src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue

@@ -1077,9 +1077,17 @@ const filterData = async (params: any) => {
   )
     .then((result) => {
       if (result.data.data != undefined) {
-        data.value = isGroupBy.value
-          ? result.data.data.rekapitulasiKeluhanPerKelompokKeluhanUid
-          : result.data.data.rekapitulasiKeluhanPerKelompokKeluhan
+        const ref = isGroupBy.value
+          ? [...result.data.data.rekapitulasiKeluhanPerKelompokKeluhanUid]
+          : [...result.data.data.rekapitulasiKeluhanPerKelompokKeluhan]
+
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = ref.sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = ref
+        }
       } else {
         data.value = []
       }

src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue

@@ -1077,7 +1077,15 @@ const filterData = async (params: any) => {
   await requestGraphQl(queries.keluhan.rekap.keluhanPerTanggal, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        data.value = result.data.data.rekapitulasiKeluhanPerTanggal
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          console.log([...result.data.data.rekapitulasiKeluhanPerTanggal])
+
+          data.value = [...result.data.data.rekapitulasiKeluhanPerTanggal].sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = result.data.data.rekapitulasiKeluhanPerTanggal
+        }
       } else {
         data.value = []
       }

src/utils/api/api.graphql.ts

@@ -411,6 +411,10 @@ export const queries = {
           ) {
             id_uid
             nama_uid
+            id_up3
+            nama_up3
+            id_ulp
+            nama_ulp
             tanggal_lapor
             total
             total_durasi_response