Merge pull request #419 from bcgov/revert-411-dev-AA-bugs2709

Revert "bug introduc"

web/src/app/route-components/child-information/child-information.component.html

@@ -1,7 +1,7 @@
 <foi-base [showInfo]="false" [continueDisabled]="!foiForm.valid" (continue)="doContinue()" (goBack)="doGoBack()">
   <div class="foi-content">
     <form [formGroup]="foiForm" novalidate (ngSubmit)="doContinue()">
-      <h2>You’re reqesting records about a children. What is the child’s Full legal name?</h2>
+      <h2>You’re requesting records about a child. What is the child’s full legal name?</h2>
       <div class="form-group row">
         <div class="col-lg-6">
           <app-foi-valid
@@ -58,7 +58,7 @@ <h2>You’re reqesting records about a children. What is the child’s Full lega
             f1
             [form]="foiForm"
             formcontrolname="proofOfGuardianship"
-            required="Firstname is a required field."
+            required="Proof of guardianship is a required field."
             (fileSelected)="newFileSelected($event)"
           >
             <label>Attach copy of proof of guardianship:</label>

web/src/app/route-components/contact-info/contact-info.component.html

@@ -27,20 +27,19 @@ <h2>Your name</h2>
           <app-foi-valid
             [form]="foiForm"
             maxLength="Middle name is longer than the maximum {requiredLength} characters."
-
           >
-            <label>Middle name*:</label>
+            <label>Middle name:</label>
             <input formControlName="middleName" />
           </app-foi-valid>
         </div>
 
         <div class="col-lg-6">
           <app-foi-valid
             [form]="foiForm"
-            maxLength="First name is longer than the maximum {requiredLength} characters."
-            required="First name is a required field."
+            maxLength="Last name is longer than the maximum {requiredLength} characters."
+            required="Last name is a required field."
           >
-            <label>Lastname:</label>
+            <label>Last name:</label>
             <input formControlName="lastName" />
           </app-foi-valid>
         </div>

web/src/app/route-components/contact-info/contact-info.component.ts

