WUP Fixes and Student Create

Author: datajohnson

src/api/routes/admin/student-router.ts

@@ -2,7 +2,7 @@ import express, { Request, Response } from "express";
 import { body, param } from "express-validator";
 import moment from "moment";
 import knex from "knex";
-import { orderBy } from "lodash";
+import { isNil, orderBy } from "lodash";
 import axios from "axios";
 import { ReturnValidationErrors, ReturnValidationErrorsCustomMessage } from "@/middleware";
 import { API_PORT, DB_CONFIG, NODE_ENV } from "@/config";
@@ -22,19 +22,36 @@ studentRouter.post(
   [body("first_name").notEmpty(), body("last_name").notEmpty()],
   ReturnValidationErrors,
   async (req: Request, res: Response) => {
-    let { first_name, last_name, initials, locator_number, sin } = req.body;
-
-    let student = {
-      first_name,
-      last_name,
-      initials,
-      locator_number,
-      sin,
-    };
+    let { first_name, last_name, sin, birth_date } = req.body;
+
+    let trx = await db.transaction();
+
+    try {
+      let person = {
+        first_name,
+        last_name,
+        sin,
+        birth_date,
+      };
 
-    let result = await insertStudent(student);
+      const newPerson = await trx("sfa.person").insert(person).returning("*");
 
-    res.json({ data: result });
+      let student = {
+        person_id: newPerson[0].id,
+        checked_for_yukon_id: false,
+        is_crown_ward: false,
+        is_active: true,
+      };
+
+      let newStudent = await trx("sfa.student").insert(student).returning("*");
+      trx.commit();
+
+      return res.json({ data: newStudent[0] });
+    } catch (error) {
+      trx.rollback();
+      console.log(error);
+      return res.status(500).send({ messages: [{ variant: "error", text: "Save failed" }] });
+    }
   }
 );
 
@@ -1218,23 +1235,6 @@ studentRouter.delete(
   }
 );
 
-async function insertStudent(student: any) {
-  let max = (await db("sfa.STUDENT").max("student_id as smax").first())?.smax;
-  let limit = 5;
-
-  while (limit > 0) {
-    let next = max; //+ 1;
-    try {
-      student.student_id = next;
-      let returning = await knex("sfa.STUDENT").insert(student).returning("*");
-      return returning[0];
-    } catch (err) {
-      max++;
-      limit--;
-    }
-  }
-}
-
 function cleanUser(email: string) {
   return email.substring(0, Math.min(10, email.indexOf("@")));
 }

src/api/services/admin/assessments/wup-apprenticeship-service.ts

@@ -117,17 +117,19 @@ export class WUPApprenticeshipService {
         });
       }
 
-      const numberDependents = cleanNumber(data.dependent_care_number_of_children);
-      const dependentWeeklyRate = 7 * 50; // $50 per day per child
+      const numberDependents = cleanNumber(data.dependent_care_number_of_children) ?? 0;
+      const numberDays = cleanNumber(data.dependent_care_number_of_days) ?? 0;
+
+      const dependentDailyRate = 50; // $50 per day per child
 
       // not sure what data.dependent_care_subsidy_eligible impacts
 
       if (data.dependent_care_allowance) {
         data.requested_supports.push({
           type: "Dependent care allowance",
-          frequency: "Weekly",
-          amount: numberDependents * dependentWeeklyRate,
-          total_amount: numberDependents * dependentWeeklyRate * this.parent.assessment.weeks_allowed,
+          frequency: "Once per application",
+          amount: null,
+          total_amount: numberDependents * dependentDailyRate * numberDays,
           assessed_date: null,
         });
       }

src/web/src/components/application/assessments/views/WUP-Apprenticeship.vue

@@ -27,7 +27,7 @@
                 <v-list-item-icon><v-icon>mdi-content-save</v-icon></v-list-item-icon>
                 <v-list-item-title>Save</v-list-item-title>
               </v-list-item>
-              <v-list-item v-if="canSave" @click="recalculateClick">
+              <v-list-item v-if="canRecalculate" @click="recalculateClick">
                 <v-list-item-icon><v-icon>mdi-refresh</v-icon></v-list-item-icon>
                 <v-list-item-title>Recalculate</v-list-item-title>
               </v-list-item>
@@ -319,6 +319,10 @@ export default {
       let lastItem = this.assessmentItems[this.assessmentItems.length - 1];
       return lastItem.id === parseInt(this.assessment.id);
     },
+
+    canRecalculate() {
+      return this.canSave && !isNil(this.assessment) && this.assessment.id > 0;
+    },
     canAddAssessment() {
       return !isNil(this.assessment) && this.canSave && this.assessment.id > 0;
     },

src/web/src/components/application/wup-funding-requests/apprenticeship-training-support/ApprenticeshipTrainingForm.vue

@@ -259,8 +259,20 @@
                 @change="saveItem"
               />
             </v-col>
+            <v-col cols="12" md="3">
+              <v-text-field
+                v-model="fundingRequest.json_data.dependent_care_number_of_days"
+                label="Number of days approved"
+                dense
+                outlined
+                background-color="white"
+                hide-details
+                @change="saveItem"
+              />
+            </v-col>
 
