From aa16111cc0d9218f3c8d325ceca59570569c38d9 Mon Sep 17 00:00:00 2001
From: kur0nek-o <maulana21mh@gmail.com>
Date: Tue, 23 Apr 2024 23:28:05 +0700
Subject: [PATCH] fix: years in monalisa type 2

---
 src/components/Form/FiltersType/Type2.vue        | 16 ++++++++++++----
 src/components/Form/FiltersType/reference.ts     |  3 +++
 .../Rekap/MonalisaGR_JumlahKaliGangguan.vue      |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue
index 01a37cf..f66188c 100755
--- a/src/components/Form/FiltersType/Type2.vue
+++ b/src/components/Form/FiltersType/Type2.vue
@@ -9,8 +9,7 @@ import {
   itemsUp3,
   itemsUlp,
   itemsRegional,
-  months,
-  years
+  months
 } from './reference'
 import { onMounted, ref, watch } from 'vue'
 import { getMonthName } from '@/utils/texts'
@@ -37,7 +36,16 @@ if (bulanIndex !== -1) {
   months.splice(bulanIndex, 1)
 }
 // Find index of current year
-const tahunIndex = years.value.findIndex((year) => year.id === tahun.value.id)
+const year = new Date().getFullYear()
+const years = ref<any>([])
+for (let i = 0; i < 5; i++) {
+  if (i == 0) {
+    years.value.push({ id: year, name: year })
+  }
+  years.value.push({ id: year - i, name: year - i })
+}
+
+const tahunIndex = years.value.findIndex((year: any) => year.id === tahun.value.id)
 if (tahunIndex !== -1) {
   years.value.splice(tahunIndex, 1)
 }
@@ -210,7 +218,7 @@ onMounted(() => {
           :data="months"
           :placeholder="bulanPlaceholder"
         />
-        <Select @update:selected="setYear($event)" :data="years" :placeholder="tahunPlaceholder" />
+        <Select @update:selected="setYear($event)" :data="years" />
       </div>
     </div>
   </div>
diff --git a/src/components/Form/FiltersType/reference.ts b/src/components/Form/FiltersType/reference.ts
index 19e73aa..56e0168 100755
--- a/src/components/Form/FiltersType/reference.ts
+++ b/src/components/Form/FiltersType/reference.ts
@@ -24,6 +24,9 @@ const months = [
 const year = new Date().getFullYear()
 const years = ref<Item[]>([])
 for (let i = 0; i < 5; i++) {
+  if (i == 0) {
+    years.value.push({ id: year, name: year })
+  }
   years.value.push({ id: year - i, name: year - i })
 }
 const itemsUid = ref<Item[]>([])
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
index 720d994..f7f18d5 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
@@ -268,7 +268,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import { getMonthName } from '@/utils/texts'
 import {
@@ -323,6 +323,7 @@ const reportMeta = ref({
   currentYear: new Date().getFullYear(),
   lastYear: new Date().getFullYear() - 1
 })
+const filters: any = ref()
 
 const grouping = ref<any[]>([
   {
@@ -566,7 +567,6 @@ const onDataSubSelectionChanged = ({ selectedRowsData }: any) => {
   dataSubSelected.value = data
 }
 
-const filters = ref()
 onMounted(() => {
   if (import.meta.env.DEV) {
     data.value = [