use date-fns for the same like new Date :)

server/mergin/stats/controller.py

@@ -68,15 +68,15 @@ def download_report(date_from: str, date_to: str):
         .order_by(MerginStatistics.created_at.desc())
         .all()
     )
-    createdColumn = "created_at"
+    created_column = "created_at"
     data = [
         {
             **stat.data,
             "created_at": datetime.isoformat(stat.created_at),
         }
         for stat in stats
     ]
-    columns = list(ServerCallhomeData.__dataclass_fields__.keys()) + [createdColumn]
+    columns = list(ServerCallhomeData.__dataclass_fields__.keys()) + [created_column]
     # get columns for data, this is usefull when we will update data json format (removing columns, adding new ones)
 
     builder = CsvTextBuilder()

web-app/packages/admin-lib/src/modules/admin/components/ReportDownloadDialog.vue

@@ -44,12 +44,8 @@
 </template>
 
 <script lang="ts" setup>
-import {
-  AppDropdown,
-  dateUtils,
-  DropdownOption,
-  useDialogStore
-} from '@mergin/lib'
+import { AppDropdown, DropdownOption, useDialogStore } from '@mergin/lib'
+import subMonths from 'date-fns/subMonths'
 import { ref, watchEffect } from 'vue'
 
 import { useAdminStore } from '@/main'
@@ -66,7 +62,7 @@ const periodOptions = ref<DropdownOption[]>([
   { label: 'Custom range', value: '-1' }
 ])
 const range = ref<Array<Date>>([
-  dateUtils.getDateFromMonthsAgo(Number(period.value)),
+  subMonths(new Date(), Number(period.value)),
   new Date()
 ])
 
@@ -76,7 +72,7 @@ watchEffect(() => {
     range.value = []
     return
   }
-  range.value = [dateUtils.getDateFromMonthsAgo(periodValue), new Date()]
+  range.value = [subMonths(new Date(), periodValue), new Date()]
 })
 
 function close() {

web-app/packages/lib/src/common/date_utils.ts

@@ -102,13 +102,3 @@ export function formatRemainingTime(t2, t1 = new Date()) {
       return remainingFormatDuration(days, 'days')
   }
 }
-
-/**
- * Calculates date from today to given months number in past.
- * Doest not convert to UTC.
- */
-export function getDateFromMonthsAgo(months) {
-  const date = new Date()
-  date.setMonth(date.getMonth() - months)
-  return date
-}