Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source 15

feat: personal offer edition · 9cc07bed
Rémi PAILHAREY authored Nov 17, 2022

9cc07bed
Merge branch 'feat/US255-edit-personal-offer' into 'V2.0' · fd8031b8
Rémi PAILHAREY authored Nov 17, 2022
```
Feat/us255 edit personal offer

See merge request !366
```
fd8031b8
feat(orientation): add language selection · 05867d0e
Guilhem CARRON authored Nov 17, 2022

05867d0e
Merge branch 'feat/US257-add-language-selection-orientation' into 'V2.0' · 8ed27e48
Guilhem CARRON authored Nov 17, 2022
```
Feat/us257 add language selection orientation

See merge request !373
```
8ed27e48
feat(footer): "mediation numérique" button · 2be0de89
Bastien DUMONT authored Nov 17, 2022

2be0de89
Merge branch 'feat/US258-mediation-distance-footer' into 'V2.0' · cb2a95f5
Bastien DUMONT authored Nov 17, 2022
```
Feat/us258 mediation distance footer

See merge request !380
```
cb2a95f5
feat(nginx): update matomo base conf · 8166b93b
Hugo SUBTIL authored Nov 17, 2022

8166b93b
Merge branch 'feat/US256-matomo-script' into 'V2.0' · 0ee24d88
Hugo SUBTIL authored Nov 17, 2022
```
feat: update matomo base conf

See merge request !375
```
0ee24d88
fix(orientation): revert merge conflict from 05867d0e · 611d9618
Hugo SUBTIL authored Nov 17, 2022

611d9618
feat: delete my personal offer · 6ffbd4ad
Rémi PAILHAREY authored Nov 18, 2022

6ffbd4ad
Merge branch 'feat/US264-delete-my-personal-offer' into 'V2.0' · 3db31052
Rémi PAILHAREY authored Nov 18, 2022
```
Feat/us264 delete my personal offer

See merge request !377
```
3db31052
Update .gitlab/issue_templates/default.md · b94e470c
Hugo NOUTS authored Nov 21, 2022

b94e470c
fix: Retours review · f904514b
Hugo SUBTIL authored Nov 22, 2022 and Guilhem CARRON committed Nov 22, 2022

f904514b
Merge branch '53-retours-sprint' into 'V2.0' · cf29ec1b
Guilhem CARRON authored Nov 22, 2022
```
Resolve "Retours sprint 5"

Closes #53

See merge request !385
```
cf29ec1b
chore(release): 2.0.0-beta5 · 475afb6a
Hugo SUBTIL authored Nov 23, 2022

475afb6a

.gitlab/issue_templates/default.md

+5
−15

Original line number
Original line
Diff line number
Diff line

/title [Scope] Description

[[_TOC_]]

### Résumé du problème

## Contexte

_Donnez une description briève du problème._

## Objectif

### Les étapes pour reproduire le bug

## Ressources

_Listez les étapes qui vous permettent de reproduire ce bug, cette étape est très importante._

## Tâches

### Décrivez le comportement du bug ?

### Quel serez le comportement attendu ?

### Logs et/ou screenshots

### Possible fixes

/label ~"type::bug"

CHANGELOG.md

+39
−0

Original line number
Original line
Diff line number
Diff line

@@ -2,6 +2,45 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.0.0-beta5](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.0.0-beta4...v2.0.0-beta5) (2022-11-23)

### Features

* Add solidarity material in onboarding + carto + edit ([1f997f2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/1f997f2c6536d36cda8df7f0cf09d24b9d50e2d7))

* **admin:** export users ([76a3add](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/76a3add32e542f5dd49cd0824a562c98c429da13))

* **carto:** add pmr handling for carto filtering and orientation ([a5232eb](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/a5232eb2be3997a6ea04db83e2374a091b1fead3))

* center loader in carto ([ff5d016](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/ff5d0161b07e787a77d7236e35dce7b97adee101))

* delete my personal offer ([6ffbd4a](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/6ffbd4ad6158d15540266a3fe690febd25918042))

* **docker:** update registry path ([6698cf8](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/6698cf839f29e780692ff6d1e776599d57a2b5f3))

* **edit-structure:** link to manage members ([e5cc5d3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/e5cc5d3064b2a925d77bb0c204497518eb002337))

* **footer:** "mediation numérique" button ([2be0de8](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/2be0de896264ff8c840bb7a8f34ae0d33d803b52))

* **nginx:** update matomo base conf ([8166b93](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/8166b93bdaa1e0970bf2da9855d01ed56b17d019))

* **orientation:** :hammer: add new orientation with the following tunnels : trainings, online accompaniement, solidarity material, material access  ([249a6be](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/249a6be341319aff8de7766490ce2a2c30faeb57))

* **orientation:** add language selection  ([05867d0](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/05867d0e76ca2d4508516b96699163bc31aa8bee))

* **orientation:** Add modal for foreigners demarch ([e8419a6](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/e8419a6b768a19d40283e016fb27eb43bc438236))

* personal offer edition ([9cc07be](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/9cc07bedb7dcafe44bb55b315c2bd0f052eea52f))

* personal offers section in profile ([a2159c5](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/a2159c52384c344065d48fd5e0db824f9b3dc9f5))

* **personnalOffer:** Add-multi-checkbox ([cfe149e](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/cfe149e4a39a8e0a6478d72a83085624e516c8b1))

### Bug Fixes

* add members ([f58fede](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/f58fedeba1a4223a020597661fddd3fe1e2ff484))

* **admin:** loader style ([27584f1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/27584f1a76e40d8606f7941197d0371e5180e66a))

* **aptic:** handling of missing fields for aptic structures ([1568706](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/1568706de0e377edff1ff930b24e0ac3fed7d2aa))

* clickable structure carto (ios) ([14a397a](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/14a397a73bcf2088e47041cf9115e02af8c2c27b))

