-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Show norms names * Add accreditation request support * Refactoring, delete duplicated code
- Loading branch information
1 parent
36f49ca
commit 3e4e5ca
Showing
21 changed files
with
352 additions
and
8 deletions.
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
src/app/accreditation-requests/accreditation-request-routing.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import { NgModule } from '@angular/core'; | ||
import { Routes, RouterModule } from '@angular/router'; | ||
import {AccreditationRequestComponent} from './accreditation-request.component'; | ||
import {AuthGuard} from '../core/services'; | ||
|
||
const routes: Routes = [ | ||
{ | ||
path: '', | ||
component: AccreditationRequestComponent, | ||
canActivate: [AuthGuard] | ||
} | ||
]; | ||
|
||
@NgModule({ | ||
imports: [RouterModule.forChild(routes)], | ||
exports: [RouterModule] | ||
}) | ||
export class AccreditationRequestRoutingModule {} |
23 changes: 23 additions & 0 deletions
23
src/app/accreditation-requests/accreditation-request.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<form (ngSubmit)="newForm.form.valid && sendRequest()" #newForm="ngForm"> | ||
<div class="form-group"> | ||
<label for="application">Nom de l'application</label> | ||
<input id="application" name="application" type="text" class="form-control" [class.is-invalid]="searchFailed" | ||
[resultFormatter]="formatter" [inputFormatter]="formatter" [(ngModel)]="model" [ngbTypeahead]="search" | ||
placeholder="nom de l'application"/> | ||
<span *ngIf="searching">recherche en cours...</span> | ||
<div class="invalid-feedback" *ngIf="searchFailed">Désolé, les suggestions ne peuvent être chargées.</div> | ||
</div> | ||
<div class="form-group"> | ||
<label for="wantManage">Droit de gestion</label> | ||
<div class="input-group"> | ||
<input type="checkbox" id="wantManage" class="form-control" name="wantManage" [(ngModel)]="request.wantManage"> | ||
</div> | ||
</div> | ||
<div class="form-group"> | ||
<label for="wantUse">Droit lancement</label> | ||
<div class="input-group"> | ||
<input type="checkbox" id="wantUse" class="form-control" name="wantUse" [(ngModel)]="request.wantUse"> | ||
</div> | ||
</div> | ||
<button type="submit" class="btn btn-outline-dark">Envoyer</button> | ||
</form> |
56 changes: 56 additions & 0 deletions
56
src/app/accreditation-requests/accreditation-request.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
import {Component, OnInit} from '@angular/core'; | ||
import {AccreditationRequestsService, ApplicationsService} from '../core/services'; | ||
import {Observable, of} from "rxjs"; | ||
import {catchError, debounceTime, distinctUntilChanged, map, switchMap, tap} from "rxjs/operators"; | ||
import {Application, CreationAccreditationRequest} from "../core/models"; | ||
import {Pageable} from "../core/models/pageable.model"; | ||
import {NotifierService} from "angular-notifier"; | ||
|
||
@Component({ | ||
selector: 'app-accreditation-request', | ||
templateUrl: './accreditation-request.component.html' | ||
}) | ||
export class AccreditationRequestComponent implements OnInit { | ||
model: Application; | ||
searching = false; | ||
searchFailed = false; | ||
request: CreationAccreditationRequest = {applicationId: undefined, wantManage: false, wantUse: false}; | ||
|
||
constructor(private accreditationRequestsService: AccreditationRequestsService, | ||
private applicationsService: ApplicationsService, | ||
private notifierService: NotifierService) { | ||
} | ||
|
||
formatter = (result: Application) => result.name; | ||
|
||
|
||
search = (text$: Observable<string>) => | ||
text$.pipe( | ||
debounceTime(300), | ||
distinctUntilChanged(), | ||
tap(() => this.searching = true), | ||
switchMap(term => | ||
this.applicationsService.search(new Pageable(0,10, 'name,asc'), term) | ||
.pipe( | ||
map(value => value.content), | ||
tap(() => this.searchFailed = false), | ||
catchError(() => { | ||
this.searchFailed = true; | ||
return of([]); | ||
})) | ||
), | ||
tap(() => this.searching = false) | ||
); | ||
|
||
ngOnInit(): void { | ||
} | ||
|
||
sendRequest(){ | ||
this.request.applicationId = this.model.id; | ||
this.accreditationRequestsService.sendAccreditation(this.request).subscribe( | ||
() => this.notifierService.notify('success', `Votre demande d'accréditation a bien été envoyée`), | ||
(error) => this.notifierService.notify('error', `Votre demande d'accréditation n'a pas pu être envoyée : ${error}`) | ||
); | ||
} | ||
} | ||
|
27 changes: 27 additions & 0 deletions
27
src/app/accreditation-requests/accreditation-request.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import {NgModule} from '@angular/core'; | ||
import {SharedModule} from '../shared'; | ||
import {IconsModule} from '../icons'; | ||
import {NgbPaginationModule, NgbTypeaheadModule} from "@ng-bootstrap/ng-bootstrap"; | ||
import {AccreditationRequestComponent} from "./accreditation-request.component"; | ||
import {AccreditationRequestRoutingModule} from "./accreditation-request-routing.module"; | ||
import {ListAccreditationRequestComponent} from "./list-accreditation-request.component"; | ||
|
||
; | ||
|
||
@NgModule({ | ||
declarations: [AccreditationRequestComponent, ListAccreditationRequestComponent], | ||
imports: [ | ||
AccreditationRequestRoutingModule, | ||
SharedModule, | ||
IconsModule, | ||
NgbPaginationModule, | ||
NgbTypeaheadModule | ||
], | ||
exports: [ | ||
AccreditationRequestComponent, | ||
ListAccreditationRequestComponent | ||
], | ||
entryComponents: [] | ||
}) | ||
export class AccreditationRequestModule { | ||
} |
3 changes: 3 additions & 0 deletions
3
src/app/accreditation-requests/list-accreditation-request.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<app-table [title]="title" [table]="table" (actionClicked)="onActionClicked($event)"> | ||
<ngb-pagination footer class="d-flex justify-content-center" [maxSize]="5" [collectionSize]="totalSize" [pageSize]="size" [(page)]="page" (pageChange)="onPageChange($event)" aria-label="Default pagination"></ngb-pagination> | ||
</app-table> |
120 changes: 120 additions & 0 deletions
120
src/app/accreditation-requests/list-accreditation-request.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
import {Component, Input, OnInit} from '@angular/core'; | ||
import {AccreditationRequestsService} from '../core/services'; | ||
import {Pageable} from "../core/models/pageable.model"; | ||
import {Action, ColumnsDefinition, Table} from "../shared/table/table.model"; | ||
import {Constants} from "../shared/Constants"; | ||
import {Observable} from "rxjs"; | ||
import {AccreditationRequest} from "../core/models"; | ||
import {Page} from "../core/models/page.model"; | ||
import {ActionClickEvent} from "../shared/table/action-click-event.model"; | ||
import {NotifierService} from "angular-notifier"; | ||
|
||
@Component({ | ||
selector: 'app-list-accreditation-request', | ||
templateUrl: './list-accreditation-request.component.html' | ||
}) | ||
export class ListAccreditationRequestComponent implements OnInit { | ||
@Input() userOnly: boolean; | ||
title = 'Liste des demandes d\'accréditation à traiter'; | ||
|
||
private idActionAccept = 'accept'; | ||
private idActionReject = 'reject'; | ||
|
||
size = this.constants.numberByPage; | ||
page = 0; | ||
totalSize = 0; | ||
table: Table; | ||
|
||
|
||
constructor(private accreditationRequestsService: AccreditationRequestsService, | ||
private notifierService: NotifierService, | ||
private constants: Constants) { | ||
} | ||
|
||
ngOnInit(): void { | ||
if(this.userOnly){ | ||
this.title = 'Liste des demandes d\'accréditation'; | ||
} | ||
this.showAccreditationRequest(); | ||
} | ||
|
||
listRequest(pageable: Pageable) : Observable<Page<AccreditationRequest>> { | ||
if(this.userOnly) { | ||
return this.accreditationRequestsService.getAllMyRequests(pageable); | ||
} | ||
return this.accreditationRequestsService.getAllNeedAnswer(pageable); | ||
} | ||
|
||
refreshAccreditationRequests(pageable: Pageable = new Pageable(0, this.constants.numberByPage, 'id,desc')) { | ||
this.listRequest(pageable).subscribe( | ||
accreditationRequests => { | ||
this.table.items = accreditationRequests.content; | ||
for (let request of this.table.items) { | ||
request.application = request.application.name; | ||
} | ||
this.totalSize = accreditationRequests.totalElements; | ||
} | ||
); | ||
} | ||
|
||
showAccreditationRequest() { | ||
this.table = new Table(); | ||
this.table.showHeader = true; | ||
this.table.showFooter = true; | ||
|
||
this.table.settings.columnsDefinition.id = new ColumnsDefinition(); | ||
this.table.settings.columnsDefinition.id.title = 'Id'; | ||
this.table.settings.columnsDefinition.id.order = 1; | ||
this.table.settings.columnsDefinition.application = new ColumnsDefinition(); | ||
this.table.settings.columnsDefinition.application.title = 'Nom de l\'application'; | ||
this.table.settings.columnsDefinition.application.order = 2; | ||
this.table.settings.columnsDefinition.wantUse = new ColumnsDefinition(); | ||
this.table.settings.columnsDefinition.wantUse.title = 'Droit d\'utilisation'; | ||
this.table.settings.columnsDefinition.wantUse.order = 3; | ||
this.table.settings.columnsDefinition.wantManage = new ColumnsDefinition(); | ||
this.table.settings.columnsDefinition.wantManage.title = 'Droit de gestion'; | ||
this.table.settings.columnsDefinition.wantManage.order = 4; | ||
this.table.settings.columnsDefinition.state = new ColumnsDefinition(); | ||
this.table.settings.columnsDefinition.state.title = 'Etat'; | ||
this.table.settings.columnsDefinition.state.order = 5; | ||
if(!this.userOnly){ | ||
this.table.settings.actionsDefinition.title = 'Action'; | ||
this.table.settings.actionsDefinition.actions.push(new Action('Accepter', this.idActionAccept)); | ||
this.table.settings.actionsDefinition.actions.push(new Action('Refuser', this.idActionReject)); | ||
} | ||
this.refreshAccreditationRequests(); | ||
} | ||
|
||
onActionClicked(event: ActionClickEvent) { | ||
if (event.id === this.idActionAccept) { | ||
this.accreditationRequestsService.sendResponse({accepted: true, id: event.item.id}).subscribe( | ||
() => { | ||
this.notifierService.notify('success', `Demande acceptée avec succès`); | ||
this.refreshAccreditationRequests(); | ||
}, | ||
(error) => { | ||
this.notifierService.notify('error', `Une erreur est survenue lors de l'acceptation : ${error}`); | ||
this.refreshAccreditationRequests(); | ||
} | ||
) | ||
} | ||
|
||
if (event.id === this.idActionReject) { | ||
this.accreditationRequestsService.sendResponse({accepted: false, id: event.item.id}).subscribe( | ||
() => { | ||
this.notifierService.notify('success', `Demande rejetée avec succès`); | ||
this.refreshAccreditationRequests(); | ||
}, | ||
(error) => { | ||
this.notifierService.notify('error', `Une erreur est survenue lors du rejet : ${error}`); | ||
this.refreshAccreditationRequests(); | ||
} | ||
); | ||
} | ||
} | ||
|
||
onPageChange(event) { | ||
this.refreshAccreditationRequests(new Pageable(this.page - 1, this.size, 'id,desc')) | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import {Environment} from './environment.model'; | ||
import {Audit} from './audit.model'; | ||
import {User} from "./user.model"; | ||
import {Application} from "./application.model"; | ||
|
||
export interface AccreditationRequest extends Audit { | ||
id: number; | ||
user: User; | ||
wantManage: boolean; | ||
wantUse: boolean; | ||
application: Application; | ||
state: string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export interface CreationAccreditationRequest { | ||
applicationId: number; | ||
wantManage: boolean; | ||
wantUse: boolean; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
export interface ResponseAccreditationRequest { | ||
id: number; | ||
accepted: boolean; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
import {Injectable} from '@angular/core'; | ||
import {Observable} from 'rxjs'; | ||
|
||
import {ApiService} from './api.service'; | ||
import { | ||
AccreditationRequest, | ||
CreationAccreditationRequest, ResponseAccreditationRequest | ||
} from '../models'; | ||
import {Page} from "../models/page.model"; | ||
import {Pageable} from "../models/pageable.model"; | ||
|
||
@Injectable() | ||
export class AccreditationRequestsService { | ||
private apiName = '/accreditation-requests'; | ||
constructor( | ||
private apiService: ApiService | ||
) { | ||
} | ||
|
||
getAllNeedAnswer(pageable: Pageable = new Pageable(0,20)): Observable<Page<AccreditationRequest>> { | ||
return this.apiService.get(`${this.apiName}/need-answer`, pageable); | ||
} | ||
|
||
getAllMyRequests(pageable: Pageable = new Pageable(0,20)): Observable<Page<AccreditationRequest>> { | ||
return this.apiService.get(`${this.apiName}`, pageable); | ||
} | ||
|
||
sendAccreditation(creationAccreditationRequest: CreationAccreditationRequest): Observable<AccreditationRequest> { | ||
return this.apiService.put(`${this.apiName}`, creationAccreditationRequest); | ||
} | ||
|
||
sendResponse(responseAccreditationRequest: ResponseAccreditationRequest): Observable<void> { | ||
return this.apiService.post(`${this.apiName}/response`, responseAccreditationRequest); | ||
} | ||
|
||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.