Merge pull request #1968 from bcgov/fix/EDX-2974

EDX-2974 - hides student differences and resolved duplicates tabs on …
bcgov · Oct 11, 2024 · 5fe953b · 5fe953b
2 parents 3012698 + 9f06be9
commit 5fe953b
Show file tree

Hide file tree

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

diff --git a/...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue b/...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue
@@ -16,23 +16,23 @@
         </div>
       </v-tab>
       <v-tab
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         key="StudentDifferences"
         value="StudentDifferences"
         class="divider"
       >
         Student <br> Differences
       </v-tab>
       <v-tab
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         key="resolvedDuplicates"
         value="resolvedDuplicates"
         class="divider"
       >
         Resolved <br> Duplicates
       </v-tab>
       <v-tab
-        v-if="isFinalSignOff && !isMigratedCollection && showSignatures"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         key="SignOff"
         value="SignOff"
         class="divider"
@@ -127,7 +127,7 @@
         />
       </v-window-item>
       <v-window-item
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         value="StudentDifferences"
         transition="false"
         reverse-transition="false"
@@ -138,7 +138,7 @@
         />
       </v-window-item>
       <v-window-item
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         value="resolvedDuplicates"
         transition="false"
         reverse-transition="false"
@@ -148,7 +148,7 @@
         />
       </v-window-item>
       <v-window-item
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         value="SignOff"
         transition="false"
         reverse-transition="false"
@@ -245,7 +245,7 @@ export default {
       type: Boolean,
       required: true
     },
-    showSignatures: {
+    showFinalSubmissionTabs: {
       type: Boolean,
       required: false,
       default: false

diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/StepSevenSubmitData.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/StepSevenSubmitData.vue
@@ -64,6 +64,7 @@
         :is-step-complete="true"
         :is-final-sign-off="true"
         :is-collection-active="isCollectionActive"
+        :show-final-submission-tabs="showFinalSubmissionTabs"
       />
     </div>
     <v-alert
@@ -133,6 +134,10 @@ export default {
       type: Boolean,
       required: true
     },
+    showFinalSubmissionTabs: {
+      type: Boolean,
+      default: false
+    }
   },
   emits: ['previous', 'next', 'refresh-store'],
   data() {

diff --git a/.../components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/StepThreeVerifyData.vue b/.../components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/StepThreeVerifyData.vue
@@ -16,15 +16,15 @@
         </div>
       </v-tab>
       <v-tab
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         key="StudentDifferences"
         value="StudentDifferences"
         class="divider"
       >
         Student <br> Differences
       </v-tab>
       <v-tab
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         key="resolvedDuplicates"
         value="resolvedDuplicates"
         class="divider"
@@ -118,7 +118,7 @@
         />
       </v-window-item>
       <v-window-item
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         value="StudentDifferences"
         transition="false"
         reverse-transition="false"
@@ -129,7 +129,7 @@
         />
       </v-window-item>
       <v-window-item
-        v-if="isFinalSignOff && !isMigratedCollection"
+        v-if="isFinalSignOff && !isMigratedCollection && showFinalSubmissionTabs"
         value="resolvedDuplicates"
         transition="false"
         reverse-transition="false"
@@ -221,6 +221,10 @@ export default {
     isCollectionActive: {
       type: Boolean,
       required: true
+    },
+    showFinalSubmissionTabs: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ['next', 'previous'],

diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/IndySchoolSteps.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/IndySchoolSteps.vue
@@ -101,6 +101,7 @@
       :school-collection-object="schoolCollectionObject"
       :is-collection-active="isSdcSchoolCollectionActive"
       :is-step-complete="true"
+      :show-final-submission-tabs="true"
       @refresh-store="refreshStore"
       @next="next"
     />

diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/IndySummerSchoolSteps.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/IndySummerSchoolSteps.vue
@@ -76,19 +76,7 @@
       :is-step-complete="isStepComplete"
       :school-collection-object="schoolCollectionObject"
       :is-collection-active="isSdcSchoolCollectionActive"
-      @refresh-store="refreshStore"
-      @next="next"
-    />
-  </v-stepper-window-item>
-  <v-stepper-window-item
-    :value="9"
-    transition="false"
-    reverse-transition="false"
-  >
-    <StepSevenSubmitData
-      :school-collection-object="schoolCollectionObject"
-      :is-collection-active="isSdcSchoolCollectionActive"
-      :is-step-complete="true"
+      :show-final-submission-tabs="true"
       @refresh-store="refreshStore"
       @next="next"
     />

diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/SchoolSteps.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/SchoolSteps.vue
@@ -79,6 +79,7 @@
       :school-collection-object="schoolCollectionObject"
       :is-collection-active="isSdcSchoolCollectionActive"
       :is-step-complete="true"
+      :show-final-submission-tabs="true"
       @refresh-store="refreshStore"
       @next="next"
     />

diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/SummerSchoolSteps.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/SummerSchoolSteps.vue
@@ -54,6 +54,7 @@
       :is-step-complete="isStepComplete"
       :school-collection-object="schoolCollectionObject"
       :is-collection-active="isSdcSchoolCollectionActive"
+      :show-final-submission-tabs="true"
       @refresh-store="refreshStore"
       @next="next"
     />