Merge pull request #1471 from bcgov/feature/ALCS-1740

Soil Labeling Fixes
bcgov · Mar 4, 2024 · 3b024b1 · 3b024b1
2 parents e15274c + e318b7a
commit 3b024b1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 26 deletions.
diff --git a/...ecision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/...ecision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
@@ -44,7 +44,6 @@
     <textarea
       class="soil-text-area"
       formControlName="soilTypeRemoved"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type of soil approved to be removed*"
@@ -55,7 +54,6 @@
     <textarea
       class="soil-text-area"
       formControlName="fillTypeToPlace"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type, origin and quality of fill approved to be placed*"
@@ -66,13 +64,13 @@
     <div class="soil-table">
       <div></div>
       <div>
-        <label for="volume">Soil to be Removed</label>
+        <label>Soil to be Removed</label>
       </div>
       <div>
-        <label for="volume">Fill to be placed</label>
+        <label>Fill to be placed</label>
       </div>
       <div class="label">
-        <label for="volumeToRemove">Volume*</label>
+        <label>Volume*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
@@ -101,7 +99,7 @@
         </mat-form-field>
       </div>
       <div class="label">
-        <label for="areaToRemove">Area*</label>
+        <label>Area*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
@@ -130,7 +128,7 @@
         </mat-form-field>
       </div>
       <div class="label">
-        <label for="maximumDepthToRemove">Maximum Depth*</label>
+        <label>Maximum Depth*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
@@ -159,7 +157,7 @@
         </mat-form-field>
       </div>
       <div class="label">
-        <label for="averageDepthToRemove">Average Depth*</label>
+        <label>Average Depth*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">

diff --git a/...ecision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/...ecision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
@@ -86,7 +86,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToPlace"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>

diff --git a/...ecision-input/decision-components/decision-component/roso-input/roso-input.component.html b/...ecision-input/decision-components/decision-component/roso-input/roso-input.component.html
@@ -31,7 +31,6 @@
     <textarea
       class="soil-text-area"
       formControlName="soilTypeRemoved"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type of soil approved to be removed*"
@@ -62,7 +61,7 @@
         formControlName="areaToRemove"
         placeholder="Area*"
       />
-      <span matTextSuffix>ha</span>
+      <span matTextSuffix>m<sup>2</sup></span>
     </mat-form-field>
 
     <mat-form-field appearance="outline">
@@ -86,7 +85,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToRemove"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>

diff --git a/...ecision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/...ecision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
@@ -43,7 +43,6 @@
     <textarea
       class="soil-text-area"
       formControlName="soilTypeRemoved"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type of soil approved to be removed*"
@@ -54,7 +53,6 @@
     <textarea
       class="soil-text-area"
       formControlName="fillTypeToPlace"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type, origin and quality of fill approved to be placed*"
@@ -64,13 +62,13 @@
   <div class="soil-table">
     <div></div>
     <div>
-      <label for="volume">Soil to be Removed</label>
+      <label>Soil to be Removed</label>
     </div>
     <div>
-      <label for="volume">Fill to be placed</label>
+      <label>Fill to be placed</label>
     </div>
     <div class="label">
-      <label for="volumeToRemove">Volume*</label>
+      <label>Volume*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
@@ -99,7 +97,7 @@
       </mat-form-field>
     </div>
     <div class="label">
-      <label for="areaToRemove">Area*</label>
+      <label>Area*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
@@ -124,11 +122,11 @@
           matInput
           formControlName="areaToPlace"
         />
-        <span matTextSuffix>ha</span>
+        <span matTextSuffix>m<sup>2</sup></span>
       </mat-form-field>
     </div>
     <div class="label">
-      <label for="maximumDepthToRemove">Maximum Depth*</label>
+      <label>Maximum Depth*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
@@ -157,7 +155,7 @@
       </mat-form-field>
     </div>
     <div class="label">
-      <label for="averageDepthToRemove">Average Depth*</label>
+      <label>Average Depth*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">

diff --git a/...ecision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/...ecision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
@@ -31,7 +31,6 @@
     <textarea
       class="soil-text-area"
       formControlName="fillTypeToPlace"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type, origin and quality of fill approved to be placed*"
@@ -62,7 +61,7 @@
         formControlName="areaToPlace"
         placeholder="Area*"
       />
-      <span matTextSuffix>ha</span>
+      <span matTextSuffix>m<sup>2</sup></span>
     </mat-form-field>
 
     <mat-form-field appearance="outline">
@@ -86,7 +85,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToPlace"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>

diff --git a/...ecision-input/decision-components/decision-component/roso-input/roso-input.component.html b/...ecision-input/decision-components/decision-component/roso-input/roso-input.component.html
@@ -61,7 +61,7 @@
         formControlName="areaToRemove"
         placeholder="Area*"
       />
-      <span matTextSuffix>ha</span>
+      <span matTextSuffix>m<sup>2</sup></span>
     </mat-form-field>
 
     <mat-form-field appearance="outline">
@@ -85,7 +85,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToRemove"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>