defuj/apkt-eis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor RKeluhan_ALL.vue and RGangguan_CTTM.vue to improve code readability and remove unused variables

Browse Source
This commit is contained in:
Dede Fuji Abdul
2024-04-17 00:18:12 +07:00
parent 018032afda
commit 604d735f18
5 changed files with 205 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue
View File

@@ -11,7 +11,7 @@
<div id="data">
<DxDataGrid
@cell-click=""
@cell-click="onCellClicked"
ref="dataGridRef"
:allow-column-reordering="true"
class="max-h-[calc(100vh-140px)] mb-10"
@@ -74,8 +74,7 @@
:allow-resizing="false"
css-class="custom-table-column"
cell-template="formatNumber"
>
</DxColumn>
/>
<DxColumn
:width="150"
alignment="center"
@@ -1227,38 +1226,8 @@ const onCellClicked = (e: any) => {
groupIndex.value = e.row.groupIndex
setAgreementDialog(e.column.caption)
const data = getDataRowGroup(e.data)
console.table(data)
groupData.value = data
groupData.value = getDataRowGroup(e.data)
showDetail()
// if (e.row.groupIndex == 0) {
// //
// } else if (e.row.groupIndex == 1) {
// if (e.row.isExpanded) {
// const data = e.data.items[0].collapsedItems[0].items[0]
// groupData.value = data
// } else {
// const data = e.data.collapsedItems[0].items[0].items[0]
// groupData.value = data
// }
// } else if (e.row.groupIndex == 2) {
// if (e.row.isExpanded) {
// const data = e.data.items[0].collapsedItems[0]
// groupData.value = data
// } else {
// const data = e.data.collapsedItems[0].items[0]
// groupData.value = data
// }
// } else if (e.row.groupIndex == 3) {
// if (e.row.isExpanded) {
// const data = e.data.items[0]
// groupData.value = data
// } else {
// const data = e.data.collapsedItems[0]
// groupData.value = data
// }
// }
// showDetail()
} else {
groupDialog.value = false
}
@@ -1360,7 +1329,11 @@ const calculateCustomSummary = (options: any) => {
count_durasi_dispatch = 0
total_durasi_dispatch = 0
} else if (options.summaryProcess === 'finalize') {
options.totalValue = total_durasi_dispatch / count_durasi_dispatch
options.totalValue = !isFinite(total_durasi_dispatch / count_durasi_dispatch)
? 0
: total_durasi_dispatch == 0
? 0
: total_durasi_dispatch / count_durasi_dispatch
}
}
@@ -1539,39 +1512,19 @@ const getDetail = async () => {
tanggal: ''
}
if (groupDialog.value) {
// if (groupColumnCaption.value != 'Semua Unit') {
// if (groupColumnCaption.value == 'Regional') {
// query = {
// ...query,
// namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
// }
// } else if (groupColumnCaption.value == 'UID') {
// query = {
// ...query,
// idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
// namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
// }
// } else if (groupColumnCaption.value == 'UP3') {
// query = {
// ...query,
// idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
// idUp3: groupData.value?.id_up3 ? groupData.value?.id_up3 : 0,
// namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
// }
// }
// }
if (groupIndex.value == 1) {
console.log('groupData', grouping.value[groupIndex.value].data)
if (grouping.value[groupIndex.value].data == 'nama_regional') {
query = {
...query,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (groupIndex.value == 2) {
} else if (grouping.value[groupIndex.value].data == 'nama_uid') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (groupIndex.value == 3) {
} else if (grouping.value[groupIndex.value].data == 'nama_up3') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,

60
src/components/Pages/Gangguan/Rekap/RGangguan_CTTM.vue
View File

@@ -11,6 +11,7 @@
<div id="data">
<DxDataGrid
@cell-click="onCellClicked"
ref="dataGridRef"
:allow-column-reordering="true"
class="max-h-[calc(100vh-140px)] mb-10"
@@ -26,7 +27,7 @@
column-resizing-mode="widget"
:word-wrap-enabled="true"
>
<DxGrouping :auto-expand-all="false" expand-mode="rowClick" />
<DxGrouping :auto-expand-all="false" expand-mode="" />
<DxSelection mode="single" />
<DxPaging :enabled="false" />
<DxScrolling column-rendering-mode="virtual" mode="virtual" />
@@ -461,6 +462,7 @@ import {
exportDetailToDOCX
} from '@/report/Gangguan/Rekap/RGangguan_CTTM'
import BufferDialog from '@/components/Dialogs/BufferDialog.vue'
import { getDataRowGroup } from '@/utils/helper'
const client = apolloClient()
provideApolloClient(client)
@@ -478,6 +480,9 @@ const loadingData = ref(false)
const loadingSubData = ref(false)
const monthSelected = ref<any>(null)
const agreeToShowDialog = ref(false)
const groupIndex = ref(0)
const groupDialog = ref(false)
const groupData = ref<any>(null)
const reportMeta = ref({
uid: { id: 0, name: 'Semua Unit Induk Distribusi/Wilayah' },
up3: { id: 0, name: 'Semua Unit Pelaksanaan Pelayanan Pelanggan' },
@@ -503,9 +508,22 @@ const grouping = ref<any[]>([
}
])
const onCellClicked = (e: any) => {
if (e.rowType == 'group') {
groupDialog.value = true
groupIndex.value = e.row.groupIndex
setMonth(e.column.caption)
groupData.value = getDataRowGroup(e.data)
showDetail()
} else {
groupDialog.value = false
}
}
const setMonth = (month: any) => {
if (month != '') {
monthSelected.value = getMonthNumber(month)
monthSelected.value = getMonthNumber(month) == 0 ? null : getMonthNumber(month)
} else {
monthSelected.value = null
}
@@ -606,12 +624,42 @@ const getDetail = async () => {
const selected = dataSelected.value
const compDate = dateValue[0].split('-').reverse().join('-').split('-')
const query = {
var query = {
bulan: monthSelected.value,
tahun: parseInt(compDate[0]),
posko: selected?.id_ulp ? selected?.id_ulp : 0,
idUid: selected?.id_uid ? selected?.id_uid : 0,
idUp3: selected?.id_up3 ? selected?.id_up3 : 0
posko: 0,
idUid: 0,
idUp3: 0,
namaRegional: ''
}
if (groupDialog.value) {
if (grouping.value[groupIndex.value].data == 'nama_regional') {
query = {
...query,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (grouping.value[groupIndex.value].data == 'nama_uid') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (grouping.value[groupIndex.value].data == 'nama_up3') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
idUp3: groupData.value?.id_up3 ? groupData.value?.id_up3 : 0,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
}
} else {
query = {
...query,
posko: selected?.id_ulp ? selected?.id_ulp : 0,
idUid: selected?.id_uid ? selected?.id_uid : 0,
idUp3: selected?.id_up3 ? selected?.id_up3 : 0
}
}
loadingSubData.value = true

71
src/components/Pages/Gangguan/Rekap/RGangguan_KTI.vue
View File

@@ -11,7 +11,7 @@
<div id="data">
<DxDataGrid
@cell-click=""
@cell-click="onCellClicked"
ref="dataGridRef"
:allow-column-reordering="true"
class="max-h-[calc(100vh-140px)] mb-10"
@@ -26,7 +26,7 @@
:allow-column-resizing="true"
column-resizing-mode="widget"
>
<DxGrouping :auto-expand-all="false" :context-menu-enabled="true" expand-mode="rowClick" />
<DxGrouping :auto-expand-all="false" :context-menu-enabled="true" expand-mode="" />
<DxSelection mode="single" />
<DxPaging :enabled="false" />
<DxScrolling column-rendering-mode="virtual" mode="virtual" />
@@ -1106,6 +1106,7 @@ import {
} from '@/report/Gangguan/Rekap/RGangguan_KTI'
import { getMonthNumber } from '@/utils/texts'
import BufferDialog from '@/components/Dialogs/BufferDialog.vue'
import { getDataRowGroup } from '@/utils/helper'
const client = apolloClient()
provideApolloClient(client)
@@ -1147,28 +1148,24 @@ const grouping = ref<any[]>([
])
const groupDialog = ref(false)
const groupData = ref<any>(null)
const groupIndex = ref(0)
const onCellClicked = (e: any) => {
// if (e.rowType == 'group') {
// groupDialog.value = true
// if (e.row.groupIndex != 0) {
// const data = getDataRowGroup(e.data)
// console.table(data)
// groupData.value = data
// }
// showDetail()
// } else {
// groupDialog.value = false
// }
if (e.rowType == 'group') {
groupDialog.value = true
groupIndex.value = e.row.groupIndex
setMonth(e.column.caption)
groupData.value = getDataRowGroup(e.data)
showDetail()
} else {
groupDialog.value = false
}
}
const setMonth = (month: any) => {
if (month != '') {
if (getMonthNumber(month) == 0) {
monthSelected.value = null
} else {
monthSelected.value = getMonthNumber(month)
}
monthSelected.value = getMonthNumber(month) == 0 ? null : getMonthNumber(month)
} else {
monthSelected.value = null
}
@@ -1181,16 +1178,17 @@ const getDetail = async () => {
const ref = dataSelected.value
const compDate = dateValue[0].split('-').reverse().join('-').split('-')
const query = {
var 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),
posko: ref?.id_ulp ? ref?.id_ulp : 0,
idUid: ref?.id_uid ? ref?.id_uid : 0,
idUp3: ref?.id_up3 ? ref?.id_up3 : 0,
posko: 0,
idUid: 0,
idUp3: 0,
namaRegional: '',
bulan: monthSelected.value,
tahun: parseInt(compDate[0]),
is_transaksi_individual:
@@ -1219,6 +1217,35 @@ const getDetail = async () => {
: 2
}
if (groupDialog.value) {
if (grouping.value[groupIndex.value].data == 'nama_regional') {
query = {
...query,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (grouping.value[groupIndex.value].data == 'nama_uid') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (grouping.value[groupIndex.value].data == 'nama_up3') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
idUp3: groupData.value?.id_up3 ? groupData.value?.id_up3 : 0,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
}
} else {
query = {
...query,
posko: ref?.id_ulp ? ref?.id_ulp : 0,
idUid: ref?.id_uid ? ref?.id_uid : 0,
idUp3: ref?.id_up3 ? ref?.id_up3 : 0
}
}
loadingSubData.value = true
await requestGraphQl(queries.gangguan.rekap.gangguanKoreksiTransaksiIndividualDetail, query)
.then((result) => {