- {{ $t('pageTitles.employeeDirectory') }}
+
+ {{ $t('employee_list.page_header') }}
diff --git a/src/modules/shared/components/navigation/right-drawer.vue b/src/modules/shared/components/navigation/right-drawer.vue
index df82ab6..12e9e2c 100644
--- a/src/modules/shared/components/navigation/right-drawer.vue
+++ b/src/modules/shared/components/navigation/right-drawer.vue
@@ -36,7 +36,7 @@
- {{ $t('navBar.userMenuHome') }}
+ {{ $t('nav_bar.home') }}
@@ -47,7 +47,7 @@
- {{ $t('navBar.userMenuShiftValidation') }}
+ {{ $t('nav_bar.timesheet_approvals') }}
@@ -58,7 +58,7 @@
- {{ $t('navBar.userMenuEmployeeList') }}
+ {{ $t('nav_bar.employee_list') }}
@@ -69,7 +69,7 @@
- {{ $t('navBar.userMenuTimesheetTemp') }}
+ {{ $t('nav_bar.timesheet') }}
@@ -79,7 +79,7 @@
- {{ $t('navBar.userMenuProfile') }}
+ {{ $t('nav_bar.profile') }}
@@ -89,7 +89,7 @@
- {{ $t('navBar.userMenuHelp') }}
+ {{ $t('nav_bar.help') }}
@@ -100,7 +100,7 @@
- {{ $t('navBar.userMenuLogout') }}
+ {{ $t('nav_bar.logout') }}
diff --git a/src/modules/shared/components/utils/table-filters.vue b/src/modules/shared/components/utils/table-filters.vue
index 3c4dc23..acdc527 100644
--- a/src/modules/shared/components/utils/table-filters.vue
+++ b/src/modules/shared/components/utils/table-filters.vue
@@ -25,7 +25,7 @@ const emit = defineEmits<{
dense
rounded
debounce="300"
- :label="$t('shared.searchBar')"
+ :label="$t('shared.label.search')"
label-color="primary"
bg-color="white"
color="primary"
diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue
index bf8e243..d2cb7a7 100644
--- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue
+++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue
@@ -7,27 +7,16 @@
value: unknown;
};
- type CardButton = {
- icon: string;
- label: string;
- onClick: () => void;
- };
-
- const props = defineProps<{
+ const { cols, row, initialState } = defineProps<{
cols: TableColumn[];
row: PayPeriodOverviewEmployee;
initialState: boolean;
}>();
const emit = defineEmits<{
- clickDetails: [email: string];
+ clickDetails: [ email: string ];
updateApproval: [ value: boolean ];
}>();
-
- const card_buttons: CardButton[] = [
- { icon: 'work_history', label: 'timeSheetValidations.tooltipTimeline', onClick: () => emit('clickDetails', props.row.email) },
- { icon: 'open_in_new', label: 'timeSheetValidations.tooltipTimesheet', onClick: () => emit('clickDetails', props.row.email) }
- ];
@@ -39,7 +28,7 @@
class="q-py-none q-pl-md relative"
>
- {{ props.row.employee_name }}
+ {{ row.employee_name }}
@@ -47,22 +36,20 @@
- {{$t(button.label)}}
+ {{ $t('timesheet_approvals.tooltip.button_detailed_view') }}
@@ -84,10 +71,10 @@
:class="$q.screen.lt.md ? 'col' : 'col-8'"
>
- {{ props.cols.find(c => c.name === 'regular_hours')?.label }}
+ {{ cols.find(c => c.name === 'regular_hours')?.label }}
- {{ props.cols.find(c => c.name === 'regular_hours')?.value }}
+ {{ cols.find(c => c.name === 'regular_hours')?.value }}
@@ -98,7 +85,7 @@
- {{ props.row.total_hours + 'h' }}
+ {{ row.total_hours + ' h' }}
total
diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue
index ef1b4ae..67494a5 100644
--- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue
+++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue
@@ -26,65 +26,68 @@
const columns = computed((): QTableColumn[] => [
{
name: 'employee_name',
- label: t('timeSheetValidations.tableColumnLabelFullname'),
+ label: t('timesheet_approvals.table.full_name'),
field: 'employee_name',
sortable: true
},
{
name: 'email',
- label: t('timeSheetValidations.tableColumnLabelEmail'),
+ label: t('timesheet_approvals.table.email'),
field: 'email',
sortable: true,
},
{
name: 'regular_hours',
- label: t('timeSheetValidations.tableColumnLabelRegularHours'),
+ label: t('shared.shift_type.regular'),
field: 'regular_hours',
sortable: true
},
{
name: 'evening_hours',
- label: t('timeSheetValidations.tableColumnLabelEveningHours'),
+ label: t('shared.shift_type.evening'),
field: 'evening_hours'
},
{
name: 'emergency_hours',
- label: t('timeSheetValidations.tableColumnLabelEmergencyHours'),
+ label: t('shared.shift_type.emergency'),
field: 'emergency_hours'
},
{
name: 'overtime_hours',
- label: t('timeSheetValidations.tableColumnLabelOvertime'),
+ label: t('shared.shift_type.overtime'),
field: 'overtime_hours'
},
{
name: 'expenses',
- label: t('timeSheetValidations.tableColumnLabelExpenses'),
+ label: t('timesheet_approvals.table.expenses'),
field: 'expenses',
sortable: true
},
{
name: 'mileage',
- label: t('timeSheetValidations.tableColumnLabelMileage'),
+ label: t('timesheet_approvals.table.mileage'),
field: 'mileage',
sortable: true
}
]);
- const has_changes = computed(() => {
- return timesheet_store.pay_period_overview_employees.some(emp => {
- return emp.is_approved !== original_approvals.value[emp.email];
- });
- });
+ // const has_changes = computed(() => {
+ // return timesheet_store.pay_period_overview_employees.some(emp => {
+ // return emp.is_approved !== original_approvals.value[emp.email];
+ // });
+ // });
+
const is_not_enough_filters = computed(() => {
return report_filter_company.value.filter(val => val === true).length < 1 ||
report_filter_type.value.filter(val => val === true).length < 1;
- })
+ });
+
const filter_types_labels = [
- t('timeSheetValidations.reportFilterShifts'),
- t('timeSheetValidations.reportFilterExpenses'),
- t('timeSheetValidations.reportFilterHoliday'),
- t('timeSheetValidations.reportFilterVacation'),
- ]
+ t('timesheet_approvals.print_report.shifts'),
+ t('timesheet_approvals.print_report.expenses'),
+ t('shared.shift_type.holiday'),
+ t('shared.shift_type.vacation'),
+ ];
+
const is_calendar_limit = computed( () => {
return timesheet_store.current_pay_period.pay_year === 2024 &&
timesheet_store.current_pay_period.pay_period_no <= 1;
@@ -152,6 +155,7 @@
:update-key="update_key"
/>
+
@@ -202,7 +206,7 @@
- {{$t('timeSheetValidations.reportFilterCategoryCompany')}}
+ {{$t('timesheet_approvals.print_report.company')}}
- {{$t('timeSheetValidations.reportFilterCategoryType')}}
+ {{$t('timesheet_approvals.print_report.type')}}
{
const dates = timesheet_store.current_pay_period.label.split('.');
- const start_date = new Intl.DateTimeFormat(locale.value, date_options).format(date.extractDate(dates[0] as string, 'YYYY-MM-DD'));
- const end_date = new Intl.DateTimeFormat(locale.value, date_options).format(date.extractDate(dates[1] as string, 'YYYY-MM-DD'));
-
- if ( dates.length === 1 ) {
- return {
- start_date: '—',
- end_date: '—'
- }
+
+ if ( dates.length < 2 ) {
+ return { start_date: '—', end_date: '—' }
}
+ const start_date = d(new Date(dates[0] as string), { day: 'numeric', month: 'long', year: 'numeric', });
+ const end_date = d(new Date(dates[1] as string), { day: 'numeric', month: 'long', year: 'numeric', });
+
return { start_date, end_date };
});
@@ -32,29 +24,20 @@
-
- {{ $t('pageTitles.timeSheetValidations') }}
-
-
-
- {{ pay_period_label.start_date }}
-
-
- {{ $t('timesheet.dateRangesTo') }}
-
-
- {{ pay_period_label.end_date }}
+
+ {{ $t('timesheet_approvals.page_title') }}
+
+
+ {{ pay_period_label.start_date }}
+
+
+ {{ $t('shared.misc.to') }}
+
+
+ {{ pay_period_label.end_date }}
+