+
{
const employee_store = useEmployeeStore();
@@ -15,34 +16,63 @@ export const useEmployeeListApi = () => {
employee_store.is_loading = false;
};
- const getEmployeeDetails = async(email: string): Promise => {
+ 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() => {
+ 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);
+ }
+
+ console.log('current preset: ', preset);
+
+ if (preset.weekdays.some(weekday => weekday.is_error)) {
+ console.log('overlap!');
+ return;
+ }
+
+ // Flatten all weekday shifts into a single array
const preset_shifts = preset.weekdays.flatMap(weekday => weekday.shifts);
- const backend_preset = new SchedulePreset(preset.id, preset.name, preset.is_default, preset_shifts);
+
+ // Build a backend-compatible SchedulePreset instance
+ const backend_preset = new SchedulePreset(
+ preset.id,
+ preset.name,
+ preset.is_default,
+ preset_shifts
+ );
+
+ // Track whether the create/update operation succeeds
let success = false;
- if (preset.id === -1) success = await schedule_preset_store.createSchedulePreset(backend_preset);
- else success = await schedule_preset_store.updateSchedulePreset(backend_preset);
-
+ // 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 deleteSchedulePreset = async (preset_id: number) => {
const success = await schedule_preset_store.deleteSchedulePreset(preset_id);
if (success) {
await schedule_preset_store.findSchedulePresetList();
diff --git a/src/modules/employee-list/models/schedule-presets.models.ts b/src/modules/employee-list/models/schedule-presets.models.ts
index ffd5b15..20c6185 100644
--- a/src/modules/employee-list/models/schedule-presets.models.ts
+++ b/src/modules/employee-list/models/schedule-presets.models.ts
@@ -50,6 +50,7 @@ export class SchedulePresetFrontend {
this.is_default = schedule_preset?.is_default ?? false;
this.weekdays = WEEKDAYS.map(day => ({
day,
+ is_error: false,
shifts: schedule_preset !== undefined ? schedule_preset?.shifts.filter(shift => shift.week_day === day) : [],
}))
}
@@ -57,5 +58,6 @@ export class SchedulePresetFrontend {
export interface WeekdayPresetShifts {
day: Weekday;
+ is_error: boolean;
shifts: SchedulePresetShift[];
}
\ No newline at end of file
diff --git a/src/modules/timesheets/utils/shift.util.ts b/src/modules/timesheets/utils/shift.util.ts
index 692c613..b008fc9 100644
--- a/src/modules/timesheets/utils/shift.util.ts
+++ b/src/modules/timesheets/utils/shift.util.ts
@@ -1,13 +1,16 @@
import { date, patterns, type ValidationRule } from "quasar";
+import type { SchedulePresetShift } from "src/modules/employee-list/models/schedule-presets.models";
import type { Shift } from "src/modules/timesheets/models/shift.models";
-export const isShiftOverlap = (shifts: Shift[]): boolean => {
+export const isShiftOverlap = (shifts: Shift[] | SchedulePresetShift[]): boolean => {
if (shifts.length < 2) return false;
const parsed_shifts = shifts.map(shift => ({
- start: date.extractDate(`${shift.date} ${shift.start_time}`, 'YYYY-MM-DD HH:mm').getTime(),
- end: date.extractDate(`${shift.date} ${shift.end_time}`, 'YYYY-MM-DD HH:mm').getTime(),
+ 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(),
}));
+
+ console.log('parsed_shifts: ', parsed_shifts);
for (let i = 0; i < parsed_shifts.length; i++) {
for (let j = i + 1; j < parsed_shifts.length; j++) {
@@ -15,6 +18,8 @@ export const isShiftOverlap = (shifts: Shift[]): boolean => {
const parsed_shift_b = parsed_shifts[j];
if (parsed_shift_a === undefined || parsed_shift_b === undefined) continue;
+ console.log('times(a start, b start, a end, b end): ', parsed_shift_a.start, parsed_shift_b.start, parsed_shift_a.end, parsed_shift_b.end);
+ console.log('result: ', Math.max(parsed_shift_a.start, parsed_shift_b.start) < Math.min(parsed_shift_a.end, parsed_shift_b.end))
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
diff --git a/src/stores/schedule-presets.store.ts b/src/stores/schedule-presets.store.ts
index 267ba84..d924f16 100644
--- a/src/stores/schedule-presets.store.ts
+++ b/src/stores/schedule-presets.store.ts
@@ -1,4 +1,3 @@
-/* eslint-disable */
import { ref } from "vue";
import { defineStore } from "pinia";
import { SchedulePresetsService } from "src/modules/employee-list/services/schedule-presets-service";
@@ -12,11 +11,17 @@ export const useSchedulePresetsStore = defineStore('schedule_presets_store', ()
const is_manager_open = ref(false);
const openSchedulePresetManager = (preset_id: number) => {
- if (preset_id === -1) {
+ if (preset_id === -1)
current_schedule_preset.value = new SchedulePresetFrontend;
- } else {
- setCurrentSchedulePreset(preset_id);
+ 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;
};
@@ -26,7 +31,7 @@ export const useSchedulePresetsStore = defineStore('schedule_presets_store', ()
current_schedule_preset.value = new SchedulePresetFrontend;
return;
}
- current_schedule_preset.value = new SchedulePresetFrontend(schedule_presets.value.find(preset => preset.id === preset_id)!)
+ current_schedule_preset.value = new SchedulePresetFrontend(schedule_presets.value.find(preset => preset.id === preset_id))
};
const createSchedulePreset = async (preset: SchedulePreset): Promise => {
@@ -73,15 +78,6 @@ export const useSchedulePresetsStore = defineStore('schedule_presets_store', ()
}
};
- const applySchedulePreset = async (): Promise => {
- try {
- return true;
- } catch (error) {
- console.error('DEV ERROR || error while building schedule: ', error);
- return false
- }
- };
-
return {
schedule_presets,
current_schedule_preset,
@@ -93,6 +89,5 @@ export const useSchedulePresetsStore = defineStore('schedule_presets_store', ()
updateSchedulePreset,
deleteSchedulePreset,
findSchedulePresetList,
- applySchedulePreset,
}
})
\ No newline at end of file
diff --git a/src/utils/table-grid-FLIP.ts b/src/utils/table-grid-FLIP.ts
deleted file mode 100644
index a2a7f7f..0000000
--- a/src/utils/table-grid-FLIP.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { type Ref, nextTick } from 'vue';
-
-export const animateFlip = (container: Ref) => {
- const el = container.value;
- if (!el) return;
-
- const children = Array.from(el.children) as HTMLElement[];
-
- // FIRST: record initial positions
- const firstRects = children.map(c => c.getBoundingClientRect());
-
- // Do LAST → INVERT → PLAY after DOM update
- void nextTick(() => {
- const lastRects = children.map(c => c.getBoundingClientRect());
-
- children.forEach((child, i) => {
- const dx = firstRects[i]!.left - lastRects[i]!.left;
- const dy = firstRects[i]!.top - lastRects[i]!.top;
-
- if (!dx && !dy) return;
-
- child.style.transition = 'none';
- child.style.transform = `translate(${dx}px, ${dy}px)`;
-
- requestAnimationFrame(() => {
- child.style.transition = 'transform 250ms ease';
- child.style.transform = '';
- });
- });
- });
-}