diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 2921b9c0f..190c98a2b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -12,7 +12,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", @@ -2970,14 +2969,6 @@ "vue": "^2.0.0" } }, - "node_modules/@vuejs-community/vue-filter-date-parse": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@vuejs-community/vue-filter-date-parse/-/vue-filter-date-parse-1.1.6.tgz", - "integrity": "sha512-OzeiL5wrq+5+sw9hJfcfaIxcG953lpe37Lf0JnRKzVvfBRTHX2t8SIVxtDmgLhSGoGx9B4bGbpv4NaIqeEofXA==", - "peerDependencies": { - "vue": "^2.0.0" - } - }, "node_modules/@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -21568,12 +21559,6 @@ "integrity": "sha512-fUjAAI/1qzJPR6AYoK00TBA6/aRYKTXjLY/rSYsWV4G5nwywKfrpOYOJi5exWyzozohyV6nrzliDlWcl32+IPg==", "requires": {} }, - "@vuejs-community/vue-filter-date-parse": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@vuejs-community/vue-filter-date-parse/-/vue-filter-date-parse-1.1.6.tgz", - "integrity": "sha512-OzeiL5wrq+5+sw9hJfcfaIxcG953lpe37Lf0JnRKzVvfBRTHX2t8SIVxtDmgLhSGoGx9B4bGbpv4NaIqeEofXA==", - "requires": {} - }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 1a640286d..e1360b062 100644 --- 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 index 51fb52652..d6e6a175a 100644 --- 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 index 3ccd9779d..8ec840159 100644 --- a/frontend/src/components/GraduationStatus/GRADStatus.vue +++ b/frontend/src/components/GraduationStatus/GRADStatus.vue @@ -480,6 +480,17 @@ > {{ editedGradStatus.schoolName }} found. + +
+ Offshore schools do not support the Adult Graduation + Program   +
= 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 index b2b878399..32f57c467 100644 --- 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);