Skip to content

Commit 315fca6

Browse files
committed
fix add employee issues
1 parent 211a5c3 commit 315fca6

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

src/Client/Logistics.OfficeApp/src/app/pages/employee/add-employee/add-employee.component.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ <h1 class="text-center">Add a new employee</h1>
4141
<div class="mb-3">
4242
<label for="role" class="form-label">Role</label>
4343
<p-dropdown formControlName="role" styleClass="w-100" [options]="roles"
44-
optionValue="name" optionLabel="displayName" [showClear]="true" (onClear)="clearSelctedRole()">
44+
optionValue="name" optionLabel="displayName"
45+
[showClear]="true"
46+
(onClear)="clearSelctedRole()">
4547
</p-dropdown>
4648
</div>
4749

@@ -50,15 +52,15 @@ <h1 class="text-center">Add a new employee</h1>
5052
type="submit"
5153
class="p-button-raised mt-3"
5254
icon="bi bi-pencil-square"
53-
[disabled]="isLoading"
54-
label="Add">
55+
[disabled]="isLoading">
56+
Add
5557
</button>
5658
<button pButton
5759
type="button"
5860
class="p-button-raised mt-3 ms-2"
5961
icon="bi bi-arrow-left-square"
60-
[routerLink]="['/employees']"
61-
label="Back to list">
62+
[routerLink]="['/employees']">
63+
Back to list
6264
</button>
6365
</div>
6466
</form>

src/Client/Logistics.OfficeApp/src/app/pages/employee/add-employee/add-employee.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {ProgressSpinnerModule} from 'primeng/progressspinner';
99
import {CardModule} from 'primeng/card';
1010
import {ConfirmDialogModule} from 'primeng/confirmdialog';
1111
import {ToastModule} from 'primeng/toast';
12+
import {ConfirmationService} from 'primeng/api';
1213
import {EnumValue, SalaryType, SalaryTypeEnum, convertEnumToArray} from '@core/enums';
1314
import {CreateEmployee, Role, User} from '@core/models';
1415
import {ApiService, ToastService} from '@core/services';
@@ -38,6 +39,7 @@ import {ValidationSummaryComponent} from '@shared/components';
3839
],
3940
providers: [
4041
UserService,
42+
ConfirmationService
4143
],
4244
})
4345
export class AddEmployeeComponent implements OnInit {
@@ -59,7 +61,7 @@ export class AddEmployeeComponent implements OnInit {
5961

6062
this.form = new FormGroup<CreateEmployeeForm>({
6163
user: new FormControl(null, {validators: Validators.required}),
62-
role: new FormControl(null, {validators: Validators.required}),
64+
role: new FormControl(null),
6365
salary: new FormControl<number>(0, {validators: Validators.required, nonNullable: true}),
6466
salaryType: new FormControl<SalaryType>(SalaryType.None, {validators: Validators.required, nonNullable: true})
6567
});
@@ -79,7 +81,7 @@ export class AddEmployeeComponent implements OnInit {
7981

8082
clearSelctedRole() {
8183
this.form.patchValue({
82-
role: {name: '', displayName: ' '},
84+
role: null,
8385
});
8486
}
8587

0 commit comments

Comments
 (0)