Merge branch 'dev'

src/components/vmd-search.component.ts

@@ -1,5 +1,5 @@
 import {css, customElement, html, LitElement, internalProperty, property } from 'lit-element';
-import {SearchRequest, SearchType} from '../state/State'
+import {SearchRequest, SearchType, TYPE_RECHERCHE_PAR_DEFAUT} from '../state/State'
 import {
     Commune,
     Departement,
@@ -57,14 +57,14 @@ export class VmdSearchComponent extends LitElement {
     private onCommuneSelected (commune: Commune) {
       this.currentSelection = commune
       this.dispatchEvent(new CustomEvent<SearchRequest.ByCommune>('on-search', {
-        detail: SearchRequest.ByCommune(commune, this.currentSearchType || 'standard', this.currentValue?.date)
+        detail: SearchRequest.ByCommune(commune, this.currentSearchType || TYPE_RECHERCHE_PAR_DEFAUT, this.currentValue?.date)
       }))
     }
 
     private onDepartementSelected (departement: Departement) {
       this.currentSelection = departement
       this.dispatchEvent(new CustomEvent<SearchRequest.ByDepartement>('on-search', {
-        detail: SearchRequest.ByDepartement(departement, this.currentSearchType || 'standard', this.currentValue?.date)
+        detail: SearchRequest.ByDepartement(departement, this.currentSearchType || TYPE_RECHERCHE_PAR_DEFAUT, this.currentValue?.date)
       }))
     }
 }

src/routing/DynamicURLs.ts

@@ -4,7 +4,7 @@ import {Strings} from "../utils/Strings";
 export const rechercheDepartementDescriptor = {
     routerUrl: '/centres-vaccination-covid-dpt:codeDpt-:nomDpt/recherche-:typeRecherche',
     urlGenerator: ({codeDepartement, nomDepartement}: {codeDepartement: string, nomDepartement: string}) => {
-        return ['standard', '18_55'].map(typeRecherche => {
+        return ['standard', /* '18_55' */, 'dose_rappel', 'dose_1_ou_2'].map(typeRecherche => {
             return `/centres-vaccination-covid-dpt${codeDepartement}-${Strings.toReadableURLPathValue(nomDepartement)}/recherche-${typeRecherche}`;
         });
     }
@@ -13,7 +13,7 @@ export const rechercheDepartementDescriptor = {
 export const rechercheCommuneDescriptor = {
     routerUrl: '/centres-vaccination-covid-dpt:codeDpt-:nomDpt/commune:codeCommune-:codePostal-:nomCommune/recherche-:typeRecherche/en-triant-par-:codeTriCentre',
     urlGenerator: ({codeDepartement, nomDepartement, codeCommune, codePostal, nomCommune, tri}: {codeDepartement: string, nomDepartement: string, codeCommune: string, codePostal: string, nomCommune: string, tri: CodeTriCentre}) => {
-        return ['standard', '18_55'].map(typeRecherche => {
+        return ['standard', /* '18_55' */, 'dose_rappel', 'dose_1_ou_2'].map(typeRecherche => {
             return `/centres-vaccination-covid-dpt${codeDepartement}-${Strings.toReadableURLPathValue(nomDepartement)}/commune${codeCommune}-${codePostal}-${Strings.toReadableURLPathValue(nomCommune)}/recherche-${typeRecherche}/en-triant-par-${tri}`;
         })
     }

src/state/State.ts

@@ -151,7 +151,7 @@ function transformLieu(rawLieu: any): Lieu {
 
 export type Coordinates = { latitude: number, longitude: number }
 export type Location = Coordinates & {city: string, cp: string}
-export type TagCreneau = "preco18_55"|"all";
+export type TagCreneau = /*"preco18_55"|*/"all"|"first_or_second_dose"|"third_dose";
 export type StatsCreneauxQuotidienParTag = {
     tag: TagCreneau;
     creneaux: number;
@@ -284,14 +284,18 @@ export const libelleUrlPathDeCommune = (commune: Commune) => {
     return Strings.toReadableURLPathValue(commune.nom);
 }
 
+/*
 type VaccineCategory = {code: SearchType, libelle: string};
 export const VACCINE_CATEGORIES: VaccineCategory[] = [
     { code: "18_55", libelle: "Préconisé pour les 18-55 ans" },
     // { code: "16_18", libelle: "Préconisé pour les 16-18 ans" },
     { code: "standard", libelle: "Tous" },
 ];
+ */
+
+export type SearchType = "standard" /*| "18_55"|*/ |"dose_rappel"|"dose_1_ou_2";
+export const TYPE_RECHERCHE_PAR_DEFAUT: SearchType = "dose_rappel";
 
-export type SearchType = "standard"|"18_55";
 export type SearchTypeConfig = {
     tagCreneau: TagCreneau;
     cardAppointmentsExtractor: (lieu: Lieu, daySelectorDisponible: boolean, creneauxParLieux: CreneauxParLieu[]) => number;
@@ -324,6 +328,7 @@ const SEARCH_TYPE_CONFIGS: {[type in SearchType]: SearchTypeConfig & {type: type
             searchResultsByCity: 'search_results_by_city'
         }
     },
+    /*
     '18_55': {
         type: '18_55',
         tagCreneau: "preco18_55",
@@ -344,6 +349,41 @@ const SEARCH_TYPE_CONFIGS: {[type in SearchType]: SearchTypeConfig & {type: type
             searchResultsByCity: 'search_results_by_city_18_55'
         }
     },
+     */
+    'dose_rappel': {
+        type: 'dose_rappel',
+        tagCreneau: 'third_dose',
+        cardAppointmentsExtractor: (lieu, daySelectorDisponible, creneauxParLieux) => daySelectorDisponible
+            ?creneauxParLieux.find(cpl => cpl.lieu === lieu.internal_id)?.creneaux || 0
+            :lieu.appointment_count,
+        lieuConsidereCommeDisponible: (lieu, creneauxParLieu) => lieu.appointment_by_phone_only || (creneauxParLieu?.creneaux || 0) > 0,
+        pathParam: 'dose_rappel',
+        standardTabSelected: true,
+        excludeAppointmentByPhoneOnly: false,
+        jourSelectionnable: true,
+        theme: 'standard',
+        analytics: {
+            searchResultsByDepartement: 'search_results_by_department_third_shot',
+            searchResultsByCity: 'search_results_by_city_third_shot'
+        }
+    },
+    'dose_1_ou_2': {
+        type: 'dose_1_ou_2',
+        tagCreneau: 'first_or_second_dose',
+        cardAppointmentsExtractor: (lieu, daySelectorDisponible, creneauxParLieux) => daySelectorDisponible
+            ?creneauxParLieux.find(cpl => cpl.lieu === lieu.internal_id)?.creneaux || 0
+            :lieu.appointment_count,
+        lieuConsidereCommeDisponible: (lieu, creneauxParLieu) => lieu.appointment_by_phone_only || (creneauxParLieu?.creneaux || 0) > 0,
+        pathParam: 'dose_1_ou_2',
+        standardTabSelected: true,
+        excludeAppointmentByPhoneOnly: false,
+        jourSelectionnable: true,
+        theme: 'standard',
+        analytics: {
+            searchResultsByDepartement: 'search_results_by_department_first_or_second_shot',
+            searchResultsByCity: 'search_results_by_city_first_or_second_shot'
+        }
+    }
 };
 export function searchTypeConfigFromPathParam(pathParams: Record<string,string>): SearchTypeConfig & {type: SearchType} {
     const config = Object.values(SEARCH_TYPE_CONFIGS).find(config => pathParams && config.pathParam === pathParams['typeRecherche']);

src/views/vmd-home.view.ts

@@ -6,7 +6,7 @@ import {
     PLATEFORMES, SearchType,
     SearchRequest,
     State,
-    StatsLieu, Departement,
+    StatsLieu, Departement, TYPE_RECHERCHE_PAR_DEFAUT,
 } from "../state/State";
 import {CSS_Global, CSS_Home} from "../styles/ConstructibleStyleSheets";
 
@@ -28,7 +28,7 @@ export class VmdHomeView extends LitElement {
     @property({type: Array, attribute: false}) statsLieu: StatsLieu|undefined = undefined;
 
     private async onSearch (event: CustomEvent<SearchRequest>) {
-      const searchType: SearchType = 'standard';
+      const searchType: SearchType = TYPE_RECHERCHE_PAR_DEFAUT;
       if (SearchRequest.isByDepartement(event.detail)) {
         const departement = event.detail.departement
         Router.navigateToRendezVousAvecDepartement(departement.code_departement, libelleUrlPathDuDepartement(departement), searchType)

src/views/vmd-rdv.view.ts

@@ -31,7 +31,7 @@ import {
     SearchTypeConfig,
     RendezVousDuJour,
     StatsCreneauxLieuxParJour,
-    countCreneauxFromCreneauxParTag
+    countCreneauxFromCreneauxParTag, TYPE_RECHERCHE_PAR_DEFAUT
 } from "../state/State";
 import {formatDistanceToNow, parseISO} from 'date-fns'
 import { fr } from 'date-fns/locale'
@@ -230,7 +230,7 @@ export abstract class AbstractVmdRdvView extends LitElement {
     }
 
     get searchTypeConfig() {
-        return searchTypeConfigFromSearch(this.currentSearch, 'standard')
+        return searchTypeConfigFromSearch(this.currentSearch, TYPE_RECHERCHE_PAR_DEFAUT)
     }
 
     async onSearchSelected (event: CustomEvent<SearchRequest>) {
@@ -282,6 +282,18 @@ export abstract class AbstractVmdRdvView extends LitElement {
                   <button class="btn btn-primary">+</button>
                 </div>
               </div>`:html``}
+                <div class="rdvForm-fields row align-items-center mb-3 mb-md-5">
+                    <label class="col-sm-24 col-md-auto mb-md-1 label-for-search p-3 ps-1">
+                        Vous recherchez :
+                    </label>
+                    <div class="col">
+                        <vmd-button-switch class="mb-3" style="display: inline-block"
+                                           codeSelectionne="dose_rappel"
+                                           .options="${[{code: 'dose_rappel', libelle: 'Une dose de rappel'}, {code: 'dose_1_ou_2', libelle: 'Une 1ère dose de vaccin'}]}"
+                                           @changed="${(e: CustomEvent<{value: SearchType}>) => this.updateSearchTypeTo(e.detail.value)}">
+                        </vmd-button-switch>
+                    </div>
+                </div>
             </div>
 
             <div class="spacer mt-5 mb-5"></div>

tools/README.md

@@ -8,7 +8,7 @@ Installer les dépendances : `npm ci`
 
 # Exécution
 
-Une fois les dépendances installées, lancer la commande suivante : `npx ts-node communes-import.ts `
+Une fois les dépendances installées, lancer la commande suivante : `npx ts-node communes-import.ts`
 
 Sous IntelliJ IDEA, il faudra configurer le launcher avec les options suivantes :
 - Working directory : current `tools` directory