Skip to content

Commit

Permalink
Merge branch 'main' into educ-dev-keycloak
Browse files Browse the repository at this point in the history
suzalflueck authored Dec 12, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 11bc1d8 + 0e98215 commit 516b628
Showing 4 changed files with 33 additions and 15 deletions.
23 changes: 15 additions & 8 deletions frontend/src/components/Batch/Forms/DistrunUserForm.vue
Original file line number Diff line number Diff line change
@@ -203,8 +203,8 @@
:disabled="
step == 0 ||
(step == 1 &&
(getCredential !== 'Blank certificate print' ||
getCredential !== 'Blank transcript print'))
getCredential !== 'Blank certificate print' &&
getCredential !== 'Blank transcript print')
"
variant="outlined"
>Back</v-btn
@@ -310,8 +310,7 @@ export default {
batchRequestFormStore.who = newValue;
if (newValue == "Ministry of Advanced Education") {
batchRequestFormStore.distribution = "User";
} else {
batchRequestFormStore.distribution = "BC Mail";
batchRequestFormStore.schools = [];
}
});
@@ -458,6 +457,7 @@ export default {
"getCredential",
"getDistribution",
"getCopies",
"gwtWhere",
]),
requestPayload() {
const requestTemplate = [
@@ -608,10 +608,11 @@ export default {
this.getBatchRequest,
requestTemplate
);
//set schoolOfRecords to "000000"
// set payload.user and payload.address for the request
if (
this.group == "Ministry of Advanced Education" &&
this.getCredential == "Blank certificate print"
(this.group == "Ministry of Advanced Education" &&
this.getCredential == "Blank certificate print") ||
this.getDistribution == "User"
) {
requestPayload.user = this.userFullName;
requestPayload.address = {
@@ -622,9 +623,15 @@ export default {
country: "CANADA",
code: "V8W9T6",
};
requestPayload.schoolOfRecords = ["00000000"];
}
//set schoolOfRecords to "000000" for Ministry of Advanced Education
if (
this.group == "Ministry of Advanced Education" &&
this.getCredential == "Blank certificate print"
) {
requestPayload.schoolOfRecords = ["00000000"];
}
BatchProcessingService.runDISTRUNUSER(
requestPayload,
this.getCredential,
Original file line number Diff line number Diff line change
@@ -12,14 +12,23 @@
></v-text-field>
</v-col>
</v-row>
<v-row v-if="getDistribution !== 'User'">
<v-row>
<v-col sm="2"><strong>Where</strong></v-col>
<v-col sm="10" md="4">
<v-select
v-if="getGroup != 'Ministry of Advanced Education'"
v-model="distribution"
:items="['BC Mail', 'Download']"
:items="[
'BC Mail',
'Download',
{
title: 'User - ' + userFullName,
value: 'User',
},
]"
item-title="title"
item-value="value"
:key="value"
label="Where"
variant="outlined"
require
@@ -32,7 +41,7 @@
</v-col>
</v-row>
<v-card
v-if="getDistribution === 'User'"
v-if="getDistribution == 'User'"
class="mt-4"
title="Mailing Address"
>
Original file line number Diff line number Diff line change
@@ -294,14 +294,16 @@ export default {
requestTemplate
);
try {
let response;
if (this.getGroup == "all") {
let response = await BatchProcessingService.runCERTREGEN_ALL();
response = await BatchProcessingService.runCERTREGEN_ALL();
} else {
let response = await BatchProcessingService.runCERTREGEN(
response = await BatchProcessingService.runCERTREGEN(
requestPayload,
this.getBatchRequestCrontime
);
}
console.log("returned");
this.batchLoading = false;
if (this.getBatchRequestCrontime) {
4 changes: 2 additions & 2 deletions grad-version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": {
"dev": "1.26.5",
"test": "1.26.5",
"dev": "1.26.7",
"test": "1.26.7",
"prod": "1.25.0"
}
}

0 comments on commit 516b628

Please sign in to comment.