Added more strict form validation rules with user feedback

add continuous deployment yaml to execute on every push to main to build and make live

.gitea/workflows/cd-deploy.yaml

@@ -0,0 +1,62 @@
+name: Continuous Deployment
+on:
+  push:
+
+jobs:
+  Deploy:
+    name: Update Deployment
+    runs-on: ubuntu-latest
+    container:
+      volumes:
+        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:rw
+    steps:
+      - name: Setup Local Environment
+        run: |
+          groupadd -g 989 nginx || true
+          useradd nginx -u 990 -g nginx -m || true
+
+      - name: Verify Node Environment
+        run: |
+          npm -v
+          node -v
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: 'main'
+
+      - name: Token Copy
+        run: |
+          cd /var/www/html/milsim-site-v4
+          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
+          chown nginx:nginx .git/config
+
+      - name: Fix File Permissions
+        run: |
+          sudo chown -R nginx:nginx /var/www/html/milsim-site-v4
+          sudo chmod -R u+w /var/www/html/milsim-site-v4
+
+      - name: Update Application Code
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4 && git reset --hard && git pull origin main"
+
+      - name: Update Shared Dependencies
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/shared && npm install"
+
+      - name: Update UI Dependencies
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm install"
+
+      - name: Update API Dependencies
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm install"
+
+      - name: Build UI
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm run build"
+
+      - name: Build API
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm run build"

shared/schemas/trainingReportSchema.ts

@@ -1,11 +1,11 @@
 import { z } from "zod";
 
 export const courseEventAttendeeSchema = z.object({
-    attendee_id: z.number({invalid_type_error: "Must select a member"}).int().positive(),
+    attendee_id: z.number({ invalid_type_error: "Must select a member" }).int().positive(),
     passed_bookwork: z.boolean(),
     passed_qual: z.boolean(),
     remarks: z.string(),
-    attendee_role_id: z.number({invalid_type_error: "Must select a role"}).int().positive()
+    attendee_role_id: z.number({ invalid_type_error: "Must select a role" }).int().positive()
 })
 
 export const trainingReportSchema = z.object({
@@ -19,5 +19,42 @@ export const trainingReportSchema = z.object({
         ),
     remarks: z.string().nullable().optional(),
     attendees: z.array(courseEventAttendeeSchema).default([]),
+}).superRefine((data, ctx) => {
+    const trainerRole = 1;
+    const traineeRole = 2;
+
+    const hasTrainer = data.attendees.some((a) => a.attendee_role_id === trainerRole);
+    const hasTrainee = data.attendees.some((a) => a.attendee_role_id === traineeRole);
+
+    if (!hasTrainer) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["attendees"],
+            message: "At least one Primary Trainer is required.",
+        });
+    }
+
+    if (!hasTrainee) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["attendees"],
+            message: "At least one Trainee is required.",
+        });
+    }
+
+    //no duplicates
+    const idCounts = new Map<number, number>();
+
+    data.attendees.forEach((a, index) => {
+        idCounts.set(a.attendee_id, (idCounts.get(a.attendee_id) ?? 0) + 1);
+
+        if (idCounts.get(a.attendee_id)! > 1) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["attendees"],
+                message: "Cannot have duplicate attendee.",
+            });
+        }
+    })
 })
 

ui/.env.example

@@ -5,6 +5,3 @@ VITE_ENVIRONMENT= # dev / prod
 # Glitchtip
 VITE_GLITCHTIP_DSN=
 VITE_DISABLE_GLITCHTIP= # true/false
-
-# Matomo
-VITE_DISABLE_MATOMO= # true/false

ui/package-lock.json

@@ -8,7 +8,6 @@
       "name": "milsimsitev4",
       "version": "0.0.0",
       "dependencies": {
-        "@certible/use-matomo": "^1.1.0",
         "@fullcalendar/core": "^6.1.19",
         "@fullcalendar/daygrid": "^6.1.19",
         "@fullcalendar/interaction": "^6.1.19",
@@ -511,12 +510,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@certible/use-matomo": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@certible/use-matomo/-/use-matomo-1.1.0.tgz",
-      "integrity": "sha512-9kOTj0ldP+RX2Rhlosxm/+1uQ2deDefMb4p2DQGFi3Gqi3TuTSrOtx+beUNKGN7D8up/8SsBPJS+ipY1ZHMfrA==",
-      "license": "MIT"
-    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
@@ -3601,13 +3594,13 @@
       }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -3735,17 +3728,17 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.2.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.4.tgz",
-      "integrity": "sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
+      "integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "fdir": "^6.5.0",
+        "fdir": "^6.4.6",
         "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
         "rollup": "^4.43.0",
-        "tinyglobby": "^0.2.15"
+        "tinyglobby": "^0.2.14"
       },
       "bin": {
         "vite": "bin/vite.js"

ui/package.json

@@ -12,7 +12,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certible/use-matomo": "^1.1.0",
     "@fullcalendar/core": "^6.1.19",
     "@fullcalendar/daygrid": "^6.1.19",
     "@fullcalendar/interaction": "^6.1.19",

ui/src/components/trainingReport/trainingReportForm.vue

@@ -18,10 +18,12 @@ import FieldSet from '../ui/field/FieldSet.vue'
 import FieldLegend from '../ui/field/FieldLegend.vue'
 import FieldDescription from '../ui/field/FieldDescription.vue'
 import Checkbox from '../ui/checkbox/Checkbox.vue'
+import { configure } from 'vee-validate'
 
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
     validationSchema: toTypedSchema(trainingReportSchema),
+    validateOnMount: false,
     initialValues: {
         course_id: null,
         event_date: "",
@@ -129,8 +131,17 @@ onMounted(async () => {
 
         <VeeFieldArray name="attendees" v-slot="{ fields, push, remove }">
             <FieldSet class="gap-4">
-                <FieldLegend class="scroll-m-20 text-lg tracking-tight">Attendees</FieldLegend>
-                <FieldDescription>Add members who attended this session.</FieldDescription>
+                <div class="flex flex-col gap-2">
+                    <FieldLegend class="scroll-m-20 text-lg tracking-tight mb-0">Attendees</FieldLegend>
+                    <FieldDescription class="mb-0">Add members who attended this session.</FieldDescription>
+                    <div class="h-4">
+                        <div class="text-red-500 text-sm"
+                            v-if="errors.attendees && typeof errors.attendees === 'string'">
+                            {{ errors.attendees }}
+                        </div>
+                    </div>
+                </div>
+
 
                 <FieldGroup class="gap-4">
 

ui/src/main.js

@@ -9,10 +9,14 @@ import FormCheckbox from './components/form/FormCheckbox.vue'
 import FormInput from './components/form/FormInput.vue'
 
 import * as Sentry from "@sentry/vue";
-import { initMatomo } from "@certible/use-matomo"
+
+
+
 
 const app = createApp(App)
 
+
+
 app.use(createPinia())
 app.use(router)
 
@@ -32,18 +36,7 @@ if (!!import.meta.env.VITE_DISABLE_GLITCHTIP) {
     });
 }
 
-if (!!import.meta.env.VITE_DISABLE_MATOMO) {
-    console.log("Matomo init")
-    app.use(initMatomo({
-        host: 'https://stats.nexuszone.net/',
-        siteId: 4,
-        trackRouter: true,
-    }));
-}
-
 app.component("FormInput", FormInput)
 app.component("FormCheckbox", FormCheckbox)
 
 app.mount('#app')
-
-// window._paq.push(['trackPageView']);