From 1743ccf0e853fc4ae340297ef7d8d56170cdde2b Mon Sep 17 00:00:00 2001 From: FyloZ Date: Mon, 15 Mar 2021 14:46:10 -0400 Subject: [PATCH] =?UTF-8?q?Normalisation=20des=20formulaires=20d'ajout=20e?= =?UTF-8?q?t=20de=20modification=20des=20employ=C3=A9es=20et=20des=20group?= =?UTF-8?q?es.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../employees/pages/add/add.component.html | 66 ++-------- .../employees/pages/add/add.component.sass | 5 +- .../employees/pages/add/add.component.ts | 111 ++++++++++------ .../employees/pages/edit/edit.component.html | 65 +++------- .../employees/pages/edit/edit.component.sass | 5 +- .../employees/pages/edit/edit.component.ts | 120 ++++++++---------- .../groups/pages/add/add.component.html | 33 ++--- .../groups/pages/add/add.component.sass | 8 +- .../modules/groups/pages/add/add.component.ts | 42 ++++-- .../groups/pages/edit/edit.component.html | 42 ++---- .../groups/pages/edit/edit.component.sass | 5 +- .../groups/pages/edit/edit.component.ts | 62 ++++----- .../groups/pages/list/list.component.ts | 6 +- .../modules/groups/services/group.service.ts | 17 ++- .../entity-add/entity-add.component.html | 6 +- .../entity-edit/entity-edit.component.html | 6 +- .../permissions-field.component.html | 2 +- .../permissions-field.component.ts | 6 + src/app/modules/shared/model/employee.ts | 1 + src/styles.sass | 1 - 20 files changed, 275 insertions(+), 334 deletions(-) diff --git a/src/app/modules/employees/pages/add/add.component.html b/src/app/modules/employees/pages/add/add.component.html index 6c528f7..8175a1f 100644 --- a/src/app/modules/employees/pages/add/add.component.html +++ b/src/app/modules/employees/pages/add/add.component.html @@ -1,56 +1,10 @@ - - - Création d'un utilisateur - - -
- - Numéro d'employé - - - - Un numéro d'employé est requis - Le numéro d'employé doit être un nombre - - - - Prénom - - - - Un prénom est requis - - - - Nom - - - - Un nom est requis - - - - Mot de passe - - - - Un mot de passe est requis - Le mot de passe doit comprendre au moins 8 caractères - - - - Groupe - - Aucun - {{group.name}} - - - - -
- - - - - - + + + + + + diff --git a/src/app/modules/employees/pages/add/add.component.sass b/src/app/modules/employees/pages/add/add.component.sass index 3c27c57..f2a4f1c 100644 --- a/src/app/modules/employees/pages/add/add.component.sass +++ b/src/app/modules/employees/pages/add/add.component.sass @@ -1,2 +1,3 @@ -mat-card - max-width: 90rem +cre-entity-add + ::ng-deep mat-card + max-width: 90rem diff --git a/src/app/modules/employees/pages/add/add.component.ts b/src/app/modules/employees/pages/add/add.component.ts index a11377a..97f5f13 100644 --- a/src/app/modules/employees/pages/add/add.component.ts +++ b/src/app/modules/employees/pages/add/add.component.ts @@ -1,13 +1,16 @@ -import {Component, ViewChild} from '@angular/core' -import {FormControl, FormGroup, Validators} from '@angular/forms' -import {PermissionsFieldComponent} from '../../../shared/components/permissions-field/permissions-field.component' -import {EmployeeGroup} from '../../../shared/model/employee' -import {Observable} from 'rxjs' +import {Component, ContentChildren, ViewChild, ViewContainerRef} from '@angular/core' +import {Validators} from '@angular/forms' +import { + currentPermissionsFieldComponent, + PermissionsFieldComponent +} from '../../../shared/components/permissions-field/permissions-field.component' import {GroupService} from '../../../groups/services/group.service' import {EmployeeService} from '../../services/employee.service' import {ActivatedRoute, Router} from '@angular/router' import {ErrorHandlingComponent} from '../../../shared/components/subscribing.component' import {ErrorService} from '../../../shared/service/error.service' +import {FormField} from '../../../shared/components/entity-add/entity-add.component' +import {map} from 'rxjs/operators' @Component({ selector: 'cre-add', @@ -15,16 +18,62 @@ import {ErrorService} from '../../../shared/service/error.service' styleUrls: ['./add.component.sass'] }) export class AddComponent extends ErrorHandlingComponent { - @ViewChild('permissionsField', {static: true}) permissionsField: PermissionsFieldComponent + @ViewChild('permissionsTemplateRef', {static: true}) permissionsTemplateRef - form: FormGroup - idControl: FormControl - firstNameControl: FormControl - lastNameControl: FormControl - passwordControl: FormControl - groupControl: FormControl - - group$: Observable | null + formFields: FormField[] = [{ + name: 'id', + label: 'Numéro d\'employé', + icon: 'pound', + type: 'number', + required: true, + validator: Validators.compose([Validators.pattern(new RegExp('^[0-9]+$')), Validators.min(0)]), + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un numéro d\'employé est requis'}, + {conditionFn: errors => errors.pattern, message: 'Le numéro d\'employé doit être un nombre'} + ] + }, { + name: 'firstName', + label: 'Prénom', + icon: 'account', + type: 'text', + required: true, + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un prénom est requis'} + ] + }, { + name: 'lastName', + label: 'Nom', + icon: 'account', + type: 'text', + required: true, + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un nom est requis'} + ] + }, { + name: 'password', + label: 'Mot de passe', + icon: 'lock', + type: 'password', + required: true, + validator: Validators.minLength(8), + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un mot de passe est requis'}, + {conditionFn: errors => errors.minlength, message: 'Le mot de passe doit comprendre au moins 8 caractères'} + ] + }, { + name: 'groupId', + label: 'Groupe', + icon: 'account-multiple', + type: 'select', + defaultValue: -1, + options$: this.groupService.all.pipe(map(groups => groups.map(g => { + return {value: g.id, label: g.name} + }))) + }, { + name: 'permissions', + label: 'Permissions', + type: 'permissions' + }] constructor( private employeeService: EmployeeService, @@ -36,35 +85,23 @@ export class AddComponent extends ErrorHandlingComponent { super(errorService, activatedRoute, router) } - ngOnInit(): void { + ngOnInit() { super.ngOnInit() - this.group$ = this.groupService.all - - this.idControl = new FormControl(null, Validators.compose([Validators.required, Validators.pattern(new RegExp('^[0-9]+$')), Validators.min(0)])) - this.firstNameControl = new FormControl(null, Validators.required) - this.lastNameControl = new FormControl(null, Validators.required) - this.passwordControl = new FormControl(null, Validators.compose([Validators.required, Validators.minLength(8)])) - this.groupControl = new FormControl(null, Validators.min(0)) - this.form = new FormGroup({ - id: this.idControl, - firstName: this.firstNameControl, - lastName: this.lastNameControl, - password: this.passwordControl, - group: this.groupControl - }) + this.formFields[this.formFields.length - 1].template = this.permissionsTemplateRef } - submit() { - if (this.permissionsField.valid() && this.form.valid) { + submit(values) { + const permissionsField = currentPermissionsFieldComponent + if (permissionsField.valid()) { this.subscribeAndNavigate( this.employeeService.save( - parseInt(this.idControl.value), - this.firstNameControl.value, - this.lastNameControl.value, - this.passwordControl.value, - this.groupControl.value, - this.permissionsField.allEnabledPermissions + values.id, + values.firstName, + values.lastName, + values.password, + values.groupId, + permissionsField.allEnabledPermissions ), '/employee/list' ) diff --git a/src/app/modules/employees/pages/edit/edit.component.html b/src/app/modules/employees/pages/edit/edit.component.html index 9cec7fb..6a5595e 100644 --- a/src/app/modules/employees/pages/edit/edit.component.html +++ b/src/app/modules/employees/pages/edit/edit.component.html @@ -1,50 +1,15 @@ - - - Modification de l'utilisateur #{{employee.id}} - - -
- - Numéro d'employé - - - - Un numéro d'employé est requis - Le numéro d'employé doit être un nombre - - - - Prénom - - - - Un prénom est requis - - - - Nom - - - - Un nom est requis - - - - Groupe - - Aucun - {{group.name}} - - - - -
- - - - - - - - + + + + + + diff --git a/src/app/modules/employees/pages/edit/edit.component.sass b/src/app/modules/employees/pages/edit/edit.component.sass index 3c27c57..f8eace4 100644 --- a/src/app/modules/employees/pages/edit/edit.component.sass +++ b/src/app/modules/employees/pages/edit/edit.component.sass @@ -1,2 +1,3 @@ -mat-card - max-width: 90rem +cre-entity-edit + ::ng-deep mat-card + max-width: 90rem diff --git a/src/app/modules/employees/pages/edit/edit.component.ts b/src/app/modules/employees/pages/edit/edit.component.ts index 27d8478..5ddd2f3 100644 --- a/src/app/modules/employees/pages/edit/edit.component.ts +++ b/src/app/modules/employees/pages/edit/edit.component.ts @@ -1,14 +1,14 @@ -import {Component} from '@angular/core' -import {PermissionsFieldComponent} from '../../../shared/components/permissions-field/permissions-field.component' -import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms' +import {Component, ViewChild} from '@angular/core' +import {currentPermissionsFieldComponent} from '../../../shared/components/permissions-field/permissions-field.component' import {EmployeeService} from '../../services/employee.service' import {GroupService} from '../../../groups/services/group.service' import {ActivatedRoute, Router} from '@angular/router' -import {Observable} from 'rxjs' -import {Employee, EmployeeGroup, EmployeePermission} from '../../../shared/model/employee' +import {Employee} from '../../../shared/model/employee' import {AccountService} from '../../../accounts/services/account.service' import {ErrorHandlingComponent} from '../../../shared/components/subscribing.component' import {ErrorService} from '../../../shared/service/error.service' +import {FormField} from '../../../shared/components/entity-add/entity-add.component' +import {map} from 'rxjs/operators' @Component({ selector: 'cre-edit', @@ -16,20 +16,52 @@ import {ErrorService} from '../../../shared/service/error.service' styleUrls: ['./edit.component.sass'] }) export class EditComponent extends ErrorHandlingComponent { + @ViewChild('permissionsTemplateRef', {static: true}) permissionsTemplateRef + employee: Employee | null - - group$: Observable | null - - private _idControl: FormControl - private _firstNameControl: FormControl - private _lastNameControl: FormControl - private _groupControl: FormControl + formFields: FormField[] = [{ + name: 'id', + label: 'Numéro d\'employé', + icon: 'pound', + type: 'number', + readonly: true + }, { + name: 'firstName', + label: 'Prénom', + icon: 'account', + type: 'text', + required: true, + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un prénom est requis'} + ] + }, { + name: 'lastName', + label: 'Nom', + icon: 'account', + type: 'text', + required: true, + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un nom est requis'} + ] + }, { + name: 'groupId', + label: 'Groupe', + icon: 'account-multiple', + type: 'select', + valueFn: employee => employee.group ? employee.group.id : -1, + options$: this.groupService.all.pipe(map(groups => groups.map(g => { + return {value: g.id, label: g.name} + }))) + }, { + name: 'permissions', + label: 'Permissions', + type: 'permissions' + }] constructor( private accountService: AccountService, private employeeService: EmployeeService, private groupService: GroupService, - private formBuilder: FormBuilder, errorService: ErrorService, router: Router, activatedRoute: ActivatedRoute @@ -46,21 +78,22 @@ export class EditComponent extends ErrorHandlingComponent { '/employee/list' ) - this.group$ = this.groupService.all + this.formFields[this.formFields.length - 1].template = this.permissionsTemplateRef } - submit(permissionsField: PermissionsFieldComponent) { - if (permissionsField.valid() && this.form.valid) { + submit(values) { + const permissionsField = currentPermissionsFieldComponent + if (permissionsField.valid()) { this.subscribe( this.employeeService.update( - parseInt(this.idControl.value), - this.firstNameControl.value, - this.lastNameControl.value, + parseInt(values.id), + values.firstName, + values.lastName, permissionsField.allEnabledPermissions ), () => { - const group = parseInt(this._groupControl.value) - if (!isNaN(group)) { + const group = values.groupId + if (group >= 0) { this.subscribeAndNavigate( this.groupService.addEmployeeToGroup(group, this.employee), '/employee/list' @@ -72,7 +105,7 @@ export class EditComponent extends ErrorHandlingComponent { '/employee/list' ) } else { - this.router.navigate(['/employee/list']) + this.urlUtils.navigateTo('/employee/list') } } } @@ -86,47 +119,4 @@ export class EditComponent extends ErrorHandlingComponent { '/employee/list' ) } - - get form(): FormGroup { - return this.formBuilder.group({ - id: this._idControl, - firstName: this._firstNameControl, - lastName: this._lastNameControl, - group: this._groupControl - }) - } - - get idControl(): FormControl { - this._idControl = this.lazyControl(this._idControl, () => new FormControl({value: this.employee.id, disabled: true}, Validators.compose([Validators.required, Validators.pattern(new RegExp('^[0-9]+$')), Validators.min(0)]))) - return this._idControl - } - - get firstNameControl(): FormControl { - this._firstNameControl = this.lazyControl(this._firstNameControl, () => new FormControl(this.employee.firstName, Validators.required)) - return this._firstNameControl - } - - get lastNameControl(): FormControl { - this._lastNameControl = this.lazyControl(this._lastNameControl, () => new FormControl(this.employee.lastName, Validators.required)) - return this._lastNameControl - } - - get groupControl(): FormControl { - this._groupControl = this.lazyControl(this._groupControl, () => new FormControl(this.employee.group?.id)) - return this._groupControl - } - - private lazyControl(control: FormControl, provider: () => FormControl): FormControl { - if (control) { - return control - } - if (this.employee) { - return provider() - } - return null - } - - get canRemoveEmployee(): boolean { - return this.accountService.hasPermission(EmployeePermission.REMOVE_EMPLOYEE) - } } diff --git a/src/app/modules/groups/pages/add/add.component.html b/src/app/modules/groups/pages/add/add.component.html index b00be66..3693e17 100644 --- a/src/app/modules/groups/pages/add/add.component.html +++ b/src/app/modules/groups/pages/add/add.component.html @@ -1,23 +1,10 @@ - - - Création d'un groupe - - -
- - Nom - - - - Un nom est requis - Le nom d'un groupe doit comprendre au moins 3 caractères - - - -
- - - - - - + + + + + + diff --git a/src/app/modules/groups/pages/add/add.component.sass b/src/app/modules/groups/pages/add/add.component.sass index d194b62..f2a4f1c 100644 --- a/src/app/modules/groups/pages/add/add.component.sass +++ b/src/app/modules/groups/pages/add/add.component.sass @@ -1,5 +1,3 @@ -mat-card - max-width: 90rem - -mat-checkbox - font-size: .8em +cre-entity-add + ::ng-deep mat-card + max-width: 90rem diff --git a/src/app/modules/groups/pages/add/add.component.ts b/src/app/modules/groups/pages/add/add.component.ts index a1a30a6..34e7623 100644 --- a/src/app/modules/groups/pages/add/add.component.ts +++ b/src/app/modules/groups/pages/add/add.component.ts @@ -1,10 +1,11 @@ import {Component, ViewChild} from '@angular/core' -import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms' +import {Validators} from '@angular/forms' import {GroupService} from '../../services/group.service' import {ActivatedRoute, Router} from '@angular/router' -import {PermissionsFieldComponent} from '../../../shared/components/permissions-field/permissions-field.component' +import {currentPermissionsFieldComponent} from '../../../shared/components/permissions-field/permissions-field.component' import {ErrorHandlingComponent} from '../../../shared/components/subscribing.component' import {ErrorService} from '../../../shared/service/error.service' +import {FormField} from '../../../shared/components/entity-add/entity-add.component' @Component({ selector: 'cre-add', @@ -12,13 +13,26 @@ import {ErrorService} from '../../../shared/service/error.service' styleUrls: ['./add.component.sass'] }) export class AddComponent extends ErrorHandlingComponent { - @ViewChild('permissionsField', {static: true}) permissionsField: PermissionsFieldComponent + @ViewChild('permissionsTemplateRef', {static: true}) permissionsTemplateRef - form: FormGroup - nameControl: FormControl + formFields: FormField[] = [{ + name: 'name', + label: 'Nom', + icon: 'account-multiple', + type: 'text', + required: true, + validator: Validators.minLength(3), + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un nom est requis'}, + {conditionFn: errors => errors.minlength, message: 'Le nom d\'un groupe doit comprendre au moins 3 caractères'} + ] + }, { + name: 'permissions', + label: 'Permissions', + type: 'permissions' + }] constructor( - private formBuilder: FormBuilder, private groupService: GroupService, errorService: ErrorService, router: Router, @@ -27,17 +41,17 @@ export class AddComponent extends ErrorHandlingComponent { super(errorService, activatedRoute, router) } - ngOnInit(): void { - this.nameControl = new FormControl(null, Validators.compose([Validators.required, Validators.minLength(3)])) - this.form = this.formBuilder.group({ - name: this.nameControl - }) + ngOnInit() { + super.ngOnInit(); + + this.formFields[this.formFields.length - 1].template = this.permissionsTemplateRef } - submit() { - if (this.form.valid && this.permissionsField.valid()) { + submit(values) { + const permissionsField = currentPermissionsFieldComponent + if (permissionsField.valid()) { this.subscribeAndNavigate( - this.groupService.save(this.nameControl.value, this.permissionsField.allEnabledPermissions), + this.groupService.save(values.name, permissionsField.allEnabledPermissions), '/group/list' ) } diff --git a/src/app/modules/groups/pages/edit/edit.component.html b/src/app/modules/groups/pages/edit/edit.component.html index 5d99d8b..6e47fe1 100644 --- a/src/app/modules/groups/pages/edit/edit.component.html +++ b/src/app/modules/groups/pages/edit/edit.component.html @@ -1,29 +1,15 @@ - - - Modifier le groupe {{group.name}} - - -
- - Nom - - - - Un nom est requis - Le nom d'un groupe doit comprendre au moins 3 caractères - - - -
- - - - - - - - + + + + + diff --git a/src/app/modules/groups/pages/edit/edit.component.sass b/src/app/modules/groups/pages/edit/edit.component.sass index 3c27c57..f8eace4 100644 --- a/src/app/modules/groups/pages/edit/edit.component.sass +++ b/src/app/modules/groups/pages/edit/edit.component.sass @@ -1,2 +1,3 @@ -mat-card - max-width: 90rem +cre-entity-edit + ::ng-deep mat-card + max-width: 90rem diff --git a/src/app/modules/groups/pages/edit/edit.component.ts b/src/app/modules/groups/pages/edit/edit.component.ts index f629334..cdbca83 100644 --- a/src/app/modules/groups/pages/edit/edit.component.ts +++ b/src/app/modules/groups/pages/edit/edit.component.ts @@ -1,12 +1,13 @@ import {Component, ViewChild} from '@angular/core' import {ActivatedRoute, Router} from '@angular/router' -import {EmployeeGroup, EmployeePermission} from '../../../shared/model/employee' +import {EmployeeGroup} from '../../../shared/model/employee' import {GroupService} from '../../services/group.service' -import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms' -import {PermissionsFieldComponent} from '../../../shared/components/permissions-field/permissions-field.component' +import {Validators} from '@angular/forms' +import {currentPermissionsFieldComponent} from '../../../shared/components/permissions-field/permissions-field.component' import {AccountService} from '../../../accounts/services/account.service' import {ErrorHandlingComponent} from '../../../shared/components/subscribing.component' import {ErrorService} from '../../../shared/service/error.service' +import {FormField} from '../../../shared/components/entity-add/entity-add.component' @Component({ selector: 'cre-edit', @@ -14,16 +15,29 @@ import {ErrorService} from '../../../shared/service/error.service' styleUrls: ['./edit.component.sass'] }) export class EditComponent extends ErrorHandlingComponent { - @ViewChild('permissionsField') permissionsField: PermissionsFieldComponent + @ViewChild('permissionsTemplateRef', {static: true}) permissionsTemplateRef + formFields: FormField[] = [{ + name: 'name', + label: 'Nom', + icon: 'account-multiple', + type: 'text', + required: true, + validator: Validators.minLength(3), + errorMessages: [ + {conditionFn: errors => errors.required, message: 'Un nom est requis'}, + {conditionFn: errors => errors.minlength, message: 'Le nom d\'un groupe doit comprendre au moins 3 caractères'} + ] + }, { + name: 'permissions', + label: 'Permissions', + type: 'permissions' + }] group: EmployeeGroup | null - private _nameControl: FormControl - constructor( private accountService: AccountService, private groupService: GroupService, - private formBuilder: FormBuilder, errorService: ErrorService, router: Router, activatedRoute: ActivatedRoute @@ -39,12 +53,15 @@ export class EditComponent extends ErrorHandlingComponent { group => this.group = group, '/group/list' ) + + this.formFields[this.formFields.length - 1].template = this.permissionsTemplateRef } - submit(): void { - if (this.form.valid && this.permissionsField.valid()) { + submit(values): void { + const permissionsField = currentPermissionsFieldComponent + if (permissionsField.valid()) { this.subscribeAndNavigate( - this.groupService.update(this.group.id, this.nameControl.value, this.permissionsField.allEnabledPermissions), + this.groupService.update(this.group.id, values.name, permissionsField.allEnabledPermissions), '/group/list' ) } @@ -56,29 +73,4 @@ export class EditComponent extends ErrorHandlingComponent { '/group/list' ) } - - get form(): FormGroup { - return this.formBuilder.group({ - name: this.nameControl - }) - } - - get confirmBoxMessage(): string { - return `Voulez-vous vraiment supprimer le groupe ${this.group.name}?` - } - - get nameControl(): FormControl { - if (this._nameControl) { - return this._nameControl - } - if (this.group) { - this._nameControl = new FormControl(this.group.name, Validators.compose([Validators.required, Validators.minLength(3)])) - return this._nameControl - } - return null - } - - get canRemoveGroup(): boolean { - return this.accountService.hasPermission(EmployeePermission.REMOVE_EMPLOYEE_GROUP) - } } diff --git a/src/app/modules/groups/pages/list/list.component.ts b/src/app/modules/groups/pages/list/list.component.ts index e6e1565..a98648c 100644 --- a/src/app/modules/groups/pages/list/list.component.ts +++ b/src/app/modules/groups/pages/list/list.component.ts @@ -1,8 +1,7 @@ import {Component} from '@angular/core' -import {Observable} from 'rxjs' import {GroupService} from '../../services/group.service' import {EmployeeGroup, EmployeePermission} from '../../../shared/model/employee' -import {takeUntil} from 'rxjs/operators' +import {map} from 'rxjs/operators' import {animate, state, style, transition, trigger} from '@angular/animations' import {AccountService} from '../../../accounts/services/account.service' import {ErrorHandlingComponent} from '../../../shared/components/subscribing.component' @@ -23,7 +22,7 @@ import {AlertService} from '../../../shared/service/alert.service' ] }) export class ListComponent extends ErrorHandlingComponent { - groups$: Observable + groups$ = this.groupService.all.pipe(map(groups => groups.filter(g => g.id >= 0))) defaultGroup: EmployeeGroup = null columns = ['name', 'permissionCount', 'employeeCount', 'defaultGroup', 'editGroup'] expandedElement: EmployeeGroup | null @@ -45,7 +44,6 @@ export class ListComponent extends ErrorHandlingComponent { } ngOnInit(): void { - this.groups$ = this.groupService.all.pipe(takeUntil(this.destroy$)) this.subscribe( this.groupService.defaultGroup, group => this.defaultGroup = group, diff --git a/src/app/modules/groups/services/group.service.ts b/src/app/modules/groups/services/group.service.ts index 7e67017..49bc2ca 100644 --- a/src/app/modules/groups/services/group.service.ts +++ b/src/app/modules/groups/services/group.service.ts @@ -1,7 +1,8 @@ -import {Injectable} from '@angular/core'; -import {ApiService} from "../../shared/service/api.service"; -import {Observable} from "rxjs"; -import {Employee, EmployeeGroup, EmployeePermission} from "../../shared/model/employee"; +import {Injectable} from '@angular/core' +import {ApiService} from '../../shared/service/api.service' +import {Observable} from 'rxjs' +import {Employee, EmployeeGroup, EmployeePermission} from '../../shared/model/employee' +import {tap} from 'rxjs/operators' @Injectable({ providedIn: 'root' @@ -14,10 +15,16 @@ export class GroupService { get all(): Observable { return this.api.get('/employee/group') + .pipe(tap(groups => groups.unshift({ + id: -1, + name: 'Aucun', + permissions: [], + employeeCount: 0 + }))) } getById(id: number): Observable { - return this.api.get(`/employee/group/${id}`); + return this.api.get(`/employee/group/${id}`) } get defaultGroup(): Observable { diff --git a/src/app/modules/shared/components/entity-add/entity-add.component.html b/src/app/modules/shared/components/entity-add/entity-add.component.html index f353ea8..5d7616e 100644 --- a/src/app/modules/shared/components/entity-add/entity-add.component.html +++ b/src/app/modules/shared/components/entity-add/entity-add.component.html @@ -6,7 +6,7 @@
@@ -30,6 +30,10 @@ [ngTemplateOutlet]="sliderTemplate" [ngTemplateOutletContext]="{control: getControl(field.name), field: field}"> + +
diff --git a/src/app/modules/shared/components/entity-edit/entity-edit.component.html b/src/app/modules/shared/components/entity-edit/entity-edit.component.html index fcafab1..83f48fd 100644 --- a/src/app/modules/shared/components/entity-edit/entity-edit.component.html +++ b/src/app/modules/shared/components/entity-edit/entity-edit.component.html @@ -21,12 +21,12 @@ [ngTemplateOutletContext]="{control: getControl(field.name), field: field}"> diff --git a/src/app/modules/shared/components/permissions-field/permissions-field.component.html b/src/app/modules/shared/components/permissions-field/permissions-field.component.html index cf7ef40..c44ead0 100644 --- a/src/app/modules/shared/components/permissions-field/permissions-field.component.html +++ b/src/app/modules/shared/components/permissions-field/permissions-field.component.html @@ -1,5 +1,5 @@
-

{{title}}

+

{{title}} *

diff --git a/src/app/modules/shared/components/permissions-field/permissions-field.component.ts b/src/app/modules/shared/components/permissions-field/permissions-field.component.ts index 7f3e0d7..59ba164 100644 --- a/src/app/modules/shared/components/permissions-field/permissions-field.component.ts +++ b/src/app/modules/shared/components/permissions-field/permissions-field.component.ts @@ -3,6 +3,10 @@ import {EmployeePermission, mapped_permissions} from "../../model/employee"; import {FormControl} from "@angular/forms"; import {AccountService} from "../../../accounts/services/account.service"; +// The current permissions field component. Workaround to be able to access a permission field in template. (See employee/AddComponent) +// This workaround prevent the use of several permissions field component at the same time. +export let currentPermissionsFieldComponent: PermissionsFieldComponent | null + @Component({ selector: 'cre-permissions-field', templateUrl: './permissions-field.component.html', @@ -35,6 +39,8 @@ export class PermissionsFieldComponent implements OnInit { this.togglePermission(control, true) }) } + + currentPermissionsFieldComponent = this } togglePermission(permission: any, bypassValue?: boolean) { diff --git a/src/app/modules/shared/model/employee.ts b/src/app/modules/shared/model/employee.ts index 711e30b..3fbb75d 100644 --- a/src/app/modules/shared/model/employee.ts +++ b/src/app/modules/shared/model/employee.ts @@ -3,6 +3,7 @@ export class Employee { public id: number, public firstName: string, public lastName: string, + public explicitPermissions: EmployeePermission[], public permissions: EmployeePermission[], public group?: EmployeeGroup, public lastLoginTime?: Date diff --git a/src/styles.sass b/src/styles.sass index 5ece4d2..5896eac 100644 --- a/src/styles.sass +++ b/src/styles.sass @@ -200,7 +200,6 @@ div.empty left: 0 background-color: black opacity: 0.4 - z-index: -1 .color-warning color: #fdd835