- A test of your reflexes!
+
+ {{ $t('usersListPage.tableHeader') }}
+
\ No newline at end of file
diff --git a/src/modules/employee-list/services/services-employee-list.ts b/src/modules/employee-list/services/services-employee-list.ts
index 0c9d59c..0bffad4 100644
--- a/src/modules/employee-list/services/services-employee-list.ts
+++ b/src/modules/employee-list/services/services-employee-list.ts
@@ -1,10 +1,10 @@
// /* eslint-disable */
import { api } from 'src/boot/axios';
-import type { employeeListTableItem } from '../types/employee-list-table-interface';
+import type { EmployeeListTableItem } from '../types/employee-list-table-interface';
export const EmployeeListService = {
- getEmployeeList: async (): Promise
=> {
- const res = await api.get('/employees/employee-list');
+ getEmployeeList: async (): Promise => {
+ const res = await api.get('/employees/employee-list');
console.log('response from backend: ', res.data);
return res.data;
}
diff --git a/src/modules/employee-list/types/employee-list-table-interface.ts b/src/modules/employee-list/types/employee-list-table-interface.ts
index 7aaf40f..43feb85 100644
--- a/src/modules/employee-list/types/employee-list-table-interface.ts
+++ b/src/modules/employee-list/types/employee-list-table-interface.ts
@@ -1,6 +1,7 @@
-export interface employeeListTableItem {
+export interface EmployeeListTableItem {
first_name: string;
last_name: string;
+ email: string;
supervisor_full_name: string | null;
company_name: number;
job_title: string;
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 b63112c..ee23bba 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
@@ -70,7 +70,7 @@
{{ props.row.employee_name }}
- {{ col.value }}
+ {{ col.value }}
{{ col.label }}
diff --git a/src/pages/test-page.vue b/src/pages/test-page.vue
index b5cd91a..5ab28f6 100644
--- a/src/pages/test-page.vue
+++ b/src/pages/test-page.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/src/stores/employee-store.ts b/src/stores/employee-store.ts
index 49950eb..a3abe11 100644
--- a/src/stores/employee-store.ts
+++ b/src/stores/employee-store.ts
@@ -1,17 +1,19 @@
import { ref } from "vue";
import { defineStore } from "pinia";
-import type { employeeListTableItem } from "src/modules/employee-list/types/employee-list-table-interface";
+import type { EmployeeListTableItem } from "src/modules/employee-list/types/employee-list-table-interface";
import { EmployeeListService } from "src/modules/employee-list/services/services-employee-list";
export const useEmployeeStore = defineStore('employee', () => {
const employee = ref ({});
- const employeeList = ref([]);
+ const employeeList = ref([]);
const getEmployeeList = async () => {
- employeeList.value = await EmployeeListService.getEmployeeList().catch(err => {
+ const response = await EmployeeListService.getEmployeeList().catch(err => {
console.log("Ran into an error fetching employee list: ", err);
+ return [] as EmployeeListTableItem[];
});
- console.log("store retrieved list successfully:");
+
+ employeeList.value = response;
};
return { employee, employeeList, getEmployeeList };