From 4fd9fd73206b7d654127a3c42cb3521a2de03f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Flusin?= Date: Thu, 21 Sep 2023 18:30:21 +0200 Subject: [PATCH] =?UTF-8?q?contraindications=20+=20various=20fixes=C3=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 10 +- src/app/app.component.html | 10 +- src/app/app.component.scss | 20 ++ src/app/app.module.ts | 8 + .../contraindications-modal.component.html | 207 ++++++++++++++++++ .../contraindications-modal.component.scss | 100 +++++++++ .../contraindications-modal.component.ts | 19 ++ src/app/compos/header/header.component.html | 10 + src/app/compos/header/header.component.scss | 12 + src/app/compos/header/header.component.ts | 29 +++ src/app/compos/logo/logo.component.scss | 1 - src/app/compos/made-by/made-by.component.html | 1 + src/app/compos/made-by/made-by.component.scss | 4 + src/app/compos/made-by/made-by.component.ts | 15 ++ .../compos/question/question.component.html | 4 - .../compos/question/question.component.scss | 3 - src/app/compos/question/question.component.ts | 6 +- src/app/compos/results/results.component.html | 4 +- src/app/compos/results/results.component.scss | 3 - src/app/compos/results/results.component.ts | 4 +- .../pages/page-form/page-form.component.ts | 4 +- .../pages/page-home/page-home.component.html | 28 +++ .../pages/page-home/page-home.component.scss | 32 +++ .../pages/page-home/page-home.component.ts | 19 ++ src/app/questions.constants.ts | 22 +- src/app/services/progress.service.ts | 12 + 26 files changed, 560 insertions(+), 27 deletions(-) create mode 100644 src/app/compos/contraindications-modal/contraindications-modal.component.html create mode 100644 src/app/compos/contraindications-modal/contraindications-modal.component.scss create mode 100644 src/app/compos/contraindications-modal/contraindications-modal.component.ts create mode 100644 src/app/compos/header/header.component.html create mode 100644 src/app/compos/header/header.component.scss create mode 100644 src/app/compos/header/header.component.ts create mode 100644 src/app/compos/made-by/made-by.component.html create mode 100644 src/app/compos/made-by/made-by.component.scss create mode 100644 src/app/compos/made-by/made-by.component.ts create mode 100644 src/app/pages/page-home/page-home.component.html create mode 100644 src/app/pages/page-home/page-home.component.scss create mode 100644 src/app/pages/page-home/page-home.component.ts create mode 100644 src/app/services/progress.service.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0297262..c151c7a 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,7 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import {PageHomeComponent} from "./pages/page-home/page-home.component"; +import {PageFormComponent} from "./pages/page-form/page-form.component"; -const routes: Routes = []; +const routes: Routes = [ + + { path: "", redirectTo: "home", pathMatch: "full" }, + { path: "home", component: PageHomeComponent }, + { path: "form", component: PageFormComponent }, + +]; @NgModule({ imports: [RouterModule.forRoot(routes)], diff --git a/src/app/app.component.html b/src/app/app.component.html index 334b85f..e61bbb5 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1 +1,9 @@ - +
+ +
+ +
+ +
diff --git a/src/app/app.component.scss b/src/app/app.component.scss index e69de29..1d80e4b 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -0,0 +1,20 @@ +.container { + width: 60%; + margin: 0 auto 100px; +} + +.app { + display: flex; + flex-direction: column; + min-height: 100vh; +} + +.container { + flex: 1; +} + +.footer { + display: flex; + justify-content: center; + padding: 12px; +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d7ac200..a6cd30a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,6 +12,10 @@ import {HttpClientModule} from "@angular/common/http"; import { ResultsComponent } from './compos/results/results.component'; import { TreatmentDetailsModalComponent } from './compos/treatment-details-modal/treatment-details-modal.component'; import { FormattedLineComponent } from './compos/treatment-details-modal/formatted-line/formatted-line.component'; +import { PageHomeComponent } from './pages/page-home/page-home.component'; +import {ContraindicationsModalComponent} from "./compos/contraindications-modal/contraindications-modal.component"; +import { HeaderComponent } from './compos/header/header.component'; +import { MadeByComponent } from './compos/made-by/made-by.component'; @NgModule({ declarations: [ @@ -23,7 +27,11 @@ import { FormattedLineComponent } from './compos/treatment-details-modal/formatt LogoComponent, ResultsComponent, TreatmentDetailsModalComponent, + ContraindicationsModalComponent, FormattedLineComponent, + PageHomeComponent, + HeaderComponent, + MadeByComponent, ], imports: [ BrowserModule, diff --git a/src/app/compos/contraindications-modal/contraindications-modal.component.html b/src/app/compos/contraindications-modal/contraindications-modal.component.html new file mode 100644 index 0000000..d3a6ddb --- /dev/null +++ b/src/app/compos/contraindications-modal/contraindications-modal.component.html @@ -0,0 +1,207 @@ +
+ + diff --git a/src/app/compos/contraindications-modal/contraindications-modal.component.scss b/src/app/compos/contraindications-modal/contraindications-modal.component.scss new file mode 100644 index 0000000..9c404b1 --- /dev/null +++ b/src/app/compos/contraindications-modal/contraindications-modal.component.scss @@ -0,0 +1,100 @@ +@import "../../../styles/variables.scss"; + +.container { + position: fixed; + inset: 0; + z-index: 999; + background-color: #00000033; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.modal { + position: relative; + height: 80vh; + width: 80vw; + max-width: 80vw; + background-color: #FFFFFF; + padding: 32px; + border-radius: 32px; +} + +.header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 32px; + padding-bottom: 16px; + border-bottom: 2px solid $border-color; + + & button { + border: none; + background-color: $color-E; + color: white; + font-size: 2em; + width: 40px; + height: 40px; + border-radius: 50%; + + &:hover { + background-color: darken($color-E, 10%); + cursor: pointer; + } + } +} + +.scrollable { + overflow-y: auto; + max-height: 90%; +} + +h1 { + font-size: 2em; + font-weight: 500; + color: $color-B; +} + +summary { + cursor: pointer; + color: $color-B; +} + +h3 { + font-size: 1em; + margin-bottom: 8px; + font-weight: 500; + margin-top: 36px; + color: $color-E; + + &.warn { + color: $color-D; + } +} + +.section { + padding: 16px; + border-bottom: 2px solid $border-color; +} + +.sub-section { + border-left: 4px solid $color-B; + padding-left: 8px; + line-height: 24px; + + &.warn { + border-color: $color-D; + } +} + +p, ul { + list-style: inherit; +} + +ul { + margin-left: 12px; + margin-bottom: 30px; + padding-left: 24px; + +} diff --git a/src/app/compos/contraindications-modal/contraindications-modal.component.ts b/src/app/compos/contraindications-modal/contraindications-modal.component.ts new file mode 100644 index 0000000..333b28d --- /dev/null +++ b/src/app/compos/contraindications-modal/contraindications-modal.component.ts @@ -0,0 +1,19 @@ +import {Component, EventEmitter, HostListener, OnInit, Output} from '@angular/core'; + +@Component({ + selector: 'app-contraindications-modal', + templateUrl: './contraindications-modal.component.html', + styleUrls: ['./contraindications-modal.component.scss'] +}) +export class ContraindicationsModalComponent implements OnInit { + + @Output() onClose: EventEmitter = new EventEmitter(); + + @HostListener('document:keydown.escape', ['$event']) onKeydownHandler(event: KeyboardEvent) { + this.onClose.emit(); + } + + ngOnInit(): void { + } + +} diff --git a/src/app/compos/header/header.component.html b/src/app/compos/header/header.component.html new file mode 100644 index 0000000..3c61697 --- /dev/null +++ b/src/app/compos/header/header.component.html @@ -0,0 +1,10 @@ + +
+ + +
+ + + + + diff --git a/src/app/compos/header/header.component.scss b/src/app/compos/header/header.component.scss new file mode 100644 index 0000000..2731217 --- /dev/null +++ b/src/app/compos/header/header.component.scss @@ -0,0 +1,12 @@ +.container { + width: 60%; + margin: 0 auto; + display: flex; + justify-content: space-between; + align-items: center; + padding: 16px 0; +} + +app-logo { + cursor: pointer; +} diff --git a/src/app/compos/header/header.component.ts b/src/app/compos/header/header.component.ts new file mode 100644 index 0000000..924a510 --- /dev/null +++ b/src/app/compos/header/header.component.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import {ProgressService} from "../../services/progress.service"; + +@Component({ + selector: 'app-header', + templateUrl: './header.component.html', + styleUrls: ['./header.component.scss'] +}) +export class HeaderComponent implements OnInit { + + currentProgress: number = 0; + contraindicationsShown = false; + + constructor(private progressService: ProgressService) { } + + ngOnInit(): void { + this.progressService.currentProgress.subscribe((value) => { + this.currentProgress = value; + }); + } + + closeContraindications() { + this.contraindicationsShown = false; + } + + showContraindications() { + this.contraindicationsShown = true; + } +} diff --git a/src/app/compos/logo/logo.component.scss b/src/app/compos/logo/logo.component.scss index cc721e7..41dc86e 100644 --- a/src/app/compos/logo/logo.component.scss +++ b/src/app/compos/logo/logo.component.scss @@ -1,7 +1,6 @@ @import "../../../styles/variables.scss"; .logo { - margin-top: 32px; font-weight: 500; color: $color-A; font-size: 32px; diff --git a/src/app/compos/made-by/made-by.component.html b/src/app/compos/made-by/made-by.component.html new file mode 100644 index 0000000..4996794 --- /dev/null +++ b/src/app/compos/made-by/made-by.component.html @@ -0,0 +1 @@ +
Made with ♥ by Jérémy Flusin and Angular
diff --git a/src/app/compos/made-by/made-by.component.scss b/src/app/compos/made-by/made-by.component.scss new file mode 100644 index 0000000..72c5154 --- /dev/null +++ b/src/app/compos/made-by/made-by.component.scss @@ -0,0 +1,4 @@ +div { + font-size: 0.8em; + color: #bbb; +} diff --git a/src/app/compos/made-by/made-by.component.ts b/src/app/compos/made-by/made-by.component.ts new file mode 100644 index 0000000..f604dc4 --- /dev/null +++ b/src/app/compos/made-by/made-by.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-made-by', + templateUrl: './made-by.component.html', + styleUrls: ['./made-by.component.scss'] +}) +export class MadeByComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/compos/question/question.component.html b/src/app/compos/question/question.component.html index 96d4379..130ac54 100644 --- a/src/app/compos/question/question.component.html +++ b/src/app/compos/question/question.component.html @@ -1,8 +1,4 @@ - - -
-

Question {{question.id}}

diff --git a/src/app/compos/question/question.component.scss b/src/app/compos/question/question.component.scss index 4a2ac28..66a410e 100644 --- a/src/app/compos/question/question.component.scss +++ b/src/app/compos/question/question.component.scss @@ -18,9 +18,6 @@ h2 { .container { - width: 60%; - margin: 0 auto; - .block { display: flex; gap: 32px; diff --git a/src/app/compos/question/question.component.ts b/src/app/compos/question/question.component.ts index 619d227..2385469 100644 --- a/src/app/compos/question/question.component.ts +++ b/src/app/compos/question/question.component.ts @@ -1,6 +1,7 @@ import {Component, EventEmitter, Input, Output} from '@angular/core'; import {Question, QUESTIONS, Symptom} from "../../questions.constants"; import {AnswersService} from "../../services/answers.service"; +import {ProgressService} from "../../services/progress.service"; @Component({ selector: 'app-question', @@ -16,6 +17,7 @@ export class QuestionComponent { @Input() set question(question: Question) { this._question = question; this.isFirstOrLast(); + this.computeProgress(); } @Output() onValidate: EventEmitter = new EventEmitter(); @@ -26,7 +28,7 @@ export class QuestionComponent { isFirstQuestion: boolean = false; isLastQuestion: boolean = false; - constructor(private answerService: AnswersService) { } + constructor(private progressService: ProgressService, private answerService: AnswersService) { } setHasTaken = (hasTaken: boolean) => { this.hasTaken = hasTaken; @@ -50,7 +52,7 @@ export class QuestionComponent { } computeProgress() { - return (this.question.id - 1) * 100 / (QUESTIONS.length - 1); + this.progressService.currentProgress.next((this.question.id - 1) * 100 / (QUESTIONS.length)); } addAnswer = (symptom: Symptom) => { diff --git a/src/app/compos/results/results.component.html b/src/app/compos/results/results.component.html index 17d69ba..f466bf1 100644 --- a/src/app/compos/results/results.component.html +++ b/src/app/compos/results/results.component.html @@ -1,6 +1,4 @@ -
-

Résultats

@@ -13,7 +11,7 @@
{{r.treatment.label}} ({{r.score}})
- +
diff --git a/src/app/compos/results/results.component.scss b/src/app/compos/results/results.component.scss index d5ee867..bc25744 100644 --- a/src/app/compos/results/results.component.scss +++ b/src/app/compos/results/results.component.scss @@ -1,9 +1,6 @@ @import "../../../styles/variables.scss"; .container { - width: 60%; - margin: 0 auto; - h2 { font-weight: 500; color: $color-E; diff --git a/src/app/compos/results/results.component.ts b/src/app/compos/results/results.component.ts index 9fe3418..36ee74c 100644 --- a/src/app/compos/results/results.component.ts +++ b/src/app/compos/results/results.component.ts @@ -1,6 +1,7 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core'; import {EngineService, RecommendationModel} from "../../services/engine.service"; import {AnswersService} from "../../services/answers.service"; +import {ProgressService} from "../../services/progress.service"; @Component({ selector: 'app-results', @@ -16,9 +17,10 @@ export class ResultsComponent implements OnInit { @Output() onReset: EventEmitter = new EventEmitter(); - constructor(private engine: EngineService, private answers: AnswersService) { } + constructor(private progressService: ProgressService, private engine: EngineService, private answers: AnswersService) { } ngOnInit(): void { + this.progressService.currentProgress.next(100); const recommendations = this.engine.getRecommendations(this.answers.answersIndexes); this.recommendations = recommendations.filter((r) => r.score >= 0).sort((r1, r2) => r2.score - r1.score); this.discouragements = recommendations.filter((r) => r.score < 0); diff --git a/src/app/pages/page-form/page-form.component.ts b/src/app/pages/page-form/page-form.component.ts index c1f077f..3c2dc5e 100644 --- a/src/app/pages/page-form/page-form.component.ts +++ b/src/app/pages/page-form/page-form.component.ts @@ -1,7 +1,6 @@ -import {AfterViewInit, Component, OnInit} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {Question, QUESTIONS} from "../../questions.constants"; import {AnswersService} from "../../services/answers.service"; -import {TreatmentsService} from "../../services/treatments.service"; @Component({ selector: 'app-page-form', @@ -37,4 +36,5 @@ export class PageFormComponent implements OnInit { this.currentStep = "questions"; this.currentQuestionIndex = 0; } + } diff --git a/src/app/pages/page-home/page-home.component.html b/src/app/pages/page-home/page-home.component.html new file mode 100644 index 0000000..b1698c1 --- /dev/null +++ b/src/app/pages/page-home/page-home.component.html @@ -0,0 +1,28 @@ +
+
+ Questionnaire d'aide à l'adaptation de la contraception +
+
+

+ Ce questionnaire s'adresse aux praticiens libéraux ou hospitalier, médecins ou sages-femmes, lors d'une + consultations ayant pour but d'adapter une contraception mal tolérée ou non adaptée au profil de la patiente. +

+

+ Il est à remplir avec l'aide de la patiente au cours de la dite consultation. +

+

+ Les résultats obtenus vont de la méthode la plus conseillée (en vert) à la moins conseillée (en rouge), sans tenir + compte des contre-indications éventuelles. +

+

+ Vous pouvez cliquer directement sur chaque résultat pour en obtenir le détail (nom commercial, mode d'utilisation, + nombre de comprimés etc...), ainsi que la bibliographie justifiant ce choix. +

+

+ Vous disposez également d'un onglet "CONTRE-INDICATIONS" que vous pouvez consulter pour étayer votre choix. +

+
+
+ +
+
diff --git a/src/app/pages/page-home/page-home.component.scss b/src/app/pages/page-home/page-home.component.scss new file mode 100644 index 0000000..5db06d5 --- /dev/null +++ b/src/app/pages/page-home/page-home.component.scss @@ -0,0 +1,32 @@ +.container { + width: 60%; + margin: auto; +} + +p { + margin-bottom: 16px; + line-height: 20px; +} + +.subtitle { + margin-top: 32px; + font-size: 2rem; + text-align: center; +} + +.box { + background: rgb(126,197,187); + background: linear-gradient(142deg, rgba(126,197,187,1) 0%, rgb(61, 141, 141) 100%); + position: relative; + box-shadow: #00000022 0px 0px 10px; + padding: 64px 32px; + + border-radius: 32px; + margin-top: 32px; +} + +.buttons { + margin-top: 32px; + display: flex; + justify-content: center; +} diff --git a/src/app/pages/page-home/page-home.component.ts b/src/app/pages/page-home/page-home.component.ts new file mode 100644 index 0000000..508771a --- /dev/null +++ b/src/app/pages/page-home/page-home.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-page-home', + templateUrl: './page-home.component.html', + styleUrls: ['./page-home.component.scss'] +}) +export class PageHomeComponent implements OnInit { + + constructor(private router: Router) { } + + ngOnInit(): void { + } + + goToForm() { + this.router.navigate(['form']); + } +} diff --git a/src/app/questions.constants.ts b/src/app/questions.constants.ts index 130da72..200222c 100644 --- a/src/app/questions.constants.ts +++ b/src/app/questions.constants.ts @@ -22,9 +22,6 @@ export const QUESTIONS = [ { key: 'G', label: "Cholestase, Lithiase / cholécystite, Tumeur bénigne du foie", description: "HNF, adénome" } ] }, - - - { id: 2, question: "La patiente a déjà pris une contraception *oestroprogestative par anneau vaginal", @@ -93,7 +90,7 @@ export const QUESTIONS = [ }, { id: 7, - question: "La patiente a-t-elle déjà pris une contraception *microprogestative par dispositif intra-utérin au cuivre", + question: "La patiente a-t-elle déjà pris une contraception *par dispositif intra-utérin au cuivre", symptoms: [ { key: 'B', label: "Ménométrorragies, Dysménorrhées" }, { key: 'C', label: "Expulsion" }, @@ -112,5 +109,18 @@ export const QUESTIONS = [ { key: 'D', label: "Brûlures vaginales liées au spermicide" }, { key: 'E', label: "Douleurs locales liées au dispositif à taille unique" }, ] - } -] + }, + { + id: 9, + question: "La patiente présente-t-elle un *profil particulier", + symptoms: [ + { key: 'B', label: "Endométriose, dysménorrhées, ménorragies" }, + { key: 'C', label: "Fibrome" }, + { key: 'D', label: "SOPK, Hyperandrogénie" }, + { key: 'E', label: "Obésité" }, + { key: 'F', label: "Syndrome pré-menstruel invalidant" }, + { key: 'G', label: "Souhait d'une contraception non-hormonale" }, + { key: 'H', label: "Souhait d'une contraception de moyenne à longue durée d’action" }, + ] + }, +]; diff --git a/src/app/services/progress.service.ts b/src/app/services/progress.service.ts new file mode 100644 index 0000000..b7d5fb8 --- /dev/null +++ b/src/app/services/progress.service.ts @@ -0,0 +1,12 @@ +import { Injectable } from '@angular/core'; +import {BehaviorSubject} from "rxjs"; + +@Injectable({ + providedIn: 'root' +}) +export class ProgressService { + + public currentProgress: BehaviorSubject = new BehaviorSubject(0); + + constructor() { } +}