fix bad naming sensors - fix sorting

hacf-fr · Mar 25, 2024 · 18bbc20 · 18bbc20
1 parent f80adc5
commit 18bbc20
Show file tree

Hide file tree

Showing 7 changed files with 2,781 additions and 183 deletions.
diff --git a/custom_components/ecole_directe/coordinator.py b/custom_components/ecole_directe/coordinator.py
@@ -103,39 +103,41 @@ async def _async_update_data(self) -> dict[Platform, dict[str, Any]]:
                                     homework["contenu"] = matiere["aFaire"]["contenu"]
 
                         _LOGGER.debug("homeworks_json:%s", homeworks_json)
-                    self.data[f"homeworks{eleve.get_fullname_lower()}"] = homeworks_json
+                    self.data[f"{eleve.get_fullname_lower()}_homeworks"] = (
+                        homeworks_json
+                    )
                 except Exception as ex:
                     _LOGGER.warning(
                         "Error getting homeworks from ecole directe: %s", ex
                     )
-                    self.data[f"homeworks{eleve.get_fullname_lower()}"] = {}
+                    self.data[f"{eleve.get_fullname_lower()}_homeworks"] = {}
             if "NOTES" in eleve.modules:
                 try:
                     self.data[
-                        f"grades{eleve.get_fullname_lower()}"
+                        f"{eleve.get_fullname_lower()}_grades"
                     ] = await self.hass.async_add_executor_job(
                         get_grades, session, eleve, year_data
                     )
                     self.compare_data(
                         previous_data,
-                        f"grades{eleve.get_fullname_lower()}",
+                        f"{eleve.get_fullname_lower()}_grades",
                         ["date", "subject", "grade_out_of"],
                         "new_grade",
                         eleve,
                         format_grade,
                     )
                 except Exception as ex:
                     _LOGGER.warning("Error getting grades from ecole directe: %s", ex)
-                    self.data[f"grades{eleve.get_fullname_lower()}"] = {}
-            # if "MESSAGERIE" in eleve.modules:
-            #     try:
-            #         self.data[
-            #             "messages" + eleve.eleve_id
-            #         ] = await self.hass.async_add_executor_job(
-            #             get_messages, session, eleve, year_data
-            #         )
-            #     except Exception as ex:
-            #         _LOGGER.warning("Error getting messages from ecole directe: %s", ex)
+                    self.data[f"{eleve.get_fullname_lower()}_grades"] = {}
+        # if "MESSAGERIE" in eleve.modules:
+        #     try:
+        #         self.data[
+        #             "messages" + eleve.eleve_id
+        #         ] = await self.hass.async_add_executor_job(
+        #             get_messages, session, eleve, year_data
+        #         )
+        #     except Exception as ex:
+        #         _LOGGER.warning("Error getting messages from ecole directe: %s", ex)
 
         return self.data
 

diff --git a/custom_components/ecole_directe/ecole_directe_formatter.py b/custom_components/ecole_directe/ecole_directe_formatter.py
@@ -10,7 +10,10 @@
 def format_homework(homework):
     """format homework"""
     try:
-        contenu = base64.b64decode(homework.contenu).decode("utf-8")
+        if homework.contenu is not None:
+            contenu = base64.b64decode(homework.contenu).decode("utf-8")
+        else:
+            contenu = ""
         return {
             "date": homework.pour_le,
             "subject": homework.matiere,