Skip to content
Snippets Groups Projects
Commit 61184aa0 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

feat(ui): orientation selectors

parent 33766f58
No related branches found
No related tags found
2 merge requests!783V3.0.0,!648feat(ui): orientation selectors
Showing
with 81 additions and 106 deletions
<div class="content-container no-pt" [ngClass]="{ 'height-100': isOrientationForm }"> <div class="content-container no-pt" [ngClass]="{ orientationHeight: isOrientationForm }">
<h1 class="visually-hidden">Cartographie</h1> <h1 class="visually-hidden">Cartographie</h1>
<div class="hide-on-print"> <div class="hide-on-print">
<app-structure-list-search [filters]="filters" (searchEvent)="getStructures($event)" /> <app-structure-list-search [filters]="filters" (searchEvent)="getStructures($event)" />
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
flex-direction: column; flex-direction: column;
} }
.height-100 { .orientationHeight {
height: calc(100vh - #{$header-height} - #{$orientation-progressBarAndButtons}); height: calc(100vh - #{$header-height} - #{$progress-bar-height} - #{$orientation-progressBarAndButtons});
} }
.panes-container { .panes-container {
......
<div class="footerForm" [ngClass]="{ column: hasFinishButton() }"> <div class="footerForm">
<app-v3-button <app-v3-button
*ngIf="!isLastFormStep && !isNextFormTransition && !isStructureLastPage() && !isPersonalOfferFirstPage()" *ngIf="!isLastFormStep && !isNextFormTransition && !isStructureLastPage() && !isPersonalOfferFirstPage()"
[variant]="buttonTypeEnumV3.Secondary" [variant]="buttonTypeEnumV3.Secondary"
[label]="!isEditMode ? btnName[0] : 'Annuler'" [label]="!isEditMode ? 'Précédent' : 'Annuler'"
[iconName]="!isEditMode && 'arrowBackV3'" [iconName]="!isEditMode && 'arrowBackV3'"
(action)="prevPage()" (action)="prevPage()"
/> />
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
<app-v3-button <app-v3-button
*ngIf="!isLastFormStep && !isNextFormTransition && !isEditMode" *ngIf="!isLastFormStep && !isNextFormTransition && !isEditMode"
[variant]="buttonTypeEnumV3.Primary" [variant]="buttonTypeEnumV3.Primary"
[label]="btnName[1]" [label]="'Suivant'"
[iconPosition]="'right'" [iconPosition]="'right'"
[iconName]="btnName[1] === 'Imprimer' ? 'print' : 'arrowForwardV3'" [iconName]="'arrowForwardV3'"
[disabled]="!isValid" [disabled]="!isValid"
[style]="buttonTypeEnumV3.Primary"
(action)="nextPage()" (action)="nextPage()"
/> />
<!-- Untested, not sure when it activates -->
<app-v3-button <app-v3-button
*ngIf="isEditMode" *ngIf="isEditMode"
[variant]="buttonTypeEnumV3.Primary" [variant]="buttonTypeEnumV3.Primary"
......
...@@ -32,28 +32,6 @@ ...@@ -32,28 +32,6 @@
} }
} }
.column {
@media #{$phone} {
flex-direction: column !important;
button {
margin-bottom: 10px !important;
margin-right: 0 !important;
}
}
}
.chevronLeft {
height: 24px;
width: 24px;
stroke: $black;
margin-right: 10px;
}
.chevronRight {
height: 24px;
width: 24px;
margin-left: 10px;
}
.print { .print {
stroke: $white; stroke: $white;
width: 20px; width: 20px;
......
...@@ -23,7 +23,6 @@ import { stepType } from '../step.type'; ...@@ -23,7 +23,6 @@ import { stepType } from '../step.type';
export class FooterFormComponent implements OnChanges { export class FooterFormComponent implements OnChanges {
@Input() currentForm: formType; @Input() currentForm: formType;
@Input() isValid: boolean; @Input() isValid: boolean;
@Input() btnName: string[];
@Input() nbPagesForm: number; @Input() nbPagesForm: number;
@Input() form: UntypedFormGroup; @Input() form: UntypedFormGroup;
@Input() linkedStructureId: string[] = null; @Input() linkedStructureId: string[] = null;
...@@ -81,10 +80,6 @@ export class FooterFormComponent implements OnChanges { ...@@ -81,10 +80,6 @@ export class FooterFormComponent implements OnChanges {
this.endPage.emit(); this.endPage.emit();
} }
public hasFinishButton(): boolean {
return this.btnName.length === 3;
}
public goToHome(): void { public goToHome(): void {
this.router.navigateByUrl('news'); this.router.navigateByUrl('news');
} }
......
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
[currentForm]="currentFormType" [currentForm]="currentFormType"
[form]="currentForm" [form]="currentForm"
[linkedStructureId]="linkedStructureId" [linkedStructureId]="linkedStructureId"
[btnName]="['Précédent', 'Suivant']"
[isValid]="isPageValid" [isValid]="isPageValid"
[acceptNewsletter]="userAcceptNewsletter" [acceptNewsletter]="userAcceptNewsletter"
[hasOtherPersonalOffer]="hasOtherPersonalOffer" [hasOtherPersonalOffer]="hasOtherPersonalOffer"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
padding: 32px 48px; padding: 32px 48px;
display: flex; display: flex;
justify-content: center; justify-content: center;
min-width: 600px;
@media #{$tablet} { @media #{$tablet} {
margin: 0px 0.5rem; margin: 0px 0.5rem;
...@@ -79,7 +80,6 @@ ...@@ -79,7 +80,6 @@
h4 { h4 {
@include font-bold-18; @include font-bold-18;
margin-bottom: 0;
} }
p { p {
@include font-regular-18; @include font-regular-18;
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
.info { .info {
@include font-regular-14; @include font-regular-14;
} }
// V3REMOVE
.backArrow { .backArrow {
cursor: pointer; cursor: pointer;
} }
......
<h2>Quel est le besoin numérique de la personne ?</h2> <div class="orientationForm">
<h2>Quel est le besoin numérique de la personne ?</h2>
<div fxLayout="column" fxLayoutGap="32px">
<div class="btn-grid"> <div class="btn-grid">
<span *ngFor="let module of baseSkills"> <span *ngFor="let module of baseSkills">
<app-button <app-button
......
import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { OrientationUtils } from '../../../utils/orientationUtils'; import { OrientationUtils } from '../../../utils/orientationUtils';
import { FiltersSteps } from '../enums/filtersSteps.enum'; import { FiltersSteps, GenericOrientationSteps, RecapsType, StructuresListSteps } from '../enums/orientation.enums';
import { GenericOrientationSteps } from '../enums/genericOrientationSteps.enum';
import { RecapsType } from '../enums/recapsType.enum';
import { StructuresListSteps } from '../enums/structuresListSteps.enum';
import { FiltersForm } from '../interfaces/filtersForm.interface'; import { FiltersForm } from '../interfaces/filtersForm.interface';
import { MediationType } from '../types/mediation.type'; import { MediationStepType, MediationType } from '../types/orientation.types';
import { MediationStepType } from '../types/mediationStep.type';
@Component({ @Component({
selector: 'app-base-skills', selector: 'app-base-skills',
...@@ -24,9 +19,9 @@ export class BaseSkillsComponent { ...@@ -24,9 +19,9 @@ export class BaseSkillsComponent {
public pagesValidation: any[] = []; public pagesValidation: any[] = [];
// Enums // Enums
public structuresListStepsEnum = StructuresListSteps; public StructuresListSteps = StructuresListSteps;
public FiltersSteps = FiltersSteps; public FiltersSteps = FiltersSteps;
public recapsType = RecapsType; public RecapsType = RecapsType;
public GenericOrientationSteps = GenericOrientationSteps; public GenericOrientationSteps = GenericOrientationSteps;
public checkValidation(): void { public checkValidation(): void {
......
export enum AppointmentSteps {
infoScreen,
structureOrientator,
pmrAccess,
location,
carto,
makeAppointment,
mediationBeneficiaryInfo,
rdvEnd,
}
export enum FiltersSteps {
filterChoice,
}
export enum GenericOrientationSteps {
common = 'Common',
structureList = 'Trouver une structure',
}
export enum HotlineMediationSteps {
infoScreen,
mediationBeneficiaryInfo,
mediationHoursSelection,
mediationLanguageSelection,
orientationRecap,
}
export enum NeedsType {
equipmentAccess,
equipmentBuy,
onlineDemarch,
learnSkills,
}
export enum OnlineDemarche {
common = 'Common',
structureList = 'Trouver une structure',
appointment = 'RDV Conseiller Numérique',
onlineMediation = 'Médiation Numérique à distance',
}
export enum OnlineDemarchesCommonSteps {
onlineDemarche,
accompanimentType,
}
export enum AppointmentSteps {
infoScreen,
structureOrientator,
pmrAccess,
location,
carto,
makeAppointment,
mediationBeneficiaryInfo,
rdvEnd,
}
export enum FiltersSteps {
filterChoice,
}
export enum GenericOrientationSteps {
common = 'Common',
structureList = 'Trouver une structure',
}
export enum HotlineMediationSteps {
infoScreen,
mediationBeneficiaryInfo,
mediationHoursSelection,
mediationLanguageSelection,
orientationRecap,
}
export enum OnlineDemarche {
structureList = 'Trouver une structure',
appointment = 'RDV Conseiller Numérique',
onlineMediation = 'Médiation Numérique à distance',
common = 'Common',
}
export enum OnlineDemarchesCommonSteps {
onlineDemarche,
accompanimentType,
}
export enum NeedsType {
equipmentAccess = 'equipmentAccess',
equipmentBuy = 'equipmentBuy',
onlineDemarch = 'onlineDemarch',
learnSkills = 'learnSkills',
}
export enum PreferredLanguages {
french = 'Français',
english = 'Anglais',
arabic = 'Arabe',
}
export enum RecapsType {
onlineMediation,
structure,
}
export enum StructuresListSteps {
pmrAccess,
address,
structureChoice,
structureOrientator,
mediationBeneficiaryInfo,
comments,
orientationRecap,
}
export enum PreferredLanguages {
french = 'Français',
english = 'Anglais',
arabic = 'Arabe',
}
export enum RecapsType {
onlineMediation,
structure,
}
export enum StructuresListSteps {
pmrAccess,
address,
structureChoice,
structureOrientator,
mediationBeneficiaryInfo,
comments,
orientationRecap,
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment