Skip to content

Commit

Permalink
Merge pull request #789 from bcgov/feature/959
Browse files Browse the repository at this point in the history
Fixed the intervention updating issue; fixed the color on rating display
  • Loading branch information
TayGov authored Nov 8, 2023
2 parents 985cd79 + 4455c28 commit 7beb8d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions cccm-frontend/src/components/RNAList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ export default {
return displayText;
},
getRatingColor(rating, formType) {
//console.log("rating, formtype: ", rating, formType);
if (rating == null || rating == '') {
return '';
}
Expand All @@ -471,6 +472,7 @@ export default {
break;
}
case this.const_rating_low:
case "LOW":
case '1AE':
case '1HE':
case '2AE':
Expand All @@ -487,6 +489,7 @@ export default {
break;
}
case this.const_rating_medium:
case "MEDIUM":
case '3AE':
case '3HE': {
colorClass = 'dashboard-background-color-yellow';
Expand All @@ -502,6 +505,7 @@ export default {
break;
}
case this.const_rating_high:
case "HIGH":
case '4ALE':
case '4AAE':
case '4AHE':
Expand Down
2 changes: 1 addition & 1 deletion cccm-frontend/src/components/form/FormRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ export default {
// setup autoSaveStore data for the form saving by doing the following:
// 1. emtpy the autoSaveDataCandidate
// 2. initialize the autoSaveData to be the initial form data, which is used to avoid unnessisary save upon form load
this.autosaveStore.autoSaveData = this.formInitData.data;
this.autosaveStore.autoSaveData = JSON.parse(JSON.stringify(this.formInitData.data));
this.autosaveStore.autoSaveData.input_key_sourceContacted = this.formInitData.data.Sources_Contacted;
this.autosaveStore.autoSaveDataCandidate = {};
console.log("form loaded, this.autosaveStore.autoSaveData: this.autosaveStore.autoSaveDataCandidate: ", this.autosaveStore.autoSaveData, this.autosaveStore.autoSaveDataCandidate);
Expand Down

0 comments on commit 7beb8d0

Please sign in to comment.