BP 589: Fixed User modal bug with new fields
diff --git a/src/app/masterdata-management/components/user/user.component.html b/src/app/masterdata-management/components/user/user.component.html
index a017683..ef58ef9 100644
--- a/src/app/masterdata-management/components/user/user.component.html
+++ b/src/app/masterdata-management/components/user/user.component.html
@@ -13,8 +13,8 @@
<form class="mt-3" [formGroup]="form" novalidate>
<div class="row mt-3 mb-3" *ngIf="!isModal">
<div class="col-md-12">
- <button *ngIf="authService.userHasRoles(['BP_Sachbearbeiter','BP_Admin'])" class="btn btn-success" (click)="saveUser()"
- id="userSave">Speichern</button>
+ <button *ngIf="authService.userHasRoles(['BP_Sachbearbeiter','BP_Admin'])" class="btn btn-success"
+ (click)="saveUser()" id="userSave">Speichern</button>
<button class="btn btn-danger float-right" (click)="close()" id="userCancel">Abbrechen</button>
</div>
</div>
@@ -90,27 +90,12 @@
</div>
</div>
</div>
- </div>
- <div [ngClass]="{'col-md-6': !isModal, 'col-md-12': isModal}">
- <div class="form-group row">
- <label for="notespriv" class="col-sm-3 col-form-label">Notizen (Hinweise, Informationen)</label>
- <div class="col-sm-9">
- <textarea rows="4" class="form-control textarea" id="notespriv" placeholder="notes" cols="50"
- formControlName="notes"></textarea>
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div [ngClass]="{'col-md-6': !isModal, 'col-md-12': isModal}">
<div class="form-group row">
<label for="hrNumber" class="col-sm-3 col-form-label">Personalnummer</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="hrNumber" placeholder="Personalnummer" formControlName="hrNumber">
</div>
</div>
- </div>
- <div [ngClass]="{'col-md-6': !isModal, 'col-md-12': isModal}">
<div class="form-group row">
<label for="userKey" class="col-sm-3 col-form-label">Benutzerkennung</label>
<div class="col-sm-9">
@@ -118,6 +103,15 @@
</div>
</div>
</div>
+ <div [ngClass]="{'col-md-6': !isModal, 'col-md-12': isModal}">
+ <div class="form-group row">
+ <label for="notespriv" class="col-sm-3 col-form-label">Notizen (Hinweise, Informationen)</label>
+ <div class="col-sm-9">
+ <textarea rows="6" class="form-control textarea" id="notespriv" placeholder="notes" cols="50"
+ formControlName="notes"></textarea>
+ </div>
+ </div>
+ </div>
</div>
</ng-template>
</ngb-panel>
@@ -426,8 +420,8 @@
</ngb-accordion>
<div class="row mt-3 mb-3">
<div class="col-md-12">
- <button *ngIf="authService.userHasRoles(['BP_Sachbearbeiter','BP_Admin'])" class="btn btn-success" (click)="saveUser()"
- id="userSave">Speichern</button>
+ <button *ngIf="authService.userHasRoles(['BP_Sachbearbeiter','BP_Admin'])" class="btn btn-success"
+ (click)="saveUser()" id="userSave">Speichern</button>
<button class="btn btn-danger float-right" (click)="close()" id="userCancel">Abbrechen</button>
</div>
</div>
diff --git a/src/app/masterdata-management/components/user/user.component.ts b/src/app/masterdata-management/components/user/user.component.ts
index 39223b6..efdacba 100644
--- a/src/app/masterdata-management/components/user/user.component.ts
+++ b/src/app/masterdata-management/components/user/user.component.ts
@@ -165,7 +165,9 @@
isCompany: false,
validFrom: ['', Validators.required],
validTo: ['', [Validators.required, DatepickerValidator.dateRangeTo('validFrom')]],
- notes: ''
+ notes: '',
+ hrNumber: '',
+ userKey: ''
});
}
/**