* **deps:** update ag-grid monorepo to v28 (major) ([1d634d0](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/1d634d0e5b910028f799a98b138618466ad3d11d))

* **deps:** update dependency @asymmetrik/ngx-leaflet to v14 ([3345bef](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/3345befd2f1dde6bca893b019d7b98473bdd88ac))

* **deps:** update dependency leaflet.locatecontrol to ^0.77.0 ([864de8e](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/864de8ec78d5edf2a62e09c059df605856ded221))

* **deps:** update dependency rxjs to v7 ([7875e76](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/7875e76fee5db11c615a2589416d6b23c6956e71))

* **deps:** update dependency zone.js to ~0.12.0 ([e5aad9e](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/e5aad9ed3d63cf5e9948065b4f64dfb02b43d8e0))

* onboarding structure creation missing end button ([fe0836a](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/fe0836a00a18a2a75bd176227937ebd9accd77ee))

* **orientation:** revert merge conflict from 05867d0e76ca2d4508516b96699163bc31aa8bee ([611d961](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/611d9618be298487bbbbfa54a513e32aa609fc82))

* retours review ([aae2d55](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/aae2d550bf92385125aa45d9983e4c7c9612c0b6))

* Retours review ([f904514](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/f904514b38c184cfabc140500faf4e82882d2ce0))

* **style:** add rouded class for buttons ([5ae4610](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/5ae461025e4f7d45ffd8695102dadf3a8709667b))

## [2.0.0-beta4](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.0.0-beta2.2...v2.0.0-beta4) (2022-10-31)

## [2.0.0-beta4](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.0.0-beta2.2...v2.0.0-beta4) (2022-10-31)

nginx/dev.conf

+2
−2

Original line number
Original line
Diff line number
Diff line

@@ -29,10 +29,10 @@ server {

    _paq.push(['enableLinkTracking']);

    _paq.push(['enableLinkTracking']);

    (function() {

    (function() {

      var u='<URL_GDLYON>';

      var u='<URL_GDLYON>';

      _paq.push(['setTrackerUrl', u+'piwik.php']);

      _paq.push(['setTrackerUrl', u+'matomo.php']);

      _paq.push(['setSiteId', '<SITE_ID>']);

      _paq.push(['setSiteId', '<SITE_ID>']);

      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];

      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];

      g.type='text/javascript'; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);

      g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);

    })();

    })();

  </script>";

  </script>";

package.json

+1
−1

Original line number
Original line
Diff line number
Diff line

{

{

  "name": "pamn",

  "name": "pamn",

  "version": "2.0.0-beta4",

  "version": "2.0.0-beta5",

  "scripts": {

  "scripts": {

    "ng": "ng",

    "ng": "ng",

    "start": "ng serve --configuration=fr --proxy-config proxy.conf.json",

    "start": "ng serve --configuration=fr --proxy-config proxy.conf.json",

src/app/annuaire/filter-modal/filter-modal.component.scss

+0
−118

Original line number
Original line
Diff line number
Diff line

@import '../../../assets/scss/icons';

@import '../../../assets/scss/color';

@import '../../../assets/scss/color';

@import '../../../assets/scss/typography';

@import '../../../assets/scss/breakpoint';

@import '../../../assets/scss/shapes';

@import '../../../assets/scss/hyperlink';

@import '../../../assets/scss/hyperlink';

@import '../../../assets/scss/z-index';

.modalemployers {

.modalemployers {

  left: 515px;

  left: 515px;

@@ -13,119 +8,6 @@

  left: 412px;

  left: 412px;

}

}

.maxModal .blockLigne {

  box-sizing: border-box;

  width: 360px;

  .smallList {

    display: block;

    box-sizing: border-box;

    background: $grey-8;

    max-width: 300px;

    padding: 0.5rem !important;

    margin-top: 1rem !important;

  }

}

.modal {

  max-width: 360px;

  width: auto;

  z-index: $modal-z-index !important;

  position: fixed;

  box-shadow: $box-shadow-simple;

  border-radius: 8px;

  margin-top: 25px;

  @media #{$large-phone} {

    height: 100%;

    max-height: auto;

    max-width: auto;

    width: 100%;

    position: fixed;

    top: 0;

    left: 0;

    border: none;

    padding: 0;

  }

  background: $white;

  .body-wrap {

    @media #{$large-phone} {

      height: 100vh;

      height: -webkit-fill-available;

    }

    .titleFilter {

      display: none !important;

      margin: 27px 25px 0px 25px;

      @include lato-bold-26;

      @media #{$large-phone} {

        display: flex !important;

      }

    }

  }

  .contentModal {

    overflow-y: auto;

    max-width: 1100px;

    border-bottom: 1px solid $grey;

    @media #{$large-phone} {

      max-height: none;

      height: 100%;

    }

    .blockFiltre {

      width: auto;

      margin: 25px 20px;

      margin-bottom: calc(25px - 1rem);

      min-width: 200px;

      @media #{$large-phone} {

        margin: 0 18px;

        padding: 25px 0;

        min-width: 0;

      }

    }

    .blockLigne {

      padding-left: 0;

      margin: 0px;

      li {

        margin-bottom: 1rem;

      }

    }

    label {

      @include lato-regular-16;

      color: $grey-1;

    }

    .arrow {

      cursor: pointer;

      margin-left: auto;

      background-color: transparent;

      border-bottom: 1px solid $black;

      border-right: 1px solid $black;

      transform: translateY(-25%) rotate(45deg);

      height: 7px;

      width: 7px;

      transition: all 300ms ease;

      margin-top: -5px;

    }

    .toggled {

      transform: translateY(25%) rotate(-135deg);

    }

    &.max-height {

      max-height: 50vh;

      overflow-y: overlay;

    }

  }

  .footer {

    box-sizing: border-box;

    padding: 0.5rem;

    .reset {

      width: 45%;

      text-align: center;

      color: $grey-4;

    }

    .half-width {

      width: 50%;

      padding: 0 4px;

    }

  }

}

