Update package.json and version.json to version 0.0.173-vm

package.json

@@ -1 +1 @@
-{"name":"eis","version":"0.0.172-vm","private":true,"scripts":{"dev":"vite","host":"vite --host","tailwind":"tailwindcss -i ./src/assets/css/tailwind.css -o ./src/assets/css/style.css --watch","build":"run-p type-check build-only","preview":"vite preview --host","test:unit":"vitest","build-only":"vite build","type-check":"vue-tsc --noEmit -p tsconfig.vitest.json --composite false","lint":"eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore","format":"prettier --write src/","deploy":"node deploy.js","set-version":"node version.js","version":"echo $npm_package_version"},"dependencies":{"@apollo/client":"^3.8.10","@apollo/link-context":"^2.0.0-beta.3","@flavorly/vanilla-components":"^0.7.65","@headlessui/tailwindcss":"^0.2.0","@headlessui/vue":"^1.7.19","@heroicons/vue":"^2.0.18","@lottiefiles/lottie-player":"^2.0.4","@phosphor-icons/vue":"^2.1.6","@types/qs":"^6.9.12","@types/uuid":"^9.0.8","@types/vue-select":"^3.16.8","@vue/apollo-components":"^4.0.0","@vue/apollo-composable":"^4.0.1","@vue/apollo-option":"^4.0.0","axios":"^1.6.7","devextreme":"23.2.4","devextreme-vue":"23.2.4","docx":"^8.5.0","dotenv":"^16.3.1","encrypt-storage":"^2.12.22","exceljs":"^4.4.0","file-saver":"^2.0.5","graphql":"^16.8.1","graphql-tag":"^2.12.6","jspdf":"^2.5.1","jspdf-autotable":"^3.8.2","pinia":"^2.1.3","qs":"^6.11.2","uuid":"^9.0.1","vue":"^3.3.4","vue-html-to-paper":"^2.0.3","vue-router":"^4.2.2","vue-tailwind-datepicker":"^1.6.1","vue3-star-ratings":"^3.0.5"},"devDependencies":{"@rushstack/eslint-patch":"^1.5.1","@tailwindcss/aspect-ratio":"^0.4.2","@tailwindcss/container-queries":"^0.1.1","@tailwindcss/forms":"^0.5.7","@tailwindcss/typography":"^0.5.10","@tsconfig/node18":"^2.0.1","@types/file-saver":"^2.0.6","@types/jsdom":"^21.1.1","@types/node":"^18.16.17","@vitejs/plugin-vue":"^4.2.3","@vitejs/plugin-vue-jsx":"^3.0.1","@vue/eslint-config-prettier":"^8.0.0","@vue/eslint-config-typescript":"^12.0.0","@vue/test-utils":"^2.3.2","@vue/tsconfig":"^0.4.0","autoprefixer":"^10.4.14","eslint":"^8.39.0","eslint-plugin-vue":"^9.11.0","jsdom":"^22.1.0","npm-run-all":"^4.1.5","postcss":"^8.4.24","prettier":"^3.0.3","tailwindcss":"^3.3.2","typescript":"~5.2.2","vite":"^4.3.9","vitest":"^1.3.1","vue-tsc":"^2.0.5"}}
+{"name":"eis","version":"0.0.173-vm","private":true,"scripts":{"dev":"vite","host":"vite --host","tailwind":"tailwindcss -i ./src/assets/css/tailwind.css -o ./src/assets/css/style.css --watch","build":"run-p type-check build-only","preview":"vite preview --host","test:unit":"vitest","build-only":"vite build","type-check":"vue-tsc --noEmit -p tsconfig.vitest.json --composite false","lint":"eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore","format":"prettier --write src/","deploy":"node deploy.js","set-version":"node version.js","version":"echo $npm_package_version"},"dependencies":{"@apollo/client":"^3.8.10","@apollo/link-context":"^2.0.0-beta.3","@flavorly/vanilla-components":"^0.7.65","@headlessui/tailwindcss":"^0.2.0","@headlessui/vue":"^1.7.19","@heroicons/vue":"^2.0.18","@lottiefiles/lottie-player":"^2.0.4","@phosphor-icons/vue":"^2.1.6","@types/qs":"^6.9.12","@types/uuid":"^9.0.8","@types/vue-select":"^3.16.8","@vue/apollo-components":"^4.0.0","@vue/apollo-composable":"^4.0.1","@vue/apollo-option":"^4.0.0","axios":"^1.6.7","devextreme":"23.2.4","devextreme-vue":"23.2.4","docx":"^8.5.0","dotenv":"^16.3.1","encrypt-storage":"^2.12.22","exceljs":"^4.4.0","file-saver":"^2.0.5","graphql":"^16.8.1","graphql-tag":"^2.12.6","jspdf":"^2.5.1","jspdf-autotable":"^3.8.2","pinia":"^2.1.3","qs":"^6.11.2","uuid":"^9.0.1","vue":"^3.3.4","vue-html-to-paper":"^2.0.3","vue-router":"^4.2.2","vue-tailwind-datepicker":"^1.6.1","vue3-star-ratings":"^3.0.5"},"devDependencies":{"@rushstack/eslint-patch":"^1.5.1","@tailwindcss/aspect-ratio":"^0.4.2","@tailwindcss/container-queries":"^0.1.1","@tailwindcss/forms":"^0.5.7","@tailwindcss/typography":"^0.5.10","@tsconfig/node18":"^2.0.1","@types/file-saver":"^2.0.6","@types/jsdom":"^21.1.1","@types/node":"^18.16.17","@vitejs/plugin-vue":"^4.2.3","@vitejs/plugin-vue-jsx":"^3.0.1","@vue/eslint-config-prettier":"^8.0.0","@vue/eslint-config-typescript":"^12.0.0","@vue/test-utils":"^2.3.2","@vue/tsconfig":"^0.4.0","autoprefixer":"^10.4.14","eslint":"^8.39.0","eslint-plugin-vue":"^9.11.0","jsdom":"^22.1.0","npm-run-all":"^4.1.5","postcss":"^8.4.24","prettier":"^3.0.3","tailwindcss":"^3.3.2","typescript":"~5.2.2","vite":"^4.3.9","vitest":"^1.3.1","vue-tsc":"^2.0.5"}}

