From 2303c9d61296d3cf5f9e8b293312d0da0fe1f830 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Fri, 26 Sep 2025 12:42:25 +0200 Subject: [PATCH] CSC: nav with modal event --- .../projects/sae-lib/alert-box/alert-box.html | 24 ++++++++++--------- .../projects/sae-lib/alert-box/alert-box.scss | 6 +++++ .../sae-lib/modal/confirm/confirm.html | 18 +++++++++----- .../projects/sae-lib/modal/confirm/confirm.ts | 10 +++++--- .../pages/similar-cases/similar-cases.html | 13 ++++++---- .../app/pages/similar-cases/similar-cases.ts | 10 ++++++-- 6 files changed, 55 insertions(+), 26 deletions(-) diff --git a/my-workspace/projects/sae-lib/alert-box/alert-box.html b/my-workspace/projects/sae-lib/alert-box/alert-box.html index 00792a4..0855eb2 100644 --- a/my-workspace/projects/sae-lib/alert-box/alert-box.html +++ b/my-workspace/projects/sae-lib/alert-box/alert-box.html @@ -1,16 +1,18 @@
- @if (alertKind == "warning") { - - } - @if (alertKind == "danger") { - - } - @if (alertKind == "error") { - - } - +
+ @if (alertKind == "warning") { + + } + @if (alertKind == "danger") { + + } + @if (alertKind == "error") { + + } +
+ +
x
-
diff --git a/my-workspace/projects/sae-lib/alert-box/alert-box.scss b/my-workspace/projects/sae-lib/alert-box/alert-box.scss index 552da03..d82111c 100644 --- a/my-workspace/projects/sae-lib/alert-box/alert-box.scss +++ b/my-workspace/projects/sae-lib/alert-box/alert-box.scss @@ -1,6 +1,12 @@ @use '../src/styles/variables'; :host { + .alert { + display: flex; + align-content: center; + justify-items: center; + } + i { margin-right: 16px; } diff --git a/my-workspace/projects/sae-lib/modal/confirm/confirm.html b/my-workspace/projects/sae-lib/modal/confirm/confirm.html index aa9bddb..37308a6 100644 --- a/my-workspace/projects/sae-lib/modal/confirm/confirm.html +++ b/my-workspace/projects/sae-lib/modal/confirm/confirm.html @@ -22,12 +22,18 @@
- - Yes - - - No, i stay - +
+ + + Yes + +
+
+ + + No, i stay + +
diff --git a/my-workspace/projects/sae-lib/modal/confirm/confirm.ts b/my-workspace/projects/sae-lib/modal/confirm/confirm.ts index 5565e68..4a0c5ca 100644 --- a/my-workspace/projects/sae-lib/modal/confirm/confirm.ts +++ b/my-workspace/projects/sae-lib/modal/confirm/confirm.ts @@ -1,4 +1,4 @@ -import {Component, Input} from '@angular/core'; +import {Component, EventEmitter, Input, Output} from '@angular/core'; import {MainButton} from '../../buttons/main-button/main-button'; import {AlertBox} from '../../alert-box/alert-box'; @@ -14,12 +14,16 @@ import {AlertBox} from '../../alert-box/alert-box'; export class Confirm { @Input() showWhen: any = false; + @Output() onConfirmation: EventEmitter = new EventEmitter(); + @Output() onRejection: EventEmitter = new EventEmitter(); confirm() { - + console.log('confirm button clicked') + this.onConfirmation.emit('confirmed'); } reject() { - + console.log('reject button clicked') + this.onRejection.emit('rejected'); } } diff --git a/sae-csc/src/app/pages/similar-cases/similar-cases.html b/sae-csc/src/app/pages/similar-cases/similar-cases.html index fd2999a..71614a7 100644 --- a/sae-csc/src/app/pages/similar-cases/similar-cases.html +++ b/sae-csc/src/app/pages/similar-cases/similar-cases.html @@ -140,13 +140,18 @@
- + @if (displayConfirmModal) { + + Search for new question - + Cela réinitialisera les filtres de sélection - - + + } diff --git a/sae-csc/src/app/pages/similar-cases/similar-cases.ts b/sae-csc/src/app/pages/similar-cases/similar-cases.ts index 1c5bba0..b206d9a 100644 --- a/sae-csc/src/app/pages/similar-cases/similar-cases.ts +++ b/sae-csc/src/app/pages/similar-cases/similar-cases.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, inject} from '@angular/core'; import {BotTalks} from 'sae-lib/chatbot/bot-talks/bot-talks'; import {CaseResult} from './case-result/case-result'; import {BottomNavigation} from '../../shared/navigation/bottom-navigation/bottom-navigation'; @@ -8,6 +8,7 @@ import {NgClass} from '@angular/common'; import {FiltersGroup} from 'sae-lib/filters/filters-group/filters-group'; import {FormsModule} from '@angular/forms'; import {Confirm} from 'sae-lib/modal/confirm/confirm'; +import {Router} from '@angular/router'; @Component({ selector: 'app-similar-cases', @@ -27,7 +28,6 @@ import {Confirm} from 'sae-lib/modal/confirm/confirm'; export class SimilarCases { public searchInput: string = ''; public displayedTab: 'similar-cases' | 'technical-manual' = 'similar-cases'; - public appState: any = {}; activeTab: string = "summarized"; displayHeaderTabs: boolean = false; @@ -35,6 +35,8 @@ export class SimilarCases { filteredSimilarCases: any = []; searchSimilarInput: string = ''; displayConfirmModal: boolean = true; + protected readonly confirm = confirm; + private router = inject(Router); constructor(private store: Store) { this.store.select(state => state.app).subscribe(app => { @@ -81,9 +83,13 @@ export class SimilarCases { onConfirmModal() { + console.log('confirm retour home') + this.displayConfirmModal = false; + this.router.navigate(['/home']) } onRejectModal() { + console.log('rester ici') this.displayConfirmModal = false; } }