changes suggested in discord

actualbudget · Nov 13, 2024 · c887f22 · c887f22
1 parent a2cebb2
commit c887f22
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx
@@ -113,7 +113,7 @@ export function CalendarGraph({
         {data.map((day, index) =>
           !isSameMonth(day.date, startOfMonth(start)) ? (
             <View key={`empty-${day.date.getTime()}`} />
-          ) : (
+          ) : day.incomeValue !== 0 || day.expenseValue !== 0 ? (
             <Tooltip
               key={day.date.getTime()}
               content={
@@ -191,6 +191,14 @@ export function CalendarGraph({
                 onPress={() => onDayClick(day.date)}
               />
             </Tooltip>
+          ) : (
+            <DayButton
+              key={day.date.getTime()}
+              resizeRef={index === 15 ? buttonRef : null}
+              fontSize={fontSize}
+              day={day}
+              onPress={() => onDayClick(day.date)}
+            />
           ),
         )}
       </View>

diff --git a/packages/desktop-client/src/components/reports/reports/Calendar.tsx b/packages/desktop-client/src/components/reports/reports/Calendar.tsx
@@ -13,7 +13,7 @@ import { useParams, useSearchParams } from 'react-router-dom';
 import { useSpring, animated, config } from 'react-spring';
 
 import { useDrag } from '@use-gesture/react';
-import { format, isValid, parseISO } from 'date-fns';
+import { format, parseISO } from 'date-fns';
 
 import { SchedulesProvider } from 'loot-core/client/data-hooks/schedules';
 import { useTransactions } from 'loot-core/client/data-hooks/transactions';
@@ -138,26 +138,16 @@ function CalendarInner({ widget, parameters }: CalendarInnerProps) {
       });
     }
 
-    if (
-      parameters.has('monthStart') &&
-      parameters.get('monthStart') &&
-      isValid(new Date(parameters.get('monthStart') || '')) &&
-      parameters.has('monthEnd') &&
-      parameters.get('monthEnd') &&
-      isValid(new Date(parameters.get('monthEnd') || '')) &&
-      onApplyFilter
-    ) {
+    if (parameters.has('month') && parameters.get('month') && onApplyFilter) {
       onApplyFilter({
         conditions: [
           {
             field: 'date',
-            op: 'gte',
-            value: parameters.get('monthStart'),
-          },
-          {
-            field: 'date',
-            op: 'lte',
-            value: parameters.get('monthEnd'),
+            op: 'is',
+            value: parameters.get('month'),
+            options: {
+              month: true,
+            },
           },
         ] as RuleConditionEntity[],
         conditionsOp: 'and',
@@ -753,13 +743,11 @@ function CalendarWithHeader({
               conditions: [
                 {
                   field: 'date',
-                  op: 'gte',
-                  value: format(calendar.start, 'yyyy-MM-dd'),
-                },
-                {
-                  field: 'date',
-                  op: 'lte',
-                  value: format(calendar.end, 'yyyy-MM-dd'),
+                  op: 'is',
+                  value: format(calendar.start, 'yyyy-MM'),
+                  options: {
+                    month: true,
+                  },
                 },
               ],
               conditionsOp: 'and',

diff --git a/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx b/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
@@ -420,7 +420,7 @@ function CalendarCardInner({
             onPress={() => {
               navigate(
                 isDashboardsFeatureEnabled
-                  ? `/reports/calendar/${widgetId}?monthStart=${format(calendar.start, 'yyyy-MM-dd')}&monthEnd=${format(calendar.end, 'yyyy-MM-dd')}`
+                  ? `/reports/calendar/${widgetId}?month=${format(calendar.start, 'yyyy-MM')}`
                   : '/reports/calendar',
               );
             }}