Merge branch 'dev' of https://github.com/GSA/GEAR3 into dev

I added some commits for issues #378, #377, #376
GSA · May 16, 2024 · 722c10e · 722c10e
2 parents c2a6745 + e2ea85b
commit 722c10e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html
@@ -291,26 +291,11 @@ <h5 class="modal-title text-white" id="itStandMngrTitle">
                   <div class="row align-items-center">
                     <div class="form-group col-3 text-center mb-0">
                       <label for="itStandReqAtte">Attestation Required</label>
-                      <ng-select id="itStandReqAtte" formControlName="itStandReqAtte"
-                        [items]="itStandReqAtteRefData"
-                        [multiple]="false"
-                        appendTo="#itStandardsManager"
-                        bindLabel="Name"
-                        bindValue="ID"
-                        clearAllText="Clear All"
-                        [clearSearchOnAdd]="true"
-                        [closeOnSelect]="true"
-                        [loading]="itStandReqAtteLoading"
-                        placeholder="Search & Select Attestation Status Here"
-                        [virtualScroll]="true"
-                        (scroll)="modalService.onScroll($event, itStandReqAtteBuffer, bufferSize, itStandReqAtteRefData, itStandReqAtteLoading)"
-                        (scrollToEnd)="modalService.onScrollToEnd(itStandReqAtteBuffer, bufferSize, itStandReqAtteRefData, itStandReqAtteLoading)">
-                        <ng-template ng-header-tmp>
-                          <small class="form-text text-muted">Loaded {{ itStandReqAtteBuffer.length }} of {{ itStandReqAtteRefData.length }}</small>
-                        </ng-template>
-                      </ng-select>
+                      <select class="form-control" id="itStandReqAtte" formControlName="itStandReqAtte">
+                        <option *ngFor="let attestationStatus of itStandReqAtteRefData" [value]="attestationStatus.ID"
+                          [selected]="attestationStatus.Name === itStandard.itStandReqAtte">{{ attestationStatus.Name }}</option>
+                      </select>
                     </div>
-
                     <div class="form-group col-9">
                       <label for="itStandAtteLink">Attestation Link</label>
                       <input type="text" class="form-control" id="itStandGoldLink"

diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts
@@ -197,7 +197,8 @@ export class ItStandardManagerComponent implements OnInit {
       // Set Approval Expiration Date on Date Picker to +2 years from current date
       $('#itStandAprvExp').datepicker('setDate', twoYearsLater);
       this.itStandardsForm.patchValue({
-        itStandStatus: 2
+        itStandStatus: 2,
+        itStandReqAtte: "1"
       });
     } else {