+
+
+
+
-
- {{ $d(
- date.extractDate(expense.date, 'YYYY-MM-DD'),
- { month: 'long', day: 'numeric' }
- ) }}
-
-
+
+ {{ $d(
+ date.extractDate(expense.date, 'YYYY-MM-DD'),
+ { month: 'long', day: 'numeric' }
+ ) }}
+
-
-
-
-
-
-
-
- {{ expense.mileage?.toFixed(1) }} km
-
-
- $ {{ expense.amount.toFixed(2) }}
-
+
-
-
+
+
+
+
+
+
+
+ {{ expense.mileage?.toFixed(1) }} km
+
+
+ $ {{ expense.amount.toFixed(2) }}
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+
diff --git a/src/modules/timesheets/components/shift-list-day-row.vue b/src/modules/timesheets/components/shift-list-day-row.vue
index da1e176..f2d2aac 100644
--- a/src/modules/timesheets/components/shift-list-day-row.vue
+++ b/src/modules/timesheets/components/shift-list-day-row.vue
@@ -3,18 +3,18 @@
lang="ts"
>
import { useI18n } from 'vue-i18n';
- import { computed, onMounted, ref } from 'vue';
- import { QSelect, QInput, useQuasar, type QSelectProps } from 'quasar';
+ import { computed, inject, onMounted, ref } from 'vue';
+ import { QSelect, QInput, useQuasar, type QSelectProps, QPopupProxy } from 'quasar';
import { useUiStore } from 'src/stores/ui-store';
import { SHIFT_OPTIONS } from 'src/modules/timesheets/utils/shift.util';
import type { Shift } from 'src/modules/timesheets/models/shift.models';
+ import { useAuthStore } from 'src/stores/auth-store';
// ================== State ==================
- const COMMENT_LENGTH_MAX = 280;
+ const shift = defineModel
('shift', { required: true });
const { errorMessage = undefined, isTimesheetApproved = false, holiday = false } = defineProps<{
- dense?: boolean;
isTimesheetApproved?: boolean;
errorMessage?: string | undefined;
holiday?: boolean | undefined;
@@ -25,19 +25,30 @@
'onTimeFieldBlur': [void];
}>();
- const shift = defineModel('shift', { required: true });
+
+ const COMMENT_LENGTH_MAX = 280;
const q = useQuasar();
const { t } = useI18n();
const ui_store = useUiStore();
+ const authStore = useAuthStore();
+
+ const mode = inject<'normal' | 'approval'>('mode');
const shiftTypeSelected = ref(SHIFT_OPTIONS.find(option => option.value == shift.value.type));
const selectRef = ref(null);
const shiftErrorMessage = ref();
const is_showing_delete_confirm = ref(false);
+ const popupProxyRef = ref(null);
// ================== Computed ==================
+ const rightClickMenuIcon = computed(() => shift.value.is_approved ? 'lock_open' : 'lock');
+
+ const rightClickMenuLabel = computed(() => shift.value.is_approved ?
+ t('timesheet_approvals.tooltip.unapprove') :
+ t('timesheet_approvals.tooltip.approve'));
+
const timeInputProps = computed(() => ({
dense: true,
borderless: shift.value.is_approved && isTimesheetApproved,
@@ -109,6 +120,14 @@
is_showing_delete_confirm.value = state;
}
+ const onRightClickApprove = () => {
+ if (authStore.user?.user_module_access.includes('timesheets_approval'))
+ shift.value.is_approved = !shift.value.is_approved;
+
+ if (popupProxyRef.value)
+ popupProxyRef.value.hide();
+ }
+
onMounted(() => {
if (ui_store.focus_next_component) {
selectRef.value?.focus();
@@ -121,6 +140,31 @@
+
+
+
+
+
+
+
+ {{ rightClickMenuLabel }}
+
+
+
+
{
if (mode === 'normal') {
diff --git a/src/modules/timesheets/models/expense.models.ts b/src/modules/timesheets/models/expense.models.ts
index 6e8b98e..93701ee 100644
--- a/src/modules/timesheets/models/expense.models.ts
+++ b/src/modules/timesheets/models/expense.models.ts
@@ -11,6 +11,8 @@ export class Expense {
type: ExpenseType;
amount: number;
mileage?: number;
+ attachment_name?: string;
+ attachment_key?: string;
comment: string;
supervisor_comment?: string;
is_approved: boolean;
diff --git a/src/stores/employee-store.ts b/src/stores/employee-store.ts
index 7a243f9..f5b37cd 100644
--- a/src/stores/employee-store.ts
+++ b/src/stores/employee-store.ts
@@ -13,14 +13,14 @@ export const useEmployeeStore = defineStore('employee', () => {
const is_loading = ref(false);
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;
}
-
+
is_loading.value = true;
management_mode.value = 'modify_employee';
await getEmployeeDetails(employee_email);
@@ -65,25 +65,29 @@ export const useEmployeeStore = defineStore('employee', () => {
return false;
};
- const createOrUpdateEmployee = async (profile: EmployeeProfile) => {
+ const createOrUpdateEmployee = async (profile: EmployeeProfile): Promise => {
let response;
if (management_mode.value === 'add_employee') {
- const { birth_date, last_work_day, ...create_payload} = profile;
+ 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 {
+ if (response.success)
+ await getEmployeeList();
+
+ else
Notify.create({
- message: 'failed to update or create employee',
- color: 'negative',
- })}
+ message: 'failed to update or create employee',
+ color: 'negative',
+ });
+
+ return response.success;
};
return {
diff --git a/src/stores/schedule-presets.store.ts b/src/stores/schedule-presets.store.ts
index d924f16..65c94fb 100644
--- a/src/stores/schedule-presets.store.ts
+++ b/src/stores/schedule-presets.store.ts
@@ -7,39 +7,49 @@ import { type PresetManagerMode, SchedulePreset, SchedulePresetFrontend } from "
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 schedule_preset_dialog_mode = ref();
+ const isManagerOpen = ref(false);
+ /**
+ * Opens the schedule preset manager with the preset associated with provided ID. If mode is
+ * set to `copy`, a clone of the preset will be created with a blank name instead.
+ * @param preset_id
+ */
const openSchedulePresetManager = (preset_id: number) => {
- if (preset_id === -1)
+ if (preset_id === -1) {
current_schedule_preset.value = new SchedulePresetFrontend;
- else if (schedule_preset_dialog_mode.value === 'copy') {
+ } 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
+ } else
setCurrentSchedulePreset(preset_id);
- is_manager_open.value = true;
+ isManagerOpen.value = true;
};
const setCurrentSchedulePreset = (preset_id: number) => {
- if (preset_id === -1) {
+ 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))
+ else
+ 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);
+
+ if (response.success && response.data)
+ current_schedule_preset.value = new SchedulePresetFrontend(response.data);
+
return response.success;
} catch (error) {
console.error('DEV ERROR || error while creating schedule preset: ', error);
+
return false;
}
};
@@ -47,9 +57,11 @@ export const useSchedulePresetsStore = defineStore('schedule_presets_store', ()
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;
}
@@ -58,17 +70,20 @@ export const useSchedulePresetsStore = defineStore('schedule_presets_store', ()
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 => {
+ const getSchedulePresetList = async (): Promise => {
try {
const response = await SchedulePresetsService.getSchedulePresetsList();
- if (response.success && response.data) schedule_presets.value = response.data;
+ if (response.success && response.data)
+ schedule_presets.value = response.data;
return response.success;
} catch (error) {
@@ -82,12 +97,12 @@ export const useSchedulePresetsStore = defineStore('schedule_presets_store', ()
schedule_presets,
current_schedule_preset,
schedule_preset_dialog_mode,
- is_manager_open,
+ isManagerOpen,
setCurrentSchedulePreset,
openSchedulePresetManager,
createSchedulePreset,
updateSchedulePreset,
deleteSchedulePreset,
- findSchedulePresetList,
+ getSchedulePresetList,
}
})
\ No newline at end of file
diff --git a/src/stores/timesheet-store.ts b/src/stores/timesheet-store.ts
index 985908b..f6f1841 100644
--- a/src/stores/timesheet-store.ts
+++ b/src/stores/timesheet-store.ts
@@ -98,7 +98,6 @@ export const useTimesheetStore = defineStore('timesheet', () => {
} catch (error) {
console.error('There was an error retrieving Employee Pay Period overviews: ', error);
pay_period_overviews.value = [];
- // TODO: More in-depth error-handling here
is_loading.value = false;
return false;
@@ -107,7 +106,6 @@ export const useTimesheetStore = defineStore('timesheet', () => {
const getTimesheetsByOptionalEmployeeEmail = async (employee_email?: string): Promise => {
if (pay_period.value === undefined) return false;
- is_loading.value = true;
let response;
try {
@@ -128,13 +126,11 @@ export const useTimesheetStore = defineStore('timesheet', () => {
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
timesheets.value = [];
- is_loading.value = false;
+
return false;
}
};