diff --git a/src/app/demandes-delegation/demandes-delegation.component.html b/src/app/demandes-delegation/demandes-delegation.component.html
index 5b82a7c..08204a2 100644
--- a/src/app/demandes-delegation/demandes-delegation.component.html
+++ b/src/app/demandes-delegation/demandes-delegation.component.html
@@ -1,4 +1,11 @@
-
Liste des demandes de délégations
-
-
\ No newline at end of file
+Liste de vos demandes de délégations en attente
+
+
+
+
+
+ Aucune demande de délégation en cours.
+
+
+
\ No newline at end of file
diff --git a/src/app/demandes-delegation/demandes-delegation.component.ts b/src/app/demandes-delegation/demandes-delegation.component.ts
index d56844e..3b4b25c 100644
--- a/src/app/demandes-delegation/demandes-delegation.component.ts
+++ b/src/app/demandes-delegation/demandes-delegation.component.ts
@@ -1,5 +1,6 @@
-import { Component, OnInit } from '@angular/core';
-import { CollaborateurDTO, DemandeDelegationDTO, DemandesDelegationService } from '@shared/api-swagger';
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { CollaborateurDTO, DemandeDelegationDTO, DemandesDelegationService, EtatDemande } from '@shared/api-swagger';
import { cles } from '@shared/utils/cles';
import { Subscription } from 'rxjs';
@@ -20,7 +21,7 @@ export class DemandesDelegationComponent implements OnInit {
demandeDelegationSubscription: Subscription;
demandeDelegationReponseSubscription: Subscription;
- constructor(private demandeDelegationService: DemandesDelegationService) {}
+ constructor(private demandeDelegationService: DemandesDelegationService, private matDialog: MatDialog) {}
ngOnInit() {
@@ -50,7 +51,17 @@ export class DemandesDelegationComponent implements OnInit {
console.log(event);
const id: number = event.id;
this.demandeDelegationReponseSubscription = this.demandeDelegationService.updateDemandeDelegation(event, event.id).subscribe(
- () => this.demandesDelegation.filter(d => d.id != id),
+ () => {
+ let data: any = {
+ acceptee: false
+ };
+ if(event.etatDemande == EtatDemande.Validee) {
+ data.acceptee = true,
+ data.ep = event.ep
+ }
+ this.demandesDelegation = this.demandesDelegation.filter(d => d.id != id);
+ this.matDialog.open(DialogValidationReponse, {data:data});
+ },
err => console.log(err)
);
}
@@ -64,3 +75,13 @@ export class DemandesDelegationComponent implements OnInit {
}
}
}
+
+
+@Component({
+ selector: "dialog-validation-reponse",
+ templateUrl: "./dialog-validation-reponse.html"
+})
+export class DialogValidationReponse {
+ constructor(@Inject(MAT_DIALOG_DATA)public data: any, private matDialog: MatDialogRef) {}
+ fermer() {this.matDialog.close();}
+}
\ No newline at end of file
diff --git a/src/app/demandes-delegation/demandes-delegation.module.ts b/src/app/demandes-delegation/demandes-delegation.module.ts
index 6adf732..b3c2d5f 100644
--- a/src/app/demandes-delegation/demandes-delegation.module.ts
+++ b/src/app/demandes-delegation/demandes-delegation.module.ts
@@ -8,7 +8,7 @@ import { MaterialModule } from "@shared/angular-material/angular-material.module
import {NavMenuModule} from '@shared/nav-menu/nav-menu.module';
-import { DemandesDelegationComponent } from './demandes-delegation.component';
+import { DemandesDelegationComponent, DialogValidationReponse } from './demandes-delegation.component';
import { DemandeDelegationComponent, DialogReponseDemandeDelegation } from './details-demande-delegation/demande-delegation.component';
import { DemandesDelegationRoutingModule } from './demandes-delegation.routing.module';
@@ -16,7 +16,7 @@ import { DemandesDelegationRoutingModule } from './demandes-delegation.routing.m
@NgModule({
declarations: [
DemandesDelegationComponent, DemandeDelegationComponent,
- DialogReponseDemandeDelegation
+ DialogReponseDemandeDelegation, DialogValidationReponse
],
exports: [ DemandesDelegationComponent
],
diff --git a/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts b/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts
index c701b47..2a6aea0 100644
--- a/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts
+++ b/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts
@@ -86,6 +86,7 @@ enregistrer() {
return;
let demandeDelegation: DemandeDelegationDTO = this.data.demandeDelegation;
demandeDelegation.etatDemande = this.data.etatDemande;
+ demandeDelegation.raisonRefus = this.raisonRefus;
this.reponse = {
engistree: true,
demandeDelegation: demandeDelegation
diff --git a/src/app/demandes-delegation/details-demande-delegation/dialog-reponse-demande-delegation.html b/src/app/demandes-delegation/details-demande-delegation/dialog-reponse-demande-delegation.html
new file mode 100644
index 0000000..171bfac
--- /dev/null
+++ b/src/app/demandes-delegation/details-demande-delegation/dialog-reponse-demande-delegation.html
@@ -0,0 +1,9 @@
+{{texte}}
+
+
+ Raison du refus
+
+
+
+Enregister la réponse
+Annuler
\ No newline at end of file
diff --git a/src/app/demandes-delegation/dialog-validation-reponse.html b/src/app/demandes-delegation/dialog-validation-reponse.html
new file mode 100644
index 0000000..012d3e6
--- /dev/null
+++ b/src/app/demandes-delegation/dialog-validation-reponse.html
@@ -0,0 +1,4 @@
+Votre réponse à la demande de délégation a bien été enregistrée
+
+Accéder à l'EP
+Fermer
\ No newline at end of file