From 6852a8cb846878c475e0224c8df5d78a503846bc Mon Sep 17 00:00:00 2001
From: Dede Fuji Abdul <defuj.official@gmail.com>
Date: Wed, 13 Mar 2024 22:15:20 +0700
Subject: [PATCH] Add min-width utility classes and format table cells

---
 src/assets/css/style.css                      |   8 +
 .../Keluhan/Rekap/RKeluhan_BerdasarMedia.vue  |  25 +-
 .../Rekap/RKeluhan_PerKelompokKeluhan.vue     | 106 +++++---
 .../Keluhan/Rekap/RKeluhan_PerTanggal.vue     | 104 +++++---
 .../Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue  | 183 +++++++++-----
 .../Keluhan/Rekap/RKeluhan_RatingPerUnit.vue  | 234 ++++++++++++++----
 6 files changed, 475 insertions(+), 185 deletions(-)

diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 4784f11..117b5c1 100755
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1831,6 +1831,14 @@ body {
   min-width: 100%;
 }
 
+.min-w-\[60px\] {
+  min-width: 60px;
+}
+
+.min-w-\[100px\] {
+  min-width: 100px;
+}
+
 .max-w-2xl {
   max-width: 42rem;
 }
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
index 628c056..a4d3db4 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
@@ -51,6 +51,7 @@
         css-class="custom-table-column"
         data-field="no"
         data-type="number"
+        cell-template="formatNumber"
       />
       <DxColumn
         :width="170"
@@ -62,13 +63,14 @@
       />
       <DxColumn alignment="center" caption="Tanggal" css-class="custom-table-column">
         <DxColumn
+          :width="100"
           v-for="i in 31"
-          :width="150"
           alignment="center"
           :data-field="`tgl${i}`"
           data-type="number"
           :caption="i"
           css-class="custom-table-column"
+          cell-template="formatNumber"
         />
       </DxColumn>
 
@@ -77,23 +79,37 @@
           summary-type="sum"
           display-format="Call PLN 123"
           show-in-column="no"
-          css-class="text-white"
+          css-class="text-white !text-left"
         />
         <DxTotalItem
           v-for="i in 31"
           summary-type="sum"
           display-format="{0}"
           :column="`tgl${i}`"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           column="total"
           summary-type="sum"
           display-format="{0}"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
       </DxSummary>
 
