From e76e85ae8ac2a8a500253398580daf92996838d2 Mon Sep 17 00:00:00 2001
From: "QSL\\SumathiT" <sumathi.thirumani@quartech.com>
Date: Thu, 26 Sep 2024 14:52:43 -0700
Subject: [PATCH 1/4] =?UTF-8?q?Issue1:=20Log=20in=20as=20a=20SCH=20user=20?=
 =?UTF-8?q?with=20a=20read-only=20role=20and=20navigate=20to=20Step=206:?=
 =?UTF-8?q?=20Resolve=20Province=20Duplicates=20(Data=20Collection)=20:=20?=
 =?UTF-8?q?Fixed=20Issue2:=20=20Log=20in=20as=20a=20SCH=20user=20with=20a?=
 =?UTF-8?q?=20read-only=20role=20and=20navigate=20to=20Step=206:=20Resolve?=
 =?UTF-8?q?=20Province=20Duplicates=20(Data=20Collection)=20:=20Fixed=20Is?=
 =?UTF-8?q?sue3:=20Log=20in=20as=20a=20SCH=20user=20with=20the=20Edit=20SD?=
 =?UTF-8?q?C=20role=20and=20navigate=20to=20Step=201:=20Upload=20Data=20(D?=
 =?UTF-8?q?ata=20Collection).=20:=20Fixed=20Issue=205=20:DIS=20side=20?=
 =?UTF-8?q?=E2=86=92=20Log=20in=20as=20a=20DIS=20user=20and=20navigate=20t?=
 =?UTF-8?q?o=20Step=205:=20Submit=20to=20Ministry.=20:=20Fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StepFiveSubmitToMinistry.vue              |  2 +-
 .../ProvincialDuplicatesStep.vue              |  4 ++--
 .../stepOneUploadData/SummaryComponent.vue    | 20 ++++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
index 3489a517..5321f4ca 100644
--- a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
+++ b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
@@ -40,7 +40,7 @@
 
         <StepThreeVerifyData
           :district-collection-object="districtCollectionObject"
-          :is-final-sign-off="true"
+          :is-final-sign-off="districtCollectionObject?.collectionTypeCode === 'SEPTEMBER' ? false : true"
           :is-collection-active="isCollectionActive"
         />
       </div>
diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/ProvincialDuplicatesStep.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/ProvincialDuplicatesStep.vue
index 36f824f9..74f12d4f 100644
--- 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/frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
index a3d11adc..0c9bb909 100644
--- a/frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
+++ b/frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
@@ -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',
@@ -119,21 +120,22 @@ export default defineComponent({
     EnrollmentHeadcountsComponent,
     HeadCountReportComponent},
   data() {
+    const summaryTabs = [
+      'Overall',
+      'French Programs',
+      'Career Programs',
+      'Indigenous Students & Support Programs',
+      'Inclusive Education',
+      'English Language Learning'       
+    ];
+    this.currentCollectionTypeCode === COLLECTIONCODETYPE.FEBRUARY ? summaryTabs.push( 'Refugee') : null;
     return {
       isLoading: false,
       headcountHeaders: [],
       headcountTableData: {},
       compareSwitch: false,
       currentTableID: null,
-      tabs: [
-        'Overall',
-        'French Programs',
-        'Career Programs',
-        'Indigenous Students & Support Programs',
-        'Inclusive Education',
-        'English Language Learning',
-        'Refugee'
-      ],
+      tabs: summaryTabs,      
       selectedTab: null,
       studentsInError: null,
       headerSearchParams: {}

From bc2ab14e43c5df8b14d16acf82a11bcba146edf5 Mon Sep 17 00:00:00 2001
From: "QSL\\SumathiT" <sumathi.thirumani@quartech.com>
Date: Thu, 26 Sep 2024 15:30:42 -0700
Subject: [PATCH 2/4] Issue3: Log in as a SCH user with the Edit SDC role and
 navigate to Step 1: Upload Data (Data Collection). : Fixed

---
 .../stepOneUploadData/SummaryComponent.vue    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue b/frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
index 0c9bb909..66631956 100644
--- a/frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
+++ b/frontend/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"
@@ -120,22 +120,21 @@ export default defineComponent({
     EnrollmentHeadcountsComponent,
     HeadCountReportComponent},
   data() {
-    const summaryTabs = [
-      'Overall',
-      'French Programs',
-      'Career Programs',
-      'Indigenous Students & Support Programs',
-      'Inclusive Education',
-      'English Language Learning'       
-    ];
-    this.currentCollectionTypeCode === COLLECTIONCODETYPE.FEBRUARY ? summaryTabs.push( 'Refugee') : null;
     return {
       isLoading: false,
       headcountHeaders: [],
       headcountTableData: {},
       compareSwitch: false,
       currentTableID: null,
-      tabs: summaryTabs,      
+      tabs: [
+        'Overall',
+        'French Programs',
+        'Career Programs',
+        'Indigenous Students & Support Programs',
+        'Inclusive Education',
+        'English Language Learning',
+        'Refugee'
+      ],      
       selectedTab: null,
       studentsInError: null,
       headerSearchParams: {}
@@ -174,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: {

From a1bd32e5a14ab79b408d61ac0397859230f09b5c Mon Sep 17 00:00:00 2001
From: "QSL\\SumathiT" <sumathi.thirumani@quartech.com>
Date: Thu, 26 Sep 2024 16:01:15 -0700
Subject: [PATCH 3/4] Changes to mark finalsignoff as false for step#5.

---
 .../sdcDistrictCollection/StepFiveSubmitToMinistry.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
index 5321f4ca..e646d7e7 100644
--- a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
+++ b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
@@ -40,7 +40,7 @@
 
         <StepThreeVerifyData
           :district-collection-object="districtCollectionObject"
-          :is-final-sign-off="districtCollectionObject?.collectionTypeCode === 'SEPTEMBER' ? false : true"
+          :is-final-sign-off="false"
           :is-collection-active="isCollectionActive"
         />
       </div>

From 4ee31017ff6d9056626d8983a4c3ef000874a2de Mon Sep 17 00:00:00 2001
From: "QSL\\SumathiT" <sumathi.thirumani@quartech.com>
Date: Thu, 26 Sep 2024 16:57:09 -0700
Subject: [PATCH 4/4] New flag to show signature on step-7 only.

---
 .../sdcDistrictCollection/StepFiveSubmitToMinistry.vue     | 2 +-
 .../sdcDistrictCollection/StepSevenFinalSubmission.vue     | 1 +
 .../stepThreeVerifyData/StepThreeVerifyData.vue            | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
index e646d7e7..3489a517 100644
--- a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
+++ b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepFiveSubmitToMinistry.vue
@@ -40,7 +40,7 @@
 
         <StepThreeVerifyData
           :district-collection-object="districtCollectionObject"
-          :is-final-sign-off="false"
+          :is-final-sign-off="true"
           :is-collection-active="isCollectionActive"
         />
       </div>
diff --git a/frontend/src/components/sdcCollection/sdcDistrictCollection/StepSevenFinalSubmission.vue b/frontend/src/components/sdcCollection/sdcDistrictCollection/StepSevenFinalSubmission.vue
index 2695f870..b8f054a4 100644
--- 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/frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue b/frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue
index 1b0872e6..dc0a28b2 100644
--- a/frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue
+++ b/frontend/src/components/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'],