diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 726ca8a4..4cd318d3 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -1,9 +1,9 @@ name: Deploy Dev -on: - push: - branches: - - dev +# on: +# push: +# branches: +# - dev jobs: deploy: diff --git a/app/src/dailyActivity/dailyActivity.service.ts b/app/src/dailyActivity/dailyActivity.service.ts index eb435e26..76435045 100644 --- a/app/src/dailyActivity/dailyActivity.service.ts +++ b/app/src/dailyActivity/dailyActivity.service.ts @@ -35,7 +35,10 @@ export class DailyActivityService { recordMap.set(timestamp, [ ...prevRecords, - { type: record.type, value: record.value }, + { + type: record.type, + value: Math.floor(record.value / DateWrapper.MIN), + }, ]); return recordMap; diff --git a/app/src/dailyLogtime/dailyLogtime.service.ts b/app/src/dailyLogtime/dailyLogtime.service.ts index 20527e2f..859414d5 100644 --- a/app/src/dailyLogtime/dailyLogtime.service.ts +++ b/app/src/dailyLogtime/dailyLogtime.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common'; import type { IntRecord } from 'src/common/models/common.valueRecord.model'; import type { DateRange } from 'src/dateRange/dtos/dateRange.dto'; import { DailyLogtimeDaoImpl } from './db/dailyLogtime.database.dao'; +import { DateWrapper } from 'src/dateWrapper/dateWrapper'; @Injectable() export class DailyLogtimeService { @@ -23,7 +24,7 @@ export class DailyLogtimeService { return { at: new Date(year, month - 1), - value, + value: Math.floor(value / DateWrapper.MIN), }; }); }