a {

a {

  @include hyperlink;

  @include hyperlink;

}

}

src/app/annuaire/result-list/result-list.component.html

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -7,7 +7,7 @@

      <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'"></app-svg-icon>

      <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'"></app-svg-icon>

    </div>

    </div>

    <div class="identity">

    <div class="identity">

      <p class="name">{{ user.name }} {{ user.surname }}</p>

      <p class="name">{{ user.name }} {{ user.surname.toUpperCase() }}</p>

      <p class="job" *ngIf="user.job">{{ user.job.name }}</p>

      <p class="job" *ngIf="user.job">{{ user.job.name }}</p>

    </div>

    </div>

    <div class="employer" *ngIf="user.employer">{{ user.employer.name }}</div>

    <div class="employer" *ngIf="user.employer">{{ user.employer.name }}</div>

src/app/app.module.ts

+4
−4

Original line number
Original line
Diff line number
Diff line

@@ -2,16 +2,14 @@ import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';

import { LOCALE_ID, NgModule } from '@angular/core';

import { LOCALE_ID, NgModule } from '@angular/core';

import { BrowserModule } from '@angular/platform-browser';

import { BrowserModule } from '@angular/platform-browser';

import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { ToastrModule } from 'ngx-toastr';

import { AppRoutingModule } from './app-routing.module';

import { ServiceWorkerModule } from '@angular/service-worker';

import { ServiceWorkerModule } from '@angular/service-worker';

import { ToastrModule } from 'ngx-toastr';

import { environment } from '../environments/environment';

import { environment } from '../environments/environment';

import { AnnuaireComponent } from './annuaire/annuaire.component';

import { AnnuaireComponent } from './annuaire/annuaire.component';

import { FilterModalComponent } from './annuaire/filter-modal/filter-modal.component';

import { FilterModalComponent } from './annuaire/filter-modal/filter-modal.component';

import { ResultListComponent } from './annuaire/result-list/result-list.component';

import { ResultListComponent } from './annuaire/result-list/result-list.component';

import { SearchBarComponent } from './annuaire/search-bar/search-bar.component';

import { SearchBarComponent } from './annuaire/search-bar/search-bar.component';

import { AppRoutingModule } from './app-routing.module';

import { AppComponent } from './app.component';

import { AppComponent } from './app.component';

import { CartoModule } from './carto/carto.module';

import { CartoModule } from './carto/carto.module';

import { CustomBreakPointsProvider } from './config/custom-breakpoint';

import { CustomBreakPointsProvider } from './config/custom-breakpoint';

@@ -32,6 +30,7 @@ import { NewsletterSubscriptionComponent } from './newsletter-subscription/newsl

import { PageComponent } from './page/page.component';

import { PageComponent } from './page/page.component';

import { ResetEmailComponent } from './reset-email/reset-email.component';

import { ResetEmailComponent } from './reset-email/reset-email.component';

import { ResetPasswordComponent } from './reset-password/reset-password.component';

import { ResetPasswordComponent } from './reset-password/reset-password.component';

import { PersonalOfferResolver } from './resolvers/personal-offer.resolver';

import { StructureResolver } from './resolvers/structure.resolver';

import { StructureResolver } from './resolvers/structure.resolver';

import { TempUserResolver } from './resolvers/temp-user.resolver';

import { TempUserResolver } from './resolvers/temp-user.resolver';

import { RouterListenerService } from './services/routerListener.service';

import { RouterListenerService } from './services/routerListener.service';

@@ -90,6 +89,7 @@ import { StructureJoinComponent } from './structure/structure-join/structure-joi

    DeactivateGuard,

    DeactivateGuard,

    TempUserResolver,

    TempUserResolver,

    StructureResolver,

    StructureResolver,

    PersonalOfferResolver,

    RouterListenerService,

    RouterListenerService,

    UpdateService,

    UpdateService,

  ],

  ],

src/app/carto/carto.component.html

+1
−0

Original line number
Original line
Diff line number
Diff line

@@ -6,6 +6,7 @@

    <app-structure-list

    <app-structure-list

      (searchEvent)="getStructures($event)"

      (searchEvent)="getStructures($event)"

      [structureList]="structures"

      [structureList]="structures"

      [selectedStructureList]="structuresSelected"

      [isOrientation]="isOrientationForm"

      [isOrientation]="isOrientationForm"

      [location]="currentLocation"

      [location]="currentLocation"

      (displayMapMarkerId)="setMapMarkerId($event)"

      (displayMapMarkerId)="setMapMarkerId($event)"

