Merge pull request #2113 from bcgov/feature/EDX-3085-3087

Feature/edx 3085 3087
bcgov · Dec 27, 2024 · 3987ec1 · 3987ec1
2 parents 4b7ef68 + dbe05f8
commit 3987ec1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/frontend/src/components/common/SignOffSignatures.vue b/frontend/src/components/common/SignOffSignatures.vue
@@ -169,7 +169,7 @@ export default {
       const payload = {districtSignatoryRole: selectedAction?.role};
       ApiService.apiAxios.post(`${ApiRoutes.sdc.SDC_DISTRICT_COLLECTION}/${this.$route.params.sdcDistrictCollectionID}/sign-off`, payload)
         .then(() => {
-          setSuccessAlert('Success! The student details have been updated.');
+          setSuccessAlert('Success! The signature has been saved.');
         })
         .catch(error => {
           console.error(error);

diff --git a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepSevenFinalSubmission.vue b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepSevenFinalSubmission.vue
@@ -81,7 +81,6 @@ export default {
   data() {
     return {
       isCollectionSignedOff: false,
-      signOffStatus: 'COMPLETED',
       isLoading: false,
     };
   },
@@ -90,7 +89,7 @@ export default {
 
   },
   mounted() {
-    this.isCollectionSignedOff = this.signOffStatus === this.districtCollectionObject.sdcDistrictCollectionStatusCode;   
+    this.isCollectionSignedOff = this.isSignedByAllParties(this.districtCollection?.submissionSignatures);   
   },
   created() {
     
@@ -102,13 +101,16 @@ export default {
     async refreshDistrictCollection() {
       this.isLoading = !this.isLoading;
       await sdcCollectionStore().getDistrictCollection(this.districtCollectionObject.sdcDistrictCollectionID).then(async () => {
-        this.isCollectionSignedOff = this.signOffStatus === this.districtCollection.sdcDistrictCollectionStatusCode;
+        this.isCollectionSignedOff = this.isSignedByAllParties(this.districtCollection?.submissionSignatures);
         this.isLoading = !this.isLoading;
       }).catch(e => {
         console.error(e);
       }).finally(() => {
         this.isLoading = false;
       });
+    },
+    isSignedByAllParties(submissionSignatures) {
+      return submissionSignatures ? submissionSignatures.length === 3 : false;
     }
   }
 };