feat: add vaccine injection choice moderna or pfizer (#87)

dunglas · Dec 8, 2021 · 1b453c0 · 1b453c0
1 parent 403dd9b
commit 1b453c0
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 6 deletions.
diff --git a/browser_action/index.html b/browser_action/index.html
@@ -60,6 +60,25 @@
 
       <div class="panel-section-separator"></div>
 
+      <div class="panel-formElements-item">
+        <div>
+          <input
+            type="radio"
+            name="injectionVaccine"
+            id="modernaInjection"
+            checked
+          />
+          <label for="modernaInjection">Moderna</label>
+        </div>
+
+        <div>
+          <input type="radio" name="injectionVaccine" id="pfizerInjection" />
+          <label for="pfizerInjection">Pfizer-BioNTech</label>
+        </div>
+      </div>
+
+      <div class="panel-section-separator"></div>
+
       <div class="panel-formElements-item">
         <div>
           <input type="radio" name="autoBook" id="disableAutoBook" checked />

diff --git a/browser_action/index.js b/browser_action/index.js
@@ -88,6 +88,11 @@
     document.getElementById(injectionType).checked = true;
   }
 
+  /** @param {'modernaInjection' | 'pfizerInjection'} injectionVaccine Le vaccin d'injection souhaité par le user */
+  function displayInjectionVaccine(injectionVaccine) {
+    document.getElementById(injectionVaccine).checked = true;
+  }
+
   // Preparation des données
   const appStatus = new AppStatus();
   const vCLStorage = new VCLocalStorage({
@@ -101,6 +106,7 @@
   appStatus.onStoppedChange(displayStopStart);
   appStatus.onAutoBookChange(displayAutoBook);
   appStatus.onInjectionTypeChange(displayInjectionType);
+  appStatus.onInjectionVaccineChange(displayInjectionVaccine);
 
   // Initialisation donnée
   appStatus.init();
@@ -129,6 +135,11 @@
   document.getElementById("thirdInjectionOnly").onclick =
     appStatus.setInjectionType.bind(appStatus, "thirdInjectionOnly");
 
+  document.getElementById("modernaInjection").onclick =
+    appStatus.setInjectionVaccine.bind(appStatus, "pfizerInjection");
+  document.getElementById("pfizerInjection").onclick =
+    appStatus.setInjectionVaccine.bind(appStatus, "pfizerInjection");
+
   document.getElementById("reset").onclick = () => {
     if (
       !confirm(
@@ -145,5 +156,6 @@
   displayStopStart(appStatus.getStopped());
   displayAutoBook(appStatus.getAutoBook());
   displayInjectionType(appStatus.getInjectionType());
+  displayInjectionVaccine(appStatus.getInjectionVaccine());
   displayLocations();
 })();
diff --git a/commons/AppStatus.js b/commons/AppStatus.js
@@ -20,6 +20,8 @@ class AppStatus {
     this.autoBook = false;
     /** @type {'fullServiceInjection' | 'firstInjectionOnly' | 'secondInjectionOnly' | 'thirdInjectionOnly'} type d'injection souhaité par le user */
     this.injectionType = "fullServiceInjection";
+    /** @type {'modernaInjection' | 'pfizerInjection'} vaccin d'injection souhaité par le user */
+    this.injectionVaccine = "modernaInjection";
     /** @type {(string) => void} callback quand une {@link VaccineLocation} a été ajouté */
     this.onLocationAddedCb = (job) => {};
     /** @type {(string) => void} callback quand une {@link VaccineLocation} a été supprimée */
@@ -30,6 +32,8 @@ class AppStatus {
     this.onAutoBookChangeCb = (newValue) => {};
     /** @type {('fullServiceInjection' | 'firstInjectionOnly' | 'secondInjectionOnly' | 'thirdInjectionOnly') => void} callback quand injectionType change de valeur */
     this.onInjectionTypeCb = (newValue) => {};
+    /** @type {'modernaInjection' | 'pfizerInjection'} callback quand injectionType change de valeur */
+    this.onInjectionVaccineCb = (newValue) => {};
 
     this.onStorageChange = this.onStorageChange.bind(this);
     browser.storage.onChanged.addListener(this.onStorageChange);
@@ -93,6 +97,10 @@ class AppStatus {
     return this.injectionType;
   }
 
+  getInjectionVaccine() {
+    return this.injectionVaccine;
+  }
+
   /**
    * @param {(string) => void} cbAdd callback quand une {@link VaccineLocation} a été ajouté
    * @param {(string) => void} cbDelete callback quand une {@link VaccineLocation} a été supprimée
@@ -123,6 +131,13 @@ class AppStatus {
     this.onInjectionTypeCb = callback;
   }
 
+  /**
+   * @param {('modernaInjection' | 'pfizerInjection') => void} callback quand injectionVaccine change de valeur
+   */
+  onInjectionVaccineChange(callback) {
+    this.onInjectionTypeCb = callback;
+  }
+
   start() {
     this.stopped = false;
     browser.storage.sync.set({ stopped: this.stopped });
@@ -149,6 +164,14 @@ class AppStatus {
     browser.storage.sync.set({ injectionType: this.injectionType });
   }
 
+  /**
+   * @param {'modernaInjection' | 'pfizerInjection'} value The new injectionVaccine value
+   */
+  setInjectionVaccine(value) {
+    this.injectionVaccine = value;
+    browser.storage.sync.set({ injectionVaccine: this.injectionVaccine });
+  }
+
   /**
    * Gérer le clean complet du stockage de l'application
    */

diff --git a/content_scripts/doctolib/book.js b/content_scripts/doctolib/book.js
@@ -109,10 +109,13 @@
   /**
    * @param {string} text La description de la dose venant de Doctolib
    * @param {'fullServiceInjection' | 'firstInjectionOnly' | 'secondInjectionOnly' | 'thirdInjectionOnly'} injectionType Le type d'injection choisi par le user
+   * @param {'modernaInjection' | 'pfizerInjection'} injectionVaccine Le vaccin d'injection choisi par le user
    */
-  function isARNmMotive(text, injectionType) {
+  function isARNmMotive(text, injectionType, injectionVaccine) {
     return (
-      (text.includes("Pfizer") || text.includes("Moderna")) && // On ne veut que du Pifzer ou du Moderna, seuls ouverts à la population générale
+      text.includes(
+        injectionVaccine === "modernaInjection" ? "Moderna" : "Pfizer"
+      ) &&
       (injectionType === "fullServiceInjection"
         ? isfullServiceInjection(text)
         : injectionType === "firstInjectionOnly"
@@ -186,12 +189,13 @@
 
   let running = false;
   async function checkAvailability() {
-    const { locations, stopped, autoBook, injectionType } =
+    const { locations, stopped, autoBook, injectionType, injectionVaccine } =
       await browser.storage.sync.get({
         locations: {},
         stopped: false,
         autoBook: false,
         injectionType: "fullServiceInjection",
+        injectionVaccine: "modernaInjection",
       });
 
     if (stopped || !locations[url]) {
@@ -280,7 +284,11 @@
         )) {
           options.push($option.textContent);
           if (
-            !isARNmMotive($option.textContent, injectionType) &&
+            !isARNmMotive(
+              $option.textContent,
+              injectionType,
+              injectionVaccine
+            ) &&
             !isGeneralPopulationMotive($option.textContent)
           )
             continue;
@@ -310,7 +318,10 @@
         for (const $option of $bookingMotive.querySelectorAll("option")) {
           // On ne s'occupe que de Pfizer et Moderna
           // Pour le reste pas besoin de l'extension, de nombreux RDV sont disponibles
-          if (!isARNmMotive($option.textContent, injectionType)) continue;
+          if (
+            !isARNmMotive($option.textContent, injectionType, injectionVaccine)
+          )
+            continue;
 
           selectOption($bookingMotive, $option);
           optionFound = true;
@@ -327,7 +338,11 @@
         const $bookingContent = document.getElementById("booking-content");
         if (
           $bookingContent === null ||
-          !isARNmMotive($bookingContent.textContent, injectionType)
+          !isARNmMotive(
+            $bookingContent.textContent,
+            injectionType,
+            injectionVaccine
+          )
         )
           throw new Error("Injection ARNm non disponible 2");
         slot = await getAvailableSlot();