From 42219171a9880a81ee4796bdae4ac708188eee01 Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Thu, 4 Sep 2025 13:40:50 -0400 Subject: [PATCH] feat(timesheet): added timesheet page with comment popup --- ...ow.vue => timesheet-expenses-list-row.vue} | 0 ...s-list.vue => timesheet-expenses-list.vue} | 0 ...et-expenses.vue => timesheet-expenses.vue} | 0 .../shift/time-sheet-shift-list.vue | 0 .../components/shift/time-sheet-shift.vue | 0 .../shift/timesheet-shift-comment.vue | 58 +++++++++ .../timesheet/time-sheet-shift-list-row.vue | 0 .../timesheet/time-sheet-shift-list.vue | 0 .../components/timesheet/time-sheet.vue | 0 .../timesheet-expense-list.vue} | 0 .../timesheet/timesheet-shift-form.vue | 116 ++++++++++++++++++ .../timesheets/pages/timesheet-temp-page.vue | 24 ++-- src/modules/timesheets/timesheet-constants.ts | 1 + 13 files changed, 187 insertions(+), 12 deletions(-) rename src/modules/timesheets/components/expenses/{time-sheet-expenses-list-row.vue => timesheet-expenses-list-row.vue} (100%) rename src/modules/timesheets/components/expenses/{time-sheet-expenses-list.vue => timesheet-expenses-list.vue} (100%) rename src/modules/timesheets/components/expenses/{time-sheet-expenses.vue => timesheet-expenses.vue} (100%) delete mode 100644 src/modules/timesheets/components/shift/time-sheet-shift-list.vue delete mode 100644 src/modules/timesheets/components/shift/time-sheet-shift.vue create mode 100644 src/modules/timesheets/components/shift/timesheet-shift-comment.vue delete mode 100644 src/modules/timesheets/components/timesheet/time-sheet-shift-list-row.vue delete mode 100644 src/modules/timesheets/components/timesheet/time-sheet-shift-list.vue delete mode 100644 src/modules/timesheets/components/timesheet/time-sheet.vue rename src/modules/timesheets/components/{shift/time-sheet-shift-list-item.vue => timesheet/timesheet-expense-list.vue} (100%) create mode 100644 src/modules/timesheets/components/timesheet/timesheet-shift-form.vue diff --git a/src/modules/timesheets/components/expenses/time-sheet-expenses-list-row.vue b/src/modules/timesheets/components/expenses/timesheet-expenses-list-row.vue similarity index 100% rename from src/modules/timesheets/components/expenses/time-sheet-expenses-list-row.vue rename to src/modules/timesheets/components/expenses/timesheet-expenses-list-row.vue diff --git a/src/modules/timesheets/components/expenses/time-sheet-expenses-list.vue b/src/modules/timesheets/components/expenses/timesheet-expenses-list.vue similarity index 100% rename from src/modules/timesheets/components/expenses/time-sheet-expenses-list.vue rename to src/modules/timesheets/components/expenses/timesheet-expenses-list.vue diff --git a/src/modules/timesheets/components/expenses/time-sheet-expenses.vue b/src/modules/timesheets/components/expenses/timesheet-expenses.vue similarity index 100% rename from src/modules/timesheets/components/expenses/time-sheet-expenses.vue rename to src/modules/timesheets/components/expenses/timesheet-expenses.vue diff --git a/src/modules/timesheets/components/shift/time-sheet-shift-list.vue b/src/modules/timesheets/components/shift/time-sheet-shift-list.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/timesheets/components/shift/time-sheet-shift.vue b/src/modules/timesheets/components/shift/time-sheet-shift.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/timesheets/components/shift/timesheet-shift-comment.vue b/src/modules/timesheets/components/shift/timesheet-shift-comment.vue new file mode 100644 index 0000000..d8c88cf --- /dev/null +++ b/src/modules/timesheets/components/shift/timesheet-shift-comment.vue @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/timesheet/time-sheet-shift-list-row.vue b/src/modules/timesheets/components/timesheet/time-sheet-shift-list-row.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/timesheets/components/timesheet/time-sheet-shift-list.vue b/src/modules/timesheets/components/timesheet/time-sheet-shift-list.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/timesheets/components/timesheet/time-sheet.vue b/src/modules/timesheets/components/timesheet/time-sheet.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/timesheets/components/shift/time-sheet-shift-list-item.vue b/src/modules/timesheets/components/timesheet/timesheet-expense-list.vue similarity index 100% rename from src/modules/timesheets/components/shift/time-sheet-shift-list-item.vue rename to src/modules/timesheets/components/timesheet/timesheet-expense-list.vue diff --git a/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue b/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue new file mode 100644 index 0000000..8f2946c --- /dev/null +++ b/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue @@ -0,0 +1,116 @@ + + + + + \ No newline at end of file diff --git a/src/modules/timesheets/pages/timesheet-temp-page.vue b/src/modules/timesheets/pages/timesheet-temp-page.vue index 1b5d365..39d59b3 100644 --- a/src/modules/timesheets/pages/timesheet-temp-page.vue +++ b/src/modules/timesheets/pages/timesheet-temp-page.vue @@ -4,6 +4,7 @@ import { useTimesheetStore } from 'src/stores/timesheet-store'; import { useTimesheetApi } from '../composables/use-timesheet-api'; import { computed, onMounted } from 'vue'; import { useI18n } from 'vue-i18n'; +import TimesheetShiftForm from '../components/timesheet/timesheet-shift-form.vue'; const { locale } = useI18n(); @@ -45,18 +46,17 @@ import { useI18n } from 'vue-i18n';
{{ $t('pageTitles.timeSheets') }}
-
-
- {{ timesheet_label.start_date }} -
-
- {{ $t('timeSheet.dateRangesTo') }} -
-
- {{ timesheet_label.end_date }} -
+
+
+ {{ timesheet_label.start_date }}
- - +
+ {{ $t('timeSheet.dateRangesTo') }} +
+
+ {{ timesheet_label.end_date }} +
+
+ \ No newline at end of file diff --git a/src/modules/timesheets/timesheet-constants.ts b/src/modules/timesheets/timesheet-constants.ts index e69de29..7ca8ae2 100644 --- a/src/modules/timesheets/timesheet-constants.ts +++ b/src/modules/timesheets/timesheet-constants.ts @@ -0,0 +1 @@ +//mock data \ No newline at end of file