diff --git a/ui/src/pages/TrainingReport.vue b/ui/src/pages/TrainingReport.vue index c9f4b36..a3f2e01 100644 --- a/ui/src/pages/TrainingReport.vue +++ b/ui/src/pages/TrainingReport.vue @@ -1,7 +1,7 @@ @@ -65,7 +78,7 @@ onMounted(async () => {

Training Reports

-
@@ -84,12 +97,13 @@ onMounted(async () => { - {{ report.course_name.length > 30 ? report.course_shortname : report.course_name }} + @click="router.push(`/trainingReport/${report.event_id}`)"> + {{ report.course_name.length > 30 ? report.course_shortname : + report.course_name }} {{ report.date }} {{ report.created_by_name === null ? "Unknown User" : report.created_by_name - }} + }} @@ -109,7 +123,7 @@ onMounted(async () => {

{{ focusedTrainingReport.event_date }}

Created by {{ focusedTrainingReport.created_by_name === null ? "Unknown User" : focusedTrainingReport.created_by_name - }} + }}

@@ -127,7 +141,9 @@ onMounted(async () => { class="grid grid-cols-4 py-2 items-center border-b last:border-none">

{{ person.attendee_name }}

{{ person.role.name }}

-

{{ person.remarks == "" ? '--' : person.remarks }}

+

{{ person.remarks == "" ? '--' + : person.remarks }}

@@ -141,13 +157,18 @@ onMounted(async () => { Remarks -
+

{{ person.attendee_name }}

- + - + -

{{ person.remarks == "" ? '--' : person.remarks }}

+

{{ person.remarks == "" ? '--' + : person.remarks }}

@@ -163,7 +184,8 @@ onMounted(async () => { Remarks -
+

{{ person.attendee_name }}

-

{{ person.remarks == "" ? '--' : person.remarks }}

+

{{ person.remarks == "" ? '--' + : person.remarks }}

-

{{ focusedTrainingReport.remarks == "" ? 'None' : focusedTrainingReport.remarks }}

+

{{ + focusedTrainingReport.remarks == "" ? 'None' : focusedTrainingReport.remarks }}

@@ -191,7 +217,7 @@ onMounted(async () => {
+ @submit="(newID) => { router.push(`/trainingReport/${newID}`); loadTrainingReports() }">
diff --git a/ui/src/router/index.js b/ui/src/router/index.js index 5fb1c80..b2ac33f 100644 --- a/ui/src/router/index.js +++ b/ui/src/router/index.js @@ -17,6 +17,8 @@ const router = createRouter({ { path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } }, { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true } }, { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } }, + { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } }, + { path: '/trainingReport/:id', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } }, // ADMIN / STAFF ROUTES {