Merge branch 'main' into wfprev-944/Display-hint-text-as-0.00

Author: sukhpalp

client/wfprev-war/src/main/angular/src/app/components/edit-project/activities/activities.component.scss

@@ -279,9 +279,6 @@
 :host ::ng-deep .mat-mdc-checkbox-disabled .mdc-label {
   margin-left: 12px !important;
 }
-:host ::ng-deep .add-activity .shared-icon-button {
-  height: 40px !important;
-}
 
 ::ng-deep .mat-form-field-disabled .mdc-text-field {
     margin-top: 6px;

client/wfprev-war/src/main/angular/src/app/components/edit-project/wfprev-performance-update/wfprev-performance-updates.component.html

@@ -5,7 +5,11 @@
                 <wfprev-expansion-indicator
                     [isExpanded]="performanceUpdatesPanels.expanded"></wfprev-expansion-indicator>
                 <span class="project-title">Performance Updates</span>
-                <wfprev-icon-button [text]="'New Update'" [icon]="'/assets/add-button.svg'" [alt]="'add-update'"
+                <wfprev-icon-button
+                    class="new-update"
+                    [text]="'New Update'" 
+                    [icon]="'/assets/add-button.svg'" 
+                    [alt]="'new-update'"
                     [iconSize]="19" (clicked)="openDialog()">
                 </wfprev-icon-button>
             </div>

client/wfprev-war/src/main/angular/src/app/components/edit-project/wfprev-performance-update/wfprev-performance-updates.component.scss

@@ -3,7 +3,7 @@
 .performance-update-container {
     padding-top: 12px;
     margin: 0;
-    width: 1500px;
+    min-width: 1500px;
 
     .expansion-panel:nth-child(even) {
         background-color: #FAF9F8;

client/wfprev-war/src/main/angular/src/app/components/shared/icon-button/icon-button.component.scss

@@ -9,6 +9,7 @@
   background: #013366;
   border: none;
   font-family: "BCSans", "Noto Sans", Verdana, Arial, sans-serif;
+
   .icon {
     vertical-align: text-bottom;
     padding-right: 5px;
@@ -24,8 +25,15 @@
     align-items: center;
     gap: 6px;
   }
+
   &:disabled {
     background-color: #c0c0c0;
     cursor: not-allowed;
   }
+}
+
+:host-context(.new-update) .shared-icon-button,
+:host-context(.add-activity) .shared-icon-button {
+  width: 153px;
+  height: 40px;
 }

client/wfprev-war/src/main/angular/src/app/components/shared/select-field/select-field.component.scss

@@ -66,4 +66,15 @@
       margin-top: 14px;
     }
   }
+
 }
+
+:host-context(.new-update) .select-field .error {
+  color: var(--wf-colour-error);
+  font-size: 14px;
+  margin-top: 4px;
+  &.invisible {
+    visibility: hidden;
+  }
+  
+}

client/wfprev-war/src/main/angular/src/app/components/wfprev-performance-update-modal-window/wfprev-performance-update-modal-window.component.html

@@ -5,7 +5,7 @@
       <p mat-dialog-title class="title">General Update for Fiscal Activity: {{data.projectFiscalName}}</p>
       <div class="modal-window-row">
         <div>
-          <wfprev-select-field class="form-item" [label]="'Reporting Period'" [required]="true"
+          <wfprev-select-field class="form-item new-update" [label]="'Reporting Period'" [required]="true"
             [control]="reportingPeriodControl" [options]="reportingPeriod" [optionValueField]="'value'"
             [optionLabelField]="'description'" id="reportingPeriod" placeholder="Select" />
         </div>

client/wfprev-war/src/main/angular/src/app/components/wfprev-performance-update-modal-window/wfprev-performance-update-modal-window.component.scss

@@ -17,6 +17,7 @@
         }
 
         .title {
+            padding-top: 8px;
             font-size: 21px;
             font-style: normal;
             font-weight: 500;