From b765c935e601d4ff30609849f0105f76652b5729 Mon Sep 17 00:00:00 2001
From: Jeroen ter Heerdt <jterh@microsoft.com>
Date: Wed, 14 Aug 2024 22:51:56 +0000
Subject: [PATCH] v2024.8.1-beta-7 fixing bug in last data entry retrieval

---
 custom_components/smart_irrigation/__init__.py               | 5 ++++-
 custom_components/smart_irrigation/const.py                  | 2 +-
 .../smart_irrigation/frontend/dist/smart-irrigation.js       | 2 +-
 custom_components/smart_irrigation/frontend/src/const.ts     | 2 +-
 custom_components/smart_irrigation/manifest.json             | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/custom_components/smart_irrigation/__init__.py b/custom_components/smart_irrigation/__init__.py
index e81fdc2..c349c52 100644
--- a/custom_components/smart_irrigation/__init__.py
+++ b/custom_components/smart_irrigation/__init__.py
@@ -620,12 +620,15 @@ def clear_weatherdata_for_mapping(self, mapping):
         _LOGGER.debug(
             f"[clear_weatherdata_for_mapping] finding last entry for each key in the sensor group."
         )
+        _LOGGER.debug(
+            f"[clear_weatherdata_for_mapping] keys in sensor group {mapping}: {mapping.get(const.MAPPING_MAPPINGS)}"
+        )
         if mapping.get(const.MAPPING_DATA):
             for key in mapping.get(const.MAPPING_MAPPINGS):
                 for e in reversed(mapping.get(const.MAPPING_DATA)):
                     if key in e:
                         data_last_entry[key] = e[key]
-                        break
+                        continue  # continue instead of break to continue to the next key
         _LOGGER.debug(
             f"[clear_weatherdata_for_mapping] last entry for each key in the sensor group: {data_last_entry}"
         )
diff --git a/custom_components/smart_irrigation/const.py b/custom_components/smart_irrigation/const.py
index 5327aeb..288902c 100644
--- a/custom_components/smart_irrigation/const.py
+++ b/custom_components/smart_irrigation/const.py
@@ -1,6 +1,6 @@
 """Store constants."""
 
-VERSION = "v2024.8.1-beta-6"
+VERSION = "v2024.8.1-beta-7"
 NAME = "Smart Irrigation"
 MANUFACTURER = "@jeroenterheerdt"
 
diff --git a/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js b/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js
index f80dc1b..b208ea7 100644
--- a/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js
+++ b/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js
@@ -11389,7 +11389,7 @@
             .narrow=${this.narrow}
           ></ha-menu-button>
           <div class="main-title">${ji("title", this.hass.language)}</div>
-          <div class="version">${"v2024.8.1-beta-6"}</div>
+          <div class="version">${"v2024.8.1-beta-7"}</div>
         </div>
 
         <ha-tabs
diff --git a/custom_components/smart_irrigation/frontend/src/const.ts b/custom_components/smart_irrigation/frontend/src/const.ts
index 5228d34..09fc246 100644
--- a/custom_components/smart_irrigation/frontend/src/const.ts
+++ b/custom_components/smart_irrigation/frontend/src/const.ts
@@ -1,4 +1,4 @@
-export const VERSION = "v2024.8.1-beta-6";
+export const VERSION = "v2024.8.1-beta-7";
 export const REPO = "https://github.com/jeroenterheerdt/HASmartIrrigation;";
 export const ISSUES_URL = REPO + "/issues";
 
diff --git a/custom_components/smart_irrigation/manifest.json b/custom_components/smart_irrigation/manifest.json
index df1942e..c497530 100644
--- a/custom_components/smart_irrigation/manifest.json
+++ b/custom_components/smart_irrigation/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/jeroenterheerdt/HASmartIrrigation/issues",
   "requirements": [],
-  "version": "v2024.8.1-beta-6"
+  "version": "v2024.8.1-beta-7"
 }