+      <template #formatNumber="{ data }">
+        <p class="!text-right cursor-pointer" @click="showDialogDataSelected()">
+          {{
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
+        </p>
+      </template>
+
       <template #formatText="{ data }">
         <p class="text-left cursor-pointer" @click="showDialogDataSelected()">
           {{ data.text }}
@@ -472,6 +488,7 @@ import { useQuery } from '@vue/apollo-composable'
 import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { queries } from '@/utils/api/api.graphql'
 import { dummyData } from '@/utils/dummy'
+import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
 
 const position = { of: '#data' }
 const showIndicator = ref(true)
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
index 3343b21..088e498 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
@@ -51,6 +51,7 @@
         data-type="number"
         data-field="no"
         caption="No"
+        cell-template="formatNumber"
       />
       <!-- <DxColumn
         :width="120"
@@ -78,6 +79,7 @@
           data-type="number"
           caption="Total"
           css-class="custom-table-column"
+          cell-template="formatNumber"
         />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
           <DxColumn
@@ -87,6 +89,7 @@
             data-type="number"
             caption="Jml"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="70"
@@ -95,7 +98,7 @@
             data-type="number"
             caption="%"
             css-class="custom-table-column"
-            cell-template="percent"
+            cell-template="formatNumber"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
@@ -106,6 +109,7 @@
             data-type="number"
             caption="Jml"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="70"
@@ -114,7 +118,7 @@
             data-type="number"
             caption="%"
             css-class="custom-table-column"
-            cell-template="percent"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -127,6 +131,7 @@
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -135,6 +140,7 @@
             data-type="number"
             caption="Rata-Rata"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -163,6 +169,7 @@
             data-type="number"
             caption=">SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -171,6 +178,7 @@
             data-type="number"
             caption="≤SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -183,6 +191,7 @@
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -191,6 +200,7 @@
             data-type="number"
             caption="Rata-Rata"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -219,6 +229,7 @@
             data-type="number"
             caption=">SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -227,6 +238,7 @@
             data-type="number"
             caption="≤SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -236,124 +248,149 @@
           summary-type="sum"
           display-format="Total"
           show-in-column="no"
-          css-class="text-white"
+          css-class="text-white !text-left"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
       </DxSummary>
 
       <template #formatTime="{ data }">
-        <p class="cursor-pointer !text-right" @click="showDialogDataSelected()">
+        <p class="!text-right cursor-pointer" @click="showDialogDataSelected()">
           {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
         </p>
       </template>
 
-      <template #percent="{ data }">
-        <p class="cursor-pointer" @click="showDialogDataSelected()">{{ data.text }}%</p>
+      <template #formatNumber="{ data }">
+        <p class="text-right cursor-pointer" @click="showDialogDataSelected()">
+          {{
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
+        </p>
       </template>
 
       <template #formatText="{ data }">
-        <p class="text-left cursor-pointer" @click="showDialogDataSelected()">
+        <p class="!text-left cursor-pointer" @click="showDialogDataSelected()">
           {{ data.text }}
         </p>
       </template>
@@ -730,6 +767,7 @@ import { useQuery } from '@vue/apollo-composable'
 import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { queries } from '@/utils/api/api.graphql'
 import { dummyData } from '@/utils/dummy'
+import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
 
 const position = { of: '#data' }
 const showIndicator = ref(true)
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
index 3c1a038..716d7ae 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
@@ -51,6 +51,7 @@
         css-class="custom-table-column"
         data-type="number"
         data-field="no"
+        cell-template="formatNumber"
       />
       <DxColumn
         :width="170"
@@ -77,6 +78,7 @@
           data-type="number"
           caption="Total"
           css-class="custom-table-column"
+          cell-template="formatNumber"
         />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
           <DxColumn
@@ -86,6 +88,7 @@
             data-type="number"
             caption="Jml"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="70"
@@ -94,7 +97,7 @@
             data-type="number"
             caption="%"
             css-class="custom-table-column"
-            cell-template="percent"
+            cell-template="formatNumber"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
@@ -105,6 +108,7 @@
             data-type="number"
             caption="Jml"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="70"
@@ -113,7 +117,7 @@
             data-type="number"
             caption="%"
             css-class="custom-table-column"
-            cell-template="percent"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -126,6 +130,7 @@
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -134,6 +139,7 @@
             data-type="number"
             caption="Rata-Rata"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -162,6 +168,7 @@
             data-type="number"
             caption=">SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -170,6 +177,7 @@
             data-type="number"
             caption="≤SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -182,6 +190,7 @@
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -190,6 +199,7 @@
             data-type="number"
             caption="Rata-Rata"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -218,6 +228,7 @@
             data-type="number"
             caption=">SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -226,6 +237,7 @@
             data-type="number"
             caption="≤SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -235,114 +247,131 @@
           summary-type="sum"
           display-format="Total"
           show-in-column="no"
-          css-class="text-white"
+          css-class="text-white !text-left"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
       </DxSummary>
 
       <template #formatTime="{ data }">
-        <p class="cursor-pointer !text-right" @click="showDialogDataSelected()">
+        <p class="!text-right cursor-pointer" @click="showDialogDataSelected()">
           {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
         </p>
       </template>
@@ -351,6 +380,18 @@
         <p class="cursor-pointer" @click="showDialogDataSelected()">{{ data.text }}%</p>
       </template>
 
+      <template #formatNumber="{ data }">
+        <p class="text-right cursor-pointer" @click="showDialogDataSelected()">
+          {{
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
+        </p>
+      </template>
+
       <template #formatText="{ data }">
         <p class="text-left cursor-pointer" @click="showDialogDataSelected()">
           {{ data.text }}
@@ -729,6 +770,7 @@ import { useQuery } from '@vue/apollo-composable'
 import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { queries } from '@/utils/api/api.graphql'
 import { dummyData } from '@/utils/dummy'
+import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
 
 const position = { of: '#data' }
 const showIndicator = ref(true)
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
index fc6ad52..671a1ea 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
@@ -18,7 +18,6 @@
       :row-alternation-enabled="true"
       :hover-state-enabled="true"
       @selection-changed="onDataSelectionChanged"
-      :column-width="100"
       @exporting="onExporting"
       :allow-column-resizing="true"
       column-resizing-mode="widget"
@@ -51,6 +50,7 @@
         css-class="custom-table-column"
         data-type="number"
         data-field="no"
+        cell-template="formatNumber"
       />
 
       <!-- <DxColumn
@@ -78,6 +78,7 @@
           data-type="number"
           caption="Total"
           css-class="custom-table-column"
+          cell-template="formatNumber"
         />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
           <DxColumn
@@ -87,6 +88,7 @@
             data-type="number"
             caption="Jml"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="70"
@@ -95,7 +97,7 @@
             data-type="number"
             caption="%"
             css-class="custom-table-column"
-            cell-templete="percent"
+            cell-template="formatNumber"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
@@ -114,7 +116,7 @@
             data-type="number"
             caption="%"
             css-class="custom-table-column"
-            cell-templete="percent"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -127,6 +129,7 @@
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -135,6 +138,7 @@
             data-type="number"
             caption="Rata-Rata"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -143,7 +147,7 @@
             data-type="number"
             caption="Max"
             css-class="custom-table-column"
-            cell-templete="data-waktu"
+            cell-template="formatTime"
           />
           <DxColumn
             :width="150"
@@ -152,7 +156,7 @@
             data-type="number"
             caption="Min"
             css-class="custom-table-column"
-            cell-templete="data-waktu"
+            cell-template="formatTime"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
@@ -163,6 +167,7 @@
             data-type="number"
             caption=">SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -171,6 +176,7 @@
             data-type="number"
             caption="≤SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -183,6 +189,7 @@
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -191,6 +198,7 @@
             data-type="number"
             caption="Rata-Rata"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -199,7 +207,7 @@
             data-type="number"
             caption="Max"
             css-class="custom-table-column"
-            cell-templete="data-waktu"
+            cell-template="formatTime"
           />
           <DxColumn
             :width="150"
@@ -208,7 +216,7 @@
             data-type="number"
             caption="Min"
             css-class="custom-table-column"
-            cell-templete="data-waktu"
+            cell-template="formatTime"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
@@ -219,6 +227,7 @@
             data-type="number"
             caption=">SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
           <DxColumn
             :width="150"
@@ -227,6 +236,7 @@
             data-type="number"
             caption="≤SLA"
             css-class="custom-table-column"
+            cell-template="formatNumber"
           />
         </DxColumn>
       </DxColumn>
@@ -236,236 +246,270 @@
           summary-type="sum"
           display-format="Total"
           show-in-column="no"
-          css-class="text-white"
+          css-class="text-white !text-left"
           :show-in-group-footer="true"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxGroupItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxGroupItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxGroupItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
           :show-in-group-footer="true"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
 
         <DxTotalItem
           summary-type="sum"
           display-format="Total"
           show-in-column="no"
-          css-class="text-white"
+          css-class="text-white !text-left"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_selesai"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
-          display-format="{0}%"
+          summary-type="avg"
+          display-format="{0}"
           column="persen_inproses"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatPercentage(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_response"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="avg"
           display-format="{0}"
           column="avg_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="min"
           display-format="{0}"
           column="min_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
-          summary-type="sum"
+          summary-type="max"
           display-format="{0}"
           column="max_durasi_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => (parseInt(e.value) ? formatWaktu(e.value) : '-')"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_diatas_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
         <DxTotalItem
           summary-type="sum"
           display-format="{0}"
           column="total_dibawah_sla_recovery"
-          css-class="text-white"
+          css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(parseFloat(e.value.toString()))"
         />
       </DxSummary>
 
@@ -475,8 +519,16 @@
         </p>
       </template>
 
-      <template #percent="{ data }">
-        <p class="cursor-pointer" @click="showDialogDataSelected()">{{ data.text }}%</p>
+      <template #formatNumber="{ data }">
+        <p class="!text-right cursor-pointer" @click="showDialogDataSelected()">
+          {{
+            isNumber(data.text)
+              ? data.column.caption == '%'
+                ? formatPercentage(data.text)
+                : formatNumber(data.text)
+              : data.text
+          }}
+        </p>
       </template>
 
       <template #formatText="{ data }">
@@ -858,6 +910,7 @@ import { useQuery } from '@vue/apollo-composable'
 import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { queries } from '@/utils/api/api.graphql'
 import { dummyData } from '@/utils/dummy'
+import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'
 
 const position = { of: '#data' }
 const showIndicator = ref(true)
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue
index 7ce3bd8..b22ccea 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue
@@ -1,67 +1,196 @@
 <template>
   <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
-    <Type8 @update:filters="(value) => filters = value" />
+    <Type8 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div id="data">
-    <DxDataGrid 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" :column-width="100" @exporting="onExporting" :allow-column-resizing="true"
-      column-resizing-mode="widget" :word-wrap-enabled="true">
+    <DxDataGrid
+      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"
+      :column-width="100"
+      @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 :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
-        v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxLoadPanel
+        :position="position"
+        :show-indicator="showIndicator"
+        :show-pane="showPane"
+        :shading="shading"
+        v-if="loading"
+        v-model:visible="loading"
+        :enabled="true"
+      />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport :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 css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn :width="150" alignment="center" data-field="regu" caption="Kode Unit" css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_idUlp" caption="Nama Unit"
-        css-class="custom-table-column" />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="50"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        data-type="number"
+        caption="No"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="regu"
+        caption="Kode Unit"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_idUlp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+      />
       <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-        <DxColumn :width="150" alignment="center" data-field="total" data-type="number" caption="Total"
-          css-class="custom-table-column" />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+        />
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="in_process" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="70" alignment="center" data-field="persen_in_process" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="in_process"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_in_process"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="selesai" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="70" alignment="center" data-field="persen_selesai" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="selesai"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_selesai"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Rating" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Bintang" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="jumlah_rating" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="70" alignment="center" data-field="persen_rating" data-type="number" caption="%"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="rating_1" data-type="number" caption="1"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="rating_2" data-type="number" caption="2"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="rating_3" data-type="number" caption="3"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="rating_4" data-type="number" caption="4"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="rating_5" data-type="number" caption="5"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="indeks_rating" data-type="number" caption="Indeks"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="jumlah_rating"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="70"
+            alignment="center"
+            data-field="persen_rating"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="rating_1"
+            data-type="number"
+            caption="1"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="rating_2"
+            data-type="number"
+            caption="2"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="rating_3"
+            data-type="number"
+            caption="3"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="rating_4"
+            data-type="number"
+            caption="4"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="rating_5"
+            data-type="number"
+            caption="5"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="indeks_rating"
+            data-type="number"
+            caption="Indeks"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Non Rating" css-class="custom-table-column">
-        <DxColumn :width="150" alignment="center" data-field="jumlah_non_rating" data-type="number" caption="Jml"
-          css-class="custom-table-column" />
-        <DxColumn :width="150" alignment="center" data-field="persen_non_rating" data-type="number" caption="%"
-          css-class="custom-table-column" />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="jumlah_non_rating"
+          data-type="number"
+          caption="Jml"
+          css-class="custom-table-column"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="persen_non_rating"
+          data-type="number"
+          caption="%"
+          css-class="custom-table-column"
+        />
       </DxColumn>
     </DxDataGrid>
   </div>
@@ -128,13 +257,16 @@ const onSelectionChanged = ({ selectedRowsData }: any) => {
 }
 
 const data = ref<any[]>([])
-const { onResult, onError, loading, refetch } = useQuery(queries.keluhan.rekap.keluhanPerRatingUnit, {
-  dateFrom: new Date('2023-10-01').toISOString().slice(0, 10),
-  dateTo: new Date('2023-10-01').toISOString().slice(0, 10),
-  idUlp: 0,
-  idUid: 0,
-  idUp3: 0
-})
+const { onResult, onError, loading, refetch } = useQuery(
+  queries.keluhan.rekap.keluhanPerRatingUnit,
+  {
+    dateFrom: new Date('2023-10-01').toISOString().slice(0, 10),
+    dateTo: new Date('2023-10-01').toISOString().slice(0, 10),
+    idUlp: 0,
+    idUid: 0,
+    idUp3: 0
+  }
+)
 const filters = ref()
 
 const filterData = (params: any) => {
@@ -164,4 +296,4 @@ const filterData = (params: any) => {
     console.log(error)
   })
 }
-</script>
\ No newline at end of file
+</script>