@@ -53,7 +53,7 @@ export class ContactInfoComponent implements OnInit {
   doContinue() {
     // Update save data & proceed.
     this.dataService.setCurrentState(this.foiRequest, this.targetKey, this.foiForm);
-    this.base.goFoiForward(this.foiForm.value.IGE ? "paymentPath" : "paymentPath");
+    this.base.goFoiForward(this.foiForm.value.IGE ? "noPaymentPath" : "paymentPath");
   }
 
   doGoBack() {

web/src/app/route-components/description-timeframe/description-timeframe.component.html

@@ -7,7 +7,7 @@
       <app-alert-warning-white *ngIf="hasmcfdspecificrecordsrequests">
         We protect the identities of people who raise child protection concerns and the Freedom of Information and Protection of Privacy Act supports this. If you ask for a reporter's name, we will reply under Section 8 of the Act which means we will not confirm, deny, or provide any information.
       </app-alert-warning-white>
-      <h2>Discribe the records you are looking for:</h2>
+      <h2>Describe the records you are looking for:</h2>
 
       <div class="form-group">
         <textarea class="form-control" formControlName="description" id="description" rows="6"></textarea>

web/src/app/route-components/getting-started1/getting-started1.component.html

@@ -1,6 +1,6 @@
 <foi-base (continue)="doContinue()" (goBack)="doGoBack()" [startupComponent]="true">
   <div class="foi-content">
-    <h2>Do u need to subit a request for records?</h2>
+    <h2>Do you need to submit a request for records?</h2>
     <p>
       Before you apply, consider the following and determine if you need to request records from government.
     </p>
@@ -12,49 +12,49 @@ <h2>Do u need to subit a request for records?</h2>
     <ul>
       <li>
         Searching on
-        <a href="https://stackoverflow.com/" target="_blank">gov.bc.ca</a>
+        <a href="https://gov.bc.ca" target="_blank">gov.bc.ca</a>
       </li>
       <li>
         Checking the routinely released information on
         <a
-          href="https://theuselessweb.com/"
+          href="https://www2.gov.bc.ca/gov/content/governments/about-the-bc-government/open-government/open-information"
           target="_blank"
           >Open Information</a
         >
       </li>
       <li>
         Contacting the
         <a
-          href="https://theuselessweb.com/"
+          href="https://www2.gov.bc.ca/gov/content/governments/organizational-structure/ministries-organizations"
           target="_blank"
           >ministry or program</a
         > directly
       </li>
     </ul>
     <p>
-      These channels are the most efficient ways to <br/> INFORMATION about government and its programs and services.
+      These channels are the most efficient ways to get information about government and its programs and services.
     </p>
   </div>
   <div class="sidebar">
-    <h2>More info:</h2>
+    <h2>More information</h2>
     <h3>Learn more about:</h3>
     <ul>
       <li>
         <a
-          href="https://stackoverflow.com/"
+          href="https://www2.gov.bc.ca/gov/content/governments/organizational-structure/ministries-organizations"
           target="_blank"
           >B.C. Government’s ministries & agencies</a
         >
       </li>
       <li>
         <a
-          href="https://stackoverflow.com/"
+          href="https://www2.gov.bc.ca/gov/content/governments/about-the-bc-government/open-government/open-information"
           target="_blank"
           >Open Information</a
         >
       </li>
       <li>
-        <a href="https://stackoverflow.com/" target="_blank">data BC Catalogue</a>
+        <a href="https://www2.gov.bc.ca/gov/content/data/open-data" target="_blank">Data BC Catalogue</a>
       </li>
     </ul>
     <app-static-contact-block></app-static-contact-block>

web/src/app/route-components/getting-started1/getting-started1.component.ts

@@ -23,6 +23,6 @@ export class GettingStarted1Component implements OnInit {
     this.base.goFoiForward();
   }
   doGoBack() {
-    document.location.href = 'https://stackoverflow.com';
+    this.base.goFoiBack();
   }
 }

web/src/app/route-components/ministry-confirmation/ministry-confirmation.component.ts

@@ -64,26 +64,8 @@ export class MinistryConfirmationComponent implements OnInit {
         const feeQuantity = this.dataService.calculateUnitFeeQuantity({
           selectedMinistry: ministries.filter((m) => m.selected),
         });
-
         this.feeAmount = feeQuantity.valueOf() * 10;
 
-        if(this.feeAmount > 60 && this.feeAmount < 100)
-        {
-          this.feeAmount = 42.67
-        }
-        else if (this.feeAmount > 100 && this.feeAmount < 120)
-        {
-          this.feeAmount = 99.07
-        }
-        else if (this.feeAmount > 150 && this.feeAmount < 180)
-        {
-          this.feeAmount = 1999.99
-        }
-        else if (this.feeAmount > 180)
-        {
-          this.feeAmount = 20.00
-        }
-
         return ministries;
       }),
       map((ministries) => {

web/src/app/services/data.json

@@ -399,7 +399,7 @@
                         "routes":[
                           { "route": "personal/childprotectionchild","progress": 2},
                           { "route": "personal/childprotectionchild/ministry-confirmation","progress": 2},
-                          {"route": "personal/childprotectionchild/description-timeframe1123","progress": -200},                     
+                          {"route": "personal/childprotectionchild/description-timeframe","progress": 2},                     
                           { "route": "personal/childprotectionchild/adoptive-parents","progress": 3},
                           {"route": "personal/childprotectionchild/contact-info-options","progress": 3},
                           { "route": "personal/childprotectionchild/review-submit", "progress": 4 },
@@ -413,7 +413,7 @@
                           {"route": "personal/youthincareparent/description-timeframe","progress": 2},                     
                           { "route": "personal/youthincareparent/adoptive-parents","progress": 3},
                           {"route": "personal/youthincareparent/contact-info-options","progress": 3},
-                          { "route": "personal/youthincareparent/review-submit1234", "progress": 4 },
+                          { "route": "personal/youthincareparent/review-submit", "progress": 4 },
                           { "route": "personal/youthincareparent/submit-complete", "progress": 6 }
 
                       ]},
@@ -443,7 +443,7 @@
                       "adoption":{ "routes":[
                         { "route": "personal/adoption","progress": 2},
                         { "route": "personal/adoption/ministry-confirmation","progress": 2},
-                        {"route": "personal/adoption/description-timeframe1234","progress": -2},                     
+                        {"route": "personal/adoption/description-timeframe","progress": 2},                     
                         { "route": "personal/adoption/adoptive-parents","progress": 3},
                         {"route": "personal/adoption/contact-info-options","progress": 3},
                         { "route": "personal/adoption/review-submit", "progress": 4 },
@@ -615,7 +615,7 @@
                           {"route": "personal/yourself-child/childprotectionparent/description-timeframe","progress": 2},                     
                           { "route": "personal/yourself-child/childprotectionparent/adoptive-parents","progress": 3},
                           {"route": "personal/yourself-child/childprotectionparent/contact-info-options","progress": 3},
-                          { "route": "personal/yourself-child/childprotectionparent/review-submit1234", "progress": 4 },
+                          { "route": "personal/yourself-child/childprotectionparent/review-submit", "progress": 4 },
                           { "route": "personal/yourself-child/childprotectionparent/submit-complete", "progress": 6 }
                         ]