Merge pull request #55 from hacf-fr/54-trier-par-date-de-saisie

Tri des notes par date de saisie
hacf-fr · Nov 30, 2024 · 153009c · 153009c
2 parents d8fb04b + 7632eba
commit 153009c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/custom_components/ecole_directe/config_flow.py b/custom_components/ecole_directe/config_flow.py
@@ -23,6 +23,7 @@
     DOMAIN,
     DEFAULT_REFRESH_INTERVAL,
     FILENAME_QCM,
+    GRADES_TO_DISPLAY,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -145,6 +146,10 @@ async def async_step_init(
                         "decode_html",
                         default=self.config_entry.options.get("decode_html", False),
                     ): bool,
+                    vol.Optional(
+                        "notes_affichees",
+                        default=self.config_entry.options.get("notes_affichees", GRADES_TO_DISPLAY),
+                    ): int,
                 }
             ),
         )
diff --git a/custom_components/ecole_directe/coordinator.py b/custom_components/ecole_directe/coordinator.py
@@ -28,6 +28,7 @@
     DEFAULT_LUNCH_BREAK_TIME,
     DEFAULT_REFRESH_INTERVAL,
     EVENT_TYPE,
+    GRADES_TO_DISPLAY,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -204,6 +205,7 @@ async def _async_update_data(self) -> dict[Platform, dict[str, Any]]:
                         eleve,
                         year_data,
                         self.hass.config.config_dir,
+                        self.config_entry.options.get("notes_affichees", GRADES_TO_DISPLAY)
                     )
                     disciplines = grades_evaluations["disciplines"]
                     self.data[f"{eleve.get_fullname_lower()}_disciplines"] = disciplines

diff --git a/custom_components/ecole_directe/ecole_directe_helper.py b/custom_components/ecole_directe/ecole_directe_helper.py
@@ -475,7 +475,7 @@ def clean_html(raw_html):
     return cleantext
 
 
-def get_grades_evaluations(token, eleve, annee_scolaire, config_path):
+def get_grades_evaluations(token, eleve, annee_scolaire, config_path, grades_dispaly = GRADES_TO_DISPLAY):
     """get grades"""
 
     if DEBUG_ON:
@@ -524,18 +524,18 @@ def get_grades_evaluations(token, eleve, annee_scolaire, config_path):
             break
 
     if "notes" in data:
-        data["notes"].sort(key=operator.itemgetter("date"))
+        data["notes"].sort(key=operator.itemgetter("dateSaisie"))
         data["notes"].reverse()
         for grade_json in data["notes"]:
             if grade_json["noteSur"] == "0":
                 index1 += 1
-                if index1 > GRADES_TO_DISPLAY:
+                if index1 > grades_dispaly:
                     continue
                 evaluation = get_evaluation(grade_json)
                 response["evaluations"].append(evaluation)
             else:
                 index2 += 1
-                if index2 > GRADES_TO_DISPLAY:
+                if index2 > grades_dispaly:
                     continue
                 grade = get_grade(grade_json)
                 response["grades"].append(grade)

diff --git a/custom_components/ecole_directe/manifest.json b/custom_components/ecole_directe/manifest.json
@@ -9,5 +9,5 @@
     "documentation": "https://github.com/hacf-fr/hass-ecoledirecte",
     "iot_class": "cloud_polling",
     "issue_tracker": "https://github.com/hacf-fr/hass-ecoledirecte/issues",
-    "version": "0.3.18"
+    "version": "0.3.19"
 }
diff --git a/custom_components/ecole_directe/sensor.py b/custom_components/ecole_directe/sensor.py
@@ -290,7 +290,7 @@ def __init__(
         self, coordinator: EDDataUpdateCoordinator, eleve: EDEleve, suffix: str
     ) -> None:
         """Initialize the ED sensor."""
-        super().__init__(coordinator, "timetable_" + suffix, eleve, "len")
+        super().__init__(coordinator, name="timetable_" + suffix, eleve=eleve, state="len")
         self._suffix = suffix
         self._start_at = None
         self._end_at = None

diff --git a/custom_components/ecole_directe/strings.json b/custom_components/ecole_directe/strings.json
@@ -37,7 +37,8 @@
         "data": {
           "refresh_interval": "Data refresh interval (in minutes)",
           "lunch_break_time": "Lunch break time",
-          "decode_html": "Decode HTML for homeworks - Warning it will delete all HTML (style, links, iFrame, etc.)"
+          "decode_html": "Decode HTML for homeworks - Warning it will delete all HTML (style, links, iFrame, etc.)",
+          "notes_affichees": "Maximum grades to display"
         }
       }
     }

diff --git a/custom_components/ecole_directe/translations/en.json b/custom_components/ecole_directe/translations/en.json
@@ -29,7 +29,8 @@
                 "data": {
                     "refresh_interval": "Data refresh interval (in minutes)",
                     "lunch_break_time": "Lunch break time",
-                    "decode_html": "Decode HTML for homeworks - Warning it will delete all HTML (style, links, iFrame, etc.)"
+                    "decode_html": "Decode HTML for homeworks - Warning it will delete all HTML (style, links, iFrame, etc.)",
+                    "notes_affichees": "Maximum grades to display"
                 }
             }
         }

diff --git a/custom_components/ecole_directe/translations/fr.json b/custom_components/ecole_directe/translations/fr.json
@@ -29,7 +29,8 @@
                 "data": {
                     "refresh_interval": "Intervale de mise à jour des données (en minutes)",
                     "lunch_break_time": "Heure de la pause déjeuner",
-                    "decode_html": "Decode HTML pour les devoirs - Attention cela va supprimer tout le HTML (style, liens, iFrame, etc.)"
+                    "decode_html": "Decode HTML pour les devoirs - Attention cela va supprimer tout le HTML (style, liens, iFrame, etc.)",
+                    "notes_affichees": "Notes maximum affichées"
                 }
             }
         }