From 7661b3c8d550870d92c8371ccb3de07bb8fe0fdd Mon Sep 17 00:00:00 2001 From: ajdj100 Date: Sun, 28 Dec 2025 14:27:37 -0500 Subject: [PATCH 1/3] Moved tooltip to a reusable component --- ui/src/components/tooltip/Tooltip.vue | 20 ++++++++++++ .../trainingReport/trainingReportForm.vue | 32 ++++++------------- ui/src/pages/TrainingReport.vue | 6 ---- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 ui/src/components/tooltip/Tooltip.vue diff --git a/ui/src/components/tooltip/Tooltip.vue b/ui/src/components/tooltip/Tooltip.vue new file mode 100644 index 0000000..7dca83c --- /dev/null +++ b/ui/src/components/tooltip/Tooltip.vue @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/ui/src/components/trainingReport/trainingReportForm.vue b/ui/src/components/trainingReport/trainingReportForm.vue index b68aeb0..4eea9b3 100644 --- a/ui/src/components/trainingReport/trainingReportForm.vue +++ b/ui/src/components/trainingReport/trainingReportForm.vue @@ -25,6 +25,7 @@ import Popover from "@/components/ui/popover/Popover.vue"; import PopoverTrigger from "@/components/ui/popover/PopoverTrigger.vue"; import PopoverContent from "@/components/ui/popover/PopoverContent.vue"; import Combobox from '../ui/combobox/Combobox.vue' +import Tooltip from '../tooltip/Tooltip.vue' const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({ @@ -50,7 +51,9 @@ watch(() => values.course_id, (newCourseId, oldCourseId) => { if (!oldCourseId) return; values.attendees.forEach((a, index) => { + // @ts-ignore setFieldValue(`attendees[${index}].passed_bookwork`, false); + // @ts-ignore setFieldValue(`attendees[${index}].passed_qual`, false); }); }); @@ -326,22 +329,13 @@ const filteredMembers = computed(() => {
-
- + - -
- This course does not have bookwork -
-
+
@@ -351,20 +345,12 @@ const filteredMembers = computed(() => {
-
+ - -
- This course does not have a qualification -
-
+
diff --git a/ui/src/pages/TrainingReport.vue b/ui/src/pages/TrainingReport.vue index d321ef3..5394b11 100644 --- a/ui/src/pages/TrainingReport.vue +++ b/ui/src/pages/TrainingReport.vue @@ -312,8 +312,6 @@ function setPage(pagenum: number) {
Name -
Remarks @@ -326,10 +324,6 @@ function setPage(pagenum: number) { class="justify-self-start">

{{ person.attendee_name }}

-

Date: Sun, 28 Dec 2025 14:46:04 -0500 Subject: [PATCH 2/3] Close #124 fixed checkmark visual state and added tooltip --- ui/src/components/tooltip/Tooltip.vue | 2 +- ui/src/pages/TrainingReport.vue | 28 +++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ui/src/components/tooltip/Tooltip.vue b/ui/src/components/tooltip/Tooltip.vue index 7dca83c..1e46eec 100644 --- a/ui/src/components/tooltip/Tooltip.vue +++ b/ui/src/components/tooltip/Tooltip.vue @@ -6,7 +6,7 @@ defineProps<{