Merge pull request #1963 from bcgov/fix/EDX-2967

Fix for EDX-2967
bcgov · Sep 27, 2024 · 41d6993 · 41d6993
2 parents fa52d37 + 4ee3101
commit 41d6993
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepSevenFinalSubmission.vue b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepSevenFinalSubmission.vue
@@ -19,6 +19,7 @@
         :district-collection-object="districtCollectionObject"
         :is-final-sign-off="true"
         :is-collection-active="isCollectionActive"
+        :show-signatures="true"
       />
     </div>
   </div>

diff --git a/...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue b/...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue
@@ -32,7 +32,7 @@
         Resolved <br> Duplicates
       </v-tab>
       <v-tab
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showSignatures"
         key="SignOff"
         value="SignOff"
         class="divider"
@@ -244,6 +244,11 @@ export default {
     isCollectionActive: {
       type: Boolean,
       required: true
+    },
+    showSignatures: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   emits: ['next', 'previous'],

diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/ProvincialDuplicatesStep.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/ProvincialDuplicatesStep.vue
@@ -50,7 +50,7 @@
           :non-allowable-duplicates="nonAllowableDuplicates"
           :allowable-duplicates="allowableDuplicates"
           :resolved-duplicates="resolvedDuplicates"
-          :can-resolve-duplicates="schoolCollectionObject.sdcSchoolCollectionStatusCode === 'P_DUP_POST'"
+          :can-resolve-duplicates="schoolCollectionObject.sdcSchoolCollectionStatusCode === 'P_DUP_POST' && hasEditPermission()"
           @refresh-duplicates="getProvincialDuplicates()"
         />
       </v-window-item>
@@ -77,7 +77,7 @@
     <PrimaryButton
       id="step-4-next-button-district"
       class="mr-3 mb-3"
-      :disabled="disableNextButton() || apiError || !hasEditPermission"
+      :disabled="disableNextButton() || apiError || !hasEditPermission()"
       icon="mdi-check"
       text="Verify as Correct"
       :click-action="next"

diff --git a/...d/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue b/...d/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
@@ -34,7 +34,7 @@
       show-arrows
     >
       <v-tab
-        v-for="name in tabs"
+        v-for="name in visibleTabs"
         :key="name"
         class="tab-divider"
         :value="name"
@@ -111,6 +111,7 @@ import EnrollmentHeadcountsComponent from './EnrollmentHeadcountsComponent.vue';
 import IndigenousHeadcountsComponent from './IndigenousHeadcountsComponent.vue';
 import {mapState} from 'pinia';
 import {sdcCollectionStore} from '../../../../store/modules/sdcCollection';
+import {COLLECTIONCODETYPE} from '../../../../utils/constants/CollectionCodeType';
 
 export default defineComponent({
   name: 'SummaryComponent',
@@ -133,7 +134,7 @@ export default defineComponent({
         'Inclusive Education',
         'English Language Learning',
         'Refugee'
-      ],
+      ],      
       selectedTab: null,
       studentsInError: null,
       headerSearchParams: {}
@@ -172,6 +173,9 @@ export default defineComponent({
         return ELL.summaryReport[0].tableID;
       }
       return null;
+    },
+    visibleTabs() {
+      return this.currentCollectionTypeCode === COLLECTIONCODETYPE.FEBRUARY ? this.tabs : this.tabs.filter((tab) => tab !== 'Refugee') ;
     }
   },
   watch: {