diff --git a/src/components/session/token/SessionUser.vue b/src/components/session/token/SessionUser.vue index 90e16656..01b2feb7 100644 --- a/src/components/session/token/SessionUser.vue +++ b/src/components/session/token/SessionUser.vue @@ -16,6 +16,7 @@ import {EconomicProducts} from "@/components/session/token/SessionUser/Objects/e import {Roles} from "@/components/session/token/SessionUser/Objects/Roles.vue"; import {Permissions} from "@/components/session/token/SessionUser/Objects/Permissions.vue"; import {CollectedOrderInvoices} from "@/components/session/token/SessionUser/Objects/CollectedOrderInvoices.vue"; +import {DepartmentDailyReports} from "@/components/session/token/SessionUser/Objects/DepartmentDailyReports.vue"; import {ObjectsGlobal} from "@/components/session/token/SessionUser/Objects/ObjectsGlobal.vue"; import {useRouter} from "vue-router"; @@ -177,6 +178,7 @@ export const SessionUser = { roles: Roles, permissions: Permissions, collectedOrderInvoices: CollectedOrderInvoices, + department_daily_reports: DepartmentDailyReports, global: ObjectsGlobal, }, /** The user's token & authentication status */ @@ -269,7 +271,7 @@ export const SessionUser = { getDepartmentIdFromUrl: () => { // Check if the department id is in the route const router = useRouter(); - return router.currentRoute.value.params.departmentId; + return parseInt(router.currentRoute.value.params.departmentId); }, /** Redirect to */ redirectTo: { diff --git a/src/components/session/token/SessionUser/Objects/DepartmentDailyReports.vue b/src/components/session/token/SessionUser/Objects/DepartmentDailyReports.vue new file mode 100644 index 00000000..b1797eae --- /dev/null +++ b/src/components/session/token/SessionUser/Objects/DepartmentDailyReports.vue @@ -0,0 +1,143 @@ + \ No newline at end of file diff --git a/src/components/session/token/SessionUser/Objects/ObjectsGlobal.vue b/src/components/session/token/SessionUser/Objects/ObjectsGlobal.vue index df75fe5f..ee7d9c36 100644 --- a/src/components/session/token/SessionUser/Objects/ObjectsGlobal.vue +++ b/src/components/session/token/SessionUser/Objects/ObjectsGlobal.vue @@ -199,14 +199,16 @@ export const ObjectsGlobal = {
- `; await columns[column].options().then((response) => { // How long are the list of options for (let i = 0; i < response.length; i++) { var tmp = response[i]; // Check if the column exists in the locked values var lockedValue = lockedValues[column] === tmp.id ? 'selected' : ''; - html += ``; + html += ``; } }); html += ` diff --git a/src/router.js b/src/router.js index 0fee2bc4..299e4193 100644 --- a/src/router.js +++ b/src/router.js @@ -71,6 +71,8 @@ import DepartmentStripeSetup from "@/views/dashboards/superUserDashboard/departm import CollectedOrderInvoices from "@/views/dashboards/superUserDashboard/CollectedOrderInvoices.vue"; import CollectedOrderInvoice from "@/views/dashboards/superUserDashboard/collectedOrderInvoice/collectedOrderInvoice.vue"; +import DepartmentDailyReport + from "@/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReport.vue"; // Export the router as router export const router = createRouter({ @@ -172,6 +174,12 @@ export const router = createRouter({ component: DepartmentBookings, meta: { middleware: adminMiddleware } }, + { + name: 'dailyreport', + path: '/admin/:departmentId/modules/daily-report', + component: DepartmentDailyReport, + meta: { middleware: adminMiddleware } + }, { name: 'superuser', path: '/superuser', diff --git a/src/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReport.vue b/src/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReport.vue new file mode 100644 index 00000000..baef6ac2 --- /dev/null +++ b/src/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReport.vue @@ -0,0 +1,79 @@ + + + + + \ No newline at end of file diff --git a/src/views/dashboards/departmentDashboard/modules/daily-report/displays/DepartmentDashboardDailyReportCount.vue b/src/views/dashboards/departmentDashboard/modules/daily-report/displays/DepartmentDashboardDailyReportCount.vue new file mode 100644 index 00000000..2319a6e0 --- /dev/null +++ b/src/views/dashboards/departmentDashboard/modules/daily-report/displays/DepartmentDashboardDailyReportCount.vue @@ -0,0 +1,53 @@ + + + + + \ No newline at end of file