Skip to content

Commit

Permalink
Update Discard/Withdraw button to Cancel button
Browse files Browse the repository at this point in the history
  • Loading branch information
@vietle-cgi
vietle-cgi committed Jul 25, 2023
1 parent d2e745f commit 6bf8c5a
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 49 deletions.
69 changes: 35 additions & 34 deletions frontend/src/components/requestChanges/ReportChanges.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,32 +120,22 @@
Update
</v-btn>
<v-btn
v-if="isDiscardButtonDisplayed(item.externalStatus)"
v-if="isCancelButtonDisplayed(item.externalStatus)"
class="blueOutlinedButton mr-3 my-2"
@click="confirmDiscardChangeRequest(item.changeRequestId)"
@click="confirmCancelChangeRequest(item.changeRequestId, item.changeTypeString, item.externalStatus, item.submissionDateString)"
outlined
:width="changeHistoryButtonWidth"
>
Discard
Cancel
</v-btn>
<!-- FUTURE RELEASE -->
<!-- <v-btn
v-if="isWithdrawButtonDisplayed(item.externalStatus, item.internalStatus)"
class="blueOutlinedButton mr-3 my-2"
@click="false"
outlined
:width="changeHistoryButtonWidth"
>
Withdraw
</v-btn> -->
</template>
</v-data-table>
<v-dialog v-model="dialog" persistent max-width="525px">
<v-card>
<v-container class="pt-0">
<v-row>
<v-col cols="7" class="py-0 pl-0" style="background-color:#234075;">
<v-card-title class="white--text">Discard Change Request</v-card-title>
<v-card-title class="white--text font-weight-bold">Cancel a change request</v-card-title>
</v-col>
<v-col cols="5" class="d-flex justify-end" style="background-color:#234075;">
</v-col>
Expand All @@ -155,13 +145,15 @@
</v-row>
<v-row>
<v-col cols="12" style="text-align: left;">
<p class="pt-4">Are you sure you want to discard this change request?</p>
<p class="pt-8">Are you sure you want to cancel this change request?</p>
<p class="pt-2">[{{cancelChangeRequestType}}] [{{cancelChangeRequestStatus}}] [{{cancelChangeRequestSubmissionDate}}]</p>
<p class="pt-2 pb-8">You will not be able to resume a cancelled request. They will be viewable in your change history.</p>
</v-col>
</v-row>
<v-row>
<v-col cols="12" style="text-align: center;">
<v-btn dark color="secondary" :loading="processing" class="mr-10" @click="dialog = false">Cancel</v-btn>
<v-btn dark color="primary" :loading="processing" @click="deleteRequest()">Continue</v-btn>
<v-btn dark color="primary" :loading="processing" @click="cancel()">Continue</v-btn>
</v-col>
</v-row>
</v-container>
Expand Down Expand Up @@ -213,6 +205,10 @@ export default {
],
changeHistoryButtonWidth: '100px',
dialog: false,
cancelChangeRequestId: undefined,
cancelChangeRequestType: undefined,
cancelChangeRequestStatus: undefined,
cancelChangeRequestSubmissionDate: undefined,
};
},
computed: {
Expand Down Expand Up @@ -241,8 +237,8 @@ export default {
facilityNames: this.createFacilityNameString(changeRequest.changeActions),
internalStatus: this.getInternalStatusString(changeRequest.status),
externalStatus: this.getExternalStatusString(changeRequest.externalStatus),
submissionDate: changeRequest?.latestSubmissionDate,
submissionDateString: this.getSubmissionDateString(changeRequest?.latestSubmissionDate),
submissionDate: changeRequest?.firstSubmissionDate,
submissionDateString: this.getSubmissionDateString(changeRequest?.firstSubmissionDate),
priority: changeRequest?.priority
}));
}
Expand All @@ -257,7 +253,7 @@ export default {
}
},
methods: {
...mapActions('reportChanges', ['loadChangeRequest', 'deleteChangeRequest', 'createChangeRequest' ]),
...mapActions('reportChanges', ['loadChangeRequest', 'deleteChangeRequest', 'createChangeRequest', 'cancelChangeRequest']),
...mapMutations('reportChanges', ['setChangeRequestId', 'setChangeActionId']),
previous() {
this.$router.push(PATHS.ROOT.HOME);
Expand Down Expand Up @@ -314,7 +310,7 @@ export default {
getExternalStatusString(status){
switch (status){
case 1:
return "Incomplete";
return "In progress";
case 2:
return "Submitted";
case 3:
Expand All @@ -332,7 +328,7 @@ export default {
getInternalStatusString(status){
switch (status){
case 1:
return "Incomplete";
return "In progress";
case 3:
return "Submitted";
case 4:
Expand Down Expand Up @@ -431,17 +427,26 @@ export default {
}
},
confirmDiscardChangeRequest(requestId) {
this.discardChangeRequestId = requestId;
confirmCancelChangeRequest(requestId, requestType, requestStatus, submissionDate) {
this.cancelChangeRequestId = requestId;
this.cancelChangeRequestType = requestType;
this.cancelChangeRequestStatus = requestStatus;
this.cancelChangeRequestSubmissionDate = submissionDate;
this.dialog = true;
},
async deleteRequest(requestId){
async cancel(){
this.processing = true;
try{
await this.deleteChangeRequest(requestId);
try {
await this.cancelChangeRequest(this.cancelChangeRequestId);
this.cancelChangeRequestId = undefined;
this.setSuccessAlert('Success! Your change request have been canceled.');
}
catch(error){
this.setFailureAlert('An error occurred while deleting a change request Please try again later.');
console.log('CANCEL ERROR ----------> ');
console.log(error);
this.setFailureAlert('An error occurred while canceling a change request. Please try again later.');
}
this.processing = false;
Expand All @@ -451,15 +456,11 @@ export default {
return ['Submitted','Approved','Canceled'].includes(externalStatus);
},
isContinueButtonDisplayed(externalStatus) {
return ['Incomplete'].includes(externalStatus);
return ['In progress'].includes(externalStatus);
},
isDiscardButtonDisplayed(externalStatus) {
return ['Incomplete'].includes(externalStatus);
isCancelButtonDisplayed(externalStatus) {
return !(['Canceled'].includes(externalStatus));
},
// FUTURE RELEASE
// isWithdrawButtonDisplayed(externalStatus, internalStatus) {
// return (externalStatus == 'Submitted' && (['Submitted','Incomplete','WITH_PROVIDER'].includes(internalStatus)));
// },
isUpdateButtonDisplayed(externalStatus) {
return ['Action Required'].includes(externalStatus);
},
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/store/modules/navBar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ function getNavBarAtPositionIndex(items, index) {
function filterNavBar(state) {
if (state.changeRequestId) {
state.navBarList = state.userProfileList.filter(el => el.changeRequestId == state.changeRequestId);
// VIET - temporary removed to fix issue in the Landing page (empty navBarList)
// VIET - temporary removed to fix issue in the Landing page (empty navBarList)
// need to check with Rob to see if we need to check this programYearId
// } else if (state.programYearId) {
} else {
state.navBarList = state.userProfileList.filter(el => !el.changeRequestId); //TODO: This will take FACILITY.STATUS as well
Expand Down
35 changes: 21 additions & 14 deletions frontend/src/store/modules/reportChanges.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,20 +193,27 @@ export default {
}
},

// FUTURE RELEASE
// async withdrawChangeRequest({state, commit}, changeRequestId) {
// console.log('WITHDRAW Change request: ', changeRequestId);
// checkSession();
// if (changeRequestId){
// let payload = {
// externalStatus: 6,
// }
// let response = await ApiService.apiAxios.patch(ApiRoutes.CHANGE_REQUEST + '/' + changeRequestId, payload);
// state.model.externalStatus = 'CANCELLED';
// commit('model', state.model);
// return response;
// }
// },
async cancelChangeRequest({state, commit}, changeRequestId) {
console.log('CANCEL Change request: ', changeRequestId);
checkSession();
if (changeRequestId){
try {
let payload = {
externalStatus: 6,
}
let response = await ApiService.apiAxios.patch(ApiRoutes.CHANGE_REQUEST + '/' + changeRequestId, payload);
let index = state.changeRequestStore?.findIndex(changeRequest => changeRequest.changeRequestId == changeRequestId);
if (index) {
state.changeRequestStore[index].externalStatus = 6;
commit('setChangeRequestStore', state.changeRequestStore);
}
return response;
} catch (e) {
console.log(`Failed to cancel change request with error - ${e}`);
throw e;
}
}
},

//to load the documents, you need the change action ID. Everything else so far... you need the change REQUEST ID.
//change action id will return arr of docs
Expand Down

0 comments on commit 6bf8c5a

Please sign in to comment.