use relative dates & add doc

dunglas · Dec 12, 2021 · 9d20287 · 9d20287
1 parent 086fff9
commit 9d20287
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/browser_action/index.html b/browser_action/index.html
@@ -98,7 +98,7 @@
       <div class="panel-formElements-item">
         <div>
           <input type="date" name="dateMaxSearch" id="dateMax" />
-          <label for="dateMax">Date maximale de recherche</label>
+          <label for="dateMax">Date maximale de recherche (MM/JJ/YYYY)</label>
         </div>
       </div>
 

diff --git a/browser_action/index.js b/browser_action/index.js
@@ -104,6 +104,7 @@
     document.getElementById(injectionVaccine).checked = true;
   }
 
+  /** @param {Date} dateMaxSearch La date maximale de recherche de rdv */
   function displayDateMaxSearch(dateMaxSearch) {
     const date = new Date(dateMaxSearch);
     document.getElementById('dateMax').value = date.toISOString().split('T')[0]

diff --git a/commons/AppStatus.js b/commons/AppStatus.js
@@ -22,7 +22,8 @@ class AppStatus {
     this.injectionType = "fullServiceInjection";
     /** @type {'modernaInjection' | 'pfizerInjection'} vaccin d'injection souhaité par le user */
     this.injectionVaccine = "pfizerInjection";
-    this.dateMaxSearch = new Date(2022, 1, 15);
+    /** @type {Date} Date max de recherche de rdv (par défaut aujd + 1 mois) */
+    this.dateMaxSearch = new Date((new Date()).getFullYear()+1, (new Date()).getMonth(), (new Date()).getDate());
     /** @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 */
@@ -35,6 +36,7 @@ class AppStatus {
     this.onInjectionTypeCb = (newValue) => {};
     /** @type {'modernaInjection' | 'pfizerInjection'} callback quand injectionVaccine change de valeur */
     this.onInjectionVaccineCb = (newValue) => {};
+    /** @type {Date} callback quand maxDateSearch change de valeur */
     this.onDateMaxSearchCb = (newValue) => {};
 
     this.onStorageChange = this.onStorageChange.bind(this);
@@ -51,7 +53,7 @@ class AppStatus {
       autoBook: false,
       injectionType: "fullServiceInjection",
       injectionVaccine: "pfizerInjection",
-      dateMaxSearch: new Date(2022, 1, 15),
+      dateMaxSearch: new Date((new Date()).getFullYear()+1, (new Date()).getMonth(), (new Date()).getDate()),
     });
 
     Object.keys(result.locations).forEach((url) => {
@@ -151,6 +153,10 @@ class AppStatus {
   onInjectionVaccineChange(callback) {
     this.onInjectionVaccineCb = callback;
   }
+
+  /**
+   * @param {(Date) => void} callback quand dateMaxSearch change de valeur
+   */
   onDateMaxSearchChange(callback) {
     this.onDateMaxSearchCb = callback;
   }
@@ -181,6 +187,10 @@ class AppStatus {
     browser.storage.sync.set({ injectionType: this.injectionType });
   }
 
+
+  /**
+   * @param {Date} value The new dateMaxSearch value
+   */
   setDateMaxSearch(value) {
     this.dateMaxSearch = new Date(value.value);
     browser.storage.sync.set({ dateMaxSearch: this.dateMaxSearch });
@@ -211,7 +221,7 @@ class AppStatus {
     this.onInjectionTypeCb(this.injectionType);
     this.injectionVaccine = "pfizerInjection";
     this.onInjectionTypeCb(this.injectionVaccine);
-    this.dateMaxSearch = new Date(2022, 1, 15);
+    this.dateMaxSearch = new Date((new Date()).getFullYear(), (new Date()).getMonth()+1, (new Date()).getDate());
     this.onDateMaxSearchCb(this.dateMaxSearch);
   }
 

diff --git a/content_scripts/doctolib/book.js b/content_scripts/doctolib/book.js
@@ -316,11 +316,10 @@
         autoBook: false,
         injectionType: "fullServiceInjection",
         injectionVaccine: "pfizerInjection",
-        dateMaxSearch: new Date(2022, 1, 15)
+        dateMaxSearch: new Date((new Date()).getFullYear()+1, (new Date()).getMonth(), (new Date()).getDate()),
       });
 
     const dateMaxSearchDate = typeof(dateMaxSearch) === 'string' ? new Date(dateMaxSearch) : dateMaxSearch;
-    console.log(dateMaxSearchDate)
 
     if (stopped || !locations[url]) {
       running = false;
@@ -455,19 +454,6 @@
 
       const date = new Date(
         `${selectedMonth} ${selectedDay} ${selectedYear} ${selectedTime}`);
-      // console.log(parts)
-      // const year = parts[1] === 'decembre' ? 2021 : 2022;
-      // const date = new Date(
-      //   `${MONTHS[parts[1]]} ${parts[0]} ${year} ${
-      //     parts[2]
-      //   }`
-      // );
-
-      const tomorrow = new Date();
-      tomorrow.setHours(23);
-      tomorrow.setMinutes(59);
-      tomorrow.setDate(tomorrow.getDate() + 1);
-
 
       if (date > dateMaxSearchDate) {
         const formatedDate = dateMaxSearchDate.toLocaleDateString();