Skip to content

Commit

Permalink
updated district select for REGENT CERT
Browse files Browse the repository at this point in the history
  • Loading branch information
shaunlumbcgov committed Apr 19, 2024
1 parent 2e180c3 commit ce9fffa
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
11 changes: 8 additions & 3 deletions frontend/src/components/Batch/Batch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,10 @@
>
<div
class="p-0 mt-3 col-3"
v-if="batch.details['who'] == 'District'"
v-if="
batch.details['who'] == 'District' &&
batch.details['what'] != 'CERT_REGEN'
"
>
<label class="font-weight-bold">Category</label>
<b-form-select
Expand All @@ -210,7 +213,8 @@
batch.details['what'] != 'NONGRADRUN' &&
batch.details['what'] != 'DISTRUN_YE' &&
batch.details['what'] != 'DISTRUN_SUPP' &&
batch.details['what'] != 'ARC_STUDENTS'
batch.details['what'] != 'ARC_STUDENTS' &&
batch.details['what'] != 'CERT_REGEN'
"
>
<label class="font-weight-bold p-0 m-0 row"
Expand Down Expand Up @@ -1244,7 +1248,7 @@ export default {
group: [
{ text: "All", value: "all" },
"Student",
{ text: "School Category", value: "District" },
{ text: "District", value: "District" },
],
},
ARC_STUDENTS: {
Expand Down Expand Up @@ -1414,6 +1418,7 @@ export default {
if (
this.batch.details["who"] == "District" &&
this.batch.details["what"] != "CERT_REGEN" &&
!this.batch.details["categoryCode"]
) {
this.batchIsValid = false;
Expand Down
13 changes: 11 additions & 2 deletions frontend/src/components/Batch/BatchConfimInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@
</li>
<li v-if="details.who">
<strong>Group: </strong
>{{ details.who == "District" ? "School Category" : details.who }}
>{{
details.who == "District"
? details.what == "CERT_REGEN"
? "District"
: "School Category"
: details.who
}}
</li>
<li v-if="details.credential">
<strong>Credential Type: </strong>{{ details.credential }}
Expand Down Expand Up @@ -100,7 +106,10 @@
</ul>
<li
v-if="
details.where && details.what != 'REGALG' && details.what != 'TVRRUN'
details.where &&
details.what != 'REGALG' &&
details.what != 'TVRRUN' &&
details.what != 'CERT_REGEN'
"
>
<strong>Where: </strong>
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/views/BatchProcessing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,10 @@ export default {
if (this.tabContent[id]["details"].categoryCode == "") {
districtCategoryCode = [];
}
if (!districtCategoryCode.length) {
if (
!districtCategoryCode.length &&
this.tabContent[id].details["what"] != "CERT_REGEN"
) {
this.validationMessage = "Please select a district category";
return;
}
Expand Down

0 comments on commit ce9fffa

Please sign in to comment.