Merge pull request #509 from bcgov/release/v1.8.0

Release/v1.8.0
bcgov · Oct 19, 2023 · 5ddbb77 · 5ddbb77
2 parents 4e28565 + b116ed0
commit 5ddbb77
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 25 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -14,7 +14,6 @@
     "@braintree/sanitize-url": "^6.0.2",
     "@fortawesome/fontawesome-free": "^5.15.3",
     "@vuejs-community/vue-filter-date-format": "^1.6.3",
-    "@vuejs-community/vue-filter-date-parse": "^1.1.6",
     "axios": "^0.21.4",
     "bootstrap-vue": "^2.21.2",
     "core-js": "^3.10.1",

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
@@ -1454,12 +1454,15 @@ export default {
           }
           //disable code for release 1.7.0
           this.batchTypes = this.batchTypes.map((type) => {
-            if (type.code === "ARC_STUDENTS" || type.code === "ARC_SCH_REPORTS") {
+            if (
+              type.code === "ARC_STUDENTS" ||
+              type.code === "ARC_SCH_REPORTS"
+            ) {
               type.disabled = true;
             }
             return type;
-          });         
-                  
+          });
+
           if (!this.allowRunNonGradRun)
             this.batchTypes = this.batchTypes.filter(
               (type) => type.code != "NONGRADRUN"
@@ -1698,8 +1701,15 @@ export default {
                   if (this.batch.details["credential"] == "RC") {
                     for (let cert of certificate.data) {
                       if (!cert.distributionDate) {
-                        this.validationMessage =
-                          "Warning: This students' certificate distribution date is null.  Their original certificate has not been distributed.";
+                        if (this.batch.details["where"] == "localDownload") {
+                          // warning for download request if certificate has null distribution date
+                          this.validationMessage =
+                            "This students' certificate distribution date is null. Their original certificate has not been distributed. You may still download the requested document by clicking on the link below.";
+                        } else {
+                          // warning message for print requests to BC Mail or User if certificate has null distribution date
+                          this.validationMessage =
+                            "This students' certificate distribution date is null. Their original certificate has not been distributed. You may still submit a print request by clicking on the link below";
+                        }
                         this.validating = false;
                       } else {
                         this.validationMessage = "";
@@ -1710,11 +1720,11 @@ export default {
                   //student has a gradstatus but does not have a certificate
                   if (this.batch.details["credential"] == "RC") {
                     this.validationMessage =
-                      "Cannot reprint certificate for this student.";
+                      "Cannot reprint certificate for this student as they have not yet earned one. They may need to be run through the grad algorithm first.";
                   }
                   if (this.batch.details["credential"] == "OC") {
                     this.validationMessage =
-                      "Cannot print certificate for this student,this student does not have a certificate.";
+                      "Cannot print certificate for this student, this student does not have a certificate.";
                   }
                   this.$forceUpdate();
                   this.validating = false;

diff --git a/frontend/src/components/GraduationStatus/GRADStatus.vue b/frontend/src/components/GraduationStatus/GRADStatus.vue
@@ -480,6 +480,17 @@
                 >
                   {{ editedGradStatus.schoolName }} found.
                 </div>
+                <!-- Warning if school code for school of record is Offshore and program is 1950 -->
+                <div
+                  v-if="errorFlags.other.offshore1950"
+                  class="form-validation-message text-danger"
+                >
+                  Offshore schools do not support the Adult Graduation
+                  Program&nbsp;&nbsp;<i
+                    class="fas fa-exclamation-triangle"
+                    aria-hidden="true"
+                  ></i>
+                </div>
               </td>
               <td>
                 <b-input
@@ -832,6 +843,7 @@ export default {
         other: {
           programGrade: false,
           programComplete: false,
+          offshore1950: false,
         },
       },
       // Validation flags that do NOT prevent submission of GRAD status form
@@ -957,6 +969,12 @@ export default {
         } else {
           this.errorFlags.other.programGrade = true;
         }
+        // check that school of record is NOT offshore
+        if (this.editedGradStatus.schoolOfRecord.search(/^103.*/) >= 0) {
+          this.errorFlags.other.offshore1950 = true;
+        } else {
+          this.errorFlags.other.offshore1950 = false;
+        }
       } else {
         this.errorFlags.emptyError.adultStartDate = false;
         if (
@@ -1024,13 +1042,22 @@ export default {
       } else {
         this.errorFlags.emptyError.schoolOfRecordMissing = false;
       }
+
       if (this.editedGradStatus.schoolOfRecord.length < 8) {
         this.warningFlags.schoolOfRecordWarning = false;
         this.warningFlags.schoolNotFoundWarning = false;
         this.warningFlags.schoolOfRecordInputWarning = true;
         this.validateFields();
         return;
+      } else if (
+        this.studentGradStatus.program == "1950" &&
+        this.editedGradStatus.schoolOfRecord.search(/^103.*/) >= 0
+      ) {
+        this.errorFlags.other.offshore1950 = true;
+      } else {
+        this.errorFlags.other.offshore1950 = false;
       }
+
       if (
         this.editedGradStatus.schoolOfRecord ==
         this.studentGradStatus.schoolOfRecord

diff --git a/frontend/src/main.js b/frontend/src/main.js
@@ -6,7 +6,6 @@ import VueLogger from "vuejs-logger";
 import Vuelidate from "vuelidate";
 import { BootstrapVue, BootstrapVueIcons, ToastPlugin } from "bootstrap-vue";
 import qs from "query-string";
-import VueFilterDateParse from "@vuejs-community/vue-filter-date-parse";
 import VueFilterDateFormat from "@vuejs-community/vue-filter-date-format";
 import store from "./store/index.js";
 import "@fortawesome/fontawesome-free/css/all.css";
@@ -31,7 +30,6 @@ const options = {
 
 Vue.use(VueLogger, options);
 Vue.use(qs);
-Vue.use(VueFilterDateParse);
 Vue.use(VueFilterDateFormat);
 Vue.use(Vuex);
 Vue.use(BootstrapVue);