Merge branch 'main' into report-changes-Viet

bcgov · Sep 29, 2023 · d17b5c6 · d17b5c6
2 parents 72b0669 + f8da8dc
commit d17b5c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/frontend/src/components/RFI/RFIDocumentUpload.vue b/frontend/src/components/RFI/RFIDocumentUpload.vue
@@ -124,7 +124,7 @@ export default {
     ...mapGetters('navBar',['isChangeRequest']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
     isLocked() {
-      if (this.currentFacility.unlockRfi === 1) {
+      if (this.currentFacility.unlockRfi) {
         return false;
       } else if(this.isChangeRequest){
         if (!this.changeRequestStatus){

diff --git a/frontend/src/components/RFI/RFILanding.vue b/frontend/src/components/RFI/RFILanding.vue
@@ -1609,7 +1609,7 @@ export default {
     },
     isReadOnly() {
       //if submitted, lock er up. If unlock CCFRI - unlock
-      if (this.currentFacility?.unlockRfi === 1) {
+      if (this.currentFacility?.unlockRfi) {
         return false;
       }else if(this.isChangeRequest){
         if (!this.changeRequestStatus||this.currentFacility.unlockRfi){

diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -206,8 +206,7 @@
           <div class="px-md-12 px-7">
             <br>
             <div>
-              <p>Do you charge parent fees at this facility for any closures on business days? Indicate the facility closures on business days within the current fiscal year other than <a href="https://www2.gov.bc.ca/gov/content/employment-business/employment-standards-advice/employment-standards/statutory-holidays"> British Columbia Statutory Holidays. </a> Only indicate the date of closures where parent fees are charged.
-              </p>
+              <p> Do you charge parent fees at this facility for any closures on business days (other than designated holidays)? Only indicate the date of closures where parent fees are charged. </p>
             </div>
             <v-radio-group
               required
@@ -405,7 +404,7 @@
   </v-form>
 </template>
 <script>
-import { PATHS, pcfUrlGuid, pcfUrl } from '@/utils/constants';
+import { PATHS, pcfUrlGuid, pcfUrl, changeUrl} from '@/utils/constants';
 import { mapGetters, mapState, mapActions, mapMutations} from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import globalMixin from '@/mixins/globalMixin';
@@ -544,6 +543,9 @@ export default {
       if (this.isReadOnly){
         this.$router.push(pcfUrl(PATHS.CCFRI_HOME, this.programYearId));
       }
+      else if(this.isChangeRequest){
+        this.$router.push(changeUrl(PATHS.CCFRI_HOME, this.changeRequestId));
+      }
       else if (this.isRenewal){
         this.$router.push(pcfUrlGuid(PATHS.CCFRI_CURRENT_FEES, this.programYearId, this.$route.params.urlGuid));
       }