louis/targo-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/matthieu/timesheet-form

Browse Source
This commit is contained in:
Matthieu Haineault 2025-09-25 09:58:07 -04:00
commit 9512bc4bf6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/modules/timesheet-approval/components/timesheet-approval-period-picker.vue → src/modules/shared/components/utils/pay-period-calendar-picker.vue
View File

8
src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue
View File

@ -2,13 +2,13 @@
/* eslint-disable */ /* eslint-disable */
import { computed, onMounted, ref } from 'vue'; import { computed, onMounted, ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { date, type QTableColumn } from 'quasar';
import { useTimesheetStore } from 'src/stores/timesheet-store'; import { useTimesheetStore } from 'src/stores/timesheet-store';
import { useTimesheetApprovalApi } from '../composables/use-timesheet-approval-api'; import { useTimesheetApprovalApi } from '../composables/use-timesheet-approval-api';
import TimesheetApprovalPeriodPicker from '../components/timesheet-approval-period-picker.vue'; import PayPeriodCalendarPicker from 'src/modules/shared/components/utils/pay-period-calendar-picker.vue';
import TimesheetApprovalEmployeeOverviewListItem from './timesheet-approval-employee-overview-list-item.vue'; import TimesheetApprovalEmployeeOverviewListItem from './timesheet-approval-employee-overview-list-item.vue';
import TimesheetApprovalEmployeeDetails from 'src/modules/timesheet-approval/pages/timesheet-approval-employee-details.vue'; import TimesheetApprovalEmployeeDetails from 'src/modules/timesheet-approval/pages/timesheet-approval-employee-details.vue';
import { date, type QTableColumn } from 'quasar'; import { type PayPeriodOverviewEmployee } from '../types/timesheet-approval-pay-period-overview-employee-interface';
import type { PayPeriodOverviewEmployee } from '../types/timesheet-approval-pay-period-overview-employee-interface';
const { t } = useI18n(); const { t } = useI18n();
const timesheet_store = useTimesheetStore(); const timesheet_store = useTimesheetStore();
@ -177,7 +177,7 @@
<template #top> <template #top>
<div class="full-width" :class="$q.screen.lt.md ? 'text-center q-gutter-sm' : 'row'"> <div class="full-width" :class="$q.screen.lt.md ? 'text-center q-gutter-sm' : 'row'">
<!-- Date Picker --> <!-- Date Picker -->
<TimesheetApprovalPeriodPicker <PayPeriodCalendarPicker
:is-disabled="timesheet_store.is_loading" :is-disabled="timesheet_store.is_loading"
:is-previous-limit="is_calendar_limit" :is-previous-limit="is_calendar_limit"
@date-selected="onDateSelected" @date-selected="onDateSelected"