+
-
+
{{ $t('login.page_header') }}
@@ -23,34 +35,53 @@
-
-
+
+ {{ $t('login.email') }}
+
+
+
+
+
-
-
+
- => {
+ const response = await api.get('/auth/me');
+ return response.data;
},
};
diff --git a/src/modules/dashboard/components/_shared/dashboard-container-user-card.vue b/src/modules/dashboard/components/_shared/dashboard-container-user-card.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/components/_shared/dashboard-container-user-menu.vue b/src/modules/dashboard/components/_shared/dashboard-container-user-menu.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/components/_shared/dashboard-container.vue b/src/modules/dashboard/components/_shared/dashboard-container.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/components/admin/admin-things.vue b/src/modules/dashboard/components/admin/admin-things.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/components/customer/customer-things.vue b/src/modules/dashboard/components/customer/customer-things.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/components/dealer/dealer-things.vue b/src/modules/dashboard/components/dealer/dealer-things.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/components/employee/shortcut-card.vue b/src/modules/dashboard/components/employee/shortcut-card.vue
new file mode 100644
index 0000000..90ee54e
--- /dev/null
+++ b/src/modules/dashboard/components/employee/shortcut-card.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ {{ description }}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/dashboard/components/main-carousel.vue b/src/modules/dashboard/components/main-carousel.vue
new file mode 100644
index 0000000..5b44748
--- /dev/null
+++ b/src/modules/dashboard/components/main-carousel.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/dashboard/components/support/support-things.vue b/src/modules/dashboard/components/support/support-things.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/components/technician/technician-things.vue b/src/modules/dashboard/components/technician/technician-things.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/dashboard/pages/basic-dashboard.vue b/src/modules/dashboard/pages/basic-dashboard.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/employee-list/components/add-modify-dialog-access.vue b/src/modules/employee-list/components/add-modify-dialog-access.vue
new file mode 100644
index 0000000..02d7017
--- /dev/null
+++ b/src/modules/employee-list/components/add-modify-dialog-access.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+ {{ label }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/add-modify-dialog-form-select.vue b/src/modules/employee-list/components/add-modify-dialog-form-select.vue
new file mode 100644
index 0000000..9f2b9f8
--- /dev/null
+++ b/src/modules/employee-list/components/add-modify-dialog-form-select.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+ {{ label }}
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/add-modify-dialog-form.vue b/src/modules/employee-list/components/add-modify-dialog-form.vue
new file mode 100644
index 0000000..b992dff
--- /dev/null
+++ b/src/modules/employee-list/components/add-modify-dialog-form.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/customer/customer-profile.vue b/src/modules/employee-list/components/customer/customer-profile.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/employee-list/components/employee-list-table-item.vue b/src/modules/employee-list/components/employee-list-table-item.vue
new file mode 100644
index 0000000..1aef68e
--- /dev/null
+++ b/src/modules/employee-list/components/employee-list-table-item.vue
@@ -0,0 +1,107 @@
+
+
+
+
-
-
- LOL
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/employee-list/components/schedule-presets-dialog-delete.vue b/src/modules/employee-list/components/schedule-presets-dialog-delete.vue
new file mode 100644
index 0000000..23e82b7
--- /dev/null
+++ b/src/modules/employee-list/components/schedule-presets-dialog-delete.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
diff --git a/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue b/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue
deleted file mode 100644
index cfdc610..0000000
--- a/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/employee-list/components/supervisor/supervisor-crew-table.vue b/src/modules/employee-list/components/supervisor/supervisor-crew-table.vue
deleted file mode 100644
index 495614d..0000000
--- a/src/modules/employee-list/components/supervisor/supervisor-crew-table.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
- => {
- return employeeListStore.getEmployeeList();
+ const getEmployeeList = async (): Promise => {
+ employee_store.is_loading = true;
+
+ const success = await employee_store.getEmployeeList();
+ if (success) await schedule_preset_store.findSchedulePresetList();
+
+ employee_store.is_loading = false;
};
- const getEmployeeDetails = (email: string): Promise => {
- return employeeListStore.getEmployeeDetails(email);
+ const getEmployeeDetails = async (email: string): Promise => {
+ const success = await employee_store.getEmployeeDetails(email);
+ if (success && employee_store.employee.preset_id !== null) {
+ schedule_preset_store.setCurrentSchedulePreset(employee_store.employee.preset_id ?? -1);
+ }
+ }
+
+ const setSchedulePreset = (preset_id: number) => {
+ schedule_preset_store.setCurrentSchedulePreset(preset_id);
+ employee_store.employee.preset_id = preset_id < 0 ? null : preset_id;
+ }
+
+ const saveSchedulePreset = async () => {
+ // Get the currently edited schedule preset from the store (frontend model)
+ const preset = schedule_preset_store.current_schedule_preset;
+
+ // Check if there's any overlap between shifts. If there is, is_error property
+ // will be toggled to true and save process will stop
+ for (const weekday of preset.weekdays) {
+ weekday.is_error = isShiftOverlap(weekday.shifts);
+ }
+
+ if (preset.weekdays.some(weekday => weekday.is_error)) {
+ return;
+ }
+
+ // Flatten all weekday shifts into a single array
+ const preset_shifts = preset.weekdays.flatMap(weekday => weekday.shifts);
+
+ // Build a backend-compatible SchedulePreset instance
+ const backend_preset = new SchedulePreset(
+ preset.id,
+ preset.name,
+ preset_shifts
+ );
+
+ // Track whether the create/update operation succeeds
+ let success = false;
+
+ // Create a new preset if it has no backend ID, otherwise update the existing one
+ if (preset.id === -1)
+ success = await schedule_preset_store.createSchedulePreset(backend_preset);
+ else
+ success = await schedule_preset_store.updateSchedulePreset(backend_preset);
+
+ // On success, refresh the preset list and close the preset manager UI
+ if (success) {
+ await schedule_preset_store.findSchedulePresetList();
+ schedule_preset_store.is_manager_open = false;
+ }
+ }
+
+ const deleteSchedulePreset = async (preset_id: number) => {
+ const success = await schedule_preset_store.deleteSchedulePreset(preset_id);
+ if (success) {
+ await schedule_preset_store.findSchedulePresetList();
+ schedule_preset_store.is_manager_open = false;
+ }
}
return {
getEmployeeList,
getEmployeeDetails,
+ setSchedulePreset,
+ saveSchedulePreset,
+ deleteSchedulePreset,
};
};
\ No newline at end of file
diff --git a/src/modules/employee-list/employee-constants.ts b/src/modules/employee-list/employee-constants.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/employee-list/employee-list-utils.ts b/src/modules/employee-list/employee-list-utils.ts
new file mode 100644
index 0000000..5b5b6ba
--- /dev/null
+++ b/src/modules/employee-list/employee-list-utils.ts
@@ -0,0 +1,17 @@
+import type { EmbeddedValidationRule, EmbeddedValidationRuleFn } from "quasar";
+
+export type QuasarRules = Record;
+type EmployeeProfileValidationRule = EmbeddedValidationRule | ((value: T, rules: QuasarRules, error_message: string) => boolean | string | Promise);
+
+export const useEmployeeProfileRules = () => {
+ const isNotEmpty: EmployeeProfileValidationRule = (value, _rules, error_message) => (value !== undefined && value !== null && value !== '') || error_message;
+
+ return {
+ isNotEmpty,
+ }
+}
+
+export const company_options = [
+ { label: 'Targo', value: 'Targo' },
+ { label: 'Solucom', value: 'Solucom' },
+]
\ No newline at end of file
diff --git a/src/modules/employee-list/models/employee-profile.models.ts b/src/modules/employee-list/models/employee-profile.models.ts
new file mode 100644
index 0000000..72660fc
--- /dev/null
+++ b/src/modules/employee-list/models/employee-profile.models.ts
@@ -0,0 +1,149 @@
+import type { QSelectOption, QTableColumn } from "quasar";
+import type { UserModuleAccess } from "src/modules/shared/models/user.models";
+
+export type ModuleAccessPreset = 'admin' | 'supervisor' | 'employee' | 'none';
+export type CompanyNames = 'Targo' | 'Solucom';
+
+export interface PaidTimeOff {
+ sick_hours: number;
+ vacation_hours: number;
+ banked_hours: number;
+ last_updated?: string | null;
+}
+
+export class EmployeeProfile {
+ first_name: string;
+ last_name: string;
+ supervisor_full_name: string;
+ company_name: CompanyNames;
+ job_title: string;
+ email: string;
+ phone_number: string;
+ first_work_day: string;
+ last_work_day?: string | null;
+ external_payroll_id?: number;
+ daily_expected_hours?: number;
+ paid_time_off?: PaidTimeOff;
+ residence: string;
+ birth_date: string;
+ is_supervisor: boolean;
+ user_module_access: UserModuleAccess[];
+ preset_id?: number | null;
+
+ constructor() {
+ this.first_name = '';
+ this.last_name = '';
+ this.supervisor_full_name = '';
+ this.company_name = 'Targo';
+ this.job_title = '';
+ this.email = '';
+ this.phone_number = '';
+ this.first_work_day = '';
+ this.last_work_day = null;
+ this.residence = '';
+ this.birth_date = '';
+ this.is_supervisor = false;
+ this.user_module_access = ['dashboard',];
+ }
+}
+
+export interface EmployeeListFilters {
+ search_bar_string: string;
+ hide_inactive_users: boolean;
+};
+
+export const employee_list_columns: QTableColumn[] = [
+ {
+ name: 'first_name',
+ label: 'timesheet_approvals.table.full_name',
+ field: 'first_name',
+ align: 'left',
+ sortable: true,
+ },
+ {
+ name: 'last_name',
+ label: 'employee_list.table.last_name',
+ field: 'last_name',
+ align: 'left',
+ sortable: true,
+ },
+ {
+ name: 'email',
+ label: 'employee_list.table.email',
+ field: 'email',
+ align: 'left',
+ sortable: true,
+ },
+ {
+ name: 'supervisor_full_name',
+ label: 'employee_list.table.supervisor',
+ field: 'supervisor_full_name',
+ align: 'left',
+ sortable: true,
+ },
+ {
+ name: 'company_name',
+ label: 'employee_list.table.company',
+ field: 'company_name',
+ align: 'left',
+ sortable: true,
+ },
+ {
+ name: 'phone_number',
+ label: 'employee_list.table.phone_number',
+ field: 'phone_number',
+ align: 'left',
+ sortable: true,
+ },
+ {
+ name: 'job_title',
+ label: 'employee_list.table.role',
+ field: 'job_title',
+ align: 'left',
+ },
+ {
+ name: 'expected_daily_hours',
+ label: 'employee_list.table.expected_daily_hours',
+ field: 'daily_expected_hours',
+ align: 'left',
+ },
+ {
+ name: 'last_work_day',
+ label: 'status',
+ field: 'last_work_day',
+ align: 'center',
+ sortable: true,
+ sort: (a: string | null, b: string | null) => {
+ if (a === null && b === null) return 0;
+ else if (a === null && b !== null) return 1;
+ else return -1;
+ },
+ },
+];
+
+export const employee_access_options: QSelectOption[] = [
+ { label: 'dashboard', value: 'dashboard' },
+ { label: 'employee_list', value: 'employee_list' },
+ { label: 'personal_profile', value: 'personal_profile' },
+ { label: 'timesheets', value: 'timesheets' },
+ { label: 'employee_management', value: 'employee_management' },
+ { label: 'timesheets_approval', value: 'timesheets_approval' },
+]
+
+export const employee_access_presets: Record = {
+ 'admin' : ['dashboard', 'employee_list', 'employee_management', 'personal_profile', 'timesheets', 'timesheets_approval'],
+ 'supervisor' : ['dashboard', 'employee_list', 'personal_profile', 'timesheets', 'timesheets_approval'],
+ 'employee' : ['dashboard', 'timesheets', 'personal_profile', 'employee_list'],
+ 'none' : [],
+}
+
+export const getEmployeeAccessOptionIcon = (module: UserModuleAccess): string => {
+ switch (module) {
+ case 'dashboard': return 'home';
+ case 'employee_list' : return 'groups';
+ case 'employee_management': return 'las la-user-edit';
+ case 'personal_profile': return 'las la-id-card';
+ case 'timesheets': return 'punch_clock';
+ case 'timesheets_approval': return 'event_available';
+ }
+}
\ No newline at end of file
diff --git a/src/modules/employee-list/models/schedule-presets.models.ts b/src/modules/employee-list/models/schedule-presets.models.ts
new file mode 100644
index 0000000..1f3c85a
--- /dev/null
+++ b/src/modules/employee-list/models/schedule-presets.models.ts
@@ -0,0 +1,59 @@
+import type { ShiftType } from "src/modules/timesheets/models/shift.models";
+
+export type Weekday = 'SUN' | 'MON' | 'TUE' | 'WED' | 'THU' | 'FRI' | 'SAT';
+
+export const WEEKDAYS: Weekday[] = ['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'];
+
+export type PresetManagerMode = 'create' | 'update' | 'copy' | 'delete';
+
+export class SchedulePreset {
+ id: number;
+ name: string;
+ shifts: SchedulePresetShift[];
+
+ constructor(id?: number, name?: string, shifts?: SchedulePresetShift[]) {
+ this.id = id ?? -1;
+ this.name = name ?? 'default';
+ this.shifts = shifts ?? [];
+ }
+}
+
+export class SchedulePresetShift {
+ preset_id: number;
+ week_day: Weekday;
+ type: ShiftType;
+ start_time: string;
+ end_time: string;
+ is_remote: boolean;
+
+ constructor(weekday: Weekday) {
+ this.preset_id = -1;
+ this.week_day = weekday;
+ this.type = 'REGULAR';
+ this.start_time = '00:00';
+ this.end_time = '00:00';
+ this.is_remote = false;
+ }
+}
+
+export class SchedulePresetFrontend {
+ id: number;
+ name: string;
+ weekdays: WeekdayPresetShifts[];
+
+ constructor(schedule_preset?: SchedulePreset) {
+ this.id = schedule_preset?.id ?? -1;
+ this.name = schedule_preset?.name ?? '';
+ this.weekdays = WEEKDAYS.map(day => ({
+ day,
+ is_error: false,
+ shifts: schedule_preset !== undefined ? schedule_preset?.shifts.filter(shift => shift.week_day === day) : [],
+ }))
+ }
+}
+
+export interface WeekdayPresetShifts {
+ day: Weekday;
+ is_error: boolean;
+ shifts: SchedulePresetShift[];
+}
\ No newline at end of file
diff --git a/src/modules/employee-list/pages/supervisor-crew-add-employee-page.vue b/src/modules/employee-list/pages/supervisor-crew-add-employee-page.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/modules/employee-list/services/employee-list-service.ts b/src/modules/employee-list/services/employee-list-service.ts
new file mode 100644
index 0000000..d2c0c7d
--- /dev/null
+++ b/src/modules/employee-list/services/employee-list-service.ts
@@ -0,0 +1,31 @@
+import { api } from 'src/boot/axios';
+import type { EmployeeProfile } from 'src/modules/employee-list/models/employee-profile.models';
+import type { BackendResponse } from 'src/modules/shared/models/backend-response.models';
+
+export const EmployeeListService = {
+ getEmployeeList: async (): Promise> => {
+ const response = await api.get>('/employees/employee-list')
+ return response.data;
+
+ },
+
+ getEmployeeDetails: async (): Promise> => {
+ const response = await api.get('employees/profile');
+ return response.data;
+ },
+
+ getEmployeeDetailsWithEmployeeEmail: async (employee_email: string): Promise> => {
+ const response = await api.get(`employees/profile?employee_email=${employee_email}`);
+ return response.data;
+ },
+
+ createNewEmployee: async (profile: Omit): Promise> => {
+ const response = await api.post('employees/create', profile);
+ return response.data;
+ },
+
+ updateEmployee: async (profile: EmployeeProfile): Promise> => {
+ const response = await api.patch('employees/update', profile);
+ return response.data;
+ },
+};
\ No newline at end of file
diff --git a/src/modules/employee-list/services/schedule-presets-service.ts b/src/modules/employee-list/services/schedule-presets-service.ts
new file mode 100644
index 0000000..b288363
--- /dev/null
+++ b/src/modules/employee-list/services/schedule-presets-service.ts
@@ -0,0 +1,30 @@
+import { api } from "src/boot/axios";
+import type { SchedulePreset } from "src/modules/employee-list/models/schedule-presets.models";
+import type { BackendResponse } from "src/modules/shared/models/backend-response.models";
+
+export const SchedulePresetsService = {
+ createSchedulePresets: async (preset: SchedulePreset) => {
+ const response = await api.post(`/schedule-presets/create/`, preset);
+ return response.data;
+ },
+
+ updateSchedulePresets: async (preset: SchedulePreset): Promise> => {
+ const response = await api.patch(`/schedule-presets/update`, preset);
+ return response.data;
+ },
+
+ deleteSchedulePresets: async (preset_id: number): Promise> => {
+ const response = await api.delete(`/schedule-presets/delete/${preset_id}`);
+ return response.data;
+ },
+
+ getSchedulePresetsList: async (): Promise> => {
+ const response = await api.get(`/schedule-presets/find-list`);
+ return response.data;
+ },
+
+ applyPresets: async (preset_name: string, start_date: string) => {
+ const response = await api.post(`/schedule-presets/apply-presets/`, { preset: preset_name, start: start_date });
+ return response.data;
+ },
+};
\ No newline at end of file
diff --git a/src/modules/employee-list/services/services-employee-list.ts b/src/modules/employee-list/services/services-employee-list.ts
deleted file mode 100644
index cc36b98..0000000
--- a/src/modules/employee-list/services/services-employee-list.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// /* eslint-disable */
-import { api } from 'src/boot/axios';
-import type { EmployeeListTableItem } from '../types/employee-list-table-interface';
-import type { EmployeeProfile } from '../types/employee-profile-interface';
-
-
-export const EmployeeListService = {
- getEmployeeList: async (): Promise => {
- const response = await api.get('/employees/employee-list')
- return response.data;
- },
-
- getEmployeeDetails: async (email: string): Promise => {
- const response = await api.get('employees/profile/' + email);
- return response.data;
- },
-};
\ No newline at end of file
diff --git a/src/modules/employee-list/types/employee-list-table-interface.ts b/src/modules/employee-list/types/employee-list-table-interface.ts
deleted file mode 100644
index 43feb85..0000000
--- a/src/modules/employee-list/types/employee-list-table-interface.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface EmployeeListTableItem {
- first_name: string;
- last_name: string;
- email: string;
- supervisor_full_name: string | null;
- company_name: number;
- job_title: string;
-};
\ No newline at end of file
diff --git a/src/modules/employee-list/types/employee-profile-interface.ts b/src/modules/employee-list/types/employee-profile-interface.ts
deleted file mode 100644
index 9f8cae0..0000000
--- a/src/modules/employee-list/types/employee-profile-interface.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export interface EmployeeProfile {
- first_name: string;
- last_name: string;
- supervisor_full_name: string;
- company_name: number;
- job_title: string;
- email: string;
- phone_number: string;
- first_work_day: string;
- last_work_day: string;
- residence: string;
- birth_date: string;
-}
-
-export const default_employee_profile: EmployeeProfile = {
- first_name: '',
- last_name: '',
- supervisor_full_name: '',
- company_name: -1,
- job_title: '',
- email: '',
- phone_number: '',
- first_work_day: '',
- last_work_day: '',
- residence: '',
- birth_date: '',
-}
\ No newline at end of file
diff --git a/src/modules/help/components/help-module.vue b/src/modules/help/components/help-module.vue
new file mode 100644
index 0000000..f947c35
--- /dev/null
+++ b/src/modules/help/components/help-module.vue
@@ -0,0 +1,150 @@
+
+
+
+ ;
+export type PartialOptions = Partial>;
+
+
+
+//Shared images and descriptions
+import calendar from 'src/assets/help-ss/calendar.png';
+import employee_list_display from 'src/assets/help-ss/employee-list-grid.png';
+import employee_list_card from 'src/assets/help-ss/employee-list.png';
+import search_bar from 'src/assets/help-ss/search-bar.png';
+
+const calendar_nav_desc = "descriptions.shared.calendar";
+const display_desc = "descriptions.shared.display";
+const search_bar_desc = "descriptions.shared.search";
+
+// Dashboard images and descriptions
+import dashboard from 'src/assets/help-ss/dashboard.png';
+import menu from 'src/assets/help-ss/dashboard.png';
+import notifications from 'src/assets/help-ss/dashboard.png';
+import chatbot from 'src/assets/help-ss/dashboard.png';
+
+const menu_desc = "descriptions.dashboard.menu";
+const news_feed_desc = "descriptions.dashboard.news_feed";
+const chat_bot_desc = "descriptions.dashboard.chat_bot";
+const notification_desc = "descriptions.dashboard.notifications";
+
+export const dashboard_options: HelpModuleOptions[] = [
+ { label: 'help.tutorial.dashboard.menu', path: dashboard, description: menu_desc, icon: 'menu' },
+ { label: 'help.tutorial.dashboard.news_feed', path: menu, description: news_feed_desc, icon: 'newspaper' },
+ { label: 'help.tutorial.dashboard.notifications', path: notifications, description: notification_desc, icon: 'notifications_active' },
+ { label: 'help.tutorial.dashboard.chat_bot', path: chatbot, description: chat_bot_desc, icon: 'smart_toy' },
+];
+
+// profile images and descriptions
+import personal_info from 'src/assets/help-ss/personal_infos.png';
+import professionnal_info from 'src/assets/help-ss/professionnal_infos.png';
+import preferences from 'src/assets/help-ss/preferences.png';
+
+const personal_infos_desc = "descriptions.personal_profile.personal_info";
+const professional_info_desc = "descriptions.personal_profile.professional_info";
+const preferences_details_desc = "descriptions.personal_profile.preferences";
+
+export const profile_options: HelpModuleOptions[] = [
+ { label: 'help.tutorial.personal_profile.personal_info', path: personal_info, description: personal_infos_desc, icon: 'contact_page' },
+ { label: 'help.tutorial.personal_profile.professional_info', path: professionnal_info, description: professional_info_desc, icon: 'badge' },
+ { label: 'help.tutorial.shared.preferences', path: preferences, description: preferences_details_desc, icon: 'display_settings' },
+];
+
+// timesheet images and descriptions
+import create_shift from 'src/assets/help-ss/create-shift.png';
+import update_shift from 'src/assets/help-ss/update-shift.png';
+import delete_shift from 'src/assets/help-ss/delete-shift.png';
+import comment_shift from 'src/assets/help-ss/commenting-shift.png';
+import create_expense from 'src/assets/help-ss/expenses.png';
+import delete_expense from 'src/assets/help-ss/delete-expense.png';
+import update_expense from 'src/assets/help-ss/update-expense.png';
+
+const create_shift_desc = "descriptions.timesheets.create_shift";
+const update_shift_desc = "descriptions.timesheets.update_shift";
+const delete_shift_desc = "descriptions.timesheets.delete_shift";
+const comment_shift_desc = "descriptions.timesheets.comment_shift";
+const create_expense_desc = "descriptions.timesheets.create_expense";
+const update_expense_desc = "descriptions.timesheets.update_expense";
+const delete_expense_desc = "descriptions.timesheets.delete_expense";
+
+export const timesheets_options: HelpModuleOptions[] = [
+ { label: 'help.tutorial.timesheets.create_shift', path: create_shift, description: create_shift_desc, icon: 'add' },
+ { label: 'help.tutorial.timesheets.update_shift', path: update_shift, description: update_shift_desc, icon: 'create' },
+ { label: 'help.tutorial.timesheets.delete_shift', path: delete_shift, description: delete_shift_desc, icon: 'las la-trash' },
+ { label: 'help.tutorial.timesheets.comment_shift', path: comment_shift, description: comment_shift_desc, icon: 'chat_bubble_outline' },
+ { label: 'help.tutorial.timesheets.create_expense', path: create_expense, description: create_expense_desc, icon: 'add' },
+ { label: 'help.tutorial.timesheets.update_expense', path: update_expense, description: update_expense_desc, icon: 'create' },
+ { label: 'help.tutorial.timesheets.delete_expense', path: delete_expense, description: delete_expense_desc, icon: 'clear' },
+ { label: 'help.tutorial.shared.calendar', path: calendar, description: calendar_nav_desc, icon: 'calendar_month' },
+];
+
+// employee management images and descriptions
+import terminated_employee_display from 'src/assets/help-ss/terminated-employee-list.png';
+import create_employee from 'src/assets/help-ss/create-employee.png';
+import update_employee from 'src/assets/help-ss/update-employee.png';
+import access_management from 'src/assets/help-ss/access-management.png';
+import schedule_preset from 'src/assets/help-ss/schedule-preset-management.png';
+
+const terminated_employee_desc = "descriptions.employee_list.terminated_employees";
+const terminating_employee_desc = "descriptions.employee_management.terminating_employee";
+const create_employee_desc = "descriptions.employee_management.create_employee";
+const update_employee_desc = "descriptions.employee_management.update_employee";
+const module_access_desc = "descriptions.employee_management.module_access";
+const schedule_preset_desc = "descriptions.employee_management.schedule_preset";
+
+
+export const employee_list_options: HelpModuleOptions[] = [
+ { label: 'help.tutorial.shared.display', path: employee_list_card, description: display_desc, icon: 'display_settings' },
+ { label: 'help.tutorial.shared.search', path: search_bar, description: search_bar_desc, icon: 'search' },
+];
+
+export const employee_management_options: HelpModuleOptions[] = [
+ { label: 'help.tutorial.employee_list.terminated_employees', path: terminated_employee_display, description: terminated_employee_desc, icon: 'work_off' },
+ { label: 'help.tutorial.employee_management.create_employee', path: create_employee, description: create_employee_desc, icon: 'person_add' },
+ { label: 'help.tutorial.employee_management.update_employee', path: update_employee, description: update_employee_desc, icon: 'las la-id-card' },
+ { label: 'help.tutorial.employee_management.module_access', path: access_management, description: module_access_desc, icon: 'las la-key' },
+ { label: 'help.tutorial.employee_management.schedule_preset', path: schedule_preset, description: schedule_preset_desc, icon: 'calendar_month' },
+ { label: 'help.tutorial.employee_management.terminating_employee', path: update_employee, description: terminating_employee_desc, icon: 'work_off' },
+ { label: 'help.tutorial.shared.display', path: employee_list_display, description: display_desc, icon: 'display_settings' },
+ { label: 'help.tutorial.shared.search', path: search_bar, description: search_bar_desc, icon: 'search' },
+];
+
+// Timesheets approval images and descriptions
+import comment_expense from 'src/assets/help-ss/timesheet-details.png';
+import timesheet_approval_inspect from 'src/assets/help-ss/timesheet-approvals.png';
+import timesheet_details from 'src/assets/help-ss/timesheet-details.png';
+import timesheet_approval_list from 'src/assets/help-ss/timesheet-appovals-list.png';
+
+
+const comment_expense_desc = "descriptions.timesheets_approval.comment_expense";
+const timesheets_approval_desc = "descriptions.timesheets_approval.approval";
+const timesheets_approval_inspect_desc = "descriptions.timesheets_approval.inspect";
+
+export const timesheets_approval_options: HelpModuleOptions[] = [
+ { label: 'help.tutorial.timesheets_approval.approval', path: timesheet_approval_inspect, description: timesheets_approval_desc, icon: 'verified' },
+ { label: 'help.tutorial.timesheets_approval.inspect', path: timesheet_details, description: timesheets_approval_inspect_desc, icon: 'work_history' },
+ { label: 'help.tutorial.timesheets_approval.comment_expense', path: comment_expense, description: comment_expense_desc, icon: 'chat_bubble_outline' },
+ { label: 'help.tutorial.shared.display', path: timesheet_approval_list, description: display_desc, icon: 'display_settings' },
+ { label: 'help.tutorial.shared.search', path: search_bar, description: search_bar_desc, icon: 'search' },
+ { label: 'help.tutorial.shared.calendar', path: calendar, description: calendar_nav_desc, icon: 'calendar_month' },
+];
+
+
+
+
+export const help_module_details: Options = {
+ dashboard: [],
+ personal_profile: profile_options,
+ timesheets: timesheets_options,
+ employee_list: employee_list_options,
+ employee_management: employee_management_options,
+ timesheets_approval: timesheets_approval_options,
+};
+
+
+
+
+
diff --git a/src/modules/help/services/help.service.ts b/src/modules/help/services/help.service.ts
new file mode 100644
index 0000000..ccd8ba2
--- /dev/null
+++ b/src/modules/help/services/help.service.ts
@@ -0,0 +1,10 @@
+import { api } from "src/boot/axios";
+import type { BackendResponse } from "src/modules/shared/models/backend-response.models";
+import type { UserModuleAccess } from "src/modules/shared/models/user.models";
+
+export const HelpService = {
+ getHelpModules: async (): Promise> => {
+ const response = await api.get>(`/help`);
+ return response.data;
+ }
+}
\ No newline at end of file
diff --git a/src/modules/profile/components/employee/menu-employee.vue b/src/modules/profile/components/employee/menu-employee.vue
new file mode 100644
index 0000000..7d666ba
--- /dev/null
+++ b/src/modules/profile/components/employee/menu-employee.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/modules/profile/components/employee/profile-panel-info-personal.vue b/src/modules/profile/components/employee/profile-panel-info-personal.vue
deleted file mode 100644
index 3167479..0000000
--- a/src/modules/profile/components/employee/profile-panel-info-personal.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/menu-header.vue b/src/modules/profile/components/shared/menu-header.vue
new file mode 100644
index 0000000..39ae2fa
--- /dev/null
+++ b/src/modules/profile/components/shared/menu-header.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/menu-panel-input-field.vue b/src/modules/profile/components/shared/menu-panel-input-field.vue
new file mode 100644
index 0000000..f17ae24
--- /dev/null
+++ b/src/modules/profile/components/shared/menu-panel-input-field.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+ {{ labelString }}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/menu-panel-preferences.vue b/src/modules/profile/components/shared/menu-panel-preferences.vue
new file mode 100644
index 0000000..135678c
--- /dev/null
+++ b/src/modules/profile/components/shared/menu-panel-preferences.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/menu-template.vue b/src/modules/profile/components/shared/menu-template.vue
new file mode 100644
index 0000000..6f3a1ad
--- /dev/null
+++ b/src/modules/profile/components/shared/menu-template.vue
@@ -0,0 +1,61 @@
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/profile-panel-input-field.vue b/src/modules/profile/components/shared/profile-panel-input-field.vue
deleted file mode 100644
index b69e4d6..0000000
--- a/src/modules/profile/components/shared/profile-panel-input-field.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/profile-panel-select-field.vue b/src/modules/profile/components/shared/profile-panel-select-field.vue
deleted file mode 100644
index d4f98e7..0000000
--- a/src/modules/profile/components/shared/profile-panel-select-field.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/profile/services/profile-service.ts b/src/modules/profile/services/profile-service.ts
new file mode 100644
index 0000000..3757e17
--- /dev/null
+++ b/src/modules/profile/services/profile-service.ts
@@ -0,0 +1,15 @@
+import { api } from "src/boot/axios";
+import type { Preferences } from "src/modules/profile/models/preferences.models";
+import type { BackendResponse } from "src/modules/shared/models/backend-response.models";
+
+export const ProfileService = {
+ getUserPreferences: async (): Promise> => {
+ const response = await api.get>(`/preferences`);
+ return response.data;
+ },
+
+ updateUserPreferences: async (new_preferences: Preferences): Promise> => {
+ const response = await api.patch>(`/preferences/update`, new_preferences);
+ return response.data;
+ },
+};
\ No newline at end of file
diff --git a/src/modules/shared/components/horizontal-slide-transition.vue b/src/modules/shared/components/horizontal-slide-transition.vue
new file mode 100644
index 0000000..425020a
--- /dev/null
+++ b/src/modules/shared/components/horizontal-slide-transition.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/shared/components/language-switch.vue b/src/modules/shared/components/language-switch.vue
index 5284226..e2ca11c 100644
--- a/src/modules/shared/components/language-switch.vue
+++ b/src/modules/shared/components/language-switch.vue
@@ -1,36 +1,50 @@
-
-
+
+
+
+
+
+ {{ $t(`profile.preferences.${locale}`) }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/shared/components/loading-overlay.vue b/src/modules/shared/components/loading-overlay.vue
new file mode 100644
index 0000000..f3bd6d7
--- /dev/null
+++ b/src/modules/shared/components/loading-overlay.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/shared/components/page-header-template.vue b/src/modules/shared/components/page-header-template.vue
index 24106a7..15a71ba 100644
--- a/src/modules/shared/components/page-header-template.vue
+++ b/src/modules/shared/components/page-header-template.vue
@@ -1,30 +1,71 @@
-
-
{{ title }}
+
+
+
+
+
+
+ {{ $t('dashboard.carousel.welcome_title') }}
+
+
+ {{ $t('dashboard.carousel.welcome_message') }}
+
+
+
+
+
+
+
+ {{ $t('dashboard.carousel.help_title') }}
+
+
+ {{ $t('dashboard.carousel.help_message') }}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/add-modify-dialog-form-input.vue b/src/modules/employee-list/components/add-modify-dialog-form-input.vue
new file mode 100644
index 0000000..8998149
--- /dev/null
+++ b/src/modules/employee-list/components/add-modify-dialog-form-input.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('employee_management.module_access.usage_description') }}
+
+
+
+
+
+
+
+ {{ $t('employee_management.module_access.by_role') }}
+
+
+
+
+
+ {{ $t('employee_management.module_access.preset_admin') }}
+
+
+
+ {{ $t('employee_management.module_access.admin_description') }}
+
+
+
+
+
+
+
+ {{ $t('employee_management.module_access.preset_employee') }}
+
+
+
+ {{ $t('employee_management.module_access.employee_description') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('employee_management.module_access.by_module') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/add-modify-dialog-schedule-preview.vue b/src/modules/employee-list/components/add-modify-dialog-schedule-preview.vue
new file mode 100644
index 0000000..631909e
--- /dev/null
+++ b/src/modules/employee-list/components/add-modify-dialog-schedule-preview.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/add-modify-dialog-schedule.vue b/src/modules/employee-list/components/add-modify-dialog-schedule.vue
new file mode 100644
index 0000000..c8f77b2
--- /dev/null
+++ b/src/modules/employee-list/components/add-modify-dialog-schedule.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+ {{
+ $t(`shared.weekday.${weekday.day.toLowerCase()}`) }}
+
+
+
+
+
+
+ {{ $t(`shared.shift_type.${shift.type.toLowerCase()}`) }}
+
+ {{ shift.start_time }}
+ {{ shift.end_time }}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/add-modify-dialog.vue b/src/modules/employee-list/components/add-modify-dialog.vue
new file mode 100644
index 0000000..df83a8d
--- /dev/null
+++ b/src/modules/employee-list/components/add-modify-dialog.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+ {{ current_preset.label === undefined ?
+ $t('employee_management.schedule_presets.preset_list_placeholder') :
+ current_preset.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('employee_management.' + employee_store.management_mode) }}
+
+
+
+ {{ `${employee_store.employee.first_name} ${employee_store.employee.last_name}` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/employee-list-table.vue b/src/modules/employee-list/components/employee-list-table.vue
new file mode 100644
index 0000000..6b574ce
--- /dev/null
+++ b/src/modules/employee-list/components/employee-list-table.vue
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.first_name }} {{ row.last_name }}
+
+
+
+ {{ row.job_title }}
+
+
+
+
+
+ extension:
+
+ {{ row.email }}
+
+
+
+
+
+
+ {{ $t(col.label) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/employee/employee-list-add-modify-dialog.vue b/src/modules/employee-list/components/employee/employee-list-add-modify-dialog.vue
deleted file mode 100644
index 5c1fffe..0000000
--- a/src/modules/employee-list/components/employee/employee-list-add-modify-dialog.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.value }}
+ {{ scope.row.last_name }}
+
+
+
+
+
+ {{ scope.row.last_work_day === null ? $t('employee_list.table.active') :
+ $t('employee_list.table.inactive') }}
+
+
+
+
+ {{ scope.value }}
+
+
+ {{ message }}
+
+
+
+
+
+ {{ $t('shared.label.remove') }}
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/schedule-presets-dialog-row.vue b/src/modules/employee-list/components/schedule-presets-dialog-row.vue
new file mode 100644
index 0000000..a9db807
--- /dev/null
+++ b/src/modules/employee-list/components/schedule-presets-dialog-row.vue
@@ -0,0 +1,170 @@
+
+
+
+
+ {{ $t('employee_management.schedule_presets.delete_warning_employee_1') }}
+ {{ employee_amount_using_preset
+ }}
+ {{ $t('employee_management.module_access.preset_employee') +
+ (employee_amount_using_preset > 1 ? 's' : '') }}
+ {{ $t('employee_management.schedule_presets.delete_warning_employee_2') }}
+
+
+
+ {{ $t('employee_management.schedule_presets.delete_warning')
+ }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/employee-list/components/schedule-presets-dialog.vue b/src/modules/employee-list/components/schedule-presets-dialog.vue
new file mode 100644
index 0000000..d4f1585
--- /dev/null
+++ b/src/modules/employee-list/components/schedule-presets-dialog.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+ {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
+ $t('timesheet.shift.types.OFFICE') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('shared.misc.in') }} :
+
+
+
+
+
+
+
+
+
+ {{ $t('shared.misc.out') }} :
+
+
+
+
+
+
+
+ {{
+ schedule_preset_store.current_schedule_preset.id === -1 ?
+ $t('shared.label.add') :
+ $t('shared.label.modify') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t(`shared.weekday.${weekday.day.toLowerCase()}`) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{ row.first_name }} {{ row.last_name }}
- {{ row.job_title }}
- {{ row.email }}
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/employee-list/composables/use-employee-api.ts b/src/modules/employee-list/composables/use-employee-api.ts
index 12ec52f..60bd474 100644
--- a/src/modules/employee-list/composables/use-employee-api.ts
+++ b/src/modules/employee-list/composables/use-employee-api.ts
@@ -1,18 +1,86 @@
import { useEmployeeStore } from "src/stores/employee-store";
+import { useSchedulePresetsStore } from "src/stores/schedule-presets.store";
+import { SchedulePreset } from "../models/schedule-presets.models";
+import { isShiftOverlap } from "src/modules/timesheets/utils/shift.util";
export const useEmployeeListApi = () => {
- const employeeListStore = useEmployeeStore();
+ const employee_store = useEmployeeStore();
+ const schedule_preset_store = useSchedulePresetsStore();
- const getEmployeeList = (): Promise
-
-
-
-
-
-
-
-
-
-
- {{ message }}
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/help/models/help-module.model.ts b/src/modules/help/models/help-module.model.ts
new file mode 100644
index 0000000..261fc5e
--- /dev/null
+++ b/src/modules/help/models/help-module.model.ts
@@ -0,0 +1,152 @@
+import type { UserModuleAccess } from 'src/modules/shared/models/user.models';
+
+export type HelpModuleOptions = {
+ label: string;
+ path: string;
+ description: string;
+ icon: string;
+};
+
+export type Options = Record
+ {{ ($t(`help.tutorial.${help_module}.title`)).toUpperCase() }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ($t(`${option.description}`)) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/employee/menu-panel-employee.vue b/src/modules/profile/components/employee/menu-panel-employee.vue
new file mode 100644
index 0000000..cf6649a
--- /dev/null
+++ b/src/modules/profile/components/employee/menu-panel-employee.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/employee/menu-panel-personal.vue b/src/modules/profile/components/employee/menu-panel-personal.vue
new file mode 100644
index 0000000..4264348
--- /dev/null
+++ b/src/modules/profile/components/employee/menu-panel-personal.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/employee/profile-panel-info-employee.vue b/src/modules/profile/components/employee/profile-panel-info-employee.vue
deleted file mode 100644
index c5badb0..0000000
--- a/src/modules/profile/components/employee/profile-panel-info-employee.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ userFirstName }} {{ userLastName }}
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/menu-panel-schedule-presets.vue b/src/modules/profile/components/shared/menu-panel-schedule-presets.vue
new file mode 100644
index 0000000..3f2d9cd
--- /dev/null
+++ b/src/modules/profile/components/shared/menu-panel-schedule-presets.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+ {{ $t('profile.preferences.display_options') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t(mode.label) }}
+
+
+
+
+
+
+
+
+ {{ $t('profile.preferences.language_options') }}
+
+
+ {{ $t('profile.schedule_presets.selected_schedule') }}
+
+ {{ $t('profile.schedule_presets.new_preset') }}
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/profile/components/shared/profile-header.vue b/src/modules/profile/components/shared/profile-header.vue
deleted file mode 100644
index b63319e..0000000
--- a/src/modules/profile/components/shared/profile-header.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ userFirstName }} {{ userLastName }}
- {{ $t('profile.preferences.display_options') }}
-
-
-
-
-
-
-
-
-
-
- {{$t('profile.preferences.light_mode')}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('profile.preferences.dark_mode')}}
-
-
-
-
-
-
-
-
-
- {{ $t('profile.preferences.language_options') }}
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/profile/models/preferences.models.ts b/src/modules/profile/models/preferences.models.ts
new file mode 100644
index 0000000..c9e0a82
--- /dev/null
+++ b/src/modules/profile/models/preferences.models.ts
@@ -0,0 +1,33 @@
+import type { MessageLanguages } from "src/boot/i18n";
+
+export interface DarkModeOption {
+ label: string;
+ value: boolean | null;
+ quasar_value: boolean | "auto";
+ icon: string;
+}
+export const dark_mode_options: DarkModeOption[] = [
+ { label: 'profile.preferences.dark_mode', value: true, quasar_value: true, icon: 'dark_mode'},
+ { label: 'profile.preferences.light_mode', value: false, quasar_value: false, icon: 'light_mode'},
+ { label: 'profile.preferences.auto_mode', value: null, quasar_value: "auto", icon: 'brightness_auto'},
+]
+
+export class Preferences {
+ id: number;
+ notifications: boolean;
+ is_dark_mode: boolean | null;
+ display_language: MessageLanguages;
+ is_lefty_mode: boolean;
+ is_employee_list_grid: boolean;
+ is_timesheet_approval_grid: boolean;
+
+ constructor() {
+ this.id = -1;
+ this.notifications = true;
+ this.is_dark_mode = null;
+ this.display_language = 'fr-FR';
+ this.is_lefty_mode = false;
+ this.is_employee_list_grid = true;
+ this.is_timesheet_approval_grid = true;
+ }
+}
\ No newline at end of file
diff --git a/src/modules/profile/pages/employee/profile-employee.vue b/src/modules/profile/pages/employee/profile-employee.vue
deleted file mode 100644
index 775e750..0000000
--- a/src/modules/profile/pages/employee/profile-employee.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ option.label }}
-
-
-
-
-
+
- {{ $t(title) }}
+
+
+
-
\ No newline at end of file
diff --git a/src/modules/shared/components/pay-period-navigator.vue b/src/modules/shared/components/pay-period-navigator.vue
index 4485c1e..de20dfc 100644
--- a/src/modules/shared/components/pay-period-navigator.vue
+++ b/src/modules/shared/components/pay-period-navigator.vue
@@ -1,22 +1,30 @@
-
-
- {{ $d(new Date(startDate), date_format_options) }}
+
+
+
+ {{ $d(date.extractDate(startDate, 'YYYY-MM-DD'), date_format_options) }}
{{ $t('shared.misc.to') }}
-
- {{ $d(new Date(endDate), date_format_options) }}
+
-
+ {{ $d(date.extractDate(endDate, 'YYYY-MM-DD'), date_format_options) }}
+
-
\ No newline at end of file
diff --git a/src/modules/shared/components/q-table-filters.vue b/src/modules/shared/components/q-table-filters.vue
index 1cb919a..727a87c 100644
--- a/src/modules/shared/components/q-table-filters.vue
+++ b/src/modules/shared/components/q-table-filters.vue
@@ -1,34 +1,24 @@
-
-
-
+
diff --git a/src/modules/shared/models/backend-response.models.ts b/src/modules/shared/models/backend-response.models.ts
new file mode 100644
index 0000000..0d8db79
--- /dev/null
+++ b/src/modules/shared/models/backend-response.models.ts
@@ -0,0 +1,5 @@
+export interface BackendResponse {
+ success: boolean;
+ data?: T | undefined;
+ error?: string | undefined;
+};
\ No newline at end of file
diff --git a/src/modules/shared/models/user.models.ts b/src/modules/shared/models/user.models.ts
index f83f3af..a4c46c8 100644
--- a/src/modules/shared/models/user.models.ts
+++ b/src/modules/shared/models/user.models.ts
@@ -1,6 +1,20 @@
export interface User {
- firstName: string;
- lastName: string;
+ first_name: string;
+ last_name: string;
email: string;
- role: string;
-}
\ No newline at end of file
+ role: UserRole;
+ user_module_access: UserModuleAccess[];
+}
+
+export type UserRole = 'ADMIN' | 'SUPERVISOR' | 'HR' | 'ACCOUNTING' | 'EMPLOYEE' | 'DEALER' | 'CUSTOMER' | 'GUEST';
+
+export const ModuleNames = {
+ DASHBOARD: 'dashboard',
+ EMPLOYEE_LIST: 'employee_list',
+ EMPLOYEE_MANAGEMENT: 'employee_management',
+ PERSONAL_PROFILE: 'personal_profile',
+ TIMESHEETS: 'timesheets',
+ TIMESHEETS_APPROVAL: 'timesheets_approval',
+} as const;
+
+export type UserModuleAccess = typeof ModuleNames[keyof typeof ModuleNames];
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/details-crud-dialog-chart-hours-worked.vue b/src/modules/timesheet-approval/components/details-crud-dialog-chart-hours-worked.vue
deleted file mode 100644
index 862fae3..0000000
--- a/src/modules/timesheet-approval/components/details-crud-dialog-chart-hours-worked.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ timesheet_store.pay_period_details.employee_full_name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/details-crud-dialog-chart-expenses.vue b/src/modules/timesheet-approval/components/details-dialog-chart-expenses.vue
similarity index 50%
rename from src/modules/timesheet-approval/components/details-crud-dialog-chart-expenses.vue
rename to src/modules/timesheet-approval/components/details-dialog-chart-expenses.vue
index 8854179..2147d13 100644
--- a/src/modules/timesheet-approval/components/details-crud-dialog-chart-expenses.vue
+++ b/src/modules/timesheet-approval/components/details-dialog-chart-expenses.vue
@@ -2,12 +2,12 @@
setup
lang="ts"
>
- import { ref } from 'vue';
+ import { onMounted, ref } from 'vue';
import { Bar } from 'vue-chartjs';
import { useI18n } from 'vue-i18n';
- import { useQuasar } from 'quasar';
+ import { useQuasar, colors } from 'quasar';
import { useTimesheetStore } from 'src/stores/timesheet-store';
- import { Chart as ChartJS, Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale, TimeScale, type ChartData, type ChartDataset } from 'chart.js';
+ import { Chart as ChartJS, Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale, TimeScale, type ChartDataset } from 'chart.js';
const { t } = useI18n();
const $q = useQuasar();
@@ -19,47 +19,42 @@
const timesheet_store = useTimesheetStore();
+ const all_days = timesheet_store.timesheets.flatMap(week => week.days.flatMap(day => day.daily_expenses));
+
+ const expenses_labels = ref(timesheet_store.timesheets.flatMap(week => week.days.map(day => day.date.slice(-5,))));
const expenses_dataset = ref[]>([]);
- const expenses_labels = ref([]);
- const getExpensesData = (): ChartData<'bar'> => {
- const all_days = timesheet_store.pay_period_details.weeks.flatMap(week => Object.values(week.expenses));
- const all_days_dates = timesheet_store.pay_period_details.weeks.flatMap(week => Object.values(week.shifts))
-
- const all_costs = all_days.map(day => day.total_expenses);
- const all_mileage = all_days.map(day => day.total_mileage);
-
-
- expenses_dataset.value = [
- {
- label: t('timesheet_approvals.table.expenses'),
- data: all_costs,
- backgroundColor: getComputedStyle(document.body).getPropertyValue('--q-primary').trim(),
- },
- {
- label: t('timesheet_approvals.table.mileage'),
- data: all_mileage,
- backgroundColor: getComputedStyle(document.body).getPropertyValue('--q-info').trim(),
- }
- ]
-
- expenses_labels.value = all_days_dates.map(day => day.short_date);
-
- return {
- datasets: expenses_dataset.value,
- labels: expenses_labels.value
- };
- };
+ onMounted(() => {
+ setTimeout(() => {
+ expenses_dataset.value = [
+ {
+ label: t('timesheet_approvals.table.expenses'),
+ data: all_days.map(day => (day.expenses + day.on_call + day.per_diem)),
+ backgroundColor: colors.getPaletteColor('accent'),
+ },
+ {
+ label: t('timesheet_approvals.table.mileage'),
+ data: all_days.map(day => day.mileage),
+ backgroundColor: colors.getPaletteColor('info'),
+ }
+ ]
+ }, 100)
+ });
-
-
-
- {{ $t( 'timesheet.nav_button.previous_week' )}}
+ >
+ {{ $t('timesheet.nav_button.previous_week') }}
-
{{ $t('timesheet.nav_button.calendar_date_picker') }}
+
+
+
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/details-crud-dialog-chart-shift-types.vue b/src/modules/timesheet-approval/components/details-crud-dialog-chart-shift-types.vue
deleted file mode 100644
index 14bd9c9..0000000
--- a/src/modules/timesheet-approval/components/details-crud-dialog-chart-shift-types.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/details-crud-dialog.vue b/src/modules/timesheet-approval/components/details-crud-dialog.vue
deleted file mode 100644
index 35530f4..0000000
--- a/src/modules/timesheet-approval/components/details-crud-dialog.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
- {{ $t('shared.loading') }}
-
-
-
-
+
+ import { ref, onMounted } from 'vue';
+ import { useI18n } from 'vue-i18n';
+ import { colors, useQuasar } from 'quasar';
+ import { Bar } from 'vue-chartjs';
+ import { Chart as ChartJS, Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale, TimeScale, type ChartDataset } from 'chart.js';
+ import { useTimesheetStore } from 'src/stores/timesheet-store';
+ import type { TotalHours } from 'src/modules/timesheets/models/timesheet.models';
+
+ interface ChartConfigHoursWorked {
+ key: keyof Pick;
+ label: string;
+ color: string;
+ }
+
+ const { t } = useI18n();
+ const $q = useQuasar();
+
+ ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale, TimeScale);
+ ChartJS.defaults.font.family = '"Roboto", sans-serif';
+ ChartJS.defaults.maintainAspectRatio = false;
+ ChartJS.defaults.color = $q.dark.isActive ? '#F5F5F5' : '#616161';
+
+ const timesheet_store = useTimesheetStore();
+
+ const all_days = timesheet_store.timesheets.flatMap(week => week.days);
+
+ const datasetConfig: ChartConfigHoursWorked[] = [
+ {
+ key: 'regular',
+ label: t('shared.shift_type.regular'),
+ color: colors.getPaletteColor('accent'),
+ },
+ {
+ key: 'evening',
+ label: t('shared.shift_type.evening'),
+ color: colors.getPaletteColor('green-10'),
+ },
+ {
+ key: 'emergency',
+ label: t('shared.shift_type.emergency'),
+ color: colors.getPaletteColor('warning'),
+ },
+ {
+ key: 'overtime',
+ label: t('shared.shift_type.overtime'),
+ color: colors.getPaletteColor('negative'),
+ },
+ ];
+
+ const hours_worked_labels = ref(all_days.map(day => day.date.slice(-5,)));
+ const hours_worked_dataset = ref[]>([]);
+
+ onMounted(() => {
+ setTimeout(() => {
+ hours_worked_dataset.value = datasetConfig.map(cfg => ({
+ label: cfg.label,
+ data: all_days.map(day => day.daily_hours[cfg.key]),
+ backgroundColor: cfg.color,
+ }));
+ }, 100);
+ });
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/overview-list-filters.vue b/src/modules/timesheet-approval/components/overview-list-filters.vue
new file mode 100644
index 0000000..9290348
--- /dev/null
+++ b/src/modules/timesheet-approval/components/overview-list-filters.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/details-dialog-chart-shift-types.vue b/src/modules/timesheet-approval/components/details-dialog-chart-shift-types.vue
new file mode 100644
index 0000000..74d3d65
--- /dev/null
+++ b/src/modules/timesheet-approval/components/details-dialog-chart-shift-types.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/details-dialog.vue b/src/modules/timesheet-approval/components/details-dialog.vue
new file mode 100644
index 0000000..ccd539d
--- /dev/null
+++ b/src/modules/timesheet-approval/components/details-dialog.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/overview-list-item.vue b/src/modules/timesheet-approval/components/overview-list-item.vue
index 852fa91..f770ef3 100644
--- a/src/modules/timesheet-approval/components/overview-list-item.vue
+++ b/src/modules/timesheet-approval/components/overview-list-item.vue
@@ -1,125 +1,239 @@
-
-
+
+
+
+ {{ $t('timesheet_approvals.table.filter_columns') }}
+
+
+
+
+
+ {{ $t(scope.label.toLowerCase()) }}
+
+
+
+
-
-
-
-
- {{ row.employee_name }}
-
-
-
-
- {{ $t('timesheet_approvals.tooltip.button_detailed_view') }}
-
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+ {{ $t('timesheet_approvals.tooltip.button_detailed_view') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/overview-list.vue b/src/modules/timesheet-approval/components/overview-list.vue
index d6cefc8..c071cd4 100644
--- a/src/modules/timesheet-approval/components/overview-list.vue
+++ b/src/modules/timesheet-approval/components/overview-list.vue
@@ -1,78 +1,338 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('shared.shift_type.regular') }}
- {{ row.regular_hours }}
-
-
-
-
-
- {{ $t('shared.shift_type.evening') }}
- {{ row.evening_hours }}
-
-
-
- {{ $t('shared.shift_type.emergency') }}
- {{ row.emergency_hours }}
-
-
-
- {{ $t('shared.shift_type.overtime') }}
- {{ row.overtime_hours }}
-
-
-
-
- {{ $t('timesheet.expense.types.EXPENSES') }}
- {{ row.expenses }}
-
-
-
- {{ $t('timesheet.expense.types.MILEAGE') }}
- {{ row.mileage }}
-
-
- {{ row.total_hours }}
- total
-
+
+
+
+ {{ row.employee_first_name }}
+
+ {{ row.employee_last_name }}
+
-
+
+
+
+
+
+
+
+ {{
+ $t('shared.shift_type.regular') }}
+ {{ getHoursMinutesStringFromHoursFloat(row.regular_hours) }}
+
+
+
+
+
+
+
+ {{ $t(`shared.shift_type.${index.replace('_hours', '')}`) }}
+
+
+
+ {{ getHoursMinutesStringFromHoursFloat(hour_type) }}
+
+
+
+
+
+ {{ $t('timesheet.expense.types.EXPENSES') }}
+ {{ row.expenses }} $
+
+
+
+ {{ $t('timesheet.expense.types.MILEAGE') }}
+ {{ row.mileage }} km
+
+
+
+
+
+ {{ $t('timesheet.week') }} {{ index + 1 }}
+
+
+
+ {{ getHoursMinutesStringFromHoursFloat(weekly_hours) }}
+
+
+
+
+
+
+ Total
+
+ {{ getHoursMinutesStringFromHoursFloat(row.total_hours) }}
+
+
+
+
+
+
+ {{ row.is_approved ? $t('timesheet_approvals.tooltip.unapprove') :
+ $t('timesheet_approvals.tooltip.approve') }}
+
+
+
+
+
+
+
+
-
-
+
+
+ {{ $t(col.label) }}
+
+
+
+ {{ col.name.slice(-1,) }}
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.value }}
+
+
+ {{ props.row.employee_last_name }}
+
+
+
+
+
+
+ {{
+ getHoursMinutesStringFromHoursFloat((props.value[Number(props.col.name.slice(-1,)) -
+ 1]) ?? 0) }}
+
+
+
+
+
+ {{ getHoursMinutesStringFromHoursFloat(props.value) }}
+
+
+
+
+ {{ TIME_COLUMNS.includes(props.col.name) ?
+ getHoursMinutesStringFromHoursFloat(props.value) : props.value }}
+
+
+
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/overview-report.vue b/src/modules/timesheet-approval/components/overview-report.vue
index 417f2b4..3e810c3 100644
--- a/src/modules/timesheet-approval/components/overview-report.vue
+++ b/src/modules/timesheet-approval/components/overview-report.vue
@@ -1,93 +1,168 @@
-
-
-
+
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 4f60aeb..eec21e6 100644
--- a/src/modules/timesheet-approval/composables/use-timesheet-approval-api.ts
+++ b/src/modules/timesheet-approval/composables/use-timesheet-approval-api.ts
@@ -1,40 +1,61 @@
import { useTimesheetStore } from "src/stores/timesheet-store";
-import { useAuthStore } from "src/stores/auth-store";
import type { TimesheetApprovalCSVReportFilters } from "src/modules/timesheet-approval/models/timesheet-approval-csv-report.models";
export const useTimesheetApprovalApi = () => {
const timesheet_store = useTimesheetStore();
- const auth_store = useAuthStore();
+ const DATE_REGEX = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/;
- const getPayPeriodOverviewsByDate = async (date_string: string): Promise => {
- const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber(date_string);
-
- if (success) {
- await timesheet_store.getPayPeriodOverviewsBySupervisorEmail(
- timesheet_store.pay_period.pay_year,
- timesheet_store.pay_period.pay_period_no,
- auth_store.user.email
- );
+ const getTimesheetOverviews = async (date?: string) => {
+ timesheet_store.is_loading = true;
+
+ const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber(date);
+ if (success) await timesheet_store.getTimesheetOverviews();
+
+ timesheet_store.is_loading = false;
+ }
+
+ const getTimesheetOverviewsByDate = async (date: string) => {
+ const valid_date = DATE_REGEX.test(date);
+ timesheet_store.is_loading = true;
+
+ if (valid_date) {
+ const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber(date);
+ if (success) await timesheet_store.getTimesheetOverviews();
}
+
+ timesheet_store.is_loading = false;
};
- const getTimesheetApprovalCSVReport = async ( report_filter_company: boolean[], report_filter_type: boolean[], year?: number, period_number?: number ) => {
- const [ targo, solucom ] = report_filter_company;
- const [ shifts, expenses, holiday, vacation ] = report_filter_type;
+ const toggleTimesheetsApprovalByEmployeeEmail = async (email: string, approval_status: boolean) => {
+ timesheet_store.is_loading = true;
+
+ const success = await timesheet_store.getTimesheetsByOptionalEmployeeEmail(email);
+ if (success) {
+ const approval_success = await timesheet_store.toggleTimesheetsApprovalByEmployeeEmail(email, approval_status);
+ const overview = timesheet_store.pay_period_overviews.find(overview => overview.email === email);
+
+ if (overview && approval_success) overview.is_approved = approval_status;
+ }
+
+ timesheet_store.is_loading = false;
+ };
+
+ const getTimesheetApprovalCSVReport = async (report_filter_company: boolean[], report_filter_type: boolean[]) => {
+ if (timesheet_store.pay_period === undefined) return;
+
+ const [targo, solucom] = report_filter_company;
+ const [shifts, expenses, holiday, vacation] = report_filter_type;
const options = {
- types: { shifts, expenses, holiday, vacation },
- companies: { targo, solucom },
+ shifts, expenses, holiday, vacation, targo, solucom
} as TimesheetApprovalCSVReportFilters;
-
- await timesheet_store.getPayPeriodReportByYearAndPeriodNumber(
- year ?? timesheet_store.pay_period.pay_year,
- period_number ?? timesheet_store.pay_period.pay_period_no,
- options
- );
+
+ await timesheet_store.getPayPeriodReport(options);
};
return {
- getPayPeriodOverviewsByDate,
+ getTimesheetOverviewsByDate,
+ toggleTimesheetsApprovalByEmployeeEmail,
getTimesheetApprovalCSVReport,
+ getTimesheetOverviews,
}
};
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/models/detailed-dialog-shift-color.model.ts b/src/modules/timesheet-approval/models/detailed-dialog-shift-color.model.ts
deleted file mode 100644
index 439942b..0000000
--- a/src/modules/timesheet-approval/models/detailed-dialog-shift-color.model.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-export interface shiftColor {
- type_label: string;
- background_color: string;
- font_color: string;
-}
-
-export const shift_type_legend: shiftColor[] = [
- {
- type_label: 'shared.shift_type.regular',
- background_color: 'blue-grey-4',
- font_color: 'blue-grey-8',
- },
- {
- type_label: 'shared.shift_type.evening',
- background_color: 'warning',
- font_color: 'blue-grey-2',
- },
- {
- type_label: 'shared.shift_type.emergency',
- background_color: 'amber-10',
- font_color: 'blue-grey-2',
- },
- {
- type_label: 'shared.shift_type.overtime',
- background_color: 'negative',
- font_color: 'blue-grey-2',
- },
- {
- type_label: 'shared.shift_type.vacation',
- background_color: 'purple-10',
- font_color: 'blue-grey-2',
- },
- {
- type_label: 'shared.shift_type.holiday',
- background_color: 'purple-8',
- font_color: 'blue-grey-2',
- },
- {
- type_label: 'shared.shift_type.sick',
- background_color: 'grey-8',
- font_color: 'blue-grey-2',
- },
-]
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/models/pay-period-overview.models.ts b/src/modules/timesheet-approval/models/pay-period-overview.models.ts
deleted file mode 100644
index a83271d..0000000
--- a/src/modules/timesheet-approval/models/pay-period-overview.models.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-export interface PayPeriodOverview {
- email: string;
- employee_name: string;
- regular_hours: number;
- evening_hours: number;
- emergency_hours: number;
- overtime_hours: number;
- total_hours: number;
- expenses: number;
- mileage: number;
- is_approved: boolean;
-};
-
-export interface PayPeriodOverviewResponse {
- pay_period_no: number;
- pay_year: number;
- period_start: string;
- period_end: string;
- payday: string;
- label: string;
- employees_overview: PayPeriodOverview[];
-}
-
-export const default_pay_period_overview: PayPeriodOverview = {
- email: '',
- employee_name: '',
- regular_hours: -1,
- evening_hours: -1,
- emergency_hours: -1,
- overtime_hours: -1,
- total_hours: -1,
- expenses: -1,
- mileage: -1,
- is_approved: false
-}
-
-export const pay_period_overview_columns = [
- {
- name: 'employee_name',
- label: 'timesheet_approvals.table.full_name',
- field: 'employee_name',
- sortable: true
- },
- {
- name: 'email',
- label: 'timesheet_approvals.table.email',
- field: 'email',
- sortable: true,
- },
- {
- name: 'regular_hours',
- label: 'shared.shift_type.regular',
- field: 'regular_hours',
- sortable: true,
- },
- {
- name: 'evening_hours',
- label: 'shared.shift_type.evening',
- field: 'evening_hours',
- sortable: true,
- },
- {
- name: 'emergency_hours',
- label: 'shared.shift_type.emergency',
- field: 'emergency_hours',
- sortable: true,
- },
- {
- name: 'overtime_hours',
- label: 'shared.shift_type.overtime',
- field: 'overtime_hours',
- sortable: true,
- },
- {
- name: 'expenses',
- label: 'timesheet_approvals.table.expenses',
- field: 'expenses',
- sortable: true,
- },
- {
- name: 'mileage',
- label: 'timesheet_approvals.table.mileage',
- field: 'mileage',
- sortable: true,
- },
- {
- name: 'is_approved',
- label: 'timesheet_approvals.table.is_approved',
- field: 'is_approved',
- sortable: true,
- }
-];
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/models/timesheet-approval-csv-report.models.ts b/src/modules/timesheet-approval/models/timesheet-approval-csv-report.models.ts
index 3633813..921605a 100644
--- a/src/modules/timesheet-approval/models/timesheet-approval-csv-report.models.ts
+++ b/src/modules/timesheet-approval/models/timesheet-approval-csv-report.models.ts
@@ -1,25 +1,18 @@
-export interface TimesheetApprovalCSVReportFilters {
- types: {
- shifts: boolean;
- expenses: boolean;
- holiday: boolean;
- vacation: boolean;
- };
- companies: {
- targo: boolean;
- solucom: boolean;
+export class TimesheetApprovalCSVReportFilters {
+ shifts: boolean;
+ expenses: boolean;
+ holiday: boolean;
+ vacation: boolean;
+ targo: boolean;
+ solucom: boolean;
+
+ constructor() {
+ this.shifts = true;
+ this.expenses = true;
+ this.holiday = true;
+ this.vacation = true;
+ this.targo = true;
+ this.solucom = false;
};
}
-export const default_timesheet_approval_cvs_report_filters: TimesheetApprovalCSVReportFilters = {
- types: {
- shifts: true,
- expenses: true,
- holiday: true,
- vacation: true,
- },
- companies: {
- targo: true,
- solucom: true,
- },
-};
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/models/timesheet-overview.models.ts b/src/modules/timesheet-approval/models/timesheet-overview.models.ts
new file mode 100644
index 0000000..3d5bce0
--- /dev/null
+++ b/src/modules/timesheet-approval/models/timesheet-overview.models.ts
@@ -0,0 +1,211 @@
+import type { QTableColumn } from "quasar";
+
+export class TimesheetApprovalOverview {
+ email: string;
+ employee_first_name: string;
+ employee_last_name: string;
+ supervisor: {
+ first_name: string;
+ last_name: string;
+ email: string;
+ } | null;
+ is_active: boolean;
+ regular_hours: number;
+ other_hours: {
+ evening_hours: number;
+ emergency_hours: number;
+ overtime_hours: number;
+ sick_hours: number;
+ holiday_hours: number;
+ vacation_hours: number;
+ };
+ weekly_hours: number[];
+ total_hours: number;
+ expenses: number;
+ mileage: number;
+ is_approved: boolean;
+
+ constructor() {
+ this.email = '';
+ this.employee_first_name = 'Unknown';
+ this.employee_last_name = 'Unknown';
+ this.supervisor = null;
+ this.is_active = true;
+ this.regular_hours = 0;
+ this.other_hours = {
+ evening_hours: 0,
+ emergency_hours: 0,
+ overtime_hours: 0,
+ sick_hours: 0,
+ holiday_hours: 0,
+ vacation_hours: 0,
+ }
+ this.weekly_hours = [0];
+ this.total_hours = 0;
+ this.expenses = 0;
+ this.mileage = 0;
+ this.is_approved = false;
+ };
+}
+
+export interface PayPeriodOverviewResponse {
+ pay_period_no: number;
+ pay_year: number;
+ period_start: string;
+ period_end: string;
+ payday: string;
+ label: string;
+ employees_overview: TimesheetApprovalOverview[];
+}
+
+export interface PayPeriodOverviewFilters {
+ is_showing_inactive: boolean;
+ is_showing_team_only: boolean;
+ supervisors: string[];
+ name_search_string: string;
+}
+
+export type OverviewColumns = 'employee_first_name' | 'employee_last_name' | 'email' | 'REGULAR' | 'EVENING' | 'EMERGENCY' | 'SICK' | 'HOLIDAY' | 'VACATION' | 'OVERTIME' | 'expenses' | 'mileage' | 'total_hours' | 'weekly_hours_1' | 'weekly_hours_2' | 'is_approved' | 'is_active'
+
+export const overview_column_names = {
+ FIRST_NAME: 'employee_first_name',
+ LAST_NAME: 'employee_last_name',
+ EMAIL: 'email',
+ REGULAR: 'REGULAR',
+ EVENING: 'EVENING',
+ EMERGENCY: 'EMERGENCY',
+ SICK: 'SICK',
+ HOLIDAY: 'HOLIDAY',
+ VACATION: 'VACATION',
+ OVERTIME: 'OVERTIME',
+ EXPENSES: 'expenses',
+ MILEAGE: 'mileage',
+ WEEKLY_HOURS_1: 'weekly_hours_1',
+ WEEKLY_HOURS_2: 'weekly_hours_2',
+ TOTAL_HOURS: 'total_hours',
+ IS_APPROVED: 'is_approved',
+ IS_ACTIVE: 'is_active',
+}
+
+export const pay_period_overview_columns: QTableColumn[] = [
+ {
+ name: overview_column_names.FIRST_NAME,
+ label: 'timesheet_approvals.table.full_name',
+ align: 'left',
+ field: overview_column_names.FIRST_NAME,
+ sortable: true,
+ required: true,
+ style: 'width: 10vw;'
+ },
+ {
+ name: overview_column_names.LAST_NAME,
+ label: 'timesheet_approvals.table.full_name',
+ align: 'left',
+ field: '',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.EMAIL,
+ label: 'timesheet_approvals.table.email',
+ align: 'left',
+ field: overview_column_names.EMAIL,
+ sortable: true,
+ style: 'width: 10vw;'
+ },
+ {
+ name: overview_column_names.REGULAR,
+ label: 'shared.shift_type.regular',
+ align: 'left',
+ field: 'regular_hours',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.EVENING,
+ label: 'shared.shift_type.evening',
+ align: 'left',
+ field: row => row.other_hours.evening_hours,
+ sortable: true,
+ },
+ {
+ name: overview_column_names.EMERGENCY,
+ label: 'shared.shift_type.emergency',
+ align: 'left',
+ field: row => row.other_hours.emergency_hours,
+ sortable: true,
+ },
+ {
+ name: overview_column_names.SICK,
+ label: 'shared.shift_type.sick',
+ align: 'left',
+ field: row => row.other_hours.sick_hours,
+ sortable: true,
+ },
+ {
+ name: overview_column_names.HOLIDAY,
+ label: 'shared.shift_type.holiday',
+ align: 'left',
+ field: row => row.other_hours.holiday_hours,
+ sortable: true,
+ },
+ {
+ name: overview_column_names.VACATION,
+ label: 'shared.shift_type.vacation',
+ align: 'left',
+ field: row => row.other_hours.vacation_hours,
+ sortable: true,
+ },
+ {
+ name: overview_column_names.OVERTIME,
+ label: 'shared.shift_type.overtime',
+ align: 'left',
+ field: row => row.other_hours.overtime_hours,
+ sortable: true,
+ },
+ {
+ name: overview_column_names.EXPENSES,
+ label: 'timesheet_approvals.table.expenses',
+ align: 'left',
+ field: 'expenses',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.MILEAGE,
+ label: 'timesheet_approvals.table.mileage',
+ align: 'left',
+ field: 'mileage',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.WEEKLY_HOURS_1,
+ label: 'timesheet.week',
+ align: 'left',
+ field: 'weekly_hours',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.WEEKLY_HOURS_2,
+ label: 'timesheet.week',
+ align: 'left',
+ field: 'weekly_hours',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.TOTAL_HOURS,
+ label: 'timesheet_approvals.table.total_hours',
+ align: 'left',
+ field: 'total_hours',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.IS_APPROVED,
+ label: 'timesheet_approvals.table.is_approved',
+ field: 'is_approved',
+ sortable: true,
+ },
+ {
+ name: overview_column_names.IS_ACTIVE,
+ label: 'timesheet_approvals.table.is_active',
+ field: 'is_active',
+ sortable: true,
+ }
+]
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/services/timesheet-approval-service.ts b/src/modules/timesheet-approval/services/timesheet-approval-service.ts
index 53e3e9b..383dde2 100644
--- a/src/modules/timesheet-approval/services/timesheet-approval-service.ts
+++ b/src/modules/timesheet-approval/services/timesheet-approval-service.ts
@@ -1,15 +1,21 @@
import { api } from "src/boot/axios";
+import type { BackendResponse } from "src/modules/shared/models/backend-response.models";
import type { TimesheetApprovalCSVReportFilters } from "src/modules/timesheet-approval/models/timesheet-approval-csv-report.models";
-import type { PayPeriodOverviewResponse } from "src/modules/timesheet-approval/models/pay-period-overview.models";
+import type { PayPeriodOverviewResponse } from "src/modules/timesheet-approval/models/timesheet-overview.models";
export const timesheetApprovalService = {
- getPayPeriodOverviewsBySupervisorEmail: async (year: number, period_number: number, supervisor_email: string): Promise => {
- const response = await api.get(`pay-periods/${year}/${period_number}/${supervisor_email}`);
- return response.data;
+ getPayPeriodOverviews: async (year: number, period_number: number): Promise => {
+ const response = await api.get<{ success: boolean, data: PayPeriodOverviewResponse, error?: string }>(`pay-periods/overview/${year}/${period_number}`);
+ return response.data.data;
},
- getPayPeriodReportByYearAndPeriodNumber: async (year: number, period_number: number, report_filters?: TimesheetApprovalCSVReportFilters) => {
- const response = await api.get(`csv/${year}/${period_number}`, { params: { report_filters, }});
+ getPayPeriodReportByYearAndPeriodNumber: async (year: number, period_number: number, filters?: TimesheetApprovalCSVReportFilters) => {
+ const response = await api.get(`exports/csv/${year}/${period_number}`, { params: filters, responseType: 'arraybuffer' });
+ return response;
+ },
+
+ updateTimesheetsApprovalStatus: async (email: string, timesheet_ids: number[], is_approved: boolean): Promise> => {
+ const response = await api.patch>('pay-periods/pay-period-approval', { email, timesheet_ids, is_approved});
return response.data;
},
};
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-crud-dialog-form.vue b/src/modules/timesheets/components/expense-crud-dialog-form.vue
deleted file mode 100644
index 38773bf..0000000
--- a/src/modules/timesheets/components/expense-crud-dialog-form.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-crud-dialog-header.vue b/src/modules/timesheets/components/expense-crud-dialog-header.vue
deleted file mode 100644
index 682b8e5..0000000
--- a/src/modules/timesheets/components/expense-crud-dialog-header.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- {{ $t('timesheet.expense.title') }}
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-crud-dialog-list.vue b/src/modules/timesheets/components/expense-crud-dialog-list.vue
deleted file mode 100644
index eef7b96..0000000
--- a/src/modules/timesheets/components/expense-crud-dialog-list.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
- {{ $t('timesheet.expense.empty_list') }}
-
-
-
-
-
-
-
-
-
-
- {{ expense.mileage?.toFixed(1) }} km
-
-
- {{ expense.amount.toFixed(2) }} $
-
-
-
- {{ expense.amount.toFixed(2) }} $
-
-
-
-
- {{ $d(new Date(expense.date), { year: 'numeric', month: 'short', day: 'numeric', weekday: 'short' })
- }}
-
-
-
-
-
-
-
-
-
-
- {{ $t('timesheet.expense.employee_comment') }}
-
-
- {{ expense.comment }}
-
-
-
-
-
-
- {{ $t('timesheet.expense.supervisor_comment') }}
-
-
- {{ expense.supervisor_comment }}
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-crud-dialog.vue b/src/modules/timesheets/components/expense-crud-dialog.vue
deleted file mode 100644
index ed9d3ed..0000000
--- a/src/modules/timesheets/components/expense-crud-dialog.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-dialog-form.vue b/src/modules/timesheets/components/expense-dialog-form.vue
new file mode 100644
index 0000000..0fa8a91
--- /dev/null
+++ b/src/modules/timesheets/components/expense-dialog-form.vue
@@ -0,0 +1,293 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-dialog-header.vue b/src/modules/timesheets/components/expense-dialog-header.vue
new file mode 100644
index 0000000..0602f5e
--- /dev/null
+++ b/src/modules/timesheets/components/expense-dialog-header.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-dialog-list.vue b/src/modules/timesheets/components/expense-dialog-list.vue
new file mode 100644
index 0000000..bc09ce0
--- /dev/null
+++ b/src/modules/timesheets/components/expense-dialog-list.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-crud-dialog-supervisor-comment.vue b/src/modules/timesheets/components/expense-dialog-supervisor-comment.vue
similarity index 100%
rename from src/modules/timesheets/components/expense-crud-dialog-supervisor-comment.vue
rename to src/modules/timesheets/components/expense-dialog-supervisor-comment.vue
diff --git a/src/modules/timesheets/components/expense-dialog.vue b/src/modules/timesheets/components/expense-dialog.vue
new file mode 100644
index 0000000..21ba93e
--- /dev/null
+++ b/src/modules/timesheets/components/expense-dialog.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue
new file mode 100644
index 0000000..2c1fdc7
--- /dev/null
+++ b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue
@@ -0,0 +1,288 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue
new file mode 100644
index 0000000..ccbf27e
--- /dev/null
+++ b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue
@@ -0,0 +1,115 @@
+
+
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-date-widget.vue b/src/modules/timesheets/components/shift-list-date-widget.vue
new file mode 100644
index 0000000..5555892
--- /dev/null
+++ b/src/modules/timesheets/components/shift-list-date-widget.vue
@@ -0,0 +1,53 @@
+
+
+
+
-
-
-
-
-
-
- {{ $t('shared.misc.in') }}
-
-
-
-
-
-
-
-
-
-
- {{ $t('shared.misc.out') }}
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-legend.vue b/src/modules/timesheets/components/shift-list-legend.vue
deleted file mode 100644
index f8327fe..0000000
--- a/src/modules/timesheets/components/shift-list-legend.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
- {{ shift.start_time }}
-
-
-
-
-
-
-
-
-
-
- {{ shift.end_time }}
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-scrollable.vue b/src/modules/timesheets/components/shift-list-scrollable.vue
new file mode 100644
index 0000000..cc33003
--- /dev/null
+++ b/src/modules/timesheets/components/shift-list-scrollable.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/timesheet-wrapper.vue b/src/modules/timesheets/components/timesheet-wrapper.vue
index 31bd9a8..5da004d 100644
--- a/src/modules/timesheets/components/timesheet-wrapper.vue
+++ b/src/modules/timesheets/components/timesheet-wrapper.vue
@@ -2,87 +2,213 @@
setup
lang="ts"
>
+ /* eslint-disable */
import ShiftList from 'src/modules/timesheets/components/shift-list.vue';
- import ShiftCrudDialog from 'src/modules/timesheets/components/shift-crud-dialog.vue';
- import ExpenseCrudDialog from 'src/modules/timesheets/components/expense-crud-dialog.vue';
+ import ShiftListScrollable from 'src/modules/timesheets/components/shift-list-scrollable.vue';
+ import LoadingOverlay from 'src/modules/shared/components/loading-overlay.vue';
+ import ExpenseDialog from 'src/modules/timesheets/components/expense-dialog.vue';
+ import PageHeaderTemplate from 'src/modules/shared/components/page-header-template.vue';
import PayPeriodNavigator from 'src/modules/shared/components/pay-period-navigator.vue';
- import ShiftListLegend from 'src/modules/timesheets/components/shift-list-legend.vue';
- import { useTimesheetStore } from 'src/stores/timesheet-store';
- import { useTimesheetApi } from 'src/modules/timesheets/composables/api/use-timesheet-api';
+ import TimesheetErrorWidget from 'src/modules/timesheets/components/timesheet-error-widget.vue';
+ import ShiftListWeeklyOverview from 'src/modules/timesheets/components/shift-list-weekly-overview.vue';
+ import ShiftListWeeklyOverviewMobile from 'src/modules/timesheets/components/mobile/shift-list-weekly-overview-mobile.vue';
+
+ import { computed, onMounted } from 'vue';
+ import { useShiftApi } from 'src/modules/timesheets/composables/use-shift-api';
+ import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
import { useExpensesStore } from 'src/stores/expense-store';
- import { provide } from 'vue';
+ import { useTimesheetStore } from 'src/stores/timesheet-store';
+ import { date } from 'quasar';
- const { open } = useExpensesStore();
- const { employeeEmail, dense = false } = defineProps<{
- employeeEmail: string;
- dense?: boolean;
+ const expenses_store = useExpensesStore();
+ const timesheet_store = useTimesheetStore();
+ const timesheet_api = useTimesheetApi();
+ const shift_api = useShiftApi();
+ const has_shift_errors = computed(() => timesheet_store.all_current_shifts.filter(shift => shift.has_error === true).length > 0);
+
+ const is_timesheets_approved = computed(() => timesheet_store.timesheets.every(timesheet => timesheet.is_approved))
+
+ const total_hours = computed(() => timesheet_store.timesheets.reduce((sum, timesheet) =>
+ sum + timesheet.weekly_hours.regular
+ + timesheet.weekly_hours.evening
+ + timesheet.weekly_hours.emergency
+ + timesheet.weekly_hours.overtime,
+ 0) //initial value
+ );
+
+ const total_expenses = computed(() => timesheet_store.timesheets.reduce((sum, timesheet) =>
+ sum + timesheet.weekly_expenses.expenses
+ + timesheet.weekly_expenses.on_call
+ + timesheet.weekly_expenses.per_diem,
+ 0) //initial value
+ );
+
+ const { mode = 'normal' } = defineProps<{
+ mode?: 'approval' | 'normal';
}>();
- const { is_loading } = useTimesheetStore();
- const { getPayPeriodDetailsByDate, getPreviousPayPeriodDetails, getNextPayPeriodDetails } = useTimesheetApi();
-
- provide('employeeEmail', employeeEmail);
+ onMounted(async () => {
+ if (mode === 'normal')
+ await timesheet_api.getTimesheetsByDate(date.formatDate(new Date(), 'YYYY-MM-DD'));
+ });
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/composables/api/use-expense-api.ts b/src/modules/timesheets/composables/api/use-expense-api.ts
deleted file mode 100644
index ee9a3fd..0000000
--- a/src/modules/timesheets/composables/api/use-expense-api.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { normalizeObject } from "src/utils/normalize-object";
-import { useExpensesStore } from "src/stores/expense-store";
-import { expense_validation_schema } from "src/modules/timesheets/models/expense.validation";
-import type { Expense, UpsertExpense } from "src/modules/timesheets/models/expense.models";
-
-export const useExpensesApi = () => {
- const expenses_store = useExpensesStore();
-
- const toUpsertExpense = (obj: {
- old_expense?: Expense;
- new_expense?: Expense;
- }) => obj as UpsertExpense;
-
- const createExpenseByEmployeeEmail = async (employee_email: string, date: string): Promise => {
- const upsert_expense = toUpsertExpense({
- new_expense: normalizeObject(expenses_store.current_expense, expense_validation_schema),
- });
- await expenses_store.upsertOrDeleteExpensesByEmployeeEmail(employee_email, date, upsert_expense);
- };
-
- const updateExpenseByEmployeeEmail = async (employee_email: string, date: string): Promise => {
- const upsert_expense = toUpsertExpense({
- old_expense: normalizeObject(expenses_store.initial_expense, expense_validation_schema),
- new_expense: normalizeObject(expenses_store.current_expense, expense_validation_schema),
- });
- await expenses_store.upsertOrDeleteExpensesByEmployeeEmail(employee_email, date, upsert_expense);
- };
-
- const deleteExpenseByEmployeeEmail = async (employee_email: string, date: string): Promise => {
- const upsert_expense = toUpsertExpense({
- old_expense: normalizeObject(expenses_store.initial_expense, expense_validation_schema),
- });
- await expenses_store.upsertOrDeleteExpensesByEmployeeEmail(employee_email, date, upsert_expense);
- };
-
- return {
- createExpenseByEmployeeEmail,
- updateExpenseByEmployeeEmail,
- deleteExpenseByEmployeeEmail,
- };
-};
\ No newline at end of file
diff --git a/src/modules/timesheets/composables/api/use-shift-api.ts b/src/modules/timesheets/composables/api/use-shift-api.ts
deleted file mode 100644
index f32461d..0000000
--- a/src/modules/timesheets/composables/api/use-shift-api.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { unwrapAndClone } from "src/utils/unwrap-and-clone";
-import { TIME_FORMAT_PATTERN } from "src/modules/timesheets/constants/shift.constants";
-import { GenericApiError } from "src/modules/timesheets/models/expense.validation";
-import { useShiftStore } from "src/stores/shift-store";
-import { default_shift, type Shift, type UpsertShift } from "src/modules/timesheets/models/shift.models";
-import { deepEqual } from "src/utils/deep-equal";
-
-export const useShiftApi = () => {
- const shift_store = useShiftStore();
-
- const normalizeShiftPayload = (shift: Shift): Shift => {
- const comment = shift.comment?.trim() || undefined;
-
- return {
- date: shift.date,
- start_time: shift.start_time,
- end_time: shift.end_time,
- type: shift.type,
- is_approved: false,
- is_remote: shift.is_remote,
- comment: comment,
- };
- };
-
- const parseHHMM = (s: string): [number, number] => {
- const m = /^(\d{2}):(\d{2})$/.exec(s);
-
- if (!m) {
- throw new GenericApiError({ status_code: 400, message: `Invalid time format: ${s}. Expected HH:MM.` });
- }
-
- const h = Number(m[1]);
- const min = Number(m[2]);
-
- if (Number.isNaN(h) || Number.isNaN(min) || h < 0 || h > 23 || min < 0 || min > 59) {
- throw new GenericApiError({ status_code: 400, message: `Invalid time value: ${s}.` })
- }
- return [h, min];
- };
-
- const toMinutes = (hhmm: string): number => {
- const [h, m] = parseHHMM(hhmm);
- return h * 60 + m;
- };
-
- const validateShift = (shift: Shift, label: 'old_shift' | 'new_shift') => {
- if (!TIME_FORMAT_PATTERN.test(shift.start_time) || !TIME_FORMAT_PATTERN.test(shift.end_time)) {
- throw new GenericApiError({
- status_code: 400,
- message: `Invalid time format in ${label}. Expected HH:MM`,
- context: { [label]: shift }
- });
- }
-
- if (toMinutes(shift.end_time) <= toMinutes(shift.start_time)) {
- throw new GenericApiError({
- status_code: 400,
- message: `Invalid time range in ${label}. The End time must be after the Start time`,
- context: { [label]: shift }
- });
- }
- };
-
- const upsertOrDeleteShiftByEmployeeEmail = async (employee_email: string): Promise => {
- const flat_upsert_shift: UpsertShift = {
- ...(deepEqual(shift_store.initial_shift, default_shift) ? { old_shift: unwrapAndClone(shift_store.initial_shift) } : {}),
- ...(deepEqual(shift_store.current_shift, default_shift) ? { new_shift: unwrapAndClone(shift_store.current_shift) } : {}),
- };
-
- const normalized_upsert_shift: UpsertShift = {
- ...(flat_upsert_shift.old_shift ? { old_shift: normalizeShiftPayload(flat_upsert_shift.old_shift) } : {}),
- ...(flat_upsert_shift.new_shift ? { new_shift: normalizeShiftPayload(flat_upsert_shift.new_shift) } : {}),
- };
-
- if (normalized_upsert_shift.old_shift) validateShift(normalized_upsert_shift.old_shift, 'old_shift');
- if (normalized_upsert_shift.new_shift) validateShift(normalized_upsert_shift.new_shift, 'new_shift');
-
- await shift_store.upsertOrDeleteShiftByEmployeeEmail(employee_email, normalized_upsert_shift);
- };
-
- return {
- upsertOrDeleteShiftByEmployeeEmail,
- };
-}
-
diff --git a/src/modules/timesheets/composables/api/use-timesheet-api.ts b/src/modules/timesheets/composables/api/use-timesheet-api.ts
deleted file mode 100644
index 7692ffd..0000000
--- a/src/modules/timesheets/composables/api/use-timesheet-api.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useAuthStore } from "src/stores/auth-store";
-import { useTimesheetStore } from "src/stores/timesheet-store"
-
-export const useTimesheetApi = () => {
- const timesheet_store = useTimesheetStore();
- const auth_store = useAuthStore();
- const NEXT = 1;
- const PREVIOUS = -1;
-
- const getPayPeriodDetailsByDate = async (date_string: string, employee_email?: string) => {
- const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber(date_string);
-
- if (success) {
- await timesheet_store.getPayPeriodDetailsByEmployeeEmail(employee_email ?? auth_store.user.email)
- }
- }
-
- const getNextOrPreviousPayPeriodDetails = async (direction: number, employee_email?: string) => {
- const { pay_period } = timesheet_store;
- let new_number = pay_period.pay_period_no + direction;
- let new_year = pay_period.pay_year;
-
- if (new_number > 26) {
- new_number = 1;
- new_year += 1;
- }
-
- if (new_number < 1) {
- new_number = 26;
- new_year -= 1;
- }
-
- const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber(new_year, new_number);
-
- if (success) {
- await timesheet_store.getPayPeriodDetailsByEmployeeEmail(employee_email ?? auth_store.user.email);
- }
- };
-
- const getNextPayPeriodDetails = async (employee_email?: string) => {
- await getNextOrPreviousPayPeriodDetails(NEXT, employee_email ?? auth_store.user.email);
- }
-
- const getPreviousPayPeriodDetails = async (employee_email?: string) => {
- await getNextOrPreviousPayPeriodDetails(PREVIOUS, employee_email ?? auth_store.user.email);
- }
-
- return {
- getPayPeriodDetailsByDate,
- getNextPayPeriodDetails,
- getPreviousPayPeriodDetails,
- };
-};
\ No newline at end of file
diff --git a/src/modules/timesheets/composables/use-expense-api.ts b/src/modules/timesheets/composables/use-expense-api.ts
new file mode 100644
index 0000000..d5ea046
--- /dev/null
+++ b/src/modules/timesheets/composables/use-expense-api.ts
@@ -0,0 +1,30 @@
+/* eslint-disable */
+import { useExpensesStore } from "src/stores/expense-store";
+import { useTimesheetStore } from "src/stores/timesheet-store";
+import { Expense } from "src/modules/timesheets/models/expense.models";
+import { date } from "quasar";
+
+export const useExpensesApi = () => {
+ const expenses_store = useExpensesStore();
+ const timesheet_store = useTimesheetStore();
+
+ const upsertExpense = async (expense: Expense): Promise => {
+ const success = await expenses_store.upsertExpense(expense);
+ if (success) {
+ expenses_store.current_expense = new Expense(date.formatDate( new Date(), 'YYYY-MM-DD'));
+ timesheet_store.getTimesheetsByOptionalEmployeeEmail();
+ }
+ };
+
+ const deleteExpenseById = async (expense_id: number): Promise => {
+ const success = await expenses_store.deleteExpenseById(expense_id);
+ if (success) {
+ timesheet_store.getTimesheetsByOptionalEmployeeEmail();
+ }
+ };
+
+ return {
+ upsertExpense,
+ deleteExpenseById,
+ };
+};
\ No newline at end of file
diff --git a/src/modules/timesheets/composables/use-expense-draft.ts b/src/modules/timesheets/composables/use-expense-draft.ts
deleted file mode 100644
index 8b7afa2..0000000
--- a/src/modules/timesheets/composables/use-expense-draft.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ref, computed } from "vue";
-import type { Expense } from "src/modules/timesheets/models/expense.models";
-import type { ExpenseType } from "src/modules/timesheets/models/expense.models";
-
-export const useExpenseDraft = (initial?: Partial) => {
- const DEFAULT_TYPE: ExpenseType = 'EXPENSES';
-
- const draft = ref>({
- date: '',
- type: DEFAULT_TYPE,
- comment: '',
- ...(initial ?? {}),
- });
-
- const reset = () => {
- draft.value = {
- date: '',
- type: DEFAULT_TYPE,
- comment: '',
- }
- }
-
- const setType = (value: ExpenseType) => {
- draft.value.type = value;
- if(value === 'MILEAGE') {
- delete draft.value.amount;
- } else {
- delete draft.value.mileage;
- }
- };
-
- const showMileage = computed(()=> (draft.value.type as string) === 'MILEAGE');
- const showAmount = computed(()=> !showMileage.value);
-
- return { draft, setType, reset, showMileage, showAmount };
-}
\ No newline at end of file
diff --git a/src/modules/timesheets/composables/use-expense-form.ts b/src/modules/timesheets/composables/use-expense-form.ts
deleted file mode 100644
index 1947693..0000000
--- a/src/modules/timesheets/composables/use-expense-form.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ref } from "vue";
-import type { QForm } from "quasar"
-
-
-export const useExpenseForm = () => {
- const formRef = ref(null);
- const triedSubmit = ref(false);
-
- const validateAnd = async (fn: ()=> void | Promise) => {
- triedSubmit.value = true;
- const ok = await formRef.value?.validate(true);
- if(!ok) return false;
- await fn();
- return true;
- };
-
- return {
- formRef,
- validateAnd,
- };
-}
\ No newline at end of file
diff --git a/src/modules/timesheets/composables/use-expense-items.ts b/src/modules/timesheets/composables/use-expense-items.ts
deleted file mode 100644
index aeeae5a..0000000
--- a/src/modules/timesheets/composables/use-expense-items.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// import { ref, type Ref } from "vue";
-// import { normalizeObject } from "src/utils/normalize-object";
-// import { normExpenseType } from "../utils/expense.util";
-// import type { Expense, PayPeriodExpenses } from "src/modules/timesheets/models/expense.models";
-// import { useExpensesStore } from "src/stores/expense-store";
-// import { unwrapAndClone } from "src/utils/unwrap-and-clone";
-// import { expense_validation_schema } from "src/modules/timesheets/models/expense.validation";
-
-// const expenses_store = useExpensesStore();
-
-// export const useExpenseItems = () => {
-// let expenses = unwrapAndClone(expenses_store.pay_period_expenses.expenses.map(normalizeExpense));
-
-// const normalizePayload = (expense: Expense): Expense => {
-// const exp = normalizeObject(expense, expense_validation_schema);
-// const out: Expense = {
-// date: exp.date,
-// type: exp.type as ExpenseType,
-// comment: exp.comment || '',
-// };
-// if(typeof exp.amount === 'number') out.amount = exp.amount;
-// if(typeof exp.mileage === 'number') out.mileage = exp.mileage;
-// return out;
-// }
-
-// const addFromDraft = () => {
-// const candidate: Expense = normalizeExpense({
-// date: draft.date,
-// type: normExpenseType(draft.type),
-// ...(typeof draft.amount === 'number' ? { amount: draft.amount }: {}),
-// ...(typeof draft.mileage === 'number' ? { mileage: draft.mileage }: {}),
-// comment: String(draft.comment ?? '').trim(),
-// } as Expense);
-
-// validateExpenseUI(candidate, 'expense_draft');
-// expenses = [ ...expenses, candidate];
-// };
-
-// const removeAt = (index: number) => {
-// if(index < 0 || index >= expenses.length) return;
-// expenses = expenses.filter((_,i)=> i !== index);
-// };
-
-// const validateAll = () => {
-// for (const expense of expenses) {
-// validateExpenseUI(expense, 'expense_item');
-// }
-// };
-
-// const payload = () => expenses.map(normalizeExpense);
-
-// return {
-// expenses,
-// addFromDraft,
-// removeAt,
-// validateAll,
-// payload,
-// };
-// };
diff --git a/src/modules/timesheets/composables/use-shift-api.ts b/src/modules/timesheets/composables/use-shift-api.ts
new file mode 100644
index 0000000..05bc0de
--- /dev/null
+++ b/src/modules/timesheets/composables/use-shift-api.ts
@@ -0,0 +1,38 @@
+import { useAuthStore } from "src/stores/auth-store";
+import { useShiftStore } from "src/stores/shift-store";
+import { useTimesheetStore } from "src/stores/timesheet-store";
+
+export const useShiftApi = () => {
+ const timesheet_store = useTimesheetStore();
+ const shift_store = useShiftStore();
+ const auth_store = useAuthStore();
+
+ const deleteShiftById = async (shift_id: number) => {
+ timesheet_store.is_loading = true;
+ const success = await shift_store.deleteShiftById(shift_id);
+
+ if (success) {
+ await timesheet_store.getTimesheetsByOptionalEmployeeEmail(auth_store.user?.email ?? '');
+ }
+
+ timesheet_store.is_loading = false;
+ };
+
+ const saveShiftChanges = async () => {
+ timesheet_store.is_loading = true;
+
+ const update_success = await shift_store.updateShifts();
+ const create_success = await shift_store.createNewShifts();
+
+ if (create_success || update_success){
+ await timesheet_store.getTimesheetsByOptionalEmployeeEmail(auth_store.user?.email ?? '');
+ }
+
+ timesheet_store.is_loading = false;
+ }
+
+ return {
+ deleteShiftById,
+ saveShiftChanges,
+ };
+}
\ No newline at end of file
diff --git a/src/modules/timesheets/composables/use-timesheet-api.ts b/src/modules/timesheets/composables/use-timesheet-api.ts
new file mode 100644
index 0000000..33eb159
--- /dev/null
+++ b/src/modules/timesheets/composables/use-timesheet-api.ts
@@ -0,0 +1,71 @@
+import { useTimesheetStore } from "src/stores/timesheet-store";
+import { timesheetService } from "src/modules/timesheets/services/timesheet-service";
+
+export const useTimesheetApi = () => {
+ const timesheet_store = useTimesheetStore();
+
+ const getTimesheetsByDate = async (date_string: string, employee_email?: string) => {
+ timesheet_store.timesheets = [];
+ timesheet_store.is_loading = true;
+ const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber(date_string);
+
+ if (success) {
+ await timesheet_store.getTimesheetsByOptionalEmployeeEmail(employee_email);
+ timesheet_store.is_loading = false;
+ }
+
+ timesheet_store.is_loading = false;
+ }
+
+ const getTimesheetsByCurrentPayPeriod = async (employee_email?: string) => {
+ if (timesheet_store.pay_period === undefined) return false;
+
+ timesheet_store.is_loading = true;
+ const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber();
+
+ if (success) {
+ await timesheet_store.getTimesheetsByOptionalEmployeeEmail(employee_email);
+ timesheet_store.is_loading = false;
+ }
+
+ timesheet_store.is_loading = false;
+ };
+
+ const applyPreset = async (timesheet_id: number, week_day_index?: number, date?: string) => {
+ if (timesheet_store.timesheets.map(timesheet => timesheet.timesheet_id).includes(timesheet_id)) {
+ timesheet_store.is_loading = true;
+ try {
+ let response;
+
+ if (week_day_index && date)
+ response = await timesheetService.applyPresetToDay(timesheet_id, week_day_index, date);
+ else
+ response = await timesheetService.applyPresetToWeek(timesheet_id);
+
+ if (response.success)
+ await timesheet_store.getTimesheetsByOptionalEmployeeEmail();
+ } catch (error) {
+ console.error('Error applying weekly timesheet: ', error);
+ }
+
+ timesheet_store.is_loading = false;
+ }
+ }
+
+ const getTimesheetsBySwiping = async( direction: number ) => {
+ timesheet_store.is_loading = true;
+
+ timesheet_store.getNextOrPreviousPayPeriod(direction);
+ await timesheet_store.getPayPeriodByDateOrYearAndNumber();
+ await timesheet_store.getTimesheetsByOptionalEmployeeEmail();
+
+ timesheet_store.is_loading = false;
+ }
+
+ return {
+ getTimesheetsByDate,
+ getTimesheetsByCurrentPayPeriod,
+ getTimesheetsBySwiping,
+ applyPreset,
+ };
+};
\ No newline at end of file
diff --git a/src/modules/timesheets/constants/expense.constants.ts b/src/modules/timesheets/constants/expense.constants.ts
deleted file mode 100644
index ce6d207..0000000
--- a/src/modules/timesheets/constants/expense.constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const DATE_FORMAT_PATTERN = /^\d{4}-\d{2}-\d{2}$/;
\ No newline at end of file
diff --git a/src/modules/timesheets/constants/shift.constants.ts b/src/modules/timesheets/constants/shift.constants.ts
deleted file mode 100644
index 80f821b..0000000
--- a/src/modules/timesheets/constants/shift.constants.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const TIME_FORMAT_PATTERN = /^\d{2}:\d{2}$/;
-export const DATE_FORMAT_PATTERN = /^\d{4}-\d{2}-\d{2}$/;
\ No newline at end of file
diff --git a/src/modules/timesheets/models/expense.models.ts b/src/modules/timesheets/models/expense.models.ts
index dbc32a5..fcf3138 100644
--- a/src/modules/timesheets/models/expense.models.ts
+++ b/src/modules/timesheets/models/expense.models.ts
@@ -1,45 +1,27 @@
-export type ExpenseType = 'PER_DIEM' | 'MILEAGE' | 'EXPENSES' | 'PRIME_GARDE';
+export type ExpenseType = 'PER_DIEM' | 'MILEAGE' | 'EXPENSES' | 'ON_CALL';
-export const EXPENSE_TYPE: ExpenseType[] = ['PER_DIEM', 'MILEAGE', 'EXPENSES', 'PRIME_GARDE',];
+export const EXPENSE_TYPE: ExpenseType[] = ['PER_DIEM', 'MILEAGE', 'EXPENSES', 'ON_CALL',];
export const TYPES_WITH_MILEAGE_ONLY: Readonly = ['MILEAGE'];
-export const TYPES_WITH_AMOUNT_ONLY: Readonly = ['PER_DIEM', 'EXPENSES', 'PRIME_GARDE',];
+export const TYPES_WITH_AMOUNT_ONLY: Readonly = ['PER_DIEM', 'EXPENSES', 'ON_CALL',];
-export interface Expense {
- date: string;
+export class Expense {
+ id: number;
+ timesheet_id: number;
+ date: string; //YYYY-MM-DD
type: ExpenseType;
amount: number;
mileage?: number;
comment: string;
supervisor_comment?: string;
is_approved: boolean;
-}
-export type ExpenseTotals = {
- amount: number;
- mileage: number;
- reimburseable_total?: number;
-};
-
-export interface PayPeriodExpenses {
- is_approved: boolean;
- expenses: Expense[];
- totals?: ExpenseTotals;
-}
-
-export interface UpsertExpense {
- old_expense: Expense;
- new_expense: Expense;
-}
-
-export const default_expense: Expense = {
- date: '',
- type: 'EXPENSES',
- amount: 0,
- comment: '',
- is_approved: false,
-};
-
-export const default_pay_period_expenses: PayPeriodExpenses = {
- is_approved: false,
- expenses: [],
-}
\ No newline at end of file
+ constructor(date: string) {
+ this.id = -1;
+ this.timesheet_id = -1;
+ this.date = date;
+ this.type = 'EXPENSES';
+ this.amount = 0;
+ this.comment = '';
+ this.is_approved = false;
+ };
+};
\ No newline at end of file
diff --git a/src/modules/timesheets/models/expense.validation.ts b/src/modules/timesheets/models/expense.validation.ts
deleted file mode 100644
index 9a9700a..0000000
--- a/src/modules/timesheets/models/expense.validation.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { type Expense, EXPENSE_TYPE, type ExpenseType } from "src/modules/timesheets/models/expense.models";
-import type { Normalizer } from "src/utils/normalize-object";
-
-export interface ApiErrorPayload {
- status_code: number;
- error_code?: string;
- message?: string;
- context?: Record;
-};
-
-export abstract class ApiError extends Error {
- status_code: number;
- error_code?: string;
- context?: Record;
-
- constructor(payload: ApiErrorPayload, defaultMessage: string) {
- super(payload.message || defaultMessage);
- this.status_code = payload.status_code;
- this.error_code = payload.error_code ?? "unknown";
- this.context = payload.context ?? {'unknown': 'unknown error has occured', };
- }
-};
-
-export class GenericApiError extends ApiError {
- constructor(payload: ApiErrorPayload) {
- super(payload, 'Encountered an error processing request');
- this.name = 'GenericApiError';
- }
-};
-
-export class ExpensesValidationError extends ApiError {
- constructor(payload: ApiErrorPayload) {
- super(payload, 'Invalid expense payload');
- this.name = 'ExpensesValidationError';
- }
-};
-
-export class ExpensesApiError extends ApiError {
- constructor(payload: ApiErrorPayload) {
- super(payload, 'Request failed');
- this.name = 'ExpensesApiError';
- }
-};
-
-export const expense_validation_schema: Normalizer = {
- date: v => typeof v === 'string' ? v.trim() : '1970-01-01',
- type: v => EXPENSE_TYPE.includes(v as ExpenseType) ? v as ExpenseType : "EXPENSES",
- amount: v => typeof v === "number" ? v : -1,
- mileage: v => typeof v === "number" ? v : undefined,
- comment: v => typeof v === 'string' ? v.trim() : '',
- supervisor_comment: v => typeof v === 'string' ? v.trim() : '',
- is_approved: v => !!v,
-};
-
-export function toExpensesError(err: unknown): ExpensesValidationError | ExpensesApiError {
- if (err instanceof ExpensesValidationError || err instanceof ExpensesApiError) {
- return err;
- }
-
- if (typeof err === 'object' && err !== null && 'status_code' in err) {
- const payload = err as ApiErrorPayload;
-
- // Don't know how to differentiate both types of errors, can be updated here
- if (payload.error_code?.startsWith('API_')) {
- return new ExpensesApiError(payload);
- }
-
- return new ExpensesValidationError(payload);
- }
-
- // Fallback with ValidationError as default
- return new ExpensesValidationError({
- status_code: 500,
- message: err instanceof Error ? err.message : 'Unknown error',
- context: { original: err }
- });
-}
diff --git a/src/modules/timesheets/models/pay-period-details.models.ts b/src/modules/timesheets/models/pay-period-details.models.ts
deleted file mode 100644
index 4ec846c..0000000
--- a/src/modules/timesheets/models/pay-period-details.models.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import type { Shift } from "./shift.models";
-import { default_expense, type Expense } from "src/modules/timesheets/models/expense.models";
-
-export type Week = {
- sun: T;
- mon: T;
- tue: T;
- wed: T;
- thu: T;
- fri: T;
- sat: T;
-};
-
-export interface PayPeriodDetails {
- weeks: PayPeriodDetailsWeek[];
- employee_full_name: string;
-}
-
-export interface PayPeriodDetailsWeek {
- is_approved: boolean;
- shifts: Week
- expenses: Week;
-}
-
-export interface PayPeriodDetailsWeekDayShifts {
- shifts: Shift[];
- regular_hours: number;
- evening_hours: number;
- emergency_hours: number;
- overtime_hours: number;
- total_hours: number;
- short_date: string;
- break_duration?: number;
-}
-
-export interface PayPeriodDetailsWeekDayExpenses {
- expenses: Expense[];
- total_expenses: number;
- total_mileage: number;
-}
-
-const makeWeek = (factory: ()=> T): Week => ({
- sun: factory(),
- mon: factory(),
- tue: factory(),
- wed: factory(),
- thu: factory(),
- fri: factory(),
- sat: factory(),
-});
-
-const emptyDailySchedule = (): PayPeriodDetailsWeekDayShifts => ({
- shifts: [],
- regular_hours: 0,
- evening_hours: 0,
- emergency_hours: 0,
- overtime_hours: 0,
- total_hours: 0,
- short_date: "",
- break_duration: 0,
-});
-
-const emptyDailyExpenses = (): PayPeriodDetailsWeekDayExpenses => ({
- expenses: [default_expense,],
- total_expenses: -1,
- total_mileage: -1,
-});
-
-export const defaultPayPeriodDetailsWeek = (): PayPeriodDetailsWeek => ({
- is_approved: false,
- shifts: makeWeek(emptyDailySchedule),
- expenses: makeWeek(emptyDailyExpenses),
-});
-
-export const default_pay_period_details: PayPeriodDetails = {
- weeks: [ defaultPayPeriodDetailsWeek(), ],
- employee_full_name: "",
-}
\ No newline at end of file
diff --git a/src/modules/timesheets/models/shift.models.ts b/src/modules/timesheets/models/shift.models.ts
index 143d3ed..5f3de78 100644
--- a/src/modules/timesheets/models/shift.models.ts
+++ b/src/modules/timesheets/models/shift.models.ts
@@ -1,50 +1,45 @@
-export const SHIFT_TYPES = [
- 'REGULAR',
- 'EVENING',
+export const SHIFT_TYPES: ShiftType[] = [
+ 'REGULAR',
+ 'EVENING',
'EMERGENCY',
- 'OVERTIME',
- 'HOLIDAY',
- 'VACATION',
+ 'HOLIDAY',
+ 'VACATION',
'SICK'
];
-export type ShiftType = 'REGULAR' | 'EVENING' | 'EMERGENCY' | 'OVERTIME' | 'HOLIDAY' | 'VACATION' | 'SICK' ;
+export type ShiftType = 'REGULAR' | 'EVENING' | 'EMERGENCY' | 'HOLIDAY' | 'VACATION' | 'SICK';
-export type UpsertAction = 'create' | 'update' | 'delete';
+export type ShiftErrorCode = 'SHIFT_OVERLAP' | 'MISSING_START_TIME' | 'MISSING_END_TIME' | 'COMMENT_LENGTH_EXCEEDED' | 'APPROVAL_LOCK' | 'INVALID_DATE' | 'INVALID TYPE' | 'INVALID_TIMESHEET';
-export type ShiftLegendItem = {
- type: ShiftType;
- color: string;
- label_type: string;
- text_color?: string;
-};
-
-export interface Shift {
- date: string;
- type: ShiftType;
- start_time: string;
- end_time: string;
- comment: string | undefined;
+export class Shift {
+ id: number;
+ timesheet_id: number;
+ date: string; //YYYY-MM-DD
+ type: ShiftType;
+ start_time: string; //HH:mm:ss
+ end_time: string; //HH:mm:ss
+ comment: string | undefined;
is_approved: boolean;
- is_remote: boolean;
+ is_remote: boolean;
+ has_error: boolean;
+
+ constructor() {
+ this.id = -1;
+ this.timesheet_id = -1;
+ this.date = '';
+ this.type = 'REGULAR';
+ this.start_time = '';
+ this.end_time = '';
+ this.comment = undefined;
+ this.is_approved = false;
+ this.is_remote = false;
+ this.has_error = false;
+ }
}
-export interface UpsertShiftsResponse {
- action: UpsertAction;
- day: Shift[];
-}
-
-export interface UpsertShift {
- old_shift?: Shift | undefined;
- new_shift?: Shift | undefined;
-}
-
-export const default_shift: Readonly = {
- date: '',
- start_time: '--:--',
- end_time: '--:--',
- type: 'REGULAR',
- comment: '',
- is_approved: false,
- is_remote: false,
-};
\ No newline at end of file
+export interface ShiftOption {
+ label: string;
+ value: ShiftType;
+ icon: string;
+ icon_color: string;
+}
\ No newline at end of file
diff --git a/src/modules/timesheets/models/timesheet.models.ts b/src/modules/timesheets/models/timesheet.models.ts
new file mode 100644
index 0000000..e293813
--- /dev/null
+++ b/src/modules/timesheets/models/timesheet.models.ts
@@ -0,0 +1,45 @@
+import type { Shift } from "./shift.models";
+import type { Expense } from "src/modules/timesheets/models/expense.models";
+
+export const TIME_FORMAT_PATTERN = /^(\d{2}:\d{2})?$/;
+export const DATE_FORMAT_PATTERN = /^\d{4}-\d{2}-\d{2}$/;
+
+export interface TimesheetResponse {
+ has_preset_schedule: boolean;
+ employee_fullname: string;
+ timesheets: Timesheet[];
+}
+
+export interface Timesheet {
+ timesheet_id: number;
+ is_approved: boolean;
+ weekly_hours: TotalHours;
+ weekly_expenses: TotalExpenses;
+ days: TimesheetDay[];
+}
+
+export interface TimesheetDay {
+ date: string; // YYYY-MM-DD
+ daily_hours: TotalHours;
+ daily_expenses: TotalExpenses;
+ shifts: Shift[];
+ expenses: Expense[];
+}
+
+export interface TotalHours {
+ regular: number;
+ evening: number;
+ emergency: number;
+ overtime: number;
+ vacation: number;
+ holiday: number;
+ sick: number;
+ absent: number;
+}
+
+export interface TotalExpenses {
+ expenses: number;
+ per_diem: number;
+ on_call: number;
+ mileage: number;
+}
\ No newline at end of file
diff --git a/src/modules/timesheets/models/ui.models.ts b/src/modules/timesheets/models/ui.models.ts
deleted file mode 100644
index 69e3b22..0000000
--- a/src/modules/timesheets/models/ui.models.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type PayPeriodLabel = {
- start_date: string;
- end_date: string;
-};
-
-export type UpsertAction = 'created' | 'updated' | 'deleted';
\ No newline at end of file
diff --git a/src/modules/timesheets/services/expense-service.ts b/src/modules/timesheets/services/expense-service.ts
new file mode 100644
index 0000000..bd199b5
--- /dev/null
+++ b/src/modules/timesheets/services/expense-service.ts
@@ -0,0 +1,19 @@
+import { api } from "src/boot/axios";
+import type { Expense } from "src/modules/timesheets/models/expense.models";
+
+export const ExpenseService = {
+ createExpense: async (expense: Expense): Promise<{success: boolean, data: Expense, error?: unknown}> => {
+ const response = await api.post('expense/create', expense);
+ return response.data;
+ },
+
+ updateExpense: async (expense: Expense, email?: string): Promise<{success: boolean, data: Expense, error?: unknown}> => {
+ const response = await api.patch(`expense/update${email ? '?employee_email=' + email : ''}`, expense);
+ return response.data;
+ },
+
+ deleteExpenseById: async (expense_id: number): Promise<{success: boolean, data: number, error?: unknown}> => {
+ const response = await api.delete(`expense/delete/${expense_id}`);
+ return response.data;
+ }
+};
\ No newline at end of file
diff --git a/src/modules/timesheets/services/shift-service.ts b/src/modules/timesheets/services/shift-service.ts
new file mode 100644
index 0000000..ccb4434
--- /dev/null
+++ b/src/modules/timesheets/services/shift-service.ts
@@ -0,0 +1,20 @@
+import { api } from "src/boot/axios";
+import type { BackendResponse } from "src/modules/shared/models/backend-response.models";
+import type { Shift } from "src/modules/timesheets/models/shift.models";
+
+export const ShiftService = {
+ deleteShiftById: async (shift_id: number) => {
+ const response = await api.delete(`/shift/${shift_id}`);
+ return response.data;
+ },
+
+ createNewShifts: async (new_shifts: Shift[]):Promise> => {
+ const response = await api.post(`/shift/create`, new_shifts);
+ return response.data;
+ },
+
+ updateShifts: async (existing_shifts: Shift[]):Promise> => {
+ const response = await api.patch(`/shift/update`, existing_shifts);
+ return response.data;
+ }
+};
\ No newline at end of file
diff --git a/src/modules/timesheets/services/timesheet-service.ts b/src/modules/timesheets/services/timesheet-service.ts
index 0f4fdda..f5b7f57 100644
--- a/src/modules/timesheets/services/timesheet-service.ts
+++ b/src/modules/timesheets/services/timesheet-service.ts
@@ -1,50 +1,42 @@
import { api } from "src/boot/axios";
-import type { UpsertShift } from "src/modules/timesheets/models/shift.models";
import type { PayPeriod } from "src/modules/shared/models/pay-period.models";
-import type { PayPeriodDetails } from "src/modules/timesheets/models/pay-period-details.models";
-import type { PayPeriodOverview } from "src/modules/timesheet-approval/models/pay-period-overview.models";
-import type { Expense, PayPeriodExpenses, UpsertExpense } from "src/modules/timesheets/models/expense.models";
+import type { TimesheetResponse } from "src/modules/timesheets/models/timesheet.models";
+import type { TimesheetApprovalOverview } from "src/modules/timesheet-approval/models/timesheet-overview.models";
+import type { BackendResponse } from "src/modules/shared/models/backend-response.models";
export const timesheetService = {
- getPayPeriodDetailsByEmployeeEmail: async (email: string): Promise => {
- const response = await api.get(`/timesheets/${encodeURIComponent(email)}`);
- return response.data;
- },
-
getPayPeriodByDate: async (date_string: string): Promise => {
- const response = await api.get(`pay-periods/date/${date_string}`);
- return response.data;
+ const response = await api.get<{ success: boolean, data: PayPeriod, error?: string }>(`pay-periods/date/${date_string}`);
+ return response.data.data;
},
getPayPeriodByYearAndPeriodNumber: async (year: number, period_number: number): Promise => {
- const response = await api.get(`pay-periods/${year}/${period_number}`);
+ const response = await api.get<{ success: boolean, data: PayPeriod, error?: string }>(`pay-periods/${year}/${period_number}`);
+ return response.data.data;
+ },
+
+ getTimesheetOverviewsByPayPeriodAndSupervisorEmail: async (year: number, period_number: number, supervisor_email: string): Promise => {
+ const response = await api.get<{ success: boolean, data: TimesheetApprovalOverview[], error?: string }>(`pay-periods/${year}/${period_number}/${supervisor_email}`);
+ return response.data.data;
+ },
+
+ getTimesheetsByPayPeriodAndOptionalEmail: async (year: number, period_number: number, employee_email?: string): Promise> => {
+ if (employee_email !== undefined) {
+ const response = await api.get>(`timesheets/${year}/${period_number}?employee_email=${employee_email}`);
+ return response.data;
+ } else {
+ const response = await api.get>(`timesheets/${year}/${period_number}`);
+ return response.data;
+ }
+ },
+
+ applyPresetToWeek: async (timesheet_id: number): Promise> => {
+ const response = await api.post>(`schedule-presets/apply-preset`, { timesheet_id });
return response.data;
},
- getPayPeriodOverviewsBySupervisorEmail: async (year: number, period_number: number, supervisor_email: string): Promise => {
- const response = await api.get(`pay-periods/${year}/${period_number}/${supervisor_email}`);
- return response.data;
- },
-
- getPayPeriodDetailsByPayPeriodAndEmployeeEmail: async (year: number, period_no: number, email: string): Promise => {
- const response = await api.get('timesheets', { params: { year, period_no, email, } });
- return response.data;
- },
-
- getExpensesByPayPeriodAndEmployeeEmail: async (email: string, year: string, period_number: string): Promise => {
- const response = await api.get(`/expenses/${email}/${year}/${period_number}`);
- return response.data;
- },
-
- upsertOrDeleteShiftsByDateAndEmployeeEmail: async (email: string, payload: UpsertShift[], date: string): Promise => {
- const response = await api.put(`/shifts/upsert/${email}/${date}`, payload);
- return response.data;
- },
-
- upsertOrDeleteExpensesByPayPeriodAndEmployeeEmail: async (email: string, date: string, payload: UpsertExpense): Promise => {
- const headers = { 'Content-Type': 'application/json' }
-
- const response = await api.put(`/expenses/upsert/${email}/${date}`, payload, { headers });
+ applyPresetToDay: async (timesheet_id: number, week_day_index: number, date: string): Promise> => {
+ const response = await api.post>('schedule-presets/apply-day-preset', { timesheet_id, week_day_index, date });
return response.data;
}
};
\ No newline at end of file
diff --git a/src/modules/timesheets/utils/expense.util.ts b/src/modules/timesheets/utils/expense.util.ts
index 36e0bb3..5b97777 100644
--- a/src/modules/timesheets/utils/expense.util.ts
+++ b/src/modules/timesheets/utils/expense.util.ts
@@ -1,46 +1,21 @@
-import type { Expense, ExpenseTotals } from "src/modules/timesheets/models/expense.models";
+import type { ExpenseType } from "src/modules/timesheets/models/expense.models";
-//------------------ normalization / icons ------------------
-export const normExpenseType = (type: unknown): string =>
- typeof type === 'string' ? type.trim().toUpperCase() : '';
-
-const icon_map: Record = {
- MILEAGE: 'time_to_leave',
- EXPENSES: 'receipt_long',
- PER_DIEM: 'hotel',
- PRIME_GARDE: 'admin_panel_settings',
+export const getExpenseIcon = (type: ExpenseType) => {
+ switch (type) {
+ case 'MILEAGE': return 'time_to_leave';
+ case 'EXPENSES': return 'las la-coins';
+ case 'PER_DIEM': return 'hotel';
+ case 'ON_CALL': return 'phone_android';
+ default: return 'help_outline';
+ }
};
-export const expenseTypeIcon = (type: unknown): string => {
- const t = normExpenseType(type);
- return (
- icon_map[t.toLowerCase()] ??
- icon_map[t.replace('-','_').toLowerCase()] ??
- 'help_outline'
- );
-};
-
-//------------------ totals ------------------
-export const computeExpenseTotals = (items: readonly Expense[]): ExpenseTotals =>
- items.reduce(
- (acc, e) => ({
- amount: acc.amount + (Number(e.amount) || 0),
- mileage: acc.mileage + (Number(e.mileage) || 0),
- }),
- { amount: 0, mileage: 0 }
-);
-
-//------------------ Quasar :rules=[] ------------------
-export const makeExpenseRules = (t: (_key: string) => string) => {
+export const useExpenseRules = (t: (_key: string) => string) => {
const isPresent = (val: unknown) => val !== undefined && val !== null && val !== '';
-
- const typeRequired = (val: unknown) => (!!val) || t('timesheet.expense.errors.type_required');
-
- const amountRequired = (val: unknown) => (isPresent(val)) || t('timesheet.expense.errors.amount_required_for_type');
-
- const mileageRequired = (val: unknown) => (isPresent(val)) || t('timesheet.expense.errors.mileage_required_for_type');
-
- const commentRequired = (val: unknown) => (typeof val === 'string' ? val.trim().length > 0 : false ) || t('timesheet.expense.errors.comment_required');
+ const typeRequired = (val: unknown) => (!!val) || t('timesheet.expense.errors.type_required');
+ const amountRequired = (val: unknown) => (isPresent(val)) || t('timesheet.expense.errors.amount_required_for_type');
+ const mileageRequired = (val: unknown) => (isPresent(val)) || t('timesheet.expense.errors.mileage_required_for_type');
+ const commentRequired = (val: unknown) => (typeof val === 'string' ? val.trim().length > 0 : false) || t('timesheet.expense.hints.comment_required');
return {
typeRequired,
diff --git a/src/modules/timesheets/utils/expenses-validators.ts b/src/modules/timesheets/utils/expenses-validators.ts
deleted file mode 100644
index 24fd181..0000000
--- a/src/modules/timesheets/utils/expenses-validators.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-// import { COMMENT_MAX_LENGTH, DATE_FORMAT_PATTERN } from "src/modules/timesheets/constants/expense.constants";
-// import { ExpensesValidationError } from "src/modules/timesheets/models/expense.validation";
-// import { type Expense, type ExpenseType, TYPES_WITH_AMOUNT_ONLY, TYPES_WITH_MILEAGE_ONLY } from "src/modules/timesheets/models/expense.models";
-
-// //normalization helpers
-// export const toNumOrUndefined = (value: unknown): number | undefined => {
-// if(value === undefined || value === null || (typeof value === 'string' && value.trim() === '')) return undefined;
-// const num = Number(value);
-
-// return Number.isFinite(num) ? num : undefined;
-// };
-
-// export const normalizeComment = (input?: string): string | undefined => {
-// if(typeof input === 'undefined' || input === null) return undefined;
-// const trimmed = String(input).trim();
-
-// return trimmed.length ? trimmed : undefined;
-// };
-
-// export const normalizeType = (input: string): string => (input ?? '').trim().toUpperCase();
-
-// export const normalizeExpense = (expense: Expense): Expense => {
-// const comment = normalizeComment(expense.comment);
-// const amount = toNumOrUndefined(expense.amount);
-// const mileage = toNumOrUndefined(expense.mileage);
-
-// return {
-// date: (expense.date ?? '').trim(),
-// type: normalizeType(expense.type),
-// ...(amount !== undefined ? { amount } : {}),
-// ...(mileage !== undefined ? { mileage } : {}),
-// ...(comment !== undefined ? { comment } : {}),
-// ...(typeof expense.supervisor_comment === 'string' && expense.supervisor_comment.trim().length
-// ? { supervisor_comment: expense.supervisor_comment.trim() }
-// : {}),
-// ...(typeof expense.is_approved === 'boolean' ? { is_approved: expense.is_approved }: {} ),
-// };
-// };
-
-// //UI validation error messages
-// export const validateExpenseUI = (raw: Expense, label: string = 'expense'): void => {
-// const expense = normalizeExpense(raw);
-
-// //Date input validation
-// if(!DATE_FORMAT_PATTERN.test(expense.date)) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.date_required_or_invalid',
-// context: { [label]: expense },
-// });
-// }
-
-// //comment input validation
-// if(!expense.comment) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.comment_required',
-// context: { [label]: expense },
-// })
-// }
-
-// if((expense.comment.length ?? 0) > COMMENT_MAX_LENGTH) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.comment_too_long',
-// context: { [label]: { ...expense, comment_length: expense.comment?.length } },
-// });
-// }
-
-// //amount input validation
-// if(expense.amount !== undefined && expense.amount <= 0) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.amount_must_be_positive',
-// context: { [label]: expense },
-// });
-// }
-
-// //mileage input validation
-// if(expense.mileage !== undefined && expense.mileage <= 0) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.mileage_must_be_positive',
-// context: { [label]: expense },
-// });
-// }
-
-// //cross origin amount/mileage validation
-// const has_amount = typeof expense.amount === 'number' && expense.amount > 0;
-// const has_mileage = typeof expense.mileage === 'number' && expense.mileage > 0;
-
-// if(has_amount === has_mileage) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.amount_xor_mileage',
-// context: { [label]: expense },
-// });
-// }
-
-// //type constraint validation
-// const type = expense.type as ExpenseType;
-// if( TYPES_WITH_MILEAGE_ONLY.includes(type) && !has_mileage ) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.mileage_required_for_type',
-// context: { [label]: expense },
-// });
-// }
-// if(TYPES_WITH_AMOUNT_ONLY.includes(type) && !has_amount) {
-// throw new ExpensesValidationError({
-// status_code: 400,
-// message: 'timesheet.expense.errors.amount_required_for_type',
-// context: { [label]: expense },
-// });
-// }
-// };
-// <<<<<<< HEAD
-
-// //totals per pay-period
-// export const compute_expense_totals = (items: Expense[]) => items.reduce(
-// (acc, raw) => {
-// const expense = normalizeExpense(raw);
-// if(typeof expense.amount === 'number' && expense.amount > 0) acc.amount += expense.amount;
-// if(typeof expense.mileage === 'number' && expense.mileage > 0) acc.mileage += expense.mileage;
-// return acc;
-// },
-// { amount: 0, mileage: 0 }
-// );
-// =======
-// >>>>>>> 1bdbe021facc85fb50cff6c60053278695df6bdc
diff --git a/src/modules/timesheets/utils/shift.util.ts b/src/modules/timesheets/utils/shift.util.ts
index ac6f6d6..0dc2c5e 100644
--- a/src/modules/timesheets/utils/shift.util.ts
+++ b/src/modules/timesheets/utils/shift.util.ts
@@ -1,18 +1,36 @@
-// import type { ShiftKey, ShiftPayload, ShiftSelectOption } from "../types/shift.types";
-
-// export const toShiftPayload = (shift: any): ShiftPayload => ({
-// start_time: String(shift.start_time),
-// end_time: String(shift.end_time),
-// type: String(shift.type).toUpperCase() as ShiftKey,
-// is_remote: !!shift.is_remote,
-// ...(shift.comment ? { comment: String(shift.comment) } : {}),
-// });
-
-// export const buildShiftOptions = (
-// keys: readonly string[],
-// t:(k: string) => string
-// ): ShiftSelectOption[] =>
-// keys.map((key) => ({
-// value: key as any,
-// label: t(`timesheet.shift.types.${key}`),
-// }));
\ No newline at end of file
+import { date } from "quasar";
+import type { SchedulePresetShift } from "src/modules/employee-list/models/schedule-presets.models";
+import type { Shift, ShiftOption } from "src/modules/timesheets/models/shift.models";
+
+export const isShiftOverlap = (shifts: Shift[] | SchedulePresetShift[]): boolean => {
+ if (shifts.length < 2) return false;
+
+ const parsed_shifts = shifts.map(shift => ({
+ start: date.extractDate(`2000-01-01 ${shift.start_time}`, 'YYYY-MM-DD HH:mm').getTime(),
+ end: date.extractDate(`2000-01-01 ${shift.end_time}`, 'YYYY-MM-DD HH:mm').getTime(),
+ }));
+
+ for (let i = 0; i < parsed_shifts.length; i++) {
+ for (let j = i + 1; j < parsed_shifts.length; j++) {
+ const parsed_shift_a = parsed_shifts[i];
+ const parsed_shift_b = parsed_shifts[j];
+
+ if (parsed_shift_a === undefined || parsed_shift_b === undefined) continue;
+
+ if (Math.max(parsed_shift_a.start, parsed_shift_b.start) < Math.min(parsed_shift_a.end, parsed_shift_b.end)) {
+ return true; // overlap found
+ }
+ }
+ }
+
+ return false;
+};
+
+export const SHIFT_OPTIONS: ShiftOption[] = [
+ { label: 'timesheet.shift.types.REGULAR', value: 'REGULAR', icon: 'wb_sunny', icon_color: 'accent' },
+ { label: 'timesheet.shift.types.EVENING', value: 'EVENING', icon: 'bedtime', icon_color: 'orange-5' },
+ { label: 'timesheet.shift.types.EMERGENCY', value: 'EMERGENCY', icon: 'ring_volume', icon_color: 'red-5' },
+ { label: 'timesheet.shift.types.VACATION', value: 'VACATION', icon: 'beach_access', icon_color: 'deep-orange-5' },
+ { label: 'timesheet.shift.types.HOLIDAY', value: 'HOLIDAY', icon: 'event', icon_color: 'purple-5' },
+ { label: 'timesheet.shift.types.SICK', value: 'SICK', icon: 'medication_liquid', icon_color: 'light-blue-6' },
+ ];
diff --git a/src/modules/timesheets/utils/timesheet-format.util.ts b/src/modules/timesheets/utils/timesheet-format.util.ts
deleted file mode 100644
index c2ecb12..0000000
--- a/src/modules/timesheets/utils/timesheet-format.util.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { PayPeriodLabel } from "src/modules/timesheets/models/ui.models";
-
-export const formatPayPeriodLabel = (
- raw_label: string | undefined,
- locale: string,
- extractDate: (_input: string, _mask: string) => Date,
- opts: Intl.DateTimeFormatOptions
-): PayPeriodLabel => {
- const label = raw_label ?? '';
- const dates = label.split('.');
- if(dates.length < 2) return { start_date: '—', end_date:'—' };
-
- const fmt = new Intl.DateTimeFormat(locale, opts);
- const start = fmt.format(extractDate(dates[0]!, 'YYYY-MM-DD'));
- const end = fmt.format(extractDate(dates[1]!, 'YYYY-MM-DD'));
- return { start_date: start, end_date: end };
-}
\ No newline at end of file
diff --git a/src/pages/dashboard-page.vue b/src/pages/dashboard-page.vue
new file mode 100644
index 0000000..448e56c
--- /dev/null
+++ b/src/pages/dashboard-page.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/employee-list-page.vue b/src/pages/employee-list-page.vue
new file mode 100644
index 0000000..380d14e
--- /dev/null
+++ b/src/pages/employee-list-page.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/error-page.vue b/src/pages/error-page.vue
index 8bf297d..6cd9fd3 100644
--- a/src/pages/error-page.vue
+++ b/src/pages/error-page.vue
@@ -1,19 +1,43 @@
+
+
-
-
-
-
-
-
-
- {{ $t('timesheet_approvals.print_report.company') }}
-
+
+
-
-
-
-
+
+
+
+ {{ $t('timesheet_approvals.print_report.title') }}
+
-
+
-
-
-
-
-
-
-
\ No newline at end of file
+
+ {{ $t('timesheet_approvals.print_report.description') }}
+
+
+
+
+
+ {{ $t('timesheet_approvals.print_report.company') }}
+
+
+
+ - {{ $t('timesheet_approvals.print_report.type') }}
-
+
+
+
+
+ {{ $t('timesheet_approvals.print_report.options') }}
+
+
+
+
+
+
+
+
+
+
+
+
- {{ $t('timesheet.expense.add_expense') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('timesheet.expense.comment') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.date') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.type') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.amount') }}
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.mileage') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.employee_comment') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-dialog-list-item.vue b/src/modules/timesheets/components/expense-dialog-list-item.vue
new file mode 100644
index 0000000..7003990
--- /dev/null
+++ b/src/modules/timesheets/components/expense-dialog-list-item.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+ {{ $t('timesheet.expense.title') }}
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.total_amount') }} :
+
+
+
+ {{ weekly_totals.expenses.toFixed(2) }}
+
+
+
+
+
+
+ {{ $t('timesheet.expense.total_mileage') }} :
+
+
+
+ {{ weekly_totals.mileage.toFixed(1) }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t(`timesheet.expense.types.${expense.type}`) }}
+
+
+
+
+
+
+ {{ expense.type === 'MILEAGE' ? `${Number(expense.mileage).toFixed(1)} km` : `$
+ ${Number(expense.amount).toFixed(2)}` }}
+
+
+
+
+ {{ $d(date.extractDate(expense.date, 'YYYY-MM-DD'), {
+ month: 'short', day: 'numeric', weekday:
+ 'long'
+ }) }}
+
+
+
+
+
+
+ attachment_name.jpg
+
+
+
+
+
+
+ {{ $t('timesheet.expense.employee_comment') }}
+
+
+
+ {{ expense.comment }}
+
+
+
+ {{ expense.comment }}
+
+
+
+
+
+
+ {{ $t('timesheet.expense.supervisor_comment') }}
+
+
+
+ {{ expense.supervisor_comment }}
+
+
+
+
+
+
+
+ {{ expense.is_approved ? $t('timesheet_approvals.tooltip.unapprove') :
+ $t('timesheet_approvals.tooltip.approve') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.date') }}
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.type') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.employee_comment') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.amount') }}
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.expense.mileage') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue b/src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue
new file mode 100644
index 0000000..77f9206
--- /dev/null
+++ b/src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue
@@ -0,0 +1,329 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ expense.mileage?.toFixed(1) }} km
+
+
+ $ {{ expense.amount.toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/mobile/shift-list-weekly-overview-mobile.vue b/src/modules/timesheets/components/mobile/shift-list-weekly-overview-mobile.vue
new file mode 100644
index 0000000..87ccaf6
--- /dev/null
+++ b/src/modules/timesheets/components/mobile/shift-list-weekly-overview-mobile.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
+ $t('timesheet.shift.types.OFFICE') }}
+
+
+
+
+
+ {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
+ $t('timesheet.shift.types.OFFICE') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t(scope.label) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('shared.misc.in') }}
+
+
+
+
+
+
+
+
+
+ {{ $t('shared.misc.out') }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-crud-dialog.vue b/src/modules/timesheets/components/shift-crud-dialog.vue
deleted file mode 100644
index b85f6c5..0000000
--- a/src/modules/timesheets/components/shift-crud-dialog.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{
+ getHoursMinutesStringFromHoursFloat(timesheet.weekly_hours.regular +
+ timesheet.weekly_hours.evening +
+ timesheet.weekly_hours.emergency +
+ timesheet.weekly_hours.overtime)
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{ date_iso }}
-
-
-
-
- {{
- mode === 'create'
- ? $t('timesheet.shift.actions.add')
- : mode === 'update'
- ? $t('timesheet.shift.actions.edit')
- : $t('timesheet.shift.actions.delete')
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('timesheet.shift.actions.delete_confirmation_msg') }}
-
-
-
- {{ errorBanner }}
-
-
-
-
- Conflits :
- -
-
- - {{ c.start_time }}–{{ c.end_time }} ({{ c.type }}) - -
-
-
+
+ {{ $d(display_date, { weekday: $q.screen.lt.md ? 'short' : 'long'}) }}
+
+
+ {{ display_date.getDate() }}
+
+
+ {{ $d(display_date, { month: $q.screen.lt.md ? 'short' : 'long' }) }}
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-day-row.vue b/src/modules/timesheets/components/shift-list-day-row.vue
new file mode 100644
index 0000000..67c5f25
--- /dev/null
+++ b/src/modules/timesheets/components/shift-list-day-row.vue
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-day.vue b/src/modules/timesheets/components/shift-list-day.vue
new file mode 100644
index 0000000..8ab3523
--- /dev/null
+++ b/src/modules/timesheets/components/shift-list-day.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+ {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
+ $t('timesheet.shift.types.OFFICE') }}
+
+
+
+
+
+ {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
+ $t('timesheet.shift.types.OFFICE') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t(scope.label) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('shared.misc.in') }}
+
+
+
+
+
+
+ {{ $t('shared.misc.out') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-header.vue b/src/modules/timesheets/components/shift-list-header.vue
deleted file mode 100644
index 780e833..0000000
--- a/src/modules/timesheets/components/shift-list-header.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
+
+
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-row.vue b/src/modules/timesheets/components/shift-list-row.vue
deleted file mode 100644
index b978473..0000000
--- a/src/modules/timesheets/components/shift-list-row.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-weekly-overview.vue b/src/modules/timesheets/components/shift-list-weekly-overview.vue
new file mode 100644
index 0000000..2e66398
--- /dev/null
+++ b/src/modules/timesheets/components/shift-list-weekly-overview.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list.vue b/src/modules/timesheets/components/shift-list.vue
index fc43565..5ba425a 100644
--- a/src/modules/timesheets/components/shift-list.vue
+++ b/src/modules/timesheets/components/shift-list.vue
@@ -1,98 +1,246 @@
-
-
-
-
+
+
+
+
+
+ {{ $t('timesheet.total_hours') }}
+
+
+ {{ getHoursMinutesStringFromHoursFloat(totalHours) }}
+
+
+
+
+ {{ $t('timesheet.total_expenses') }}
+
+
+ {{ totalExpenses }}$
+
+
+
+
+
+ {{ $t('timesheet.vacation_available') }}
+
+
+ {{ Math.floor(vacationHours / 8) }}
+
+
+
+
+ {{ $t('timesheet.sick_available') }}
+
+
+ {{ Math.floor(sickHours / 8) }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
- {{ $d(getDate(day.short_date), { weekday: $q.screen.lt.md ? 'short' : 'long' }) }}
- {{ day.short_date.split('/')[1] }}
- {{ $d(getDate(day.short_date), { month: $q.screen.lt.md ? 'short' : 'long' }) }}
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/timesheets/components/timesheet-error-widget.vue b/src/modules/timesheets/components/timesheet-error-widget.vue
new file mode 100644
index 0000000..d7044cf
--- /dev/null
+++ b/src/modules/timesheets/components/timesheet-error-widget.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $d(extractDate(day.date, 'YYYY-MM-DD'), {
+ weekday: 'long', day: 'numeric', month:
+ 'long'
+ }) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.errors.' + error) }}
+
+
+
+
+
+
+
+
+ {{ $t('timesheet.page_header') }}
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+ {{ $t('shared.error.no_data_found')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('dashboard.useful_links') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/pages/help-page.vue b/src/pages/help-page.vue
index e69de29..4e3de2a 100644
--- a/src/pages/help-page.vue
+++ b/src/pages/help-page.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/login-page.vue b/src/pages/login-page.vue
new file mode 100644
index 0000000..3877f55
--- /dev/null
+++ b/src/pages/login-page.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/profile-page.vue b/src/pages/profile-page.vue
index f98522b..0598b8a 100644
--- a/src/pages/profile-page.vue
+++ b/src/pages/profile-page.vue
@@ -1,22 +1,31 @@
-
-
-
+
\ No newline at end of file
diff --git a/src/pages/supervisor-crew-page.vue b/src/pages/supervisor-crew-page.vue
deleted file mode 100644
index 5fe11a6..0000000
--- a/src/pages/supervisor-crew-page.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/test-page.vue b/src/pages/test-page.vue
deleted file mode 100644
index d62f747..0000000
--- a/src/pages/test-page.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
- Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,
- totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta
- sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia
- consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui
- dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora
- incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum
- exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem
- vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum
- qui
- dolorem eum fugiat quo voluptas nulla pariatur?
-
-
-
- At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum
- deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non
- provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga.
- Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est
- eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas
- assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum
- necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum
- rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut
- perferendis doloribus asperiores repellat.
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
- dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
- ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
- fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia
- deserunt mollit anim id est laborum.
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/timesheet-approval-page.vue b/src/pages/timesheet-approval-page.vue
index 7ef554f..5677750 100644
--- a/src/pages/timesheet-approval-page.vue
+++ b/src/pages/timesheet-approval-page.vue
@@ -1,46 +1,65 @@
-
-
\ No newline at end of file
diff --git a/src/pages/timesheet-page.vue b/src/pages/timesheet-page.vue
index a91997a..38b8180 100644
--- a/src/pages/timesheet-page.vue
+++ b/src/pages/timesheet-page.vue
@@ -1,33 +1,24 @@
-
-
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index c1afbd1..0ddcc7d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,6 +2,8 @@ import { defineRouter } from '#q-app/wrappers';
import { createMemoryHistory, createRouter, createWebHashHistory, createWebHistory, } from 'vue-router';
import routes from './routes';
import { useAuthStore } from 'src/stores/auth-store';
+import { RouteNames } from 'src/router/router-constants';
+import type { UserModuleAccess } from 'src/modules/shared/models/user.models';
/*
* If not building with SSR mode, you can
@@ -13,27 +15,34 @@ import { useAuthStore } from 'src/stores/auth-store';
*/
export default defineRouter(function (/* { store, ssrContext } */) {
- const createHistory = process.env.SERVER
- ? createMemoryHistory
- : (process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory);
+ const createHistory = process.env.SERVER
+ ? createMemoryHistory
+ : (process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory);
- const Router = createRouter({
- scrollBehavior: () => ({ left: 0, top: 0 }),
- routes,
+ const Router = createRouter({
+ scrollBehavior: () => ({ left: 0, top: 0 }),
+ routes,
- // Leave this as is and make changes in quasar.conf.js instead!
- // quasar.conf.js -> build -> vueRouterMode
- // quasar.conf.js -> build -> publicPath
- history: createHistory(process.env.VUE_ROUTER_BASE),
- });
+ // Leave this as is and make changes in quasar.conf.js instead!
+ // quasar.conf.js -> build -> vueRouterMode
+ // quasar.conf.js -> build -> publicPath
+ history: createHistory(process.env.VUE_ROUTER_BASE),
+ });
- Router.beforeEach((destinationPage) => {
- const authStore = useAuthStore();
+ Router.beforeEach(async (destination_page) => {
+ const auth_store = useAuthStore();
+ const result = await auth_store.getProfile() ?? { status: 400, message: 'unknown error occured' };
- if (destinationPage.meta.requiresAuth && !authStore.isAuthorizedUser) {
- return { name: 'login' };
- }
- })
+ if (destination_page.meta.requires_auth && !auth_store.user || (result.status >= 400 && destination_page.name !== RouteNames.LOGIN)) {
+ console.error('no user account found');
+ return { name: 'login' };
+ }
+
+ if (destination_page.meta.required_module && auth_store.user) {
+ if (!auth_store.user.user_module_access.includes(destination_page.meta.required_module as UserModuleAccess))
+ return {name: 'error'};
+ }
+ })
- return Router;
+ return Router;
});
diff --git a/src/router/router-constants.ts b/src/router/router-constants.ts
index b24aa80..2f1bc70 100644
--- a/src/router/router-constants.ts
+++ b/src/router/router-constants.ts
@@ -1,10 +1,12 @@
export enum RouteNames {
- /* eslint-disable */
LOGIN = 'login',
LOGIN_SUCCESS = 'login-success',
- DASHBOARD = 'dashboard',
+ DASHBOARD = '/',
TIMESHEET_APPROVALS = 'timesheet-approvals',
- EMPLOYEE_LIST = 'employee-list',
- PROFILE = 'user/profile',
- TIMESHEET_TEMP = 'timesheet-temp'
+ EMPLOYEE_LIST = 'employees',
+ PROFILE = 'profile',
+ TIMESHEET = 'timesheet',
+ HELP = 'help',
+
+ ERROR = 'error',
}
\ No newline at end of file
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 7a21d96..5cc7111 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -1,60 +1,72 @@
import type { RouteRecordRaw } from 'vue-router';
import { RouteNames } from './router-constants';
+import { ModuleNames } from 'src/modules/shared/models/user.models';
const routes: RouteRecordRaw[] = [
{
- path: '/',
+ path: '/',
component: () => import('src/layouts/main-layout.vue'),
- meta: { requiresAuth: true },
+ meta: { requires_auth: true },
children: [
- {
- path: '',
+ {
+ path: '',
name: RouteNames.DASHBOARD,
- component: () => import('src/pages/test-page.vue'),
+ component: () => import('src/pages/dashboard-page.vue'),
+ meta: { required_module: ModuleNames.DASHBOARD }
},
{
path: 'timesheet-approvals',
name: RouteNames.TIMESHEET_APPROVALS,
component: () => import('src/pages/timesheet-approval-page.vue'),
+ meta: { required_module: ModuleNames.TIMESHEETS_APPROVAL }
},
{
path: 'employees',
name: RouteNames.EMPLOYEE_LIST,
- component: () => import('src/pages/supervisor-crew-page.vue'),
+ component: () => import('src/pages/employee-list-page.vue'),
+ meta: { required_module: ModuleNames.EMPLOYEE_LIST }
},
{
- path: 'timesheet-temp',
- name: RouteNames.TIMESHEET_TEMP,
- component: () => import('src/pages/timesheet-page.vue')
+ path: 'timesheet',
+ name: RouteNames.TIMESHEET,
+ component: () => import('src/pages/timesheet-page.vue'),
+ meta: { required_module: ModuleNames.TIMESHEETS },
},
{
- path: 'user/profile',
+ path: 'profile',
name: RouteNames.PROFILE,
component: () => import('src/pages/profile-page.vue'),
+ meta: { required_module: ModuleNames.PERSONAL_PROFILE },
+ },
+ {
+ path: 'help',
+ name: RouteNames.HELP,
+ component: () => import('src/pages/help-page.vue'),
},
],
},
{
- path: '/v1/login',
+ path: '/v1/login',
name: RouteNames.LOGIN,
- component: () => import('src/modules/auth/pages/auth-login.vue'),
- meta: { requiresAuth: false },
+ component: () => import('src/pages/login-page.vue'),
+ meta: { requires_auth: false },
},
{
- path: '/login-success',
+ path: '/login-success',
name: RouteNames.LOGIN_SUCCESS,
component: () => import('src/modules/auth/pages/auth-login-popup-success.vue'),
- meta: { requiresAuth: false },
+ meta: { requires_auth: false },
},
// Always leave this as last one,
// but you can also remove it
{
path: '/:catchAll(.*)*',
+ name: RouteNames.ERROR,
component: () => import('src/pages/error-page.vue'),
- meta: { requiresAuth: false },
+ meta: { requires_auth: false },
},
];
diff --git a/src/stores/auth-store.ts b/src/stores/auth-store.ts
index 603876f..3eecc6f 100644
--- a/src/stores/auth-store.ts
+++ b/src/stores/auth-store.ts
@@ -1,47 +1,73 @@
-import { computed, ref } from "vue";
+import { ref } from "vue";
+import { Notify } from "quasar";
import { defineStore } from "pinia";
import { AuthService } from "../modules/auth/services/services-auth";
+import { useRouter } from "vue-router";
import type { User } from "src/modules/shared/models/user.models";
-export type CompanyRole = 'guest' | 'supervisor' | 'accounting' | 'human_resources' | 'employee';
+export const useAuthStore = defineStore('auth', () => {
+ const user = ref();
+ const authError = ref("");
+ const router = useRouter();
-const TestUsers: Record = {
- guest: { firstName: 'Unknown', lastName: 'Unknown', email: 'guest@guest.com', role: 'guest' },
- supervisor: { firstName: 'User', lastName: 'Test', email: 'user@targointernet.com', role: 'supervisor' },
- accounting: { firstName: 'Robin', lastName: 'Clark', email: 'user5@example.test', role: 'supervisor' },
- human_resources: { firstName: 'Robin', lastName: 'Clark', email: 'user5@example.test', role: 'supervisor' },
- employee: { firstName: 'Robin', lastName: 'Clark', email: 'user5@example.test', role: 'supervisor' },
-}
+ const login = () => {
+ //TODO: manage customer login process
+ };
-export const useAuthStore = defineStore('auth', () => {
- const user = ref(TestUsers.guest);
- const authError = ref("");
- const isAuthorizedUser = computed(() => user.value.role !== 'guest');
+ const oidcLogin = () => {
+ window.addEventListener('message', (event) => {
+ void handleAuthMessage(event);
+ });
- const login = () => {
- //TODO: manage customer login process
- };
+ const oidc_popup = window.open(`${import.meta.env.VITE_TARGO_BACKEND_URL}auth/v1/login`, 'authPopup', 'width=600,height=800');
- const oidcLogin = () => {
- const oidcPopup = AuthService.oidcLogin();
- if (!oidcPopup) {
- authError.value = "You have popups blocked on this website!";
+ if (!oidc_popup)
+ Notify.create({
+ message: "You have popups blocked on this website!",
+ color: 'negative',
+ textColor: 'white',
+ });
+ };
+
+ const logout = () => {
+ user.value = undefined;
+ };
+
+ const handleAuthMessage = async (event: MessageEvent) => {
+ if (event.data.type === 'authSuccess') {
+ try {
+ await getProfile();
+ await router.push('/');
+ } catch (error) {
+ console.error('failed to login: ', error);
+ }
+ } else {
+ Notify.create({
+ message: "You have popups blocked on this website!",
+ color: 'negative',
+ textColor: 'white',
+ });
+ }
+ };
+
+ const getProfile = async (): Promise<{ status: number, message: string }> => {
+ try {
+ const new_user = await AuthService.getProfile();
+ user.value = new_user;
+ return { status: 200, message: 'profile retrieved successfully' };
+ } catch (error) {
+ console.error('error while retrieving profile: ', error);
+ }
+ return { status: 400, message: 'unknown error occured' };
}
- };
- const logout = () => {
- user.value = TestUsers.guest;
- };
-
- const setUser = (bypassRole: string) => {
- if (bypassRole in TestUsers) {
- user.value = TestUsers[bypassRole as CompanyRole];
- }
- else {
- user.value = TestUsers.guest;
- }
- };
-
- return { user, authError, isAuthorizedUser, login, oidcLogin, logout, setUser };
+ return {
+ user,
+ authError,
+ login,
+ oidcLogin,
+ logout,
+ getProfile
+ };
});
diff --git a/src/stores/employee-store.ts b/src/stores/employee-store.ts
index 1010364..7a243f9 100644
--- a/src/stores/employee-store.ts
+++ b/src/stores/employee-store.ts
@@ -1,41 +1,102 @@
+/* eslint-disable */
import { ref } from "vue";
import { defineStore } from "pinia";
-import { EmployeeListService } from "src/modules/employee-list/services/services-employee-list";
-import { default_employee_profile, type EmployeeProfile } from "src/modules/employee-list/types/employee-profile-interface";
-import type { EmployeeListTableItem } from "src/modules/employee-list/types/employee-list-table-interface";
+import { EmployeeListService } from "src/modules/employee-list/services/employee-list-service";
+import { EmployeeProfile } from "src/modules/employee-list/models/employee-profile.models";
+import { Notify } from "quasar";
-export const useEmployeeStore = defineStore('employee', () => {
- const employee = ref( default_employee_profile );
- const employeeList = ref([]);
- const isShowingEmployeeAddModifyWindow = ref(false);
- const isLoadingEmployeeProfile = ref(false);
- const isLoadingEmployeeList = ref(false);
+export const useEmployeeStore = defineStore('employee', () => {
+ const employee = ref(new EmployeeProfile);
+ const employee_list = ref([]);
+ const is_add_modify_dialog_open = ref(false);
+ const management_mode = ref<'modify_employee' | 'add_employee'>('add_employee');
+ const is_loading = ref(false);
- const getEmployeeList = async () => {
- isLoadingEmployeeList.value = true;
- try {
- const response = await EmployeeListService.getEmployeeList();
- employeeList.value = response;
- } catch (error) {
- console.error("Ran into an error fetching employee list: ", error);
- //TODO: trigger an alert window with an error message here!
+ const openAddModifyDialog = async (employee_email?: string) => {
+
+ if (employee_email === undefined) {
+ management_mode.value = 'add_employee'
+ employee.value = new EmployeeProfile();
+ is_add_modify_dialog_open.value = true;
+ return;
}
- isLoadingEmployeeList.value = false;
+
+ is_loading.value = true;
+ management_mode.value = 'modify_employee';
+ await getEmployeeDetails(employee_email);
+ is_loading.value = false;
+ is_add_modify_dialog_open.value = true;
+ }
+
+ const closeAddModifyDialog = () => {
+ is_add_modify_dialog_open.value = false;
+ management_mode.value = 'add_employee';
+ employee.value = new EmployeeProfile;
};
- const getEmployeeDetails = async (email: string) => {
- isLoadingEmployeeProfile.value = true;
+ const getEmployeeList = async (): Promise => {
try {
- const response = await EmployeeListService.getEmployeeDetails(email);
- employee.value = response;
+ const response = await EmployeeListService.getEmployeeList();
+ if (response.success && response.data) employee_list.value = response.data;
+ return response.success;
+ } catch (error) {
+ console.error("Ran into an error fetching employee list: ", error);
+ return false;
+ }
+ };
+
+ const getEmployeeDetails = async (email?: string): Promise => {
+ try {
+ if (email === undefined) {
+ const response = await EmployeeListService.getEmployeeDetails();
+ if (response.success && response.data) employee.value = response.data;
+ return response.success;
+ } else {
+ const response = await EmployeeListService.getEmployeeDetailsWithEmployeeEmail(email);
+ if (response.success && response.data) employee.value = response.data;
+ return response.success;
+ }
} catch (error) {
console.error('There was an error retrieving employee info: ', error);
//TODO: trigger an alert window with an error message here!
}
- isLoadingEmployeeProfile.value = false;
+
+ return false;
};
- return { employee, employeeList, isShowingEmployeeAddModifyWindow, isLoadingEmployeeList, isLoadingEmployeeProfile, getEmployeeList, getEmployeeDetails };
+ const createOrUpdateEmployee = async (profile: EmployeeProfile) => {
+ let response;
+
+ if (management_mode.value === 'add_employee') {
+ const { birth_date, last_work_day, ...create_payload} = profile;
+ response = await EmployeeListService.createNewEmployee(create_payload);
+ } else {
+
+ response = await EmployeeListService.updateEmployee(profile);
+ }
+
+ closeAddModifyDialog();
+
+ if (response.success) await getEmployeeList();
+ else {
+ Notify.create({
+ message: 'failed to update or create employee',
+ color: 'negative',
+ })}
+ };
+
+ return {
+ employee,
+ employee_list,
+ is_add_modify_dialog_open,
+ management_mode,
+ is_loading,
+ getEmployeeList,
+ getEmployeeDetails,
+ openAddModifyDialog,
+ closeAddModifyDialog,
+ createOrUpdateEmployee,
+ };
});
diff --git a/src/stores/expense-store.ts b/src/stores/expense-store.ts
index b9bbfbd..1fdcf5c 100644
--- a/src/stores/expense-store.ts
+++ b/src/stores/expense-store.ts
@@ -1,109 +1,66 @@
+import { date } from "quasar";
import { computed, ref } from "vue";
import { defineStore } from "pinia";
import { useTimesheetStore } from "src/stores/timesheet-store";
-import { default_expense, default_pay_period_expenses, type UpsertExpense, type Expense, type PayPeriodExpenses } from "src/modules/timesheets/models/expense.models";
-import { timesheetService } from "src/modules/timesheets/services/timesheet-service";
-import { ExpensesApiError, type GenericApiError } from "src/modules/timesheets/models/expense.validation";
-import { computeExpenseTotals } from "src/modules/timesheets/utils/expense.util";
-import type { UpsertAction } from "src/modules/timesheets/models/shift.models";
-
-
+import { Expense } from "src/modules/timesheets/models/expense.models";
+import { ExpenseService } from "src/modules/timesheets/services/expense-service";
export const useExpensesStore = defineStore('expenses', () => {
const timesheet_store = useTimesheetStore();
const is_open = ref(false);
const is_loading = ref(false);
- const mode = ref('create');
- const pay_period_expenses = ref(default_pay_period_expenses);
- const pay_period_expenses_totals = computed(() => computeExpenseTotals(pay_period_expenses.value.expenses))
- const current_expense = ref(default_expense);
- const initial_expense = ref(default_expense);
- const error = ref(null);
+ const is_showing_create_form = ref(false);
+ const mode = ref<'create' | 'update' | 'delete'>('create');
+ const current_expense = ref(new Expense(date.formatDate(new Date(), 'YYYY-MM-DD')));
+ const initial_expense = ref(new Expense(date.formatDate(new Date(), 'YYYY-MM-DD')));
+ const is_save_disabled = computed(() => JSON.stringify(current_expense.value) === JSON.stringify(initial_expense.value))
- // const setErrorFrom = (err: unknown) => {
- // const e = err as any;
- // error.value = e?.message || 'Unknown error';
- // };
-
- const open = async (employee_email: string): Promise => {
+ const open = (): void => {
is_open.value = true;
- is_loading.value = true;
- error.value = null;
- current_expense.value = default_expense;
- initial_expense.value = default_expense;
-
- await getPayPeriodExpensesByEmployeeEmail(employee_email);
- is_loading.value = false;
+ is_showing_create_form.value = false;
+ if (timesheet_store.pay_period !== undefined) {
+ current_expense.value = new Expense(date.formatDate(new Date(), 'YYYY-MM-DD'));
+ initial_expense.value = new Expense(date.formatDate(new Date(), 'YYYY-MM-DD'));
+ }
+ mode.value = 'create';
}
const close = () => {
- error.value = null;
is_open.value = false;
+ is_showing_create_form.value = false;
};
- const getPayPeriodExpensesByEmployeeEmail = async (employee_email: string): Promise => {
- is_loading.value = true;
- error.value = null;
-
+ const upsertExpense = async (expense: Expense, email?: string): Promise => {
try {
- const expenses = await timesheetService.getExpensesByPayPeriodAndEmployeeEmail(
- encodeURIComponent(employee_email),
- encodeURIComponent(timesheet_store.pay_period.pay_year),
- encodeURIComponent(timesheet_store.pay_period.pay_period_no),
- );
- pay_period_expenses.value = expenses;
- } catch (err: unknown) {
- if (typeof err === 'object') {
- const error = err as GenericApiError;
- const status_code: number = error.status_code ?? 500;
- // const data = error.context ?? '';
- // error.value = data.message || data.error || err.message;
-
- throw new ExpensesApiError({
- status_code,
- // error_code: data.error_code,
- // message: data.message || data.error || err.message,
- // context: data.context,
- });
+ if (expense.id < 0) {
+ const data = await ExpenseService.createExpense(expense);
+ return data.success;
}
-
- } finally {
- is_loading.value = false;
- }
- };
-
- const upsertOrDeleteExpensesByEmployeeEmail = async (employee_email: string, date: string, expense: UpsertExpense): Promise => {
- is_loading.value = true;
- error.value = null;
-
- try {
- const updated_expenses = await timesheetService.upsertOrDeleteExpensesByPayPeriodAndEmployeeEmail(
- encodeURIComponent(employee_email),
- encodeURIComponent(date),
- expense,
- );
- console.log('updated expenses received: ', updated_expenses)
- pay_period_expenses.value.expenses = updated_expenses;
+ const data = await ExpenseService.updateExpense(expense, email);
+ return data.success;
} catch (err) {
// setErrorFrom(err);
- console.log('error doing some expense thing: ', err)
- } finally {
- is_loading.value = false;
+ console.error(err);
+ return false;
}
};
+ const deleteExpenseById = async (expense_id: number): Promise => {
+ const data = await ExpenseService.deleteExpenseById(expense_id);
+ return data.success;
+ }
+
return {
is_open,
is_loading,
+ is_showing_create_form,
mode,
- pay_period_expenses,
- pay_period_expenses_totals,
current_expense,
initial_expense,
- error,
+ is_save_disabled,
open,
- getPayPeriodExpensesByEmployeeEmail,
- upsertOrDeleteExpensesByEmployeeEmail,
+ upsertExpense,
+ deleteExpenseById,
close,
};
});
\ No newline at end of file
diff --git a/src/stores/help-store.ts b/src/stores/help-store.ts
new file mode 100644
index 0000000..df89732
--- /dev/null
+++ b/src/stores/help-store.ts
@@ -0,0 +1,37 @@
+import { defineStore } from "pinia";
+import { ref } from "vue";
+import { help_module_details } from "src/modules/help/models/help-module.model";
+import { useAuthStore } from "src/stores/auth-store";
+import type { HelpModuleOptions } from "src/modules/help/models/help-module.model";
+import type { UserModuleAccess } from "src/modules/shared/models/user.models";
+
+
+
+export const useHelpStore = defineStore('help', () => {
+ const is_loading = ref(false);
+ const user_modules = ref>();
+ const auth_store = useAuthStore();
+
+ const getFilteredModule = () => {
+ if(!auth_store.user) return;
+
+ const entries = auth_store.user.user_module_access
+ .map((key) => {
+ const options = help_module_details[key];
+ return options ? ([key, options] as const) : null;
+ })
+ .filter(
+ (entry): entry is readonly [UserModuleAccess, HelpModuleOptions[]] =>
+ entry !== null
+ );
+
+ user_modules.value = Object.fromEntries(entries) as Record;
+ }
+
+ return {
+ is_loading,
+ user_modules,
+ help_module_details,
+ getFilteredModule,
+ };
+});
\ No newline at end of file
diff --git a/src/stores/schedule-presets.store.ts b/src/stores/schedule-presets.store.ts
new file mode 100644
index 0000000..d924f16
--- /dev/null
+++ b/src/stores/schedule-presets.store.ts
@@ -0,0 +1,93 @@
+import { ref } from "vue";
+import { defineStore } from "pinia";
+import { SchedulePresetsService } from "src/modules/employee-list/services/schedule-presets-service";
+import { type PresetManagerMode, SchedulePreset, SchedulePresetFrontend } from "src/modules/employee-list/models/schedule-presets.models";
+
+
+export const useSchedulePresetsStore = defineStore('schedule_presets_store', () => {
+ const schedule_presets = ref([new SchedulePreset]);
+ const current_schedule_preset = ref(new SchedulePresetFrontend);
+ const schedule_preset_dialog_mode = ref('create');
+ const is_manager_open = ref(false);
+
+ const openSchedulePresetManager = (preset_id: number) => {
+ if (preset_id === -1)
+ current_schedule_preset.value = new SchedulePresetFrontend;
+ else if (schedule_preset_dialog_mode.value === 'copy') {
+ const preset = schedule_presets.value.find(preset => preset.id === preset_id)!;
+ const copied_preset = new SchedulePresetFrontend(preset);
+ copied_preset.id = -1;
+ copied_preset.name = "";
+ current_schedule_preset.value = copied_preset;
+ }
+ else
+ setCurrentSchedulePreset(preset_id);
+
+ is_manager_open.value = true;
+ };
+
+ const setCurrentSchedulePreset = (preset_id: number) => {
+ if (preset_id === -1) {
+ current_schedule_preset.value = new SchedulePresetFrontend;
+ return;
+ }
+ current_schedule_preset.value = new SchedulePresetFrontend(schedule_presets.value.find(preset => preset.id === preset_id))
+ };
+
+ const createSchedulePreset = async (preset: SchedulePreset): Promise => {
+ try {
+ const response = await SchedulePresetsService.createSchedulePresets(preset);
+ return response.success;
+ } catch (error) {
+ console.error('DEV ERROR || error while creating schedule preset: ', error);
+ return false;
+ }
+ };
+
+ const updateSchedulePreset = async (preset: SchedulePreset): Promise => {
+ try {
+ const response = await SchedulePresetsService.updateSchedulePresets(preset);
+ return response.success;
+ } catch (error) {
+ console.error('DEV ERROR || error while updating schedule preset: ', error);
+ return false;
+ }
+
+ };
+
+ const deleteSchedulePreset = async (preset_id: number): Promise => {
+ try {
+ const response = await SchedulePresetsService.deleteSchedulePresets(preset_id);
+ return response.success;
+ } catch (error) {
+ console.error('DEV ERROR || error while deleting schedule preset: ', error);
+ return false;
+ }
+ };
+
+ const findSchedulePresetList = async (): Promise => {
+ try {
+ const response = await SchedulePresetsService.getSchedulePresetsList();
+ if (response.success && response.data) schedule_presets.value = response.data;
+
+ return response.success;
+ } catch (error) {
+ console.error('DEV ERROR || error while searching for schedule presets: ', error);
+
+ return false
+ }
+ };
+
+ return {
+ schedule_presets,
+ current_schedule_preset,
+ schedule_preset_dialog_mode,
+ is_manager_open,
+ setCurrentSchedulePreset,
+ openSchedulePresetManager,
+ createSchedulePreset,
+ updateSchedulePreset,
+ deleteSchedulePreset,
+ findSchedulePresetList,
+ }
+})
\ No newline at end of file
diff --git a/src/stores/shift-store.ts b/src/stores/shift-store.ts
index 1dac9be..abcd25f 100644
--- a/src/stores/shift-store.ts
+++ b/src/stores/shift-store.ts
@@ -1,80 +1,71 @@
-import { ref } from "vue";
-import { defineStore } from "pinia";
-import { unwrapAndClone } from "src/utils/unwrap-and-clone";
-import { timesheetService } from "src/modules/timesheets/services/timesheet-service";
-import { useTimesheetStore } from "src/stores/timesheet-store";
-import { default_shift, type UpsertAction, type Shift, type UpsertShift } from "src/modules/timesheets/models/shift.models";
-
-export const useShiftStore = defineStore('shift', () => {
- const is_open = ref(false);
- const mode = ref('create');
- const date_iso = ref('');
- const current_shift = ref(default_shift);
- const initial_shift = ref(default_shift);
-
- const timesheet_store = useTimesheetStore();
-
- const open = (next_mode: UpsertAction, date: string, current: Shift, initial: Shift) => {
- mode.value = next_mode;
- date_iso.value = date;
- current_shift.value = current; // new shift
- initial_shift.value = initial; // old shift
- is_open.value = true;
- };
-
- const openCreate = (date: string) => {
- open('create', date, default_shift, default_shift);
- };
-
- const openUpdate = (date: string, shift: Shift) => {
- open('update', date, shift, unwrapAndClone(shift));
- };
-
- const openDelete = (date: string, shift: Shift) => {
- open('delete', date, default_shift, shift);
- }
-
- const close = () => {
- is_open.value = false;
- mode.value = 'create';
- date_iso.value = '';
- current_shift.value = default_shift;
- initial_shift.value = default_shift;
- };
-
- const upsertOrDeleteShiftByEmployeeEmail = async (employee_email: string, upsert_shift: UpsertShift) => {
- const encoded_email = encodeURIComponent(employee_email);
- const encoded_date = encodeURIComponent(current_shift.value.date);
-
- try {
- const result = await timesheetService.upsertOrDeleteShiftsByDateAndEmployeeEmail(encoded_email, [ upsert_shift, ], encoded_date);
- timesheet_store.pay_period_details = result;
- } catch (err) {
- console.log('error doing thing: ', err)
- // const status_code: number = err?.response?.status ?? 500;
- // const data = err?.response?.data ?? {};
- // throw new GenericApiError({
- // status_code,
- // error_code: data.error_code,
- // message: data.message || data.error || err.message,
- // context: data.context,
- // });
- } finally {
- close();
- }
- }
-
-
- return {
- is_open,
- mode,
- date_iso,
- current_shift,
- initial_shift,
- openCreate,
- openUpdate,
- openDelete,
- close,
- upsertOrDeleteShiftByEmployeeEmail,
- };
+/* eslint-disable */
+import { ref } from "vue";
+import { Notify } from "quasar";
+import { defineStore } from "pinia";
+import { ShiftService } from "src/modules/timesheets/services/shift-service";
+import { useTimesheetStore } from "src/stores/timesheet-store";
+
+export const useShiftStore = defineStore('shift_store', () => {
+ const timesheet_store = useTimesheetStore();
+ const shift_errors = ref([]);
+
+ const deleteShiftById = async (shift_id: number): Promise => {
+ try {
+ await ShiftService.deleteShiftById(shift_id);
+ return true;
+ } catch (error) {
+ console.error('DEV ERROR || error while deleting shift: ', error);
+ return false;
+ }
+ };
+
+ const createNewShifts = async (): Promise => {
+ if (timesheet_store.timesheets === undefined) return false;
+
+ try {
+ const days = timesheet_store.timesheets.flatMap(week => week.days);
+ const new_shifts = days.flatMap(day => day.shifts).filter(shift => shift.id < 0);
+
+ if (new_shifts?.length > 0) {
+ const response = await ShiftService.createNewShifts(new_shifts);
+ if (response.success) {
+ return true;
+ }
+ else { shift_errors.value.push(response.error!) }
+ }
+ return false;
+ } catch (error) {
+ Notify.create('Error creating new shifts');
+ return false;
+ }
+ };
+
+ const updateShifts = async (): Promise => {
+ if (timesheet_store.timesheets === undefined) return false;
+
+ try {
+ const existing_shifts = timesheet_store.timesheets.flatMap(week => week.days).flatMap(day => day.shifts).filter(shift => shift.id > 0);
+
+ if (existing_shifts?.length > 0) {
+ const response = await ShiftService.updateShifts(existing_shifts);
+
+ if (response.success) {
+ return true;
+ }
+ }
+
+ Notify.create('No shifts to update')
+ return false;
+ } catch (error) {
+ Notify.create('Error updating shifts');
+ return false;
+ }
+ }
+
+ return {
+ shift_errors,
+ deleteShiftById,
+ createNewShifts,
+ updateShifts,
+ }
})
\ No newline at end of file
diff --git a/src/stores/timesheet-store.ts b/src/stores/timesheet-store.ts
index b93a33d..64d9bad 100644
--- a/src/stores/timesheet-store.ts
+++ b/src/stores/timesheet-store.ts
@@ -1,118 +1,190 @@
-import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
-import { withLoading } from 'src/utils/store-helpers';
+import { defineStore } from 'pinia';
+import { unwrapAndClone } from 'src/utils/unwrap-and-clone';
import { timesheetApprovalService } from 'src/modules/timesheet-approval/services/timesheet-approval-service';
import { timesheetService } from 'src/modules/timesheets/services/timesheet-service';
-import { default_pay_period_overview, type PayPeriodOverview } from "src/modules/timesheet-approval/models/pay-period-overview.models";
-import { default_pay_period, type PayPeriod } from 'src/modules/shared/models/pay-period.models';
-import { default_pay_period_details, type PayPeriodDetails } from 'src/modules/timesheets/models/pay-period-details.models';
+import type { PayPeriodOverviewResponse, TimesheetApprovalOverview } from "src/modules/timesheet-approval/models/timesheet-overview.models";
+import type { PayPeriod } from 'src/modules/shared/models/pay-period.models';
+import type { Timesheet } from 'src/modules/timesheets/models/timesheet.models';
import type { TimesheetApprovalCSVReportFilters } from 'src/modules/timesheet-approval/models/timesheet-approval-csv-report.models';
+
export const useTimesheetStore = defineStore('timesheet', () => {
const is_loading = ref(false);
- const pay_period = ref(default_pay_period);
- const pay_period_overviews = ref([default_pay_period_overview,]);
- const current_pay_period_overview = ref(default_pay_period_overview);
- const pay_period_details = ref(default_pay_period_details);
+ const pay_period = ref();
+ const timesheets = ref([]);
+ const all_current_shifts = computed(() => timesheets.value.flatMap(week => week.days.flatMap(day => day.shifts)) ?? []);
+ const initial_timesheets = ref([]);
+
+ const pay_period_overviews = ref([]);
+ const pay_period_infos = ref();
+ const is_report_dialog_open = ref(false);
+
+ const is_details_dialog_open = ref(false);
+ const selected_employee_name = ref();
+ const has_timesheet_preset = ref(false);
+ const current_pay_period_overview = ref();
const pay_period_report = ref();
- const is_calendar_limit = computed(() =>
- pay_period.value.pay_year === 2024 &&
- pay_period.value.pay_period_no <= 1
- );
- const getPayPeriodByDateOrYearAndNumber = async (date_or_year: string | number, period_number?: number): Promise => {
- is_loading.value = true;
+ const getNextOrPreviousPayPeriod = (direction: number) => {
+ if (!pay_period.value) return;
+ pay_period.value.pay_period_no += direction;
+
+ if (pay_period.value.pay_period_no > 26) {
+ pay_period.value.pay_period_no = 1;
+ pay_period.value.pay_year += direction;
+ }
+
+ if (pay_period.value.pay_period_no < 1) {
+ pay_period.value.pay_period_no = 26;
+ pay_period.value.pay_year += direction;
+ }
+ };
+
+ const getPayPeriodByDateOrYearAndNumber = async (date?: string): Promise => {
try {
- if (typeof date_or_year === 'string') {
- pay_period.value = await timesheetService.getPayPeriodByDate(date_or_year);
- }
- else if (typeof date_or_year === 'number' && period_number) {
- pay_period.value = await timesheetService.getPayPeriodByYearAndPeriodNumber(date_or_year, period_number);
- }
- else pay_period.value = default_pay_period;
- is_loading.value = false;
+ if (date !== undefined) {
+ pay_period.value = await timesheetService.getPayPeriodByDate(date);
+ } else if (pay_period.value !== undefined) {
+ pay_period.value = await timesheetService.getPayPeriodByYearAndPeriodNumber(pay_period.value.pay_year, pay_period.value.pay_period_no);
+ } else return false;
return true;
} catch (error) {
console.error('Could not get current pay period: ', error);
- pay_period.value = default_pay_period;
- pay_period_overviews.value = [default_pay_period_overview,];
+ pay_period.value = undefined;
+ pay_period_overviews.value = [];
//TODO: More in-depth error-handling here
- is_loading.value = false;
return false;
}
};
- const getPayPeriodOverviewsBySupervisorEmail = async (pay_year: number, period_number: number, supervisor_email: string): Promise => {
+ const getTimesheetOverviews = async (): Promise => {
is_loading.value = true;
try {
- const response = await timesheetApprovalService.getPayPeriodOverviewsBySupervisorEmail(pay_year, period_number, supervisor_email);
+ if (pay_period.value === undefined) {
+ is_loading.value = false;
+ return false;
+ }
+
+ const response = await timesheetApprovalService.getPayPeriodOverviews(pay_period.value.pay_year, pay_period.value.pay_period_no);
pay_period_overviews.value = response.employees_overview;
is_loading.value = false;
return true;
} catch (error) {
console.error('There was an error retrieving Employee Pay Period overviews: ', error);
- pay_period_overviews.value = [default_pay_period_overview,];
+ pay_period_overviews.value = [];
// TODO: More in-depth error-handling here
is_loading.value = false;
-
+
return false;
}
};
- const getPayPeriodDetailsByEmployeeEmail = async (employee_email: string) => {
+ const getTimesheetsByOptionalEmployeeEmail = async (employee_email?: string): Promise => {
+ if (pay_period.value === undefined) return false;
is_loading.value = true;
+ let response;
+
try {
- const response = await timesheetService.getPayPeriodDetailsByPayPeriodAndEmployeeEmail(
- pay_period.value.pay_year,
- pay_period.value.pay_period_no,
- employee_email
- );
- pay_period_details.value = response;
- console.log('pay period details: ', response, pay_period_details.value.employee_full_name)
+ if (employee_email) {
+ response = await timesheetService.getTimesheetsByPayPeriodAndOptionalEmail(pay_period.value.pay_year, pay_period.value.pay_period_no, employee_email);
+ } else {
+ response = await timesheetService.getTimesheetsByPayPeriodAndOptionalEmail(pay_period.value.pay_year, pay_period.value.pay_period_no);
+ }
+
+ if (response.success && response.data) {
+ has_timesheet_preset.value = response.data.has_preset_schedule;
+ selected_employee_name.value = response.data.employee_fullname;
+ timesheets.value = response.data.timesheets;
+ initial_timesheets.value = unwrapAndClone(timesheets.value);
+ } else {
+ selected_employee_name.value = '';
+ timesheets.value = [];
+ initial_timesheets.value = [];
+ }
+
is_loading.value = false;
+ return response.success;
} catch (error) {
console.error('There was an error retrieving timesheet details for this employee: ', error);
// TODO: More in-depth error-handling here
- pay_period_details.value = default_pay_period_details;
+ timesheets.value = [];
is_loading.value = false;
- }
+ return false;
+ }
};
- const getPayPeriodReportByYearAndPeriodNumber = async (year: number, period_number: number, report_filters?: TimesheetApprovalCSVReportFilters) => {
- return withLoading(is_loading.value, async () => {
- try {
- const response = await timesheetApprovalService.getPayPeriodReportByYearAndPeriodNumber(
- year,
- period_number,
- report_filters
- );
- pay_period_report.value = response;
+ const toggleTimesheetsApprovalByEmployeeEmail = async (email: string, approval_status: boolean): Promise => {
+ try {
+ const timesheet_ids = timesheets.value.map(timesheet => timesheet.timesheet_id);
+
+ // Backend returns the amount of shifts and expenses successfully updated, could be useful for error handling???
+ // const shift_expense_count = timesheets.value.reduce((timesheets_sum, timesheet) => {
+ // return timesheets_sum + timesheet.days.reduce((day_sum, day) => {
+ // return day_sum + day.shifts.length + day.expenses.length
+ // }, 0);
+ // }, 0);
- return true;
- } catch (error) {
- console.error('There was an error retrieving the report CSV: ', error);
- // TODO: More in-depth error-handling here
- }
+ const response = await timesheetApprovalService.updateTimesheetsApprovalStatus(email, timesheet_ids, approval_status);
+ return response.success;
+ } catch (error) {
+ console.error("couldn't approve timesheets for employee: ", error);
+ }
- return false;
- });
+ return false;
+ };
+
+ const getPayPeriodReport = async (report_filters: TimesheetApprovalCSVReportFilters) => {
+ try {
+ if (!pay_period.value) return false;
+ const response = await timesheetApprovalService.getPayPeriodReportByYearAndPeriodNumber(pay_period.value.pay_year, pay_period.value.pay_period_no, report_filters);
+ pay_period_report.value = response;
+ return response.data;
+ } catch (error) {
+ console.error('There was an error retrieving the report CSV: ', error);
+ // TODO: More in-depth error-handling here
+ }
+
+ return false;
+ };
+
+ const openReportDialog = () => {
+ is_report_dialog_open.value = true;
+ is_loading.value = true;
+
+
+ is_loading.value = false;
+ };
+
+ const closeReportDialog = () => {
+ is_report_dialog_open.value = false;
};
return {
is_loading,
- is_calendar_limit,
+ is_report_dialog_open,
+ is_details_dialog_open,
pay_period,
pay_period_overviews,
current_pay_period_overview,
- pay_period_details,
+ pay_period_infos,
+ selected_employee_name,
+ has_timesheet_preset,
+ timesheets,
+ all_current_shifts,
+ initial_timesheets,
+ getNextOrPreviousPayPeriod,
getPayPeriodByDateOrYearAndNumber,
- getPayPeriodOverviewsBySupervisorEmail,
- getPayPeriodDetailsByEmployeeEmail,
- getPayPeriodReportByYearAndPeriodNumber,
+ getTimesheetOverviews,
+ getTimesheetsByOptionalEmployeeEmail,
+ toggleTimesheetsApprovalByEmployeeEmail,
+ getPayPeriodReport,
+ openReportDialog,
+ closeReportDialog,
};
});
\ No newline at end of file
diff --git a/src/stores/ui-store.ts b/src/stores/ui-store.ts
index a47561a..96e75e2 100644
--- a/src/stores/ui-store.ts
+++ b/src/stores/ui-store.ts
@@ -1,12 +1,83 @@
+import { useI18n } from 'vue-i18n';
import { defineStore } from 'pinia';
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
+import { LocalStorage, useQuasar, Dark } from 'quasar';
+import { Preferences } from 'src/modules/profile/models/preferences.models';
+import { ProfileService } from 'src/modules/profile/services/profile-service';
+import { RouteNames } from 'src/router/router-constants';
+
export const useUiStore = defineStore('ui', () => {
- const isRightDrawerOpen = ref(true);
-
+ const q = useQuasar();
+ const { locale } = useI18n();
+ const is_left_drawer_open = ref(true);
+ const focus_next_component = ref(false);
+ const is_mobile_mode = computed(() => q.screen.lt.md);
+ const user_preferences = ref(new Preferences);
+ const current_page = ref(RouteNames.DASHBOARD);
+
+
const toggleRightDrawer = () => {
- isRightDrawerOpen.value = !isRightDrawerOpen.value;
+ is_left_drawer_open.value = !is_left_drawer_open.value;
+ };
+
+ const getUserPreferences = async () => {
+ try {
+ const local_user_preferences = LocalStorage.getItem('user_preferences');
+
+ if (local_user_preferences !== null) {
+ if (local_user_preferences.id !== -1) {
+ Object.assign(user_preferences.value, local_user_preferences);
+ setPreferences();
+ return;
+ }
+ }
+
+ const response = await ProfileService.getUserPreferences();
+
+ if (response.success && response.data) {
+ LocalStorage.setItem('user_preferences', response.data);
+ Object.assign(user_preferences.value, response.data);
+ setPreferences();
+ }
+ } catch (error) {
+ user_preferences.value = new Preferences;
+ console.error('Could not retrieve user preferences: ', error);
+ }
+ };
+
+ const updateUserPreferences = async () => {
+ try {
+ if (user_preferences.value.id === -1) return;
+
+ const response = await ProfileService.updateUserPreferences(user_preferences.value);
+ if (response.success && response.data) {
+ Object.assign(user_preferences.value, response.data);
+ LocalStorage.setItem('user_preferences', response.data);
+ setPreferences();
+ return;
+ }
+ } catch (error) {
+ console.error('Could not update user preferences: ', error);
+ }
+ };
+
+ const setPreferences = () => {
+ if (user_preferences.value !== undefined) {
+ // if user_preferences.value.is_dark_mode === null
+ Dark.set(user_preferences.value.is_dark_mode ?? "auto");
+ locale.value = user_preferences.value.display_language;
+ }
}
- return { isRightDrawerOpen, toggleRightDrawer };
+ return {
+ current_page,
+ is_mobile_mode,
+ focus_next_component,
+ is_left_drawer_open,
+ user_preferences,
+ toggleRightDrawer,
+ getUserPreferences,
+ updateUserPreferences,
+ };
});
diff --git a/src/utils/boolean-utils.ts b/src/utils/boolean-utils.ts
new file mode 100644
index 0000000..8335e2c
--- /dev/null
+++ b/src/utils/boolean-utils.ts
@@ -0,0 +1,25 @@
+// export const createDefaultBooleanValue = (keys_list: PropertyKey[]): Record =>
+// keys_list.reduce((acc, mod) => {
+// acc[mod] = false;
+// return acc;
+// }, {} as Record);
+
+
+// export const toBooleanFromKeys = (keys_list: PropertyKey[], arr?: readonly PropertyKey[] | null): Record => {
+// const result = createDefaultBooleanValue(keys_list);
+// if (!arr || !Array.isArray(arr)) return result;
+// for (const item of arr) {
+// if (typeof item !== 'string') continue;
+// const trimmed = item.trim();
+// if ((keys_list as readonly PropertyKey[]).includes(trimmed)) {
+// result[trimmed as T] = true;
+// }
+// }
+// return result;
+// }
+
+export const toKeysFromBoolean = (boolean_values: Record): T[] => {
+ const values_array = Object.entries(boolean_values);
+ const values = values_array.filter(([_key, value]) => value === true);
+ return values.map(([key]) => key as T);
+}
\ No newline at end of file
diff --git a/src/utils/date-and-time-utils.ts b/src/utils/date-and-time-utils.ts
index 5ce223e..3360f77 100644
--- a/src/utils/date-and-time-utils.ts
+++ b/src/utils/date-and-time-utils.ts
@@ -3,14 +3,25 @@ import { date } from 'quasar';
const anchor_date: Date = new Date('2023-12-17');
export const getCurrentPayPeriod = (today = new Date()): number => {
- const period_length = 14; // days
- const periods_per_year = 26;
+ const period_length = 14; // days
+ const periods_per_year = 26;
- const days_since_anchor = date.getDateDiff(today, anchor_date, 'days');
- const periods_since_anchor = Math.floor(days_since_anchor / period_length);
+ const days_since_anchor = date.getDateDiff(today, anchor_date, 'days');
+ const periods_since_anchor = Math.floor(days_since_anchor / period_length);
- const current_period = (periods_since_anchor % periods_per_year) + 1;
+ const current_period = (periods_since_anchor % periods_per_year) + 1;
- console.log(current_period);
- return current_period;
+ return current_period;
+}
+
+export const getMinutes = (hours: number) => {
+ const minutes_percent = hours - Math.floor(hours);
+ const minutes = Math.round(minutes_percent * 60);
+ return minutes > 1 ? minutes.toString() : '0';
+}
+
+export const getHoursMinutesStringFromHoursFloat = (hours: number): string => {
+ const flat_hours = Math.floor(hours);
+ const minutes = Math.round((hours - flat_hours) * 60);
+ return `${flat_hours}h${minutes > 1 ? ' ' + minutes : ''}`
}
\ No newline at end of file
diff --git a/src/utils/deep-equal.ts b/src/utils/deep-equal.ts
deleted file mode 100644
index 3b575f3..0000000
--- a/src/utils/deep-equal.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { unwrapAndClone } from "src/utils/unwrap-and-clone";
-
-/**
- * Internal recursive function comparing two plain values.
- */
-const _deepEqualRecursive = (a: unknown, b: unknown): boolean => {
- if (a === b) return true;
-
- if (a == null || b == null || typeof a !== "object" || typeof b !== "object") {
- return false;
- }
-
- // Handle arrays
- if (Array.isArray(a) && Array.isArray(b)) {
- if (a.length !== b.length) return false;
- return a.every((val, i) => _deepEqualRecursive(val, b[i]));
- } else if (Array.isArray(a) || Array.isArray(b)) {
- return false; // one is array, other is not
- }
-
- const aKeys = Object.keys(a as Record);
- const bKeys = Object.keys(b as Record);
-
- if (aKeys.length !== bKeys.length) return false;
-
- return aKeys.every((key) =>
- _deepEqualRecursive(
- (a as Record)[key],
- (b as Record)[key]
- )
- );
-};
-
-/**
- * Deep equality check that normalizes reactive objects first.
- */
-export const deepEqual = (given: unknown, expected: unknown): boolean => {
- const a = unwrapAndClone(given as object);
- const b = unwrapAndClone(expected as object);
- return _deepEqualRecursive(a, b);
-};
404
- PAGE NOT FOUND
+
+
+
- {{ $t('notFoundPage.pageText') }}
-
-
+
+
+
+
+
+
-
-
+
+ 404
+ {{
+ $t('error.not_found_header')
+ }}
+
+
+ {{ $t('error.not_found_description') }}
+
+
+
+
+
+
+
- {{ $t('employee_list.page_header') }}
-
-
- Welcome to App Targo!
-
-
+
+
+
+
+
+
+