-
+
+ import MenuPanelPersonal from 'src/modules/profile/components/employee/menu-panel-personal.vue';
+ import MenuPanelEmployee from 'src/modules/profile/components/employee/menu-panel-employee.vue';
+ import MenuPanelPreferences from 'src/modules/profile/components/shared/menu-panel-preferences.vue';
+ import MenuTemplate from 'src/modules/profile/components/shared/menu-template.vue';
+ import { default_employee_profile, type EmployeeProfile } from 'src/modules/employee-list/models/employee-profile.models';
+
+ const PanelNames = {
+ PERSONAL_INFO: 'personal_info',
+ EMPLOYEE_INFO: 'employee_info',
+ PREFERENCES: 'references',
+ };
+
+ const employee_profile = defineModel({ default: default_employee_profile });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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/menu-panel-employee.vue
similarity index 61%
rename from src/modules/profile/components/employee/profile-panel-info-employee.vue
rename to src/modules/profile/components/employee/menu-panel-employee.vue
index 8f9da7c..a2bb798 100644
--- a/src/modules/profile/components/employee/profile-panel-info-employee.vue
+++ b/src/modules/profile/components/employee/menu-panel-employee.vue
@@ -1,56 +1,58 @@
-
-
-
-
-
-
+
+
-
-
-
-
-
+
import { ref } from 'vue';
- import ProfileHeader from 'src/modules/profile/components/shared/profile-header.vue';
+ import MenuHeader from 'src/modules/profile/components/shared/menu-header.vue';
const { firstName, lastName, initialMenu } = defineProps<{
firstName: string;
@@ -16,7 +16,7 @@
:class="$q.screen.lt.md ? 'column no-wrap' : 'row'"
:style="$q.screen.lt.md ? 'width: 90vw;' : 'width: 40vw;'"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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..28045a3 100644
--- a/src/modules/shared/components/page-header-template.vue
+++ b/src/modules/shared/components/page-header-template.vue
@@ -1,5 +1,10 @@
-
-
- {{ $t(title) }}
+
+ {{ $t(title) }}
-
([]);
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_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);
- console.log('costs, ', all_costs);
- const all_mileage = all_days.map(day => day.total_mileage);
+ // const all_costs = all_days.map(day => day.total_expenses);
+ // console.log('costs, ', all_costs);
+ // 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_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);
+ // expenses_labels.value = all_days_dates.map(day => day.short_date);
return {
datasets: expenses_dataset.value,
diff --git a/src/modules/timesheet-approval/components/details-crud-dialog-chart-hours-worked.vue b/src/modules/timesheet-approval/components/details-dialog-chart-hours-worked.vue
similarity index 56%
rename from src/modules/timesheet-approval/components/details-crud-dialog-chart-hours-worked.vue
rename to src/modules/timesheet-approval/components/details-dialog-chart-hours-worked.vue
index 976311b..743f4fe 100644
--- a/src/modules/timesheet-approval/components/details-crud-dialog-chart-hours-worked.vue
+++ b/src/modules/timesheet-approval/components/details-dialog-chart-hours-worked.vue
@@ -1,4 +1,5 @@
-
\ 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..cd24802 100644
--- a/src/modules/shared/components/pay-period-navigator.vue
+++ b/src/modules/shared/components/pay-period-navigator.vue
@@ -3,10 +3,14 @@
import { date} from 'quasar';
import { useTimesheetStore } from 'src/stores/timesheet-store';
+ const NEXT = 1;
+ const PREVIOUS = -1;
+
const timesheet_store = useTimesheetStore();
const is_showing_calendar_picker = ref(false);
const calendar_date = ref(date.formatDate( Date.now(), 'YYYY-MM-DD' ));
+ const is_disabled = computed(() => timesheet_store.pay_period === undefined);
const emit = defineEmits<{
'date-selected': [ value: string ]
@@ -15,8 +19,8 @@
}>();
const is_previous_pay_period_limit = computed( ()=>
- timesheet_store.pay_period.pay_year === 2024 &&
- timesheet_store.pay_period.pay_period_no <= 1
+ ( timesheet_store.pay_period?.pay_year === 2024 &&
+ timesheet_store.pay_period?.pay_period_no <= 1 ) ?? false
);
const onDateSelected = (value: string) => {
@@ -24,6 +28,33 @@
is_showing_calendar_picker.value = false;
emit('date-selected', value);
};
+
+ const getNextOrPreviousPayPeriod = (direction: number) => {
+ const pay_period = timesheet_store.pay_period;
+ if (!pay_period) return;
+
+ pay_period.pay_period_no += direction;
+
+ if (pay_period.pay_period_no > 26) {
+ pay_period.pay_period_no = 1;
+ pay_period.pay_year += direction;
+ }
+
+ if (pay_period.pay_period_no < 1) {
+ pay_period.pay_period_no = 26;
+ pay_period.pay_year += direction;
+ }
+ };
+
+ const getNextPayPeriod = () => {
+ getNextOrPreviousPayPeriod(NEXT);
+ emit('pressed-next-button');
+ }
+
+ const getPreviousPayPeriod = () => {
+ getNextOrPreviousPayPeriod(PREVIOUS);
+ emit('pressed-previous-button');
+ };
@@ -33,8 +64,8 @@
push rounded
icon="keyboard_arrow_left"
color="primary"
- @click="emit('pressed-previous-button')"
- :disable="is_previous_pay_period_limit || timesheet_store.is_loading"
+ @click="getPreviousPayPeriod"
+ :disable="is_previous_pay_period_limit || timesheet_store.is_loading || is_disabled"
class="q-mr-sm q-px-sm"
>
- {{ $d(new Date(startDate), date_format_options) }}
-
-
- {{ $t('shared.misc.to') }}
-
-
- {{ $d(new Date(endDate), date_format_options) }}
-
+
+
+
+ {{ $d(date.extractDate(startDate, 'YYYY-MM-DD'), date_format_options) }}
+
+
+ {{ $t('shared.misc.to') }}
+
+
+ {{ $d(date.extractDate(endDate, 'YYYY-MM-DD'), date_format_options) }}
@@ -45,7 +46,7 @@
@@ -93,7 +94,7 @@
/>
-
+
+ /* eslint-disable */
import { useExpensesStore } from 'src/stores/expense-store';
const expense_store = useExpensesStore();
@@ -15,7 +16,8 @@
>
{{ $t('timesheet.expense.title') }}
-
@@ -23,7 +25,7 @@
outline
class="q-py-xs q-px-md"
color="primary"
- :label="$t('timesheet.expense.total_amount') + ': $' + expense_store.pay_period_expenses.total_expense.toFixed(2)"
+ :label="$t('timesheet.expense.total_amount') + ': $' + expense_store.pay_period_expenses?.toFixed(2)"
/>
@@ -35,8 +37,8 @@
outline
class="q-py-xs q-px-md"
color="primary"
- :label="$t('timesheet.expense.total_mileage') + ': ' + expense_store.pay_period_expenses.total_mileage.toFixed(1) + ' km'"
+ :label="$t('timesheet.expense.total_mileage') + ': ' + expense_store.pay_period_expenses?.total_mileage.toFixed(1) + ' km'"
/>
-
+ -->
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-crud-dialog-list-item.vue b/src/modules/timesheets/components/expense-dialog-list-item.vue
similarity index 87%
rename from src/modules/timesheets/components/expense-crud-dialog-list-item.vue
rename to src/modules/timesheets/components/expense-dialog-list-item.vue
index eeea224..8cbf6db 100644
--- a/src/modules/timesheets/components/expense-crud-dialog-list-item.vue
+++ b/src/modules/timesheets/components/expense-dialog-list-item.vue
@@ -2,15 +2,16 @@
setup
lang="ts"
>
+ /* eslint-disable */
import { computed, inject, ref } from 'vue';
import { unwrapAndClone } from 'src/utils/unwrap-and-clone';
import { useExpensesApi } from 'src/modules/timesheets/composables/use-expense-api';
import { useExpensesStore } from 'src/stores/expense-store';
import { useTimesheetStore } from 'src/stores/timesheet-store';
- import { getExpenseTypeIcon } from 'src/modules/timesheets/utils/expense.util';
- import { default_expense, type Expense } from 'src/modules/timesheets/models/expense.models';
+ import { getExpenseIcon } from 'src/modules/timesheets/utils/expense.util';
import { useAuthStore } from 'src/stores/auth-store';
import { CAN_APPROVE_PAY_PERIODS } from 'src/modules/shared/models/user.models';
+ import { empty_expense, type Expense } from 'src/modules/timesheets/models/expense.models';
const { expense, horizontal = false } = defineProps<{
expense: Expense;
@@ -26,10 +27,10 @@
const is_approved = defineModel({ required: true });
const is_selected = ref(false);
const refresh_key = ref(1);
- const is_authorized_to_approve = computed(() => CAN_APPROVE_PAY_PERIODS.includes(auth_store.user.role))
+ const is_authorized_to_approve = computed(() => CAN_APPROVE_PAY_PERIODS.includes(auth_store.user?.role ?? 'GUEST'))
const expenseItemStyle = computed(() => is_approved.value ? 'border: solid 2px var(--q-primary);' : 'border: solid 2px grey;');
- const highlightClass = computed(() => (expenses_store.mode === 'update' && is_selected) ? 'bg-accent' : '');
+ // const highlightClass = computed(() => (expenses_store.mode === 'update' && is_selected) ? 'bg-accent' : '');
const approvedClass = computed(() => horizontal ? ' q-mx-xs q-pa-xs cursor-pointer' : '')
@@ -37,15 +38,15 @@
const setExpenseToModify = () => {
- expenses_store.mode = 'update';
+ // expenses_store.mode = 'update';
expenses_store.current_expense = expense;
expenses_store.initial_expense = unwrapAndClone(expense);
};
const requestExpenseDeletion = async () => {
- expenses_store.mode = 'delete';
+ // expenses_store.mode = 'delete';
expenses_store.initial_expense = expense;
- expenses_store.current_expense = default_expense;
+ expenses_store.current_expense = empty_expense;
await expenses_api.deleteExpenseByEmployeeEmail(employeeEmail, expenses_store.initial_expense.date);
}
@@ -66,7 +67,7 @@
:key="refresh_key"
:clickable="horizontal"
class="row col-4 q-ma-xs shadow-2"
- :style="expenseItemStyle + highlightClass + approvedClass"
+ :style="expenseItemStyle + approvedClass"
@click="onExpenseClicked"
>
@@ -174,7 +175,6 @@
diff --git a/src/modules/timesheets/components/expense-crud-dialog-list.vue b/src/modules/timesheets/components/expense-dialog-list.vue
similarity index 77%
rename from src/modules/timesheets/components/expense-crud-dialog-list.vue
rename to src/modules/timesheets/components/expense-dialog-list.vue
index a68ca92..e0f31b7 100644
--- a/src/modules/timesheets/components/expense-crud-dialog-list.vue
+++ b/src/modules/timesheets/components/expense-dialog-list.vue
@@ -3,7 +3,7 @@
lang="ts"
>
import { useExpensesStore } from 'src/stores/expense-store';
- import ExpenseCrudDialogListItem from 'src/modules/timesheets/components/expense-crud-dialog-list-item.vue';
+ import ExpenseDialogListItem from 'src/modules/timesheets/components/expense-dialog-list-item.vue';
const expenses_store = useExpensesStore();
@@ -20,14 +20,14 @@
:class="horizontal ? 'row flex-center' : ''"
>
{{ $t('timesheet.expense.empty_list') }}
-
import { useExpensesStore } from 'src/stores/expense-store';
- import ExpenseCrudDialogList from 'src/modules/timesheets/components/expense-crud-dialog-list.vue';
- import ExpenseCrudDialogForm from 'src/modules/timesheets/components/expense-crud-dialog-form.vue';
- import ExpenseCrudDialogHeader from 'src/modules/timesheets/components/expense-crud-dialog-header.vue';
+ import ExpenseDialogList from 'src/modules/timesheets/components/expense-dialog-list.vue';
+ import ExpenseDialogForm from 'src/modules/timesheets/components/expense-dialog-form.vue';
+ import ExpenseDialogHeader from 'src/modules/timesheets/components/expense-dialog-header.vue';
const expense_store = useExpensesStore();
@@ -32,11 +32,17 @@
{{ expenses_error }}
-->
- ({ required: true });
defineEmits<{
'onCommentBlur': [void];
diff --git a/src/modules/timesheets/components/shift-list-row.vue b/src/modules/timesheets/components/shift-list-row.vue
index e5f22fd..180932c 100644
--- a/src/modules/timesheets/components/shift-list-row.vue
+++ b/src/modules/timesheets/components/shift-list-row.vue
@@ -2,77 +2,84 @@
setup
lang="ts"
>
- import { computed, ref } from 'vue';
- import { useQuasar } from 'quasar';
+ import { ref } from 'vue';
import type { Shift } from 'src/modules/timesheets/models/shift.models';
- const q = useQuasar();
-
const { shift, dense = false } = defineProps<{
shift: Shift;
dense?: boolean;
}>();
- const emit = defineEmits<{
+ defineEmits<{
'save-comment': [comment: string, shift: Shift];
'request-update': [shift: Shift];
- 'request-delete': [shift: Shift];
}>();
- const hour_font_size = computed(() => dense ? 'font-size: 1em;' : 'font-size: 1.5em;')
- const is_hovering = ref(false);
- const font_color = computed(() => shift.type === 'REGULAR' ? (q.dark.isActive ? ' text-blue-grey-2' : ' text-grey-8') : ' text-white')
+ const shift_start = ref(shift.start_time);
+ const shift_end = ref(shift.end_time);
+ const time_picker_model = ref('');
+ const is_showing_time_picker = ref(false);
- const get_shift_color = (type: string): string => {
- switch (type) {
- case 'REGULAR': return 'secondary';
- case 'EVENING': return 'warning';
- case 'EMERGENCY': return 'amber-10';
- case 'OVERTIME': return 'negative';
- case 'VACATION': return 'purple-10';
- case 'HOLIDAY': return 'purple-5';
- case 'SICK': return 'grey-8';
- default: return 'transparent';
- }
+ const showTimePicker = (time: string) => {
+ is_showing_time_picker.value = true;
+ time_picker_model.value = time;
};
-
- const onClickUpdate = (type: string) => {
- if (type !== '') { emit('request-update', shift) };
- }
-
- const onClickDelete = () => emit('request-delete', shift);
-
+
+
+
\ 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
index c581db0..a3b24e7 100644
--- a/src/modules/timesheets/composables/use-expense-api.ts
+++ b/src/modules/timesheets/composables/use-expense-api.ts
@@ -2,7 +2,7 @@
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.models";
+import { expense_validation_schema } from "src/modules/timesheets/models/expense-validation.models";
import type { Expense } from "src/modules/timesheets/models/expense.models";
export const useExpensesApi = () => {
diff --git a/src/modules/timesheets/composables/use-timesheet-api.ts b/src/modules/timesheets/composables/use-timesheet-api.ts
index 7692ffd..b0150b9 100644
--- a/src/modules/timesheets/composables/use-timesheet-api.ts
+++ b/src/modules/timesheets/composables/use-timesheet-api.ts
@@ -4,50 +4,27 @@ 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 getTimesheetsByDate = 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)
+ await timesheet_store.getTimesheetsByEmployeeEmail(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;
+ const getTimesheetsByCurrentPayPeriod = async (employee_email?: string) => {
+ if (timesheet_store.pay_period === undefined) return false;
- 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);
+ const success = await timesheet_store.getPayPeriodByDateOrYearAndNumber(timesheet_store.pay_period.pay_year, timesheet_store.pay_period.pay_period_no );
if (success) {
- await timesheet_store.getPayPeriodDetailsByEmployeeEmail(employee_email ?? auth_store.user.email);
+ await timesheet_store.getTimesheetsByEmployeeEmail(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,
+ getTimesheetsByDate,
+ getTimesheetsByCurrentPayPeriod,
};
};
\ No newline at end of file
diff --git a/src/modules/timesheets/models/expense.validation.models.ts b/src/modules/timesheets/models/expense-validation.models.ts
similarity index 100%
rename from src/modules/timesheets/models/expense.validation.models.ts
rename to src/modules/timesheets/models/expense-validation.models.ts
diff --git a/src/modules/timesheets/models/expense.models.ts b/src/modules/timesheets/models/expense.models.ts
index b4ebdd1..231a39c 100644
--- a/src/modules/timesheets/models/expense.models.ts
+++ b/src/modules/timesheets/models/expense.models.ts
@@ -6,20 +6,42 @@ export const TYPES_WITH_AMOUNT_ONLY: Readonly = ['PER_DIEM', 'EXP
export interface Expense {
id: number;
- date: string;
+ date: string; //YYYY-MM-DD
type: ExpenseType;
amount: number;
mileage?: number;
comment: string;
supervisor_comment?: string;
is_approved: boolean;
-}
+};
-export const default_expense: Expense = {
+export const empty_expense: Expense = {
id: -1,
date: '',
type: 'EXPENSES',
amount: 0,
comment: '',
is_approved: false,
-};
\ No newline at end of file
+};
+
+export const test_expenses: Expense[] = [
+ {
+ id: 201,
+ date: '2025-01-06',
+ type: 'EXPENSES',
+ amount: 15.5,
+ comment: 'Lunch receipt',
+ is_approved: false,
+ },
+ {
+ id: 202,
+ date: '2025-01-07',
+ type: 'MILEAGE',
+ amount: 0,
+ mileage: 32.4,
+ comment: 'Travel to client site',
+ is_approved: true,
+ },
+];
+
+
diff --git a/src/modules/timesheets/models/shift.models.ts b/src/modules/timesheets/models/shift.models.ts
index 357bffd..dae0194 100644
--- a/src/modules/timesheets/models/shift.models.ts
+++ b/src/modules/timesheets/models/shift.models.ts
@@ -19,22 +19,11 @@ export type ShiftLegendItem = {
export interface Shift {
id: number;
- date: string;
+ date: string; //YYYY-MM-DD
type: ShiftType;
- start_time: string;
- end_time: string;
+ start_time: string; //HH:mm:ss
+ end_time: string; //HH:mm:ss
comment: string | undefined;
is_approved: boolean;
is_remote: boolean;
-}
-
-export const default_shift: Readonly = {
- id: -1,
- date: '',
- start_time: '',
- end_time: '',
- type: 'REGULAR',
- comment: '',
- is_approved: false,
- is_remote: false,
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/timesheets/models/timesheet.models.ts b/src/modules/timesheets/models/timesheet.models.ts
index 9deabd7..8692fd4 100644
--- a/src/modules/timesheets/models/timesheet.models.ts
+++ b/src/modules/timesheets/models/timesheet.models.ts
@@ -6,13 +6,14 @@ export const DATE_FORMAT_PATTERN = /^\d{4}-\d{2}-\d{2}$/;
export interface Timesheet {
id: number;
+ is_approved: boolean;
weekly_hours: TotalHours;
weekly_expenses: TotalExpenses;
days: TimesheetDay[];
}
export interface TimesheetDay {
- date: string;
+ date: string; // YYYY-MM-DD
daily_hours: TotalHours;
daily_expenses: TotalExpenses;
shifts: Shift[];
@@ -33,4 +34,79 @@ export interface TotalHours {
export interface TotalExpenses {
expenses: number;
mileage: number;
-}
\ No newline at end of file
+}
+
+export const test_timesheets: Timesheet[] = [
+ {
+ id: 1,
+ is_approved: false,
+ weekly_hours: { regular: 8, evening: 0, emergency: 0, overtime: 0, vacation: 0, holiday: 0, sick: 0, absent: 0 },
+ weekly_expenses: { expenses: 15.5, mileage: 0 },
+ days: [
+ {
+ date: '2025-10-18',
+ daily_hours: { regular: 8, evening: 0, emergency: 0, overtime: 0, vacation: 0, holiday: 0, sick: 0, absent: 0 },
+ daily_expenses: { expenses: 15.5, mileage: 0 },
+ shifts: [
+ { id: 101, date: '2025-01-06', type: 'REGULAR', start_time: '08:00', end_time: '12:00', comment: 'blah', is_approved: false, is_remote: false, },
+ { id: 102, date: '2025-01-06', type: 'REGULAR', start_time: '13:00', end_time: '17:00', comment: undefined, is_approved: false, is_remote: false, },
+ ],
+ expenses: [
+ { id: 201, date: '2025-01-06', type: 'EXPENSES', amount: 15.5, comment: 'Lunch receipt', is_approved: false, },
+ ],
+ },
+ ],
+ },
+ {
+ id: 2,
+ is_approved: true,
+ weekly_hours: {
+ regular: 0,
+ evening: 0,
+ emergency: 0,
+ overtime: 8,
+ vacation: 0,
+ holiday: 0,
+ sick: 0,
+ absent: 0,
+ },
+ weekly_expenses: {
+ expenses: 0,
+ mileage: 32.4,
+ },
+ days: [
+ {
+ date: '2025-10-27',
+ daily_hours: {
+ regular: 0,
+ evening: 0,
+ emergency: 0,
+ overtime: 8,
+ vacation: 0,
+ holiday: 0,
+ sick: 0,
+ absent: 0,
+ },
+ daily_expenses: {
+ expenses: 0,
+ mileage: 32.4,
+ },
+ shifts: [
+ { id: 101, date: '2025-10-27', type: 'REGULAR', start_time: '08:00', end_time: '12:00', comment: undefined, is_approved: false, is_remote: false, },
+ { id: 102, date: '2025-10-27', type: 'REGULAR', start_time: '13:00', end_time: '17:00', comment: undefined, is_approved: false, is_remote: false, },
+ ],
+ expenses: [
+ {
+ id: 202,
+ date: '2025-10-27',
+ type: 'MILEAGE',
+ amount: 0,
+ mileage: 32.4,
+ comment: 'Travel to client site',
+ is_approved: true,
+ },
+ ],
+ },
+ ],
+ },
+];
diff --git a/src/modules/timesheets/services/timesheet-service.ts b/src/modules/timesheets/services/timesheet-service.ts
index 8cf0d96..5cd3fb8 100644
--- a/src/modules/timesheets/services/timesheet-service.ts
+++ b/src/modules/timesheets/services/timesheet-service.ts
@@ -8,11 +8,6 @@ import type { Expense } from "src/modules/timesheets/models/expense.models";
import { Shift } from "src/modules/timesheets/models/shift.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;
@@ -23,20 +18,20 @@ export const timesheetService = {
return response.data;
},
- getPayPeriodOverviewsBySupervisorEmail: async (year: number, period_number: number, supervisor_email: string): Promise => {
+ getTimesheetOverviewsByPayPeriodAndSupervisorEmail: 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, } });
+ getTimesheetsByPayPeriodAndEmployeeEmail: async (employee_email: string, year: number, period_number: number): Promise => {
+ const response = await api.get('timesheets', { params: { employee_email, year, period_number } });
return response.data;
},
- // getExpensesByPayPeriodAndEmployeeEmail: async (email: string, year: string, period_number: string): Promise => {
- // const response = await api.get(`/expenses/list/${email}/${year}/${period_number}`);
- // return response.data;
- // },
+ getExpensesByTimesheetId: async (timesheet_id: number): Promise => {
+ const response = await api.get(`/expenses/list/${timesheet_id}`);
+ return response.data;
+ },
upsertShiftsByEmployeeEmailAndAction: async (email: string, payload: Shift[]): Promise => {
const response = await api.put(`/shifts/upsert/${email}`, payload);
@@ -48,8 +43,8 @@ export const timesheetService = {
return response;
},
- upsertOrDeleteExpensesByPayPeriodAndEmployeeEmail: async (email: string, date: string, payload: Expense[]): Promise => {
- const response = await api.put(`/expenses/upsert/${email}/${date}`, payload);
+ upsertOrDeleteExpenseByEmailAndExpenseId: async (email: string, expense_id: number): Promise => {
+ const response = await api.put(`/expenses/upsert/${email}`, expense_id);
return response.data;
},
};
\ 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..b707787
--- /dev/null
+++ b/src/pages/dashboard-page.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+ 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/employee-list-page.vue b/src/pages/employee-list-page.vue
index 6d20340..bbe9828 100644
--- a/src/pages/employee-list-page.vue
+++ b/src/pages/employee-list-page.vue
@@ -8,7 +8,7 @@
-
+
-
+
\ 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 2954dd8..0000000
--- a/src/pages/test-page.vue
+++ /dev/null
@@ -1,73 +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 6d37227..fcc3fa4 100644
--- a/src/pages/timesheet-approval-page.vue
+++ b/src/pages/timesheet-approval-page.vue
@@ -5,7 +5,7 @@
import { useTimesheetStore } from 'src/stores/timesheet-store';
import PageHeaderTemplate from 'src/modules/shared/components/page-header-template.vue';
import OverviewList from 'src/modules/timesheet-approval/components/overview-list.vue';
- import DetailscrudDialog from 'src/modules/timesheet-approval/components/details-crud-dialog.vue';
+ import DetailsDialog from 'src/modules/timesheet-approval/components/details-dialog.vue';
const timesheet_approval_api = useTimesheetApprovalApi();
const timesheet_store = useTimesheetStore();
@@ -29,16 +29,16 @@
>
-
-
- {{ shift.start_time }}
-
-
+
+ {{ $t('shared.misc.in') }}
+
+
+
+
+
diff --git a/src/modules/timesheets/components/shift-list.vue b/src/modules/timesheets/components/shift-list.vue
index ad719a1..69a1581 100644
--- a/src/modules/timesheets/components/shift-list.vue
+++ b/src/modules/timesheets/components/shift-list.vue
@@ -6,7 +6,7 @@
import { date } from 'quasar';
import ShiftListRow from 'src/modules/timesheets/components/shift-list-row.vue';
import { useTimesheetStore } from 'src/stores/timesheet-store';
- import { type Shift, default_shift } from 'src/modules/timesheets/models/shift.models';
+ import { type Shift } from 'src/modules/timesheets/models/shift.models';
import { computed } from 'vue';
const timesheet_store = useTimesheetStore();
@@ -18,74 +18,87 @@
const weekday_font_size = computed(() => dense ? '0.55em;' : '0.7em;');
const date_box_size = computed(() => dense ? 'width: 50px;' : 'width: 75px;');
- const get_date_from_short = (short_date: string): Date => {
- return new Date(timesheet_store.pay_period.pay_year.toString() + '/' + short_date);
- };
- const to_iso_date = (short_date: string): string => {
- return date.formatDate(get_date_from_short(short_date), 'YYYY-MM-DD');
- };
+
+ // const get_date_from_short = (short_date: string): Date => {
+ // if (timesheet_store.pay_period === undefined) return new Date();
+ // return new Date(timesheet_store.pay_period.pay_year.toString() + '/' + short_date);
+ // };
+
+ // const to_iso_date = (short_date: string): string => {
+ // return date.formatDate(get_date_from_short(short_date), 'YYYY-MM-DD');
+ // };
const shifts_or_placeholder = (shifts: Shift[]): Shift[] => {
- return shifts.length > 0 ? shifts : [default_shift];
- };
-
- const getDate = (shift_date: string): Date => {
- return new Date(timesheet_store.pay_period.pay_year.toString() + '/' + shift_date);
+ return shifts.length > 0 ? shifts : [];
};
@@ -92,6 +90,6 @@
-
-
- {{ shift.end_time }}
-
-
-
+
+ {{ $t('shared.misc.out') }}
+
+
+
+
-
-
+
\ 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 3acb746..325d61d 100644
--- a/src/modules/timesheets/components/timesheet-wrapper.vue
+++ b/src/modules/timesheets/components/timesheet-wrapper.vue
@@ -4,7 +4,7 @@
>
import GenericLoader from 'src/modules/shared/components/generic-loader.vue';
import ShiftList from 'src/modules/timesheets/components/shift-list.vue';
- import ExpenseCrudDialog from 'src/modules/timesheets/components/expense-crud-dialog.vue';
+ import ExpenseDialog from 'src/modules/timesheets/components/expense-dialog.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';
@@ -39,6 +39,7 @@
>
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
- {{ $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' }) }}
-
-
+ {{ $d(date.extractDate(day.date, 'YYYY-MM-DD'), { weekday: $q.screen.lt.md ? 'short' : 'long' })
+ }}
+ {{ date.extractDate(day.date, 'YYYY-MM-DD').getDate() }}
+ {{ $d(date.extractDate(day.date, 'YYYY-MM-DD'), { month: $q.screen.lt.md ? 'short' : 'long' })
+ }}
+
+
+
+
-
-
+ Welcome to App Targo, !
+
+
- Welcome to App Targo!
-
-
- => {
- window.addEventListener('message', async (event) => {
- if (event.data.type === 'authSuccess') {
- const new_user = await AuthService.getProfile();
- user.value = new_user;
- router.push('/');
- } else {
- Notify.create({
- message: "You have popups blocked on this website!",
- color: 'negative',
- textColor: 'white',
- });
- }
+ const oidcLogin = () => {
+ window.addEventListener('message', (event) => {
+ void handleAuthMessage(event);
});
const oidc_popup = window.open('http://localhost:3000/auth/v1/login', 'authPopup', 'width=600,height=800');
@@ -44,6 +34,34 @@ export const useAuthStore = defineStore('auth', () => {
user.value = undefined;
};
- return { user, authError, isAuthorizedUser, login, oidcLogin, logout };
+ 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' };
+ }
+
+ return { user, authError, isAuthorizedUser, login, oidcLogin, logout, getProfile };
});
diff --git a/src/stores/expense-store.ts b/src/stores/expense-store.ts
index 4348e7f..0396e05 100644
--- a/src/stores/expense-store.ts
+++ b/src/stores/expense-store.ts
@@ -1,21 +1,17 @@
import { 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 type { CrudAction } from "src/modules/timesheets/models/shift.models";
+import { ExpensesApiError, type GenericApiError } from "src/modules/timesheets/models/expense-validation.models";
+import { empty_expense, test_expenses, type Expense } from "src/modules/timesheets/models/expense.models";
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 current_expense = ref(default_expense);
- const initial_expense = ref(default_expense);
+ const pay_period_expenses = ref(test_expenses);
+ const current_expense = ref(empty_expense);
+ const initial_expense = ref(empty_expense);
const error = ref(null);
// const setErrorFrom = (err: unknown) => {
@@ -23,14 +19,14 @@ export const useExpensesStore = defineStore('expenses', () => {
// 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;
+ current_expense.value = empty_expense;
+ initial_expense.value = empty_expense;
- await getPayPeriodExpensesByEmployeeEmail(employee_email);
+ // await getPayPeriodExpensesByTimesheetId(timesheet_id);
is_loading.value = false;
}
@@ -39,16 +35,12 @@ export const useExpensesStore = defineStore('expenses', () => {
is_open.value = false;
};
- const getPayPeriodExpensesByEmployeeEmail = async (employee_email: string): Promise => {
+ const getPayPeriodExpensesByTimesheetId = async (timesheet_id: number): Promise => {
is_loading.value = true;
error.value = null;
try {
- const expenses = await timesheetService.getExpensesByPayPeriodAndEmployeeEmail(
- encodeURIComponent(employee_email),
- encodeURIComponent(timesheet_store.pay_period.pay_year),
- encodeURIComponent(timesheet_store.pay_period.pay_period_no),
- );
+ const expenses = await timesheetService.getExpensesByTimesheetId(timesheet_id);
pay_period_expenses.value = expenses;
} catch (err: unknown) {
if (typeof err === 'object') {
@@ -70,21 +62,19 @@ export const useExpensesStore = defineStore('expenses', () => {
}
};
- const upsertOrDeleteExpensesByEmployeeEmail = async (employee_email: string, date: string, expense: UpsertExpense): Promise => {
+ const upsertOrDeleteExpensesById = async (employee_email: string, date: string, expense_id: number): Promise => {
is_loading.value = true;
error.value = null;
try {
- const updated_expenses = await timesheetService.upsertOrDeleteExpensesByPayPeriodAndEmployeeEmail(
+ await timesheetService.upsertOrDeleteExpenseByEmailAndExpenseId(
encodeURIComponent(employee_email),
- encodeURIComponent(date),
- expense,
+ expense_id,
);
- console.log('updated expenses received: ', updated_expenses)
- pay_period_expenses.value.expenses = updated_expenses;
+ // TODO: Save response data into proper ref
} catch (err) {
// setErrorFrom(err);
- console.log('error doing some expense thing: ', err)
+ console.error(err);
} finally {
is_loading.value = false;
}
@@ -93,14 +83,13 @@ export const useExpensesStore = defineStore('expenses', () => {
return {
is_open,
is_loading,
- mode,
pay_period_expenses,
current_expense,
initial_expense,
error,
open,
- getPayPeriodExpensesByEmployeeEmail,
- upsertOrDeleteExpensesByEmployeeEmail,
+ getPayPeriodExpensesByTimesheetId,
+ upsertOrDeleteExpensesById,
close,
};
});
\ No newline at end of file
diff --git a/src/stores/timesheet-store.ts b/src/stores/timesheet-store.ts
index 8b7fdba..583c19b 100644
--- a/src/stores/timesheet-store.ts
+++ b/src/stores/timesheet-store.ts
@@ -1,24 +1,24 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import { withLoading } from 'src/utils/store-helpers';
+import { useAuthStore } from 'src/stores/auth-store';
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 TimesheetOverview } from "src/modules/timesheet-approval/models/timesheet-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/timesheet.models';
+import type { TimesheetOverview } from "src/modules/timesheet-approval/models/timesheet-overview.models";
+import type { PayPeriod } from 'src/modules/shared/models/pay-period.models';
+import { test_timesheets, type Timesheet } from 'src/modules/timesheets/models/timesheet.models';
import type { TimesheetApprovalCSVReportFilters } from 'src/modules/timesheet-approval/models/timesheet-approval-csv-report.models';
+const auth_store = useAuthStore();
+
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 pay_period_overviews = ref([]);
+ const current_pay_period_overview = ref();
+ const timesheets = ref(test_timesheets);
const pay_period_report = ref();
- const is_calendar_limit = computed(() =>
- pay_period.value.pay_year === 2024 &&
- pay_period.value.pay_period_no <= 1
- );
+ const is_calendar_limit = computed(() => (pay_period.value?.pay_year === 2024 && pay_period.value?.pay_period_no <= 1) ?? false);
const getPayPeriodByDateOrYearAndNumber = async (date_or_year: string | number, period_number?: number): Promise => {
is_loading.value = true;
@@ -30,14 +30,14 @@ export const useTimesheetStore = defineStore('timesheet', () => {
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;
+ else pay_period.value = undefined;
is_loading.value = 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;
@@ -45,18 +45,18 @@ export const useTimesheetStore = defineStore('timesheet', () => {
}
};
- const getPayPeriodOverviewsBySupervisorEmail = async (pay_year: number, period_number: number, supervisor_email: string): Promise => {
+ const getTimesheetOverviewsByPayPeriod = async (pay_year: number, period_number: number, supervisor_email?: string): Promise => {
is_loading.value = true;
try {
- const response = await timesheetApprovalService.getPayPeriodOverviewsBySupervisorEmail(pay_year, period_number, supervisor_email);
+ const response = await timesheetApprovalService.getPayPeriodOverviewsBySupervisorEmail(pay_year, period_number, supervisor_email ?? auth_store.user?.email ?? '');
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;
@@ -64,21 +64,17 @@ export const useTimesheetStore = defineStore('timesheet', () => {
}
};
- const getPayPeriodDetailsByEmployeeEmail = async (employee_email: string) => {
+ const getTimesheetsByEmployeeEmail = async (employee_email: string) => {
is_loading.value = true;
+ if (pay_period.value === undefined) return;
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)
+ const response = await timesheetService.getTimesheetsByPayPeriodAndEmployeeEmail(employee_email, pay_period.value.pay_year, pay_period.value.pay_period_no);
+ timesheets.value = response;
is_loading.value = false;
} 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;
}
};
@@ -109,10 +105,10 @@ export const useTimesheetStore = defineStore('timesheet', () => {
pay_period,
pay_period_overviews,
current_pay_period_overview,
- pay_period_details,
+ timesheets,
getPayPeriodByDateOrYearAndNumber,
- getPayPeriodOverviewsBySupervisorEmail,
- getPayPeriodDetailsByEmployeeEmail,
+ getTimesheetOverviewsByPayPeriod,
+ getTimesheetsByEmployeeEmail,
getPayPeriodReportByYearAndPeriodNumber,
};
});
\ No newline at end of file
+
diff --git a/src/router/index.ts b/src/router/index.ts
index c1afbd1..71b125d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,6 +2,7 @@ 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';
/*
* If not building with SSR mode, you can
@@ -13,27 +14,29 @@ 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 (destinationPage) => {
+ const authStore = useAuthStore();
+ const result = await authStore.getProfile() ?? { status: 400, message: 'unknown error occured' };
- if (destinationPage.meta.requiresAuth && !authStore.isAuthorizedUser) {
- return { name: 'login' };
- }
- })
+ if ((destinationPage.meta.requiresAuth && !authStore.isAuthorizedUser) || (result.status >= 400 && destinationPage.name !== RouteNames.LOGIN)) {
+ console.log('no user account found');
+ return { name: 'login' };
+ }
+ })
- return Router;
+ return Router;
});
diff --git a/src/router/router-constants.ts b/src/router/router-constants.ts
index b24aa80..83c0364 100644
--- a/src/router/router-constants.ts
+++ b/src/router/router-constants.ts
@@ -6,5 +6,5 @@ export enum RouteNames {
TIMESHEET_APPROVALS = 'timesheet-approvals',
EMPLOYEE_LIST = 'employee-list',
PROFILE = 'user/profile',
- TIMESHEET_TEMP = 'timesheet-temp'
+ TIMESHEET = 'timesheet'
}
\ No newline at end of file
diff --git a/src/router/routes.ts b/src/router/routes.ts
index f852636..faf1ecb 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -10,7 +10,7 @@ const routes: RouteRecordRaw[] = [
{
path: '',
name: RouteNames.DASHBOARD,
- component: () => import('src/pages/test-page.vue'),
+ component: () => import('src/pages/dashboard-page.vue'),
},
{
path: 'timesheet-approvals',
@@ -23,8 +23,8 @@ const routes: RouteRecordRaw[] = [
component: () => import('src/pages/employee-list-page.vue'),
},
{
- path: 'timesheet-temp',
- name: RouteNames.TIMESHEET_TEMP,
+ path: 'timesheet',
+ name: RouteNames.TIMESHEET,
component: () => import('src/pages/timesheet-page.vue')
},
{
@@ -38,7 +38,7 @@ const routes: RouteRecordRaw[] = [
{
path: '/v1/login',
name: RouteNames.LOGIN,
- component: () => import('src/modules/auth/pages/auth-login.vue'),
+ component: () => import('src/pages/login-page.vue'),
meta: { requiresAuth: false },
},
diff --git a/src/stores/auth-store.ts b/src/stores/auth-store.ts
index 51002f9..3522e5e 100644
--- a/src/stores/auth-store.ts
+++ b/src/stores/auth-store.ts
@@ -15,19 +15,9 @@ export const useAuthStore = defineStore('auth', () => {
//TODO: manage customer login process
};
- const oidcLogin = async (): Promise