-            <v-col cols="12" md="8">
+
+            <v-col cols="12" md="6">
               <v-switch
                 v-model="fundingRequest.json_data.dependent_care_subsidy_eligible"
                 label="Apprentice is eligible for Yukon Child Care Subsidy"

src/web/src/router/index.js

@@ -76,6 +76,7 @@ import CSLRestrictedDataModuleRoutes from "@/modules/csl-restricted-data/router"
 
 import administrationRoutes from "@/modules/Administration/router";
 import fundingRequestRoutes from "@/components/application/funding-requests/router";
+import CreateStudent from "../views/CreateStudent.vue";
 
 Vue.use(VueRouter);
 
@@ -268,6 +269,14 @@ const routes = [
       requiresAuth: true,
     },
   },
+  {
+    path: "/create-student",
+    name: "CreateStudent",
+    component: CreateStudent,
+    meta: {
+      requiresAuth: true,
+    },
+  },
 
   {
     path: "/sign-in",

src/web/src/views/CreateStudent.vue

@@ -0,0 +1,139 @@
+<template>
+  <div>
+    <h1>
+      Create Student
+    </h1>
+    <v-row>
+      <v-col cols="12" md="6">
+        <v-card class="default">
+          <v-card-text>
+            <v-form>
+              <v-row class="mb-4">
+                <v-col cols="12" md="6">
+                  <v-text-field
+                    label="First name"
+                    dense
+                    outlined
+                    hide-details
+                    background-color="white"
+                    v-model="student.first_name"
+                  ></v-text-field>
+                </v-col>
+                <v-col cols="12" md="6">
+                  <v-text-field
+                    label="Last name"
+                    dense
+                    outlined
+                    hide-details
+                    background-color="white"
+                    v-model="student.last_name"
+                  ></v-text-field>
+                </v-col>
+                <v-col cols="12" md="6">
+                  <v-text-field
+                    label="SIN"
+                    dense
+                    outlined
+                    hide-details
+                    background-color="white"
+                    v-model="student.sin"
+                    oninput="
+                if (this.value.length > 9) this.value = this.value.slice(0, 9);
+              "
+                    @keypress="validate.isNumber($event)"
+                  ></v-text-field>
+                </v-col>
+                <v-col cols="12" md="6">
+                  <v-menu
+                    v-model="show_menu"
+                    :close-on-content-click="false"
+                    transition="scale-transition"
+                    left
+                    nudge-top="26"
+                    offset-y
+                    min-width="auto"
+                  >
+                    <template v-slot:activator="{ on, attrs }">
+                      <v-text-field
+                        label="Birth date"
+                        append-icon="mdi-calendar"
+                        :value="student.birth_date"
+                        hide-details
+                        readonly
+                        outlined
+                        dense
+                        background-color="white"
+                        v-bind="attrs"
+                        v-on="on"
+                      ></v-text-field>
+                    </template>
+                    <v-date-picker
+                      :value="student.birth_date"
+                      @input="
+                        (e) => {
+                          student.birth_date = e;
+                          show_menu = false;
+                        }
+                      "
+                    ></v-date-picker>
+                  </v-menu>
+                </v-col>
+              </v-row>
+
+              <div class="d-flex">
+                <v-btn :disabled="!formValid" color="primary" @click="saveClick">Create</v-btn>
+                <v-spacer />
+                <v-btn text to="/dashboard" color="warning" outlined>Cancel</v-btn>
+              </div>
+            </v-form>
+          </v-card-text>
+        </v-card>
+      </v-col>
+    </v-row>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { STUDENT_URL } from "@/urls";
+import validator from "@/validator";
+
+export default {
+  data: () => ({
+    showDrawer: false,
+    student: { first_name: "", last_name: "", sin: "", birth_date: "" },
+    show_menu: false,
+
+    validate: {},
+  }),
+  computed: {
+    formValid: function() {
+      let fn = this.student.first_name.trim();
+      let ln = this.student.last_name.trim();
+      let sn = this.student.sin.trim();
+      let bd = this.student.birth_date.trim();
+
+      if (fn.length == 0 || ln.length == 0 || sn.length != 9 || bd.length == 0) return false;
+
+      return true;
+    },
+  },
+  async created() {
+    this.validate = { ...validator };
+  },
+  methods: {
+    show() {
+      this.showDrawer = true;
+    },
+    saveClick() {
+      axios.post(`${STUDENT_URL}`, this.student).then((resp) => {
+        console.log(resp.data.data.id);
+
+        if (resp.data.data.id) {
+          this.$router.push(`/student/${resp.data.data.id}`);
+        }
+      });
+    },
+  },
+};
+</script>

src/web/src/views/Dashboard.vue

@@ -187,12 +187,12 @@
               <v-btn
                 x-small
                 color="primary"
-                text
-                :to="'/search?text=' + search"
+                outlined
+                :to="'/create-student'"
                 class="my-0"
                 style="font-size: 12px !important"
               >
-                Advanced search</v-btn
+                Create Student</v-btn
               >
             </div>
             <div class="float-left">Students ({{ resultCount }} matches)</div>