src/app/carto/carto.component.ts

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -22,10 +22,10 @@ export class CartoComponent implements OnInit {

  @Input() public filters: Filter[] = [];

  @Input() public filters: Filter[] = [];

  @Input() public userLatitude: number = null;

  @Input() public userLatitude: number = null;

  @Input() public userLongitude: number = null;

  @Input() public userLongitude: number = null;

  @Input() public structuresSelected: Structure[] = [];

  @Output() structureSelection = new EventEmitter<any>();

  @Output() structureSelection = new EventEmitter<any>();

  public structures: Structure[] = [];

  public structures: Structure[] = [];

  public structuresSelected: Structure[] = [];

  public currentLocation: GeoJson;

  public currentLocation: GeoJson;

  public displayMarkerId: string;

  public displayMarkerId: string;

  public selectedMarkerId: string;

  public selectedMarkerId: string;

src/app/footer/footer.component.html

+19
−14

Original line number
Original line
Diff line number
Diff line

<div class="footer" fxLayout="row" fxLayoutAlign="center">

<div class="footer">

  <div fxLayout="row">

  <div class="links">

    <!--a class="clickable text-align-center" routerLink="/page/accessibilite" i18n>Accessibilité</a-->

    <a class="clickable text-align-center" routerLink="/legal-notice" i18n>Mentions légales</a>

    <a class="clickable text-align-center" routerLink="/legal-notice" i18n>Mentions légales</a>

    <a class="clickable text-align-center" routerLink="/newsletter" i18n>Newsletter</a>

    <a class="clickable text-align-center" routerLink="/newsletter" i18n>Newsletter</a>

    <!-- <a class="clickable text-align-center" routerLink="/sitemap" i18n>Plan du site</a> -->

    <a class="clickable text-align-center" routerLink="/contact" i18n>Contact</a>

    <a class="clickable text-align-center" routerLink="/contact" i18n>Contact</a>

    <a class="clickable text-align-center" routerLink="/page/qui-sommes-nous" i18n>Qui sommes-nous ?</a>

    <a class="clickable text-align-center" routerLink="/page/qui-sommes-nous" i18n>Qui sommes-nous ?</a>

  </div>

  </div>

  <div class="right">

    <button class="mediationButton" (click)="goToMediation()">

      <img src="/assets/ico/telephone.svg" alt="telephone" />

      Médiation numérique

    </button>

    <a

    <a

      class="metro-link"

      class="metro-link"

      href="https://www.grandlyon.com"

      href="https://www.grandlyon.com"

@@ -18,3 +22,4 @@

      <p class="metro-title" i18n>Un site de la Métropole de Lyon</p>

      <p class="metro-title" i18n>Un site de la Métropole de Lyon</p>

    </a>

    </a>

  </div>

  </div>

</div>

src/app/footer/footer.component.scss

+28
−5

Original line number
Original line
Diff line number
Diff line

@@ -7,12 +7,16 @@

  height: $footer-height;

  height: $footer-height;

  background-color: black;

  background-color: black;

  display: flex;

  display: flex;

  align-items: center !important;

  align-items: center;

  justify-content: space-between !important;

  justify-content: space-between;

  padding: 0px 22px;

  padding: 0 1.5rem;

  .links {

    display: flex;

    gap: 10px;

  }

  a {

  a {

    color: $white;

    color: $white;

    margin: 0px 0px 0px 10px;

    text-decoration: none;

    text-decoration: none;

    @include lato-regular-12;

    @include lato-regular-12;

    &:hover {

    &:hover {

@@ -20,7 +24,7 @@

    }

    }

    &:not(:last-child)::after {

    &:not(:last-child)::after {

      content: '•';

      content: '•';

      margin: 0px 0px 0px 10px;

      margin-left: 10px;

      display: inline-block;

      display: inline-block;

    }

    }

  }

  }

@@ -29,6 +33,25 @@

    width: 22px;

    width: 22px;

  }

  }

  .right {

    display: flex;

    gap: 1rem;

    .mediationButton {

      @include lato-regular-12;

      padding: 0 16px 0 8px;

      display: flex;

      align-items: center;

      gap: 0.5rem;

      background-color: $grey-5;

      border-radius: 8px;

      border: 1px solid #000;

      cursor: pointer;

      &:hover {

        transform: scale(1.01);

      }

    }

  }

  @media #{$large-phone} {

  @media #{$large-phone} {

    display: none !important;

    display: none !important;

    font-size: 0.75em;

    font-size: 0.75em;

src/app/footer/footer.component.ts

+6
−1

Original line number
Original line
Diff line number
Diff line

import { Component } from '@angular/core';

import { Component } from '@angular/core';

import { Router } from '@angular/router';

@Component({

@Component({

  selector: 'app-footer',

  selector: 'app-footer',

@@ -6,5 +7,9 @@ import { Component } from '@angular/core';

  styleUrls: ['./footer.component.scss'],

  styleUrls: ['./footer.component.scss'],

})

})

export class FooterComponent {

export class FooterComponent {

  constructor() {}

  constructor(private router: Router) {}

  public goToMediation(): void {

    this.router.navigate(['/orientation'], { state: { mediationNumerique: true } });

  }

}

}

src/app/form/form-view/form-view.component.ts

+6
−2

Original line number
Original line
Diff line number
Diff line

