From 028213ea3a54248ef1fc2a4fa8209d1d9a708a67 Mon Sep 17 00:00:00 2001
From: Yann Lugrin
Date: Wed, 5 Jul 2023 13:34:22 +0200
Subject: [PATCH] Fix rounded value of recovered overtime
---
pages/api/summaries/me.ts | 9 ++-------
pages/dashboard.tsx | 9 +++------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/pages/api/summaries/me.ts b/pages/api/summaries/me.ts
index 3565b2f..b921c3e 100644
--- a/pages/api/summaries/me.ts
+++ b/pages/api/summaries/me.ts
@@ -2,12 +2,7 @@ import { sheets_v4 } from 'googleapis';
import type { NextApiRequest, NextApiResponse } from 'next';
import { User } from 'next-auth';
-import {
- HOURS_PER_DAY,
- RANGE_END,
- RANGE_START,
- SHEET_NAME,
-} from '@/configs/dashboard';
+import { RANGE_END, RANGE_START, SHEET_NAME } from '@/configs/dashboard';
import ApiError from '@/interfaces/apiError';
import Summary from '@/interfaces/summary';
import authorize from '@/middlewares/authorize';
@@ -43,7 +38,7 @@ const handler = async (
formationExpenses: row[4],
justifiedAbsence: Number(row[5]),
overtimeRecovery: Number(row[6]),
- overtimePaid: Number(row[7]) * HOURS_PER_DAY,
+ overtimePaid: Number(row[7]),
workingPercent: Number(row[8]),
overtimeRemaining: Number(row[9]),
vacationPreviousYearRemaining: Number(row[11]),
diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
index 27ef8b0..89498e2 100644
--- a/pages/dashboard.tsx
+++ b/pages/dashboard.tsx
@@ -14,11 +14,11 @@ const Dashboard = () => {
const { data: summary, isLoading } = useSummary();
const remainingOverTimeDays = summary
- ? summary.overtimeRemaining / HOURS_PER_DAY
+ ? Number((summary.overtimeRemaining / HOURS_PER_DAY).toFixed(2))
: 0;
const totalOvertimeRecoveryDays = summary
- ? (summary.overtimeRemaining + summary.overtimePaid) / HOURS_PER_DAY
+ ? Number((summary.overtimeRecovery + summary.overtimePaid).toFixed(2))
: 0;
const currentYear = new Date().getFullYear();
@@ -50,10 +50,7 @@ const Dashboard = () => {
'jour'
)} de vacances`}
- {`${pluralize(
- Number(remainingOverTimeDays.toFixed(2)),
- 'jour'
- )}
+ {`${pluralize(remainingOverTimeDays, 'jour')}
(${summary.overtimeRemaining}h) supplémentaires`}