From 332a401aa86fd8ceda2bacb0279927566d7e95af Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Tue, 3 Nov 2020 15:39:02 +0100
Subject: [PATCH] fix: trigger pop-up modal
---
.../components/search/search.component.html | 2 +-
.../components/search/search.component.ts | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/app/structure-list/components/search/search.component.html b/src/app/structure-list/components/search/search.component.html
index e8acc2e99..ee9f8c983 100644
--- a/src/app/structure-list/components/search/search.component.html
+++ b/src/app/structure-list/components/search/search.component.html
@@ -52,7 +52,7 @@
type="button"
[disabled]="modalTypeOpened === TypeModal[2]"
[ngClass]="{ selected: modalTypeOpened === TypeModal[2] }"
- (click)="modalTypeOpened === TypeModal[2] ? test() : openModal(TypeModal[2])"
+ (click)="openModal(TypeModal[2])"
fxLayout="row"
fxLayoutAlign="space-between center"
>
diff --git a/src/app/structure-list/components/search/search.component.ts b/src/app/structure-list/components/search/search.component.ts
index 604a1967a..bcd24719a 100644
--- a/src/app/structure-list/components/search/search.component.ts
+++ b/src/app/structure-list/components/search/search.component.ts
@@ -26,7 +26,8 @@ export class SearchComponent implements OnInit {
public searchForm: FormGroup;
// Modal variable
public categories: Category[];
- public modalTypeOpened: string;
+ public modalTypeOpened: string; // todo: utiliser enum
+ public isOpenModal = false;
// Checkbox variable
public checkedModulesFilter: Module[];
@@ -83,17 +84,20 @@ export class SearchComponent implements OnInit {
public openModal(option: string): void {
console.log(this.modalTypeOpened);
console.log(option);
+ console.log(this.isOpenModal);
this.categories = [];
if (this.modalTypeOpened !== option) {
- this.modalTypeOpened = option;
- this.fakeData(option);
+ if (!this.isOpenModal) {
+ this.modalTypeOpened = option;
+ this.fakeData(option);
+ this.isOpenModal = true;
+ } else {
+ this.isOpenModal = false;
+ }
} else {
this.modalTypeOpened = null;
}
}
- test() {
- console.log('test');
- }
public closeModal(): void {
this.modalTypeOpened = null;
}
--
GitLab