From 6248cb3354c1e03b884e6311e23b7aac7078123d Mon Sep 17 00:00:00 2001
From: Nicolas Drolet <nicolasd@targointernet.com>
Date: Mon, 25 Aug 2025 17:07:08 -0400
Subject: [PATCH] feat(approvals): add timeline compact viewer. Forego
 slider/range implementation for custom vue/typescript method

---
 src/i18n/en-ca/index.ts                       |   1 +
 src/i18n/fr-ca/index.ts                       |   1 +
 .../components/shifts/shift-preview-bar.vue   | 121 ++++++++++++++++++
 .../timesheet-approval-employee-details.vue   |  48 +++++++
 ...al-employee-overview-list-item-details.vue |  29 -----
 ...t-approval-employee-overview-list-item.vue |  34 ++---
 ...esheet-approval-employee-overview-list.vue |  43 +++++--
 .../composables/use-timesheet-approval-api.ts |   5 +
 .../pages/timesheet-approval.vue              |   2 +-
 .../services/services-timesheet-approval.ts   |  54 +-------
 ...pay-period-overview-employee-interface.ts} |   2 +-
 ...-approval-pay-period-overview-interface.ts |   4 +-
 .../types/timesheet-details-interface.ts      |   8 +-
 .../types/timesheet-shift-interface.ts        |   5 +
 src/stores/timesheet-store.ts                 |  82 ++++++++++--
 15 files changed, 314 insertions(+), 125 deletions(-)
 create mode 100644 src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue
 create mode 100644 src/modules/timesheet-approval/components/timesheet-approval-employee-details.vue
 delete mode 100644 src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item-details.vue
 rename src/modules/timesheet-approval/types/{timesheet-approval-pay-period-employee-overview-interface.ts => timesheet-approval-pay-period-overview-employee-interface.ts} (80%)
 create mode 100644 src/modules/timesheets/types/timesheet-shift-interface.ts

diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts
index 94335df..2a73729 100644
--- a/src/i18n/en-ca/index.ts
+++ b/src/i18n/en-ca/index.ts
@@ -297,6 +297,7 @@ export default {
   },
   timeSheetValidations: {
     tableColumnLabelFullname: 'Full name',
+    tableColumnLabelEmail: 'email address',
     tableColumnLabelRegularHours: 'regular hours',
     tableColumnLabelEveningHours: 'evening',
     tableColumnLabelEmergencyHours: 'emergency',
diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts
index 8c5005a..b5c2d7d 100644
--- a/src/i18n/fr-ca/index.ts
+++ b/src/i18n/fr-ca/index.ts
@@ -347,6 +347,7 @@ export default {
   },
   timeSheetValidations: {
     tableColumnLabelFullname: 'nom complet',
+    tableColumnLabelEmail: 'courriel',
     tableColumnLabelRegularHours: 'heures régulières',
     tableColumnLabelEveningHours: 'soir',
     tableColumnLabelEmergencyHours: 'urgence',
diff --git a/src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue b/src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue
new file mode 100644
index 0000000..e5ee8bf
--- /dev/null
+++ b/src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue
@@ -0,0 +1,121 @@
+<script setup lang="ts">
+    import { computed } from "vue";
+    import type { Shift } from "src/modules/timesheets/types/timesheet-shift-interface";
+    import { date } from 'quasar';
+    
+    const totalMinutes = 24 * 60;
+    const props = defineProps<{
+        weekdayShifts: (Shift | null)[];
+    }>();
+
+    const toMinutes = (time: string): number => {
+        const parsed_time = date.extractDate(time, 'HH:mm');     
+        return parsed_time.getHours() * 60 + parsed_time.getMinutes();
+    };
+
+    const bars = computed(() => {
+    return props.weekdayShifts
+        .filter((s): s is Shift => s !== null) // skip null shifts
+        .map((s) => {
+            const start = toMinutes(s.start_time);
+            const end = toMinutes(s.end_time);
+            const start_percent = (start / totalMinutes) * 100;
+            const width_percent = ((end - start) / totalMinutes) * 100;
+            
+            return { start_percent, width_percent };
+        });
+    });
+</script>
+
+<template>
+    <div class="relative full-width bg-grey-4 rounded-10" style="height: 8px; margin: 7px 0;">
+        <div
+            v-for="(bar, i) in bars"
+            :key="i"
+            class="absolute bg-primary"
+            :style="{
+            left: bar.start_percent + '%',
+            width: bar.width_percent + '%',
+            height: '14px',
+            transform: 'translateY(-3px)',
+            }"
+        ></div>
+    </div>
+</template>
+
+
+<!-- <script setup lang="ts">
+    import type { Shift } from 'src/modules/timesheets/types/timesheet-shift-interface';
+    import { date } from 'quasar';
+    import { ref } from 'vue';
+
+    const props = defineProps<{
+        weekdayShifts: Shift[];
+    }>();
+
+    const extractTimeValue = (time: string): number => {
+        const parsed_time = date.extractDate(time, 'HH:mm');     
+        return parsed_time.getHours() + (parsed_time.getMinutes() / 60);
+    };
+
+    const slider_model = ref<number>(0);
+    const shifts = ref<Shift[]>(props.weekdayShifts);
+    const ranges = ref( 
+        shifts.value.map( shift => 
+        shift 
+            ? {
+                min: extractTimeValue(shift.start_time),
+                max: extractTimeValue(shift.end_time) 
+            }
+            : {
+                min: 0,
+                max: 0
+            }
+        )
+    );
+</script>
+
+<template>
+    <div class="relative-position q-pa-none q-ma-none col">
+        <div class="absolute-full row justify-between">
+            <div></div>
+            <q-separator vertical color="accent" />
+            <q-separator vertical color="accent" />
+            <q-separator vertical color="accent" />
+            <q-separator vertical color="accent" />
+            <q-separator vertical color="accent" />
+            <div></div>
+        </div>
+        <q-slider
+            v-model="slider_model"
+            track-color="grey-6"
+            track-size="8px"
+            thumb-size="0px"
+            :max="24"
+            readonly
+            class="absolute-full q-pt-xs"
+        />
+        <div 
+            v-for="(_range, index) in ranges" 
+            :key="index"
+            class="absolute-full"
+        >
+            <q-range 
+                v-model="ranges[index]"
+                track-color="transparent"
+                inner-track-color="transparent"
+                color="primary"
+                :max="24"
+                thumb-size="0px"
+                track-size="16px"
+                label-color="accent"
+                label-text-color="primary"
+                label
+                :left-label-value="shifts[index]?.start_time"
+                :right-label-value="shifts[index]?.end_time"
+                readonly
+                class="z-top"
+            />
+        </div>
+    </div>
+</template> -->
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-details.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-details.vue
new file mode 100644
index 0000000..21999aa
--- /dev/null
+++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-details.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+    import type { PayPeriodEmployeeDetails } from '../types/timesheet-approval-pay-period-employee-details-interface';
+    import ShiftPreviewBar from 'src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue';
+
+    const props = defineProps<{
+        isLoading: boolean;
+        employeeDetails: PayPeriodEmployeeDetails | undefined; 
+    }>();
+</script>
+
+<template>
+    <q-card class="q-pa-sm bg-white shadow-5 full-width">
+        <!-- loader -->
+        <q-card-section v-if="props.isLoading">
+            <q-spinner 
+                color="primary"
+                size="5em"
+                :thickness="10"
+            />
+            <div class="text-primary text-h6 text-weight-bold">
+                {{ $t('shared.loading') }}
+            </div>
+        </q-card-section>
+        
+        <!-- employee timesheet details -->
+        <q-card-section 
+            v-if="!props.isLoading"
+            class="column"
+        >
+            <div class="absolute-full row justify-center text-center text-primary text-weight-bolder text-caption q-py-none q-my-none q-px-xl q-mx-sm">
+                <q-space />
+                <div class="col">4</div>
+                <div class="col">8</div>
+                <div class="col">12</div>
+                <div class="col">4</div>
+                <div class="col">8</div>
+                <q-space />
+            </div>
+            <ShiftPreviewBar 
+                v-for="(shifts, index) in employeeDetails?.week1.shifts"
+                :key="index"
+                :weekday-shifts="shifts"
+                class="q-mt-xs"
+            />
+            <!-- {{ employeeDetails }} -->
+        </q-card-section>
+    </q-card>
+</template>
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item-details.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item-details.vue
deleted file mode 100644
index a2b0cdf..0000000
--- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item-details.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script setup lang="ts">
-    import type { TimesheetDetailsWeek } from 'src/modules/timesheets/types/timesheet-details-interface';
-
-    const props = defineProps<{
-        isLoading: boolean;
-        employeeDetails: TimesheetDetailsWeek; 
-    }>();
-</script>
-
-<template>
-    <q-card class="q-pa-sm bg-white shadow-5">
-        <!-- loader -->
-        <q-card-section v-if="props.isLoading">
-            <q-spinner 
-                color="primary"
-                size="5em"
-                :thickness="10"
-            />
-            <div class="text-primary text-h6 text-weight-bold">
-                {{ $t('shared.loading') }}
-            </div>
-        </q-card-section>
-        
-        <!-- employee timesheet details -->
-        <q-card-section v-if="!props.isLoading">
-            {{ employeeDetails }}
-        </q-card-section>
-    </q-card>
-</template>
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue
index 6d18cf8..b83ca0f 100644
--- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue
+++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-    import type { PayPeriodEmployeeOverview } from '../types/timesheet-approval-pay-period-employee-overview-interface';
+    import type { PayPeriodOverviewEmployee } from 'src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-employee-interface';
 
     interface TableColumn {
         name: string;
@@ -9,36 +9,40 @@
 
     const props = defineProps<{
         cols: TableColumn[];
-        row: PayPeriodEmployeeOverview;
+        row: PayPeriodOverviewEmployee;
         initialState: boolean;
     }>();
 
     const emit = defineEmits<{
-        isDetailsButtonPressed: []
-        'update:modelValue': [value: string | number | null]
+        clickDetails: [email: string];
+        'update:modelValue': [value: boolean | null];
     }>();
 </script>
 
 <template>
     <div class="q-px-sm q-pb-sm col-xs-12 col-sm-6 col-md-4 col-lg-4 col-xl-3 grid-style-transition">
         <q-card class="rounded-10">
-            <!-- Button to get full timesheet details -->
-             <q-btn
-                flat
-                unelevated
-                class="q-pa-sm"
-                icon="open_in_full"
-                @click="emit('isDetailsButtonPressed')"
-            />
-
-            <!-- Card header with employee name -->
+            <!-- Card header with employee name and details button-->
             <q-card-section 
                 horizontal 
-                class="q-py-none q-px-md"
+                class="q-py-none q-pl-md"
             >
                 <div class="text-primary text-h5 text-weight-bolder q-pt-xs overflow-hidden">
                     {{ props.row.employee_name }}
                 </div>
+
+                <q-space />
+
+                <!-- Button to get full timesheet details -->
+                <q-btn
+                    flat
+                    unelevated
+                    rounded
+                    class="q-py-none"
+                    color="primary"
+                    icon="open_in_full"
+                    @click="emit('clickDetails', props.row.email)"
+                />
             </q-card-section>
 
             <q-separator 
diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue
index 483af1c..950b39e 100644
--- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue
+++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue
@@ -8,9 +8,10 @@
     
     import TimesheetApprovalPeriodPicker from '../components/timesheet-approval-period-picker.vue';
     import TimesheetApprovalEmployeeOverviewListItem from './timesheet-approval-employee-overview-list-item.vue';
+    import TimesheetApprovalEmployeeDetails from '../components/timesheet-approval-employee-details.vue';
     
     import { date, type QTableColumn } from 'quasar';
-    import type { PayPeriodEmployeeOverview } from '../types/timesheet-approval-pay-period-employee-overview-interface';
+    import type { PayPeriodOverviewEmployee } from '../types/timesheet-approval-pay-period-overview-employee-interface';
 
     const { t } = useI18n();
     const timesheet_store = useTimesheetStore();
@@ -21,14 +22,21 @@
     
     const filter = ref<string | number | null>('');
     const original_approvals = ref<Record<string, boolean>>({});
+    const is_showing_details = ref<boolean>(false);
 
-    const columns = computed((): QTableColumn<PayPeriodEmployeeOverview>[] => [
+    const columns = computed((): QTableColumn<PayPeriodOverviewEmployee>[] => [
         { 
             name: 'employee_name', 
             label: t('timeSheetValidations.tableColumnLabelFullname'), 
             field: 'employee_name', 
             sortable: true 
         },
+        { 
+            name: 'email', 
+            label: t('timeSheetValidations.tableColumnLabelEmail'), 
+            field: 'email', 
+            sortable: true,
+        },
         { 
             name: 'regular_hours', 
             label: t('timeSheetValidations.tableColumnLabelRegularHours'), 
@@ -65,7 +73,7 @@
     ]);
     
     const has_changes = computed(() => {
-        return timesheet_store.pay_period_employee_overviews.some(emp => {
+        return timesheet_store.pay_period_overview_employees.some(emp => {
             return emp.is_approved !== original_approvals.value[emp.email];
         });
     });
@@ -79,19 +87,36 @@
         await timesheet_approval_api.getPayPeriodOverviewByDate(date_string);
     }
 
+    const onClickedDetails = async (email: string) => {
+        is_showing_details.value = true;
+        console.log('employee email is: ', email);
+        await timesheet_approval_api.getTimesheetsByPayPeriodAndEmail(email);
+    }
+
     onMounted( async () => {
         const today = date.formatDate(new Date(), 'YYYY-MM-DD');
         await timesheet_approval_api.getPayPeriodOverviewByDate(today);
 
-        const approvals = timesheet_store.pay_period_employee_overviews.map(emp => [emp.email, emp.is_approved]);
+        const approvals = timesheet_store.pay_period_overview_employees.map(emp => [emp.email, emp.is_approved]);
         original_approvals.value = Object.fromEntries(approvals);
+        console.log(timesheet_store.pay_period_overview_employees);
     })
 </script>
 
 <template>
+     <q-dialog 
+        v-model="is_showing_details"
+        transition-show="scale" 
+        transition-hide="jump-down"
+    >
+        <TimesheetApprovalEmployeeDetails 
+            :is-loading="timesheet_store.is_loading"
+            :employee-details="timesheet_store.pay_period_employee_details"
+        />
+    </q-dialog>
     <div class="q-pa-md">
         <q-table 
-            :rows="timesheet_store.pay_period_employee_overviews" 
+            :rows="timesheet_store.pay_period_overview_employees" 
             :columns="columns"
             row-key="email" 
             :filter="filter" 
@@ -126,13 +151,15 @@
 
             <!-- Template for individual employee cards -->
             <template v-slot:item="props: { 
-                cols: (QTableColumn<PayPeriodEmployeeOverview> & { value: unknown })[], 
-                row: PayPeriodEmployeeOverview 
+                cols: (QTableColumn<PayPeriodOverviewEmployee> & { value: unknown })[], 
+                row: PayPeriodOverviewEmployee 
             }">
                 <TimesheetApprovalEmployeeOverviewListItem 
                     :cols="props.cols" 
                     :row="props.row" 
-                    :initial-state="props.row.is_approved"/>
+                    :initial-state="props.row.is_approved"
+                    @click-details="onClickedDetails"
+                />
             </template>
 
             <!-- Template for custome failed-to-load state -->
diff --git a/src/modules/timesheet-approval/composables/use-timesheet-approval-api.ts b/src/modules/timesheet-approval/composables/use-timesheet-approval-api.ts
index 16b8b6d..baf85b8 100644
--- a/src/modules/timesheet-approval/composables/use-timesheet-approval-api.ts
+++ b/src/modules/timesheet-approval/composables/use-timesheet-approval-api.ts
@@ -40,8 +40,13 @@ export const useTimesheetApprovalApi = () => {
         }
     }
 
+    const getTimesheetsByPayPeriodAndEmail = async (employee_email: string) => {
+        await timesheet_store.getTimesheetsByPayPeriodAndEmail(employee_email);
+    }
+
     return {
         getPayPeriodOverviewByDate,
         getNextPayPeriodOverview,
+        getTimesheetsByPayPeriodAndEmail
     }
 };
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/pages/timesheet-approval.vue b/src/modules/timesheet-approval/pages/timesheet-approval.vue
index 8c00a74..2248538 100644
--- a/src/modules/timesheet-approval/pages/timesheet-approval.vue
+++ b/src/modules/timesheet-approval/pages/timesheet-approval.vue
@@ -13,7 +13,6 @@
         year: 'numeric',
      };
 
-
     const pay_period_label = computed(() => {
         const dates = timesheet_store.current_pay_period.label.split('.');
         const start_date = new Intl.DateTimeFormat(locale.value, date_options).format(date.extractDate(dates[0] as string, 'YYYY-MM-DD'));
@@ -42,6 +41,7 @@
                 {{ pay_period_label.end_date }}
             </div>
         </div>
+
         <TimesheetApprovalEmployeeOverviewList />
     </q-page>
 </template>
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/services/services-timesheet-approval.ts b/src/modules/timesheet-approval/services/services-timesheet-approval.ts
index 36db4e8..54e7a0c 100644
--- a/src/modules/timesheet-approval/services/services-timesheet-approval.ts
+++ b/src/modules/timesheet-approval/services/services-timesheet-approval.ts
@@ -17,58 +17,12 @@ export const timesheetApprovalService = {
 
     getPayPeriodEmployeeOverviews: async (year: number, period_number: number, supervisor_email: string): Promise<PayPeriodOverview> => {
         // TODO: REMOVE MOCK DATA PEFORE PUSHING TO PROD
-        const response = await api.get(`/pay-periods/${year}/${period_number}/${supervisor_email}`);
+        const response = await api.get(`pay-periods/${year}/${period_number}/${supervisor_email}`);
         return response.data;
     },
 
-    getTimesheetsByPayPeriodAndEmail: async (year: number, period_number: number, employee_email: string): Promise<PayPeriodEmployeeDetails> => {
-        const response = await api.get(`/timesheets/${year}/${period_number}/${employee_email}`) || { data: MOCK_DATA_TIMESHEET_DETAILS, status: 200, statusText: 'OK'};
+    getTimesheetsByPayPeriodAndEmail: async (year: number, period_no: number, email: string): Promise<PayPeriodEmployeeDetails> => {
+        const response = await api.get('timesheets', { params: { year, period_no, email, }});
         return response.data;
     }
-};
-
-const MOCK_DATA_TIMESHEET_DETAILS = {
-    is_approved: false,
-    week1: {
-        is_approved: true,
-        shifts: {
-            sun: [],
-            mon: [ { is_approved: true, start_time: '08:00', end_time: '12:00' }, { is_approved: true, start_time: '13:00', end_time: '17:00' } ],
-            tue: [ { is_approved: true, start_time: '08:00', end_time: '11:45' }, { is_approved: true, start_time: '12:45', end_time: '17:00' } ],
-            wed: [ { is_approved: true, start_time: '08:00', end_time: '12:00' }, { is_approved: true, start_time: '13:00', end_time: '17:00' } ],
-            thu: [ { is_approved: false, start_time: '13:00', end_time: '17:00' } ],
-            fri: [ { is_approved: true, start_time: '08:00', end_time: '12:00' }, { is_approved: true, start_time: '13:00', end_time: '17:00' } ],
-            sat: []
-        },
-        expenses: {
-            sun: { costs: [], mileage: [] },
-            mon: { costs: [ { is_approved: true, amount: 156.49 } ], mileage: [] },
-            tue: { costs: [], mileage: [] },
-            wed: { costs: [], mileage: [] },
-            thu: { costs: [], mileage: [ { is_approved: false, amount: 16 } ] },
-            fri: { costs: [], mileage: [] },
-            sat: { costs: [], mileage: [] }
-        }
-    },
-    week2: {
-        is_approved: true,
-        shifts: {
-            sun: [],
-            mon: [],
-            tue: [],
-            wed: [],
-            thu: [],
-            fri: [],
-            sat: []
-        },
-        expenses: {
-            sun: { costs: [], mileage: [] },
-            mon: { costs: [], mileage: [] },
-            tue: { costs: [], mileage: [] },
-            wed: { costs: [], mileage: [] },
-            thu: { costs: [], mileage: [] },
-            fri: { costs: [], mileage: [] },
-            sat: { costs: [], mileage: [] }
-        }
-    },
-} as PayPeriodEmployeeDetails;
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-overview-interface.ts b/src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-employee-interface.ts
similarity index 80%
rename from src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-overview-interface.ts
rename to src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-employee-interface.ts
index 03783da..b0ebd46 100644
--- a/src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-overview-interface.ts
+++ b/src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-employee-interface.ts
@@ -1,4 +1,4 @@
-export interface PayPeriodEmployeeOverview {
+export interface PayPeriodOverviewEmployee {
     email: string;
     employee_name: string;
     regular_hours: number;
diff --git a/src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-interface.ts b/src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-interface.ts
index f12b0e0..c74ac70 100644
--- a/src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-interface.ts
+++ b/src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-interface.ts
@@ -1,4 +1,4 @@
-import type { PayPeriodEmployeeOverview } from "./timesheet-approval-pay-period-employee-overview-interface";
+import type { PayPeriodOverviewEmployee } from "./timesheet-approval-pay-period-overview-employee-interface";
 
 export interface PayPeriodOverview {
     pay_period_no: number;
@@ -7,5 +7,5 @@ export interface PayPeriodOverview {
     period_start: string;
     period_end: string;
     label: string;
-    employees_overview: PayPeriodEmployeeOverview[];
+    employees_overview: PayPeriodOverviewEmployee[];
 };
\ No newline at end of file
diff --git a/src/modules/timesheets/types/timesheet-details-interface.ts b/src/modules/timesheets/types/timesheet-details-interface.ts
index b524afa..ab4aee5 100644
--- a/src/modules/timesheets/types/timesheet-details-interface.ts
+++ b/src/modules/timesheets/types/timesheet-details-interface.ts
@@ -1,3 +1,5 @@
+import type { Shift } from "./timesheet-shift-interface";
+
 export interface TimesheetDetailsWeek {
     is_approved: boolean;
     shifts: WeekDay<TimesheetDetailsWeekDayShifts>;
@@ -16,12 +18,6 @@ type WeekDay<T> = {
 
 type TimesheetDetailsWeekDayShifts = Shift[];
 
-interface Shift {
-    is_approved: boolean;
-    start_time: string;
-    end_time: string;
-}
-
 interface TimesheetDetailsWeekDayExpenses {
     costs: Expense[];
     mileage: Expense[];
diff --git a/src/modules/timesheets/types/timesheet-shift-interface.ts b/src/modules/timesheets/types/timesheet-shift-interface.ts
new file mode 100644
index 0000000..6d9baea
--- /dev/null
+++ b/src/modules/timesheets/types/timesheet-shift-interface.ts
@@ -0,0 +1,5 @@
+export interface Shift {
+    is_approved: boolean;
+    start_time: string;
+    end_time: string;
+}
\ No newline at end of file
diff --git a/src/stores/timesheet-store.ts b/src/stores/timesheet-store.ts
index b2c5616..ce0861d 100644
--- a/src/stores/timesheet-store.ts
+++ b/src/stores/timesheet-store.ts
@@ -2,8 +2,8 @@ import { defineStore } from 'pinia';
 import { ref } from 'vue';
 import { timesheetApprovalService } from 'src/modules/timesheet-approval/services/services-timesheet-approval';
 import type { PayPeriod } from 'src/modules/shared/types/pay-period-interface';
-import type { PayPeriodEmployeeOverview } from "src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-overview-interface";
-import { PayPeriodEmployeeDetails } from 'src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-details-interface';
+import type { PayPeriodOverviewEmployee } from "src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-employee-interface";
+import type { PayPeriodEmployeeDetails } from 'src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-details-interface';
 
 const default_pay_period: PayPeriod = { 
     pay_period_no: -1,
@@ -17,8 +17,8 @@ const default_pay_period: PayPeriod = {
 export const useTimesheetStore = defineStore('timesheet', () => {
     const is_loading = ref<boolean>(false);
     const current_pay_period = ref<PayPeriod>(default_pay_period);
-    const pay_period_employee_overviews = ref<PayPeriodEmployeeOverview[]>([]);
-    const pay_period_employee_details = ref<PayPeriodEmployeeDetails | {}>({});
+    const pay_period_overview_employees = ref<PayPeriodOverviewEmployee[]>([]);
+    const pay_period_employee_details = ref<PayPeriodEmployeeDetails | undefined>();
 
     const getPayPeriodByDate = async (date_string: string): Promise<boolean> => {
         is_loading.value = true;
@@ -62,27 +62,35 @@ export const useTimesheetStore = defineStore('timesheet', () => {
         is_loading.value = true;
 
         try {
-            const response = await timesheetApprovalService.getPayPeriodEmployeeOverviews(pay_year, period_number, supervisor_email);
-            pay_period_employee_overviews.value = response.employees_overview;
+            const response = await timesheetApprovalService.getPayPeriodEmployeeOverviews(
+                pay_year, 
+                period_number, 
+                supervisor_email
+            );
+            pay_period_overview_employees.value = response.employees_overview;
         } catch (error) {
             console.error('There was an error retrieving Employee Pay Period overviews: ', error);
-            pay_period_employee_overviews.value = [];
+            pay_period_overview_employees.value = [];
             // TODO: More in-depth error-handling here
         }
 
         is_loading.value = false;
     };
 
-    const getTimesheetsByPayPeriodAndEmail = async (year: number, period_number: number, employee_email: string) => {
+    const getTimesheetsByPayPeriodAndEmail = async (employee_email: string) => {
         is_loading.value = true;
 
         try {
-            const response = await timesheetApprovalService.getTimesheetsByPayPeriodAndEmail(year, period_number, employee_email);
+            const response = await timesheetApprovalService.getTimesheetsByPayPeriodAndEmail(
+                current_pay_period.value.pay_year, 
+                current_pay_period.value.pay_period_no, 
+                employee_email
+            );
             pay_period_employee_details.value = response;
 
         } catch (error) {
             console.error('There was an error retrieving timesheet details for this employee: ', error);
-            pay_period_employee_details.value = {};
+            pay_period_employee_details.value = MOCK_DATA_TIMESHEET_DETAILS;
             // TODO: More in-depth error-handling here
         }
 
@@ -91,10 +99,58 @@ export const useTimesheetStore = defineStore('timesheet', () => {
 
     return { 
         current_pay_period, 
-        pay_period_employee_overviews, 
-        is_loading, 
+        pay_period_overview_employees,
+        pay_period_employee_details,
+        is_loading,
         getPayPeriodByDate,
         getPayPeriodByYearAndPeriodNumber,
-        getTimesheetApprovalPayPeriodEmployeeOverviews, 
+        getTimesheetApprovalPayPeriodEmployeeOverviews,
+        getTimesheetsByPayPeriodAndEmail,
     };
 });
+
+const MOCK_DATA_TIMESHEET_DETAILS = {
+    is_approved: false,
+    week1: {
+        is_approved: true,
+        shifts: {
+            sun: [],
+            mon: [ { is_approved: true, start_time: '08:00', end_time: '12:00' }, { is_approved: true, start_time: '13:00', end_time: '17:00' } ],
+            tue: [ { is_approved: true, start_time: '08:00', end_time: '11:45' }, { is_approved: true, start_time: '12:45', end_time: '17:00' } ],
+            wed: [ { is_approved: true, start_time: '08:00', end_time: '12:00' }, { is_approved: true, start_time: '13:00', end_time: '17:00' } ],
+            thu: [ { is_approved: false, start_time: '13:00', end_time: '17:00' } ],
+            fri: [ { is_approved: true, start_time: '08:00', end_time: '12:00' }, { is_approved: true, start_time: '13:00', end_time: '17:00' } ],
+            sat: []
+        },
+        expenses: {
+            sun: { costs: [], mileage: [] },
+            mon: { costs: [ { is_approved: true, amount: 156.49 } ], mileage: [] },
+            tue: { costs: [], mileage: [] },
+            wed: { costs: [], mileage: [] },
+            thu: { costs: [], mileage: [ { is_approved: false, amount: 16 } ] },
+            fri: { costs: [], mileage: [] },
+            sat: { costs: [], mileage: [] }
+        }
+    },
+    week2: {
+        is_approved: true,
+        shifts: {
+            sun: [],
+            mon: [],
+            tue: [],
+            wed: [],
+            thu: [],
+            fri: [],
+            sat: []
+        },
+        expenses: {
+            sun: { costs: [], mileage: [] },
+            mon: { costs: [], mileage: [] },
+            tue: { costs: [], mileage: [] },
+            wed: { costs: [], mileage: [] },
+            thu: { costs: [], mileage: [] },
+            fri: { costs: [], mileage: [] },
+            sat: { costs: [], mileage: [] }
+        }
+    },
+} as PayPeriodEmployeeDetails;