Release 1.1.1

CHANGELOG.md

@@ -5,6 +5,10 @@
 
 ## [Unreleased]
 
+## [1.1.1] - 2023-07-10
+### Changed
+- Use day unit for extra working time
+
 ## [1.1.0] - 2023-07-05
 ### Changed
 - Refactor values in dashboard
@@ -13,6 +17,7 @@
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/antistatique/windmill/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/antistatique/windmill/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/antistatique/windmill/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/antistatique/windmill/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/antistatique/windmill/releases/tag/1.0.0

VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

configs/dashboard.tsx

@@ -1,7 +1,7 @@
 export const SHEET_NAME = `résumé-${new Date().getFullYear()}`;
 
 export const RANGE_START = 'A';
-export const RANGE_END = 'P';
+export const RANGE_END = 'Q';
 
 export const HOURS_PER_DAY = 8.4;
 export const FORMATION_BUDGET = 5;

interfaces/summary.ts

@@ -11,6 +11,7 @@ export default interface Summary {
   overtime: number;
   overtimeRecovery: number;
   overtimePaid: number;
+  overtimePreviousYearRemaining: number;
   overtimeRemaining: number;
 
   vacation: number;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "dev": "next dev",

pages/api/summaries/me.ts

@@ -40,12 +40,13 @@ const handler = async (
       overtimeRecovery: Number(row[6]),
       overtimePaid: Number(row[7]),
       workingPercent: Number(row[8]),
-      overtimeRemaining: Number(row[9]),
-      vacationPreviousYearRemaining: Number(row[11]),
-      vacationCurrentYear: Number(row[12]),
-      vacationBalance: Number(row[13]),
-      remainingDaysToTake: Number(row[14]),
-      email: row[15],
+      overtimePreviousYearRemaining: Number(row[9]),
+      overtimeRemaining: Number(row[10]),
+      vacationPreviousYearRemaining: Number(row[12]),
+      vacationCurrentYear: Number(row[13]),
+      vacationBalance: Number(row[14]),
+      remainingDaysToTake: Number(row[15]),
+      email: row[16],
     }))
     .slice(1); // Remove header
 

pages/dashboard.tsx

@@ -18,9 +18,15 @@ const Dashboard = () => {
     : 0;
 
   const totalOvertimeRecoveryDays = summary
-    ? Number((summary.overtimeRecovery + summary.overtimePaid).toFixed(2))
+    ? summary.overtimeRecovery + summary.overtimePaid
     : 0;
 
+  const totalOverTime = summary
+    ? summary.overtime + summary.overtimePreviousYearRemaining * HOURS_PER_DAY
+    : 0;
+
+  const totalOverTimeDays = Number((totalOverTime / HOURS_PER_DAY).toFixed(2));
+
   const currentYear = new Date().getFullYear();
 
   return (
@@ -62,19 +68,19 @@ const Dashboard = () => {
             label="Budget congés / vacances"
             items={[
               {
-                label: `Budget année en cours ${currentYear}`,
+                label: `Budget année en cours (${currentYear})`,
                 value: summary?.vacationCurrentYear,
                 metric: 'j',
               },
               {
-                label: `Solde année précedente ${currentYear - 1}`,
+                label: `Solde année précedente (${currentYear - 1})`,
                 value: summary?.vacationPreviousYearRemaining,
                 metric: 'j',
               },
               {
-                label: 'Heures supplémentaires totales',
-                value: summary?.overtime,
-                metric: 'h',
+                label: 'Heures supplémentaires cumulées',
+                value: totalOverTimeDays,
+                metric: 'j',
               },
             ]}
           />