From 2b80023aff508afc919fcb3d1a43c62d12f0d0d8 Mon Sep 17 00:00:00 2001
From: Vlad Pintea <vlad.pintea@frontmen.nl>
Date: Tue, 27 Jul 2021 18:18:36 +0200
Subject: [PATCH 1/3] feat: warning based on totals, if it exceeds hours
 expected in day or week

---
 .../records/weekly-timesheet-totals-row.vue   | 19 ++++++++-
 helpers/dates.ts                              |  3 +-
 pages/records.vue                             | 41 ++++++++++++++++++-
 types/timesheets.d.ts                         |  7 ++++
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/components/records/weekly-timesheet-totals-row.vue b/components/records/weekly-timesheet-totals-row.vue
index e14638b1..332d6ba8 100644
--- a/components/records/weekly-timesheet-totals-row.vue
+++ b/components/records/weekly-timesheet-totals-row.vue
@@ -29,9 +29,10 @@
 </template>
 
 <script lang="ts">
-import {computed, defineComponent, PropType} from "@nuxtjs/composition-api";
+import {computed, defineComponent, PropType, watch} from "@nuxtjs/composition-api";
 
 export default defineComponent({
+  emit: ["totals"],
   props: {
     projects: {
       type: Array as PropType<TimesheetProject[]>,
@@ -50,7 +51,7 @@ export default defineComponent({
       required: true,
     },
   },
-  setup(props) {
+  setup(props, {emit}) {
     const weekTotal = computed(() => {
       let total = 0;
 
@@ -85,6 +86,20 @@ export default defineComponent({
         props.workScheme?.[index] ? props.workScheme[index].workHours : "-")
     );
 
+    watch(
+      () => [weekTotal.value],
+      () => {
+        const totals: TimesheetTotals = {
+          weekTotal: weekTotal.value,
+          expectedWeekTotal: weekWorkSchemeHoursTotal.value,
+          dayTotal: dayTotals.value,
+        };
+
+        emit('totals', totals);
+      },
+      {immediate: true}
+    );
+
     return {
       weekTotal,
       weekWorkSchemeHoursTotal,
diff --git a/helpers/dates.ts b/helpers/dates.ts
index 2154c492..6b346769 100644
--- a/helpers/dates.ts
+++ b/helpers/dates.ts
@@ -68,7 +68,8 @@ export function checkNonWorkingDays(
   return days.map((day) => {
     const workSchemeDay = workScheme?.find((ws) => ws.date === day.date);
     const isPublicHoliday = !!workSchemeDay?.holiday;
-    const isLeaveDay = !!workSchemeDay?.absenceHours;
+    // Holidays also register absence hours, prevent double label.
+    const isLeaveDay = !!workSchemeDay?.absenceHours && !isPublicHoliday;
 
     const isPartTime =
       !isPublicHoliday && !!workSchemeDay && workSchemeDay.theoreticalHours < 8;
diff --git a/pages/records.vue b/pages/records.vue
index b3169fde..d9213d80 100644
--- a/pages/records.vue
+++ b/pages/records.vue
@@ -59,6 +59,7 @@
                 :show-add-project-button="
                   !isReadonly && selectableCustomers.length > 0
                 "
+                @totals="setTotals"
               />
             </template>
           </weekly-timesheet>
@@ -165,7 +166,7 @@
         :last-saved="recordsState.lastSaved"
         :status="timesheetStatus"
         @save="saveTimesheet(recordStatus.NEW)"
-        @submit="saveTimesheet(recordStatus.PENDING)"
+        @submit="submitTimesheet"
         @unsubmit="saveTimesheet(recordStatus.NEW)"
       />
 
@@ -242,6 +243,11 @@ export default defineComponent({
     const store = useStore<RootStoreState>();
     const recordsState = computed(() => store.state.records);
     const isAdminView = router.currentRoute.name?.includes("timesheets");
+    let totals: TimesheetTotals = {
+      weekTotal: 0,
+      expectedWeekTotal: 0,
+      dayTotal: [],
+    };
 
     store.dispatch("employees/getEmployees");
     store.dispatch("customers/getCustomers");
@@ -318,6 +324,37 @@ export default defineComponent({
     });
 
 
+    const setTotals = (calculatedTotals: TimesheetTotals) => {
+      totals = calculatedTotals;
+    }
+
+    const submitTimesheet = () => {
+      let confirmation = true;
+
+      if (totals.weekTotal > totals.expectedWeekTotal) {
+        confirmation = confirm(
+          `You have filled in ${totals.weekTotal - totals.expectedWeekTotal} more hours than the expected ${totals.expectedWeekTotal} hours a week. Is this correct?`
+        );
+      } else {
+        // Only show this one if total hours is fine, but some days are too long
+        const daysExceedingExpected = totals.dayTotal.filter(
+          (hoursInDay, index) => {
+            const weekendHours = !recordsState.value?.workScheme[index] && hoursInDay;
+            const exceedsExpectedHours = recordsState.value?.workScheme[index]?.workHours;
+            return hoursInDay > exceedsExpectedHours || weekendHours;
+          },
+        );
+
+        if (daysExceedingExpected.length) confirmation = confirm(
+          `You have filled in more hours than expected on some of the days. Is this correct?`
+        );
+      }
+
+      if (!confirmation) return;
+
+      timesheet.saveTimesheet(recordStatus.PENDING as TimesheetStatus);
+    }
+
     return {
       employee: selectedEmployee,
       selectableCustomers,
@@ -327,6 +364,8 @@ export default defineComponent({
       reasonOfDenial,
       handleBlur,
       handleDeny,
+      submitTimesheet,
+      setTotals,
       ...timesheet,
     };
   },
diff --git a/types/timesheets.d.ts b/types/timesheets.d.ts
index 1d3da0b9..ef54d440 100644
--- a/types/timesheets.d.ts
+++ b/types/timesheets.d.ts
@@ -5,6 +5,13 @@ declare enum TimesheetStatus {
   DENIED = 'denied',
   EMPTY = 'empty',
 }
+
+interface TimesheetTotals {
+  weekTotal: number;
+  expectedWeekTotal: number;
+  dayTotal: number[];
+}
+
 interface TimesheetEmployee extends Employee {
   status: TimesheetStatus;
   pendingTimeRecords: TimeRecord[];

From b9226298eaf149960d8c661049111d54099f754d Mon Sep 17 00:00:00 2001
From: Vlad Pintea <vlad.pintea@frontmen.nl>
Date: Fri, 30 Jul 2021 11:27:54 +0200
Subject: [PATCH 2/3] feat: enchancement pluralization of hour + fixed to 2
 decimals

---
 pages/records.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/records.vue b/pages/records.vue
index d9213d80..f00bb616 100644
--- a/pages/records.vue
+++ b/pages/records.vue
@@ -332,8 +332,9 @@ export default defineComponent({
       let confirmation = true;
 
       if (totals.weekTotal > totals.expectedWeekTotal) {
+        const difference = +(totals.weekTotal - totals.expectedWeekTotal).toFixed(2);
         confirmation = confirm(
-          `You have filled in ${totals.weekTotal - totals.expectedWeekTotal} more hours than the expected ${totals.expectedWeekTotal} hours a week. Is this correct?`
+          `You have filled in ${difference} more hour${difference !== 1 ? 's': ''} than the expected ${totals.expectedWeekTotal} hours a week. Is this correct?`
         );
       } else {
         // Only show this one if total hours is fine, but some days are too long

From d797e966c743decbecdc4f451d0dc58f04b0a46c Mon Sep 17 00:00:00 2001
From: Vlad Pintea <vlad.pintea@frontmen.nl>
Date: Fri, 30 Jul 2021 11:49:29 +0200
Subject: [PATCH 3/3] fix: lint after rebase

---
 helpers/timesheet.ts           |  5 +--
 helpers/validation.ts          |  3 +-
 services/auth-service.ts       |  8 ++--
 services/employees-service.ts  |  4 +-
 services/timesheets-service.ts |  6 +--
 store/records/actions.ts       | 79 ++++++++++++++++------------------
 store/reports/actions.ts       | 24 +++++------
 7 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/helpers/timesheet.ts b/helpers/timesheet.ts
index b5d2fff0..5c8fb28f 100644
--- a/helpers/timesheet.ts
+++ b/helpers/timesheet.ts
@@ -21,9 +21,8 @@ export const createWeeklyTimesheet = (params: {
   const weeklyCustomers: Customer[] = [];
   const weeklyTimeRecords = params.timeRecords.filter(isWithinCurrentWeek);
   const weeklyTravelRecords = params.travelRecords.filter(isWithinCurrentWeek);
-  const weeklyStandByRecords = params.standByRecords.filter(
-    isWithinCurrentWeek
-  );
+  const weeklyStandByRecords =
+    params.standByRecords.filter(isWithinCurrentWeek);
 
   weeklyTimeRecords.forEach((timeRecord) => {
     if (!weeklyCustomers.some((x) => x.id === timeRecord.customer.id)) {
diff --git a/helpers/validation.ts b/helpers/validation.ts
index b1cab1bc..deff81c1 100644
--- a/helpers/validation.ts
+++ b/helpers/validation.ts
@@ -1,4 +1,5 @@
 export const validateEmail = (email: string) => {
-  const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  const re =
+    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
   return re.test(String(email).toLowerCase());
 };
diff --git a/services/auth-service.ts b/services/auth-service.ts
index 0d60eaec..5850bac2 100644
--- a/services/auth-service.ts
+++ b/services/auth-service.ts
@@ -34,10 +34,10 @@ export default class AuthService {
   }
 
   getPPidFromJWTToken(responseToken: string) {
-    const ppid = this.decodeAuthResponseToken(responseToken).firebase
-      .sign_in_attributes[
-      'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier'
-    ];
+    const ppid =
+      this.decodeAuthResponseToken(responseToken).firebase.sign_in_attributes[
+        'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier'
+      ];
 
     localStorage.setItem('@fm-hours/ppid', ppid);
     return ppid;
diff --git a/services/employees-service.ts b/services/employees-service.ts
index 32a09e7e..f3696755 100644
--- a/services/employees-service.ts
+++ b/services/employees-service.ts
@@ -120,7 +120,7 @@ export default class EmployeesService {
     const snapshot = await ref.get();
     const result = snapshot.docs[0].data().admins || [];
 
-    return (result as unknown) as string[];
+    return result as unknown as string[];
   }
 
   public async getTeams(): Promise<string[]> {
@@ -128,7 +128,7 @@ export default class EmployeesService {
     const snapshot = await ref.get();
     const result = snapshot.docs[0].data().teams || [];
 
-    return (result as unknown) as string[];
+    return result as unknown as string[];
   }
 
   public async updateAdminEmails(adminList: string[]): Promise<string[]> {
diff --git a/services/timesheets-service.ts b/services/timesheets-service.ts
index 31278b6c..c375cd4e 100644
--- a/services/timesheets-service.ts
+++ b/services/timesheets-service.ts
@@ -19,9 +19,9 @@ export default class TimesheetsService {
   }: GetTimesheetsProps) {
     let query:
       | firebase.default.firestore.CollectionReference<DocumentData>
-      | firebase.default.firestore.Query<
-          DocumentData
-        > = this.fire.firestore.collection(Collections.TIMESHEETS);
+      | firebase.default.firestore.Query<DocumentData> = this.fire.firestore.collection(
+      Collections.TIMESHEETS
+    );
 
     if (date && !startDate && !endDate) query = query.where('date', '==', date);
 
diff --git a/store/records/actions.ts b/store/records/actions.ts
index d80454d5..f0e84aa6 100644
--- a/store/records/actions.ts
+++ b/store/records/actions.ts
@@ -24,13 +24,12 @@ const actions: ActionTree<RecordsStoreState, RootStoreState> = {
 
     commit('setLoading', {isLoading: true});
 
-    const timeRecords = await this.app.$timeRecordsService.getEmployeeRecords<
-      TimeRecord
-    >({
-      employeeId: payload.employeeId,
-      startDate: payload.startDate.getTime().toString(),
-      endDate: payload.endDate.getTime().toString(),
-    });
+    const timeRecords =
+      await this.app.$timeRecordsService.getEmployeeRecords<TimeRecord>({
+        employeeId: payload.employeeId,
+        startDate: payload.startDate.getTime().toString(),
+        endDate: payload.endDate.getTime().toString(),
+      });
 
     commit('setLoading', {isLoading: false});
     commit('setRecords', {
@@ -56,30 +55,27 @@ const actions: ActionTree<RecordsStoreState, RootStoreState> = {
 
     const selectedWeek = checkNonWorkingDays(workWeek, workSchemeResult);
 
-    const timeRecords = await this.app.$timeRecordsService.getEmployeeRecords<
-      TimeRecord
-    >({
-      employeeId: payload.employeeId,
-    });
+    const timeRecords =
+      await this.app.$timeRecordsService.getEmployeeRecords<TimeRecord>({
+        employeeId: payload.employeeId,
+      });
 
     const leaveDays: WeekDate[] = selectedWeek.filter(
       (day: WeekDate) => day.isLeaveDay
     );
 
-    const standByRecords = await this.app.$timeRecordsService.getEmployeeRecords<
-      StandbyRecord
-    >(
-      {
-        employeeId: payload.employeeId,
-      },
-      'standby_records'
-    );
+    const standByRecords =
+      await this.app.$timeRecordsService.getEmployeeRecords<StandbyRecord>(
+        {
+          employeeId: payload.employeeId,
+        },
+        'standby_records'
+      );
 
-    const travelRecords = await this.app.$travelRecordsService.getEmployeeRecords(
-      {
+    const travelRecords =
+      await this.app.$travelRecordsService.getEmployeeRecords({
         employeeId: payload.employeeId,
-      }
-    );
+      });
 
     commit('setLoading', {isLoading: false});
     commit('setRecords', {
@@ -156,29 +152,26 @@ const actions: ActionTree<RecordsStoreState, RootStoreState> = {
       payload.week
     );
 
-    const timeRecords = await this.app.$timeRecordsService.saveEmployeeRecords<
-      TimeRecord
-    >({
-      employeeId: payload.employeeId,
-      timeRecords: timeRecordsToSave,
-    });
-
-    const standByRecords = await this.app.$timeRecordsService.saveEmployeeRecords<
-      StandbyRecord
-    >(
-      {
+    const timeRecords =
+      await this.app.$timeRecordsService.saveEmployeeRecords<TimeRecord>({
         employeeId: payload.employeeId,
-        timeRecords: standByRecordsToSave,
-      },
-      Collections.STANDBYREC
-    );
+        timeRecords: timeRecordsToSave,
+      });
 
-    const travelRecords = await this.app.$travelRecordsService.saveEmployeeRecords(
-      {
+    const standByRecords =
+      await this.app.$timeRecordsService.saveEmployeeRecords<StandbyRecord>(
+        {
+          employeeId: payload.employeeId,
+          timeRecords: standByRecordsToSave,
+        },
+        Collections.STANDBYREC
+      );
+
+    const travelRecords =
+      await this.app.$travelRecordsService.saveEmployeeRecords({
         employeeId: payload.employeeId,
         travelRecords: travelRecordsToSave,
-      }
-    );
+      });
 
     commit('setSaving', {isSaving: false});
     commit('updateRecords', {
diff --git a/store/reports/actions.ts b/store/reports/actions.ts
index b9394a27..2b463cda 100644
--- a/store/reports/actions.ts
+++ b/store/reports/actions.ts
@@ -21,21 +21,19 @@ const actions: ActionTree<ReportsStoreState, RootStoreState> = {
         endDate: endDate.getTime(),
       }
     );
-    const timeRecordsPromise = this.app.$timeRecordsService.getRecords<
-      TimeRecord
-    >({
-      startDate,
-      endDate,
-    });
-    const standByRecordsPromise = this.app.$timeRecordsService.getRecords<
-      StandbyRecord
-    >(
-      {
+    const timeRecordsPromise =
+      this.app.$timeRecordsService.getRecords<TimeRecord>({
         startDate,
         endDate,
-      },
-      Collections.STANDBYREC
-    );
+      });
+    const standByRecordsPromise =
+      this.app.$timeRecordsService.getRecords<StandbyRecord>(
+        {
+          startDate,
+          endDate,
+        },
+        Collections.STANDBYREC
+      );
     const travelRecordsPromise = this.app.$travelRecordsService.getRecords({
       startDate,
       endDate,