fix: server search for budget

jesusantguerrero · Oct 23, 2023 · c88cfc6 · c88cfc6
1 parent d10d724
commit c88cfc6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/resources/js/Pages/WidgetHeaderRow.vue b/resources/js/Pages/WidgetHeaderRow.vue
@@ -22,7 +22,7 @@ defineProps<{
                 {{ valueBadge }}
             </span>
             <span>
-                {{ {{ value }}}}
+                {{ value }}
             </span>
         </h2>
         <p class="text-xs" v-if="valueSubtitle">

diff --git a/resources/js/composables/useServerSearch.ts b/resources/js/composables/useServerSearch.ts
@@ -1,7 +1,6 @@
+import { endOfMonth, startOfMonth, format, parseISO } from 'date-fns';
 // import { format, parseISO } from "date-fns";
-import format from "date-fns/format";
-import parseISO from "date-fns/parseISO";
-import { reactive, Ref, watch, nextTick, computed, ref, inject, toRaw, onMounted } from "vue";
+import { reactive, Ref, watch, nextTick, computed, ref, inject } from "vue";
 import debounce from "lodash/debounce";
 
 export interface IServerSearchData {
@@ -102,10 +101,17 @@ export const parseParams = (state: SearchState) => {
     .join("&");
 };
 
-function parseDateFilters(options: Ref<Partial<IServerSearchData>>) {
-  const dates = options?.value?.filters?.date
+function parseDateFilters(options: Ref<Partial<IServerSearchData>>, setDefaultDate: boolean) {
+
+    const defaultDates = setDefaultDate ? [
+        format(startOfMonth(new Date()), 'yyyy-MM-dd'),
+        format(endOfMonth(new Date()), 'yyyy-MM-dd')
+    ] : [null, null]
+
+   const dates = options?.value?.filters?.date
     ? options.value.filters.date.split("~")
-    : [null, null];
+    : defaultDates;
+
   return {
     startDate: dates[0] && parseISO(dates[0]),
     endDate: