Merge pull request #1898 from bcgov/fix/EDX-2865

UX changes for EDX-2865

Author: sumathi-thirumani

frontend/src/components/sdcCollection/SDCCollectionSummary.vue

@@ -227,7 +227,7 @@ export default {
     },
     totalStepsInCollection() {
       if(this.isSchoolCollection) {
-        return this.SDC_STEPS_SCHOOL_CALC.length
+        return this.SDC_STEPS_SCHOOL_CALC.length;
       } else {
         return this.SDC_STEPS_DISTRICT_CALC.length;
       }

frontend/src/components/sdcCollection/sdcDistrictCollection/SDCDistrictCollectionView.vue

@@ -299,6 +299,7 @@ import {authStore} from '../../../store/modules/auth';
 import StepSevenFinalSubmission from './StepSevenFinalSubmission.vue';
 import ApiService from '../../../common/apiService';
 import {ApiRoutes} from '../../../utils/constants';
+import {LocalDate, LocalDateTime} from '@js-joda/core';
 
 export default defineComponent({
   name: 'SDCDistrictCollectionView',
@@ -331,7 +332,7 @@ export default defineComponent({
   computed: {
     ...mapState(sdcCollectionStore, ['currentCollectionTypeCode', 'districtCollection','currentCollectionYear']),
     ...mapState(wsNotifications, ['notification']),
-    ...mapState(appStore, ['activeSchoolsMap','activeDistrictsMap']),
+    ...mapState(appStore, ['activeSchoolsMap','activeDistrictsMap', 'config']),
     ...mapState(authStore, ['userInfo']),
     stepInCollection() {
       return this.getIndexOfSDCCollectionByStatusCode(this.districtCollection?.sdcDistrictCollectionStatusCode);
@@ -412,10 +413,11 @@ export default defineComponent({
     async getActiveSdcDistrictCollection() {
       await ApiService.apiAxios.get(ApiRoutes.sdc.SDC_COLLECTION_BY_DISTRICT_ID + '/' + this.districtID)
         .then(response => {
+          const isMigratedCollection = response.data.createDate ? LocalDateTime.parse(response.data.createDate).toLocalDate().isBefore(LocalDate.parse(this.config.SLD_MIGRATION_DATE)) : false;
           this.setCurrentCollectionSubmissionDueDate(response.data.submissionDueDate);
           this.setCurrentCollectionResolveDupDueDate(response.data.duplicationResolutionDueDate);
           this.setCurrentCollectionSignOffDueDate(response.data.signOffDueDate);
-          this.isSdcDistrictCollectionActive = response.data.sdcDistrictCollectionID === this.districtCollectionObject?.sdcDistrictCollectionID;
+          this.isSdcDistrictCollectionActive = response.data.sdcDistrictCollectionID === this.districtCollectionObject?.sdcDistrictCollectionID && !isMigratedCollection;
 
           this.submissionDueDate = 'Due: ' + formatSubmissionDate(sdcCollectionStore().currentCollectionSubmissionDueDate);
           this.duplicationResolutionDueDate = 'Due: ' + formatSubmissionDate(sdcCollectionStore().currentCollectionResolveDupDueDate);

frontend/src/components/sdcCollection/sdcDistrictCollection/StepSevenFinalSubmission.vue

@@ -11,7 +11,7 @@
             class="justify-start"
             type="info"
             variant="tonal"
-            text="Thank you for completing the 1701 collection process for your district. It is now ready for your final review and sign-off. Please use the button below to provide your sign-off for all programs. "
+            text="Thank you for completing the 1701 collection process for your district. It is now ready for your final review and sign-off. Please use the Signatures tab for signing off."
           />
         </v-col>
       </v-row>

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue

@@ -35,7 +35,7 @@
         v-if="isFinalSignOff && !isMigratedCollection"
         key="SignOff"
         value="SignOff"
-        class="sign-off-tab"
+        class="divider"
       >
         Signatures
       </v-tab>