@@ -94,6 +94,10 @@ export class FormViewComponent implements OnInit, AfterViewInit {

  }

  }

  async ngOnInit(): Promise<void> {

  async ngOnInit(): Promise<void> {

    // Get structure from history (this is used to create personal offer from profile)

    if (history.state.structure) {

      this.structure = history.state.structure;

    }

    this.routeParam = this.router.routerState.snapshot.url.split('/')[2];

    this.routeParam = this.router.routerState.snapshot.url.split('/')[2];

    this.initPage();

    this.initPage();

@@ -130,9 +134,9 @@ export class FormViewComponent implements OnInit, AfterViewInit {

  private initPage(): void {

  private initPage(): void {

    const profileFormSteps: number = Object.keys(profileFormStep).length / 2;

    const profileFormSteps: number = Object.keys(profileFormStep).length / 2;

    const personnalOfferFormSteps: number = Object.keys(personalOfferFormStep).length / 2 - 1;

    const personalOfferFormSteps: number = Object.keys(personalOfferFormStep).length / 2 - 1;

    const structureFormSteps: number = Object.keys(structureFormStep).length / 2;

    const structureFormSteps: number = Object.keys(structureFormStep).length / 2;

    const totalFormSteps: number = profileFormSteps + personnalOfferFormSteps + structureFormSteps;

    const totalFormSteps: number = profileFormSteps + personalOfferFormSteps + structureFormSteps;

    if (formType[this.routeParam] === formType.account) {

    if (formType[this.routeParam] === formType.account) {

      this.nbSteps = 3;

      this.nbSteps = 3;

      this.currentPage = accountFormStep.accountInfo;

      this.currentPage = accountFormStep.accountInfo;

src/app/form/form-view/global-components/progress-bar/progress-bar.component.scss

+2
−3

Original line number
Original line
Diff line number
Diff line

@@ -4,12 +4,11 @@

@import '../../../../../assets/scss/breakpoint';

@import '../../../../../assets/scss/breakpoint';

.progressBar {

.progressBar {

  height: #{$progressBar-height};

  max-width: 980px;

  max-width: 980px;

  margin: 16px auto 0 auto;

  margin: 1rem auto;

  @media #{$tablet} {

  @media #{$tablet} {

    margin: 0px 4px;

    margin: 0.625rem;

  }

  }

  p {

  p {

    @include lato-bold-14;

    @include lato-bold-14;

src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts

+0
−1

Original line number
Original line
Diff line number
Diff line

@@ -17,7 +17,6 @@ export class ProgressBarComponent implements OnChanges {

  public progressStatus: number;

  public progressStatus: number;

  public formTypeEnum = formType;

  public formTypeEnum = formType;

  public profileFormSteps: number = Object.keys(profileFormStep).length / 2;

  public profileFormSteps: number = Object.keys(profileFormStep).length / 2;

  public personnalOfferFormSteps: number = Object.keys(personalOfferFormStep).length / 2;

  public structureFormSteps: number = Object.keys(structureFormStep).length / 2;

  public structureFormSteps: number = Object.keys(structureFormStep).length / 2;

  ngOnChanges(changes: SimpleChanges): void {

  ngOnChanges(changes: SimpleChanges): void {

src/app/form/form-view/guards/personalOffer.guard.ts

+4
−2

Original line number
Original line
Diff line number
Diff line

@@ -10,8 +10,10 @@ export class PersonalOfferGuard implements CanActivate {

  canActivate(route: ActivatedRouteSnapshot): UrlTree | boolean {

  canActivate(route: ActivatedRouteSnapshot): UrlTree | boolean {

    if (

    if (

      route.routeConfig.path === 'personaloffer' &&

      route.routeConfig.path === 'personaloffer' &&

      (this.router.routerState.snapshot.url === '/form/profile' ||

      (this.router.routerState.snapshot.url === '/profile' ||

        this.router.routerState.snapshot.url === '/form/structure')

        this.router.routerState.snapshot.url === '/form/profile' ||

        this.router.routerState.snapshot.url === '/form/structure' ||

        this.router.routerState.snapshot.url.includes('/join/'))

    ) {

    ) {

      return true;

      return true;

    }

    }

src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html

+2
−13

Original line number
Original line
Diff line number
Diff line

@@ -5,17 +5,6 @@

    <p>Facultatif</p>

    <p>Facultatif</p>

  </div>

  </div>

  <div fxLayout="column" fxLayoutGap="32px">

  <app-accompaniment-picker [personalOfferForm]="personalOfferForm" [onlineProcedures]="onlineProcedures">

    <div *ngIf="onlineProcedures" class="btn-grid">

  </app-accompaniment-picker>

      <span *ngFor="let module of onlineProcedures.modules">

        <app-button

          [ngClass]="{ selectedChoice: true }"

          [extraClass]="isSelectedModule(module) ? 'selected' : ''"

          [style]="buttonTypeEnum.CheckButton"

          [text]="module.name"

          (action)="toogleResult(module)"

        ></app-button>

      </span>

    </div>

  </div>

</form>

</form>

src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.ts

+0
−24

Original line number
Original line
Diff line number
Diff line

import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';

import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';

import { UntypedFormGroup } from '@angular/forms';

import { UntypedFormGroup } from '@angular/forms';

import { ButtonType } from '../../../../shared/components/button/buttonType.enum';

import { Category } from '../../../../structure-list/models/category.model';

import { Category } from '../../../../structure-list/models/category.model';

import { Module } from '../../../../structure-list/models/module.model';

@Component({

@Component({

  selector: 'app-personal-offer-accompaniment',

  selector: 'app-personal-offer-accompaniment',

@@ -15,29 +13,7 @@ export class PersonalOfferAccompanimentComponent implements OnInit {

  @Input() onlineProcedures: Category;

  @Input() onlineProcedures: Category;

  @Output() validateForm = new EventEmitter<any>();

  @Output() validateForm = new EventEmitter<any>();

  public buttonTypeEnum = ButtonType;

  public selectedModules: Module[] = [];

  ngOnInit(): void {

  ngOnInit(): void {

    this.validateForm.emit();

    this.validateForm.emit();

  }

  }

  public toogleResult(module: Module): void {

    if (this.isSelectedModule(module)) {

      const index = this.selectedModules.findIndex((_module) => _module.id === module.id);

      this.selectedModules.splice(index, 1);

    } else {

      this.selectedModules.push(module);

    }

    this.personalOfferForm

      .get('categories')

      .get('onlineProcedures')

      .patchValue(this.selectedModules.map((module) => module.id));

  }

  public isSelectedModule(module: Module): boolean {

    if (this.selectedModules && this.selectedModules.includes(module)) return true;

    return false;

  }

}

}

src/app/form/form-view/personal-offer-form/personal-offer-form.component.html

+30
−31

Original line number
Original line
Diff line number
Diff line

<div class="no-max-width">

<ng-container *ngIf="currentStep === personalOfferFormStep.personalOfferAccompaniment">

<ng-container *ngIf="currentStep === personalOfferFormStep.personalOfferAccompaniment">

  <app-personal-offer-accompaniment

  <app-personal-offer-accompaniment

    *ngIf="onlineProcedures"

    [structureName]="structureName"

    [structureName]="structureName"

    [personalOfferForm]="personalOfferForm"

    [personalOfferForm]="personalOfferForm"

    [onlineProcedures]="onlineProcedures"

    [onlineProcedures]="onlineProcedures"

@@ -28,4 +28,3 @@

    (goNext)="goToProfile()"

    (goNext)="goToProfile()"

  ></app-information-step>

  ></app-information-step>

</ng-container>

</ng-container>

</div>

src/app/form/form-view/personal-offer-form/personal-offer-form.component.ts

+1
−0

Original line number
Original line
Diff line number
Diff line

@@ -30,6 +30,7 @@ export class PersonalOfferFormComponent implements OnChanges, OnInit {

  ngOnInit(): void {

  ngOnInit(): void {

    this.setCategories();

    this.setCategories();

  }

  }

  ngOnChanges(changes: SimpleChanges): void {

  ngOnChanges(changes: SimpleChanges): void {

    if (changes.currentStep) {

    if (changes.currentStep) {

      if (

      if (

src/app/form/orientation-form-view/enums/hotlineMediationSteps.enum.ts

+1
−0

Original line number
Original line
Diff line number
Diff line

export enum HotlineMediationSteps {

export enum HotlineMediationSteps {

  mediationBeneciaryInfo,

  mediationBeneciaryInfo,

  mediationHoursSelection,

  mediationHoursSelection,

  mediationLanguageSelection,

  mediationRecap,

  mediationRecap,

}

}

src/app/form/orientation-form-view/enums/preferredLanguages.enum.ts0 → 100644

+5
−0

Original line number
Original line
Diff line number
Diff line

export enum PreferredLanguages {

  french = 'Français',

  english = 'Anglais',

  arabic = 'Arabe',

}

src/app/form/orientation-form-view/global-components/mediation-recap/mediation-recap.component.html

+7
−1

Original line number
Original line
Diff line number
Diff line

@@ -13,7 +13,7 @@

    <div class="content">

    <div class="content">

      <div fxLayout="row">

      <div fxLayout="row">

        <div class="labels" fxFlex="20%">Nom</div>

        <div class="labels" fxFlex="20%">Nom</div>

        <div class="infos" fxFlex="80%">{{ beneficiary.name | uppercase }} {{ beneficiary.surname }}</div>

        <div class="infos" fxFlex="80%">{{ beneficiary.name }} {{ beneficiary.surname | uppercase }}</div>

      </div>

      </div>

      <div fxLayout="row">

      <div fxLayout="row">

        <div class="labels" fxFlex="20%">Besoin(s) d'aide</div>

        <div class="labels" fxFlex="20%">Besoin(s) d'aide</div>

@@ -21,6 +21,12 @@

          <div *ngFor="let need of needs">{{ need.displayText }}</div>

          <div *ngFor="let need of needs">{{ need.displayText }}</div>

        </div>

        </div>

      </div>

      </div>

      <div fxLayout="row" *ngIf="language">

        <div class="labels" fxFlex="20%">Langue souhaitée</div>

        <div class="infos" fxFlex="80%">

          <div>{{ language }}</div>

        </div>

      </div>

      <div *ngIf="comment" fxLayout="row">

      <div *ngIf="comment" fxLayout="row">

        <div class="labels" fxFlex="20%">Précisions</div>

        <div class="labels" fxFlex="20%">Précisions</div>

        <div class="infos" fxFlex="80%">

        <div class="infos" fxFlex="80%">

src/app/form/orientation-form-view/global-components/mediation-recap/mediation-recap.component.ts

+2
−0

Original line number
Original line
Diff line number
Diff line

@@ -20,6 +20,7 @@ export class MediationRecapComponent implements OnInit {

  public comment: string;

  public comment: string;

  public beneficiary: any;

  public beneficiary: any;

  public date: any;

  public date: any;

  public language: string;

  ngOnInit(): void {

  ngOnInit(): void {

    this.checkValidation.emit();

    this.checkValidation.emit();

@@ -55,5 +56,6 @@ export class MediationRecapComponent implements OnInit {

      day: this.form.get('dateSlot').value.day,

      day: this.form.get('dateSlot').value.day,

      hours: this.form.get('dateSlot').value.hours.replace('-', ' et '),

      hours: this.form.get('dateSlot').value.hours.replace('-', ' et '),

    };

    };

    this.language = this.form.get('preferredLanguage').value;

  }

  }

}

}

src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.html

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -2,7 +2,7 @@

  <button

  <button

    *ngFor="let item of items; let index = index"

    *ngFor="let item of items; let index = index"

    (click)="selectItem(item.key)"

    (click)="selectItem(item.key)"

    [ngClass]="{ selected: selectedItem == item.key }"

    [ngClass]="{ selected: selectedItem == item.key, smallWidth: smallWidth }"

  >

  >

    <div class="checkmark">

    <div class="checkmark">

      <svg *ngIf="selectedItem === item.key" class="validate" aria-hidden="true">

      <svg *ngIf="selectedItem === item.key" class="validate" aria-hidden="true">

src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss

+3
−0

Original line number
Original line
Diff line number
Diff line

@@ -57,5 +57,8 @@

        top: -3px;

        top: -3px;

      }

      }

    }

    }

    &.smallWidth {

      width: 300px;

    }

  }

  }

}

}

src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.ts

+1
−0

Original line number
Original line
Diff line number
Diff line

@@ -9,6 +9,7 @@ import { INeedItem } from '../../../../utils/orientationUtils';

export class MultiRadioFormComponent implements OnInit {

export class MultiRadioFormComponent implements OnInit {

  @Input() items: INeedItem[];

  @Input() items: INeedItem[];

  @Input() selected: any;

  @Input() selected: any;

  @Input() smallWidth: boolean = false;

  @Input() displayIcon = false;

  @Input() displayIcon = false;

  @Output() handleSelect = new EventEmitter<any>();

  @Output() handleSelect = new EventEmitter<any>();

src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html

+1
−1

Original line number
Original line
Diff line number
Diff line

<h2>Quelle structure oriente le bénéficiare ?</h2>

<h2>Quelle structure oriente le bénéficiaire ?</h2>

<div *ngIf="hasStructures && structuresLinked.length >= 2" class="select-structure border">

<div *ngIf="hasStructures && structuresLinked.length >= 2" class="select-structure border">

  <div class="number">{{ structuresLinked.length }} structures sont associées à votre compte</div>

  <div class="number">{{ structuresLinked.length }} structures sont associées à votre compte</div>

  <div

  <div

src/app/form/orientation-form-view/interfaces/onlineMediation.interface.ts

+1
−0

Original line number
Original line
Diff line number
Diff line

@@ -4,4 +4,5 @@ export interface IOnlineMediation {

  phone: string;

  phone: string;

  onlineDemarcheType: string[];

  onlineDemarcheType: string[];

  dateSlot: { day: string; hours: string };

  dateSlot: { day: string; hours: string };

  preferredLanguage: string;

}

}

src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html

+3
−2

Original line number
Original line
Diff line number
Diff line

<h2>Quelles sont les informations du bénéficiaire ?</h2>

<h2>Quelles sont les informations du bénéficiaire ?</h2>

<form [formGroup]="form">

<form [formGroup]="form">

  <div class="form-group" fxLayout="column">

  <div class="form-group" fxLayout="column">

    <label for="name">Nom</label>

    <label for="name">Prénom</label>

    <div fxLayout="row" fxLayoutGap="13px">

    <div fxLayout="row" fxLayoutGap="13px">

      <input

      <input

        type="text"

        type="text"

@@ -25,7 +25,7 @@

    </div>

    </div>

  </div>

  </div>

  <div class="form-group" fxLayout="column">

  <div class="form-group" fxLayout="column">

    <label for="surname">Prénom</label>

    <label for="surname">Nom</label>

    <div fxLayout="row" fxLayoutGap="13px">

    <div fxLayout="row" fxLayoutGap="13px">

      <input

      <input

        type="text"

        type="text"

@@ -48,6 +48,7 @@

      ></app-svg-icon>

      ></app-svg-icon>

    </div>

    </div>

  </div>

  </div>

  <div class="form-group" fxLayout="column" *ngIf="isPhone()">

  <div class="form-group" fxLayout="column" *ngIf="isPhone()">

    <label for="phone">Téléphone</label>

    <label for="phone">Téléphone</label>

    <div fxLayout="row" fxLayoutGap="13px">

    <div fxLayout="row" fxLayoutGap="13px">

src/app/form/orientation-form-view/online-demarch/mediation-hours-selection/mediation-hours-selection.component.html

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -4,7 +4,7 @@

  <div *ngFor="let slot of timeSlots" class="slot">

  <div *ngFor="let slot of timeSlots" class="slot">

    <div class="day">{{ slot.day }}</div>

    <div class="day">{{ slot.day }}</div>

    <button class="time" [ngClass]="{ selected: isSelected(slot) }" (click)="selectHour(slot)">

    <button class="time" [ngClass]="{ selected: isSelected(slot) }" (click)="selectHour(slot)">

      {{ slot.hours }}

      <span *ngFor="let str of slot.hours.split(' ')">{{ str }}</span>

    </button>

    </button>

  </div>

  </div>

</div>

</div>

src/app/form/orientation-form-view/online-demarch/mediation-hours-selection/mediation-hours-selection.component.scss

+12
−7

Original line number
Original line
Diff line number
Diff line

@@ -4,19 +4,17 @@

.subtitle {

.subtitle {

  color: $grey-3;

  color: $grey-3;

  text-transform: uppercase;

  @include lato-bold-14;

  @include lato-regular-14;

}

}

.container {

.container {

  display: flex;

  display: flex;

  justify-content: center;

  align-items: center;

  align-items: center;

  gap: 0.5rem;

  gap: 0.5rem;

  margin: 1.5rem 0;

  margin: 1.5rem 0;

  flex-wrap: wrap;

  flex-wrap: wrap;

  max-width: 600px;

  .slot {

  .slot {

    transition: all 300ms ease;

    transition: all 300ms ease;

    border-right: solid 1px $red;

    padding-right: 0.5rem;

    padding-right: 0.5rem;

    height: 85px;

    height: 85px;

    &:last-child {

    &:last-child {

@@ -31,18 +29,25 @@

      @include lato-regular-13;

      @include lato-regular-13;

      color: $grey-3;

      color: $grey-3;

      text-align: center;

      text-align: center;

      margin-bottom: 1rem;

      margin-bottom: 0.5rem;

    }

    }

    .time {

    .time {

      cursor: pointer;

      cursor: pointer;

      width: 125px;

      width: 73px;

      height: 37px;

      height: 71px;

      text-align: center;

      text-align: center;

      border: 1px solid $grey-1;

      border: 1px solid $grey-1;

      border-radius: 4px;

      border-radius: 4px;

      color: $grey-1;

      color: $grey-1;

      @include lato-regular-14;

      @include lato-regular-14;

      background: $white;

      background: $white;

      display: flex;

      flex-direction: column;

      align-items: center;

      justify-content: center;

      span {

        display: block;

      }

      &.selected {

      &.selected {

        background: $green-1 !important;

        background: $green-1 !important;

        color: $white;

        color: $white;

src/app/form/orientation-form-view/online-demarch/mediation-hours-selection/mediation-hours-selection.component.ts

+7
−7

Original line number
Original line
Diff line number
Diff line

@@ -25,7 +25,7 @@ export class MediationHoursSelectionComponent implements OnInit {

      this.selected = this.form.get('dateSlot').value.day;

      this.selected = this.form.get('dateSlot').value.day;

    }

    }

    const today = DateTime.local().weekday;

    const today = DateTime.local().weekday;

    if (today > 1) {

    if (today !== 7) {

      const temp = this.timeSlots.splice(today, this.timeSlots.length);

      const temp = this.timeSlots.splice(today, this.timeSlots.length);

      this.timeSlots = temp.concat(this.timeSlots);

      this.timeSlots = temp.concat(this.timeSlots);

    }

    }

src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html0 → 100644

+8
−0

Original line number
Original line
Diff line number
Diff line

<h2>Dans quelle langue le bénéficiaire souhaite-t-il être rappelé ?</h2>

<app-multi-radio-form

  [items]="languages"

  [selected]="selected"

  (handleSelect)="handleSelect($event)"

  [smallWidth]="true"

></app-multi-radio-form>

src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.scss0 → 100644

+0
−0

Original line number
Original line
Diff line number
Diff line

src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.ts0 → 100644

+38
−0

Original line number
Original line
Diff line number
Diff line

import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';

import { UntypedFormGroup } from '@angular/forms';

import { PreferredLanguages } from '../../enums/preferredLanguages.enum';

@Component({

  selector: 'app-mediation-language-selection',

  templateUrl: './mediation-language-selection.component.html',

  styleUrls: ['./mediation-language-selection.component.scss'],

})

export class MediationLanguageSelectionComponent implements OnInit {

  @Input() form: UntypedFormGroup;

  @Output() checkValidation = new EventEmitter<any>();

  public selected: string;

  public languages: any[] = [

    {

      title: 'Français',

      key: PreferredLanguages.french,

    },

    {

      title: 'Anglais',

      key: PreferredLanguages.english,

    },

    {

      title: 'Arabe',

      key: PreferredLanguages.arabic,

    },

  ];

  ngOnInit(): void {

    this.selected = this.form.get('preferredLanguage').value;

    this.checkValidation.emit();

  }

  public handleSelect(event: string): void {

    this.selected = event;

    this.form.get('preferredLanguage').patchValue(event);

    this.checkValidation.emit();

  }

}

src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html

+5
−0

Original line number
Original line
Diff line number
Diff line

@@ -38,6 +38,11 @@

    [form]="form"

    [form]="form"

    (checkValidation)="checkValidation()"

    (checkValidation)="checkValidation()"

  ></app-mediation-hours-selection>

  ></app-mediation-hours-selection>

  <app-mediation-language-selection

    *ngIf="currentStep === HotlineMediationStepsEnum.mediationLanguageSelection"

    [form]="form"

    (checkValidation)="checkValidation()"

  ></app-mediation-language-selection>

  <app-mediation-recap

  <app-mediation-recap

    *ngIf="currentStep === HotlineMediationStepsEnum.mediationRecap"

    *ngIf="currentStep === HotlineMediationStepsEnum.mediationRecap"

    [form]="form"

    [form]="form"

src/app/form/orientation-form-view/orientation-form-view.component.ts

+6
−0

Original line number
Original line
Diff line number
Diff line

@@ -69,6 +69,12 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked

    } else {

    } else {

      this.profile = await this.profileService.getProfile();

      this.profile = await this.profileService.getProfile();

    }

    }

    if (history.state.mediationNumerique) {

      this.currentStep = 0;

      this.needType = this.needEnum.learnSkills;

      this.setCurrentNeedType(NeedsType.learnSkills);

    }

  }

  }

  ngAfterContentChecked() {

  ngAfterContentChecked() {

src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.html

+2
−3

Original line number
Original line
Diff line number
Diff line

@@ -5,6 +5,7 @@

      <p>Facultatif</p>

      <p>Facultatif</p>

    </div>

    </div>

  </div>

  </div>

  <p>Ces informations accompagneront la fiche d'orientation du bénéficiaire</p>

  <div class="textareaBlock" fxLayout="column">

  <div class="textareaBlock" fxLayout="column">

    <textarea

    <textarea

      rows="8"

      rows="8"

@@ -13,8 +14,6 @@

      (input)="setComment($event.target.value)"

      (input)="setComment($event.target.value)"

      formControlName="comments"

      formControlName="comments"

    ></textarea>

    ></textarea>

    <p>

    <p class="count">{{ getStructureControl('comments').value?.length || 0 }}&nbsp;/&nbsp;500</p>

      {{ getStructureControl('comments').value?.length || 0 }}&nbsp;/&nbsp;500

    </p>

  </div>

  </div>

</form>

</form>

src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.scss0 → 100644

+17
−0

Original line number
Original line
Diff line number
Diff line

@import '../../../../../assets/scss/color';

@import '../../../../../assets/scss/typography';

form {

  max-width: 600px;

}

p {

  margin: 0.25rem 0;

}

.count {

  text-align: right;

  color: $grey-3;

  @include lato-regular-13;

  font-style: italic;

  margin-top: 0.5rem;

}

src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.ts

+1
−0

Original line number
Original line
Diff line number
Diff line

@@ -4,6 +4,7 @@ import { AbstractControl, UntypedFormGroup } from '@angular/forms';

@Component({

@Component({

  selector: 'app-orientation-comments',

  selector: 'app-orientation-comments',

  templateUrl: './orientation-comments.component.html',

  templateUrl: './orientation-comments.component.html',

  styleUrls: ['./orientation-comments.component.scss'],

})

})

export class OrientationCommentsComponent implements OnInit {

export class OrientationCommentsComponent implements OnInit {

  @Input() form: UntypedFormGroup;

  @Input() form: UntypedFormGroup;

src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html

+1
−1

Original line number
Original line
Diff line number
Diff line

<form [formGroup]="form" *ngIf="form" (keyup.enter)="(isPageValid)">

<form [formGroup]="form" *ngIf="form" (keyup.enter)="(isPageValid)">

  <div class="title">

  <div class="title">

    <p class="overtitle">{{ structureName }}</p>

    <p class="overtitle">{{ structureName }}</p>

    <h3>Quels accompagnements au numérique proposez-vous&nbsp;?</h3>

    <h3>Autour de quelle adresse cherchez-vous une structure&nbsp;?</h3>

    <p>Facultatif</p>

    <p>Facultatif</p>

  </div>

  </div>

  <div class="form-group" fxLayout="column">

  <div class="form-group" fxLayout="column">

Source

Target

Files