public/version.json

@@ -1 +1 @@
-{"version":"0.0.172-vm"}
+{"version":"0.0.173-vm"}

src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue

@@ -397,6 +397,7 @@
             cell-template="formatText"
           />
           <DxColumn
+            v-if="filters.jenisLaporan.name != 'Laporan Berulang Unit'"
             :width="150"
             alignment="center"
             data-field="no_laporan"
@@ -404,6 +405,15 @@
             css-class="custom-table-column"
             cell-template="formatText"
           />
+          <DxColumn
+            v-if="filters.jenisLaporan.name == 'Laporan Berulang Unit'"
+            :width="150"
+            alignment="center"
+            data-field="no_laporan_laporulang"
+            caption="No Laporan"
+            css-class="custom-table-column"
+            cell-template="formatText"
+          />
           <DxColumn
             v-if="filters.jenisLaporan.name == 'Laporan Rating Negatif'"
             :width="150"
@@ -435,7 +445,7 @@
             v-if="filters.jenisLaporan.name == 'Laporan Berulang Unit'"
             :width="150"
             alignment="center"
-            data-field="no_laporan_referensi"
+            data-field="no_laporan"
             caption="No Laporan Referensi"
             css-class="custom-table-column"
             cell-template="formatText"
@@ -588,7 +598,7 @@
           <DxColumn
             :width="150"
             alignment="center"
-            data-field="referensi_marking"
+            data-field="marking"
             caption="Referensi Marking"
             css-class="custom-table-column"
             cell-template="formatText"
@@ -679,7 +689,18 @@
 
         <div class="flex flex-row items-center justify-between w-full">
           <h3 class="text-sm font-medium w-[135px] text-gray-800">No Laporan:</h3>
-          <InputText :readonly="true" :value="dataSubSelected?.no_laporan" class-name="flex-1" />
+          <InputText
+            v-if="filters.jenisLaporan.name == 'Laporan Berulang Unit'"
+            :readonly="true"
+            :value="dataSubSelected?.no_laporan_laporulang"
+            class-name="flex-1"
+          />
+          <InputText
+            v-else
+            :readonly="true"
+            :value="dataSubSelected?.no_laporan"
+            class-name="flex-1"
+          />
         </div>
 
         <div
@@ -711,11 +732,7 @@
           class="flex flex-row items-center justify-between w-full"
         >
           <h3 class="text-sm font-medium w-[135px] text-gray-800">No Laporan Referensi:</h3>
-          <InputText
-            :readonly="true"
-            :value="dataSubSelected?.no_laporan_referensi"
-            class-name="flex-1"
-          />
+          <InputText :readonly="true" :value="dataSubSelected?.no_laporan" class-name="flex-1" />
         </div>
 
         <div class="flex flex-row items-center justify-between w-full">
@@ -871,11 +888,7 @@
 
         <div class="flex flex-row items-center justify-between w-full">
           <h3 class="text-sm font-medium w-[135px] text-gray-800">Referensi Marking:</h3>
-          <InputText
-            :readonly="true"
-            :value="dataSubSelected?.referensi_marking"
-            class-name="flex-1"
-          />
+          <InputText :readonly="true" :value="dataSubSelected?.marking" class-name="flex-1" />
         </div>
 
         <div

src/report/Keluhan/Rekap/RKeluhan_ALL.ts

@@ -71,8 +71,10 @@ const groupingData = (data: any, reportMeta: any) => {
 
 const formatData = (rawData: any, reportMeta: any) => {
   const tempData = groupingData(rawData, reportMeta)
-  const data = tempData.data[tempData.summaryName] || tempData.data
+  // const data = tempData.data[tempData.summaryName] || tempData.data
+  const data = tempData.data[tempData.summaryName]
   const formattedData: any = []
+  console.table('data', data)
 
   let parentName = ''
   let summaryName = tempData.summaryName ? tempData.summaryName : 'Seluruh Unit'
@@ -82,7 +84,7 @@ const formatData = (rawData: any, reportMeta: any) => {
   } else if (tempData.parent === 'regional') {
     parentName = tempData.data[tempData.summaryName][0].nama_regional
   } else {
-    parentName = tempData.parent
+    parentName = tempData.summaryName
   }
 
   const total: any = {

src/utils/api/api.graphql.ts

@@ -4390,6 +4390,7 @@ export const queries = {
             isMarking: $isMarking
             namaPetugas: $namaPetugas
           ) {
+            nama_petugas
             id
             id_uid
             nama_uid
@@ -4507,6 +4508,7 @@ export const queries = {
             isMarking: $isMarking
             namaPetugas: $namaPetugas
           ) {
+            nama_petugas
             id
             id_uid
             nama_uid
@@ -4634,6 +4636,7 @@ export const queries = {
             isMarking: $isMarking
             namaPetugas: $namaPetugas
           ) {
+            nama_petugas
             id
             id_uid
             nama_uid