From 730873595fbc521c4a8b9958bdad9c924a20256a Mon Sep 17 00:00:00 2001
From: Blackymas <denny.smarthome@t-online.de>
Date: Tue, 8 Nov 2022 23:54:00 +0100
Subject: [PATCH] rdy - weather forcast via current page

---
 blueprint.yaml | 24 ++++++++++++------------
 esphome.yaml   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/blueprint.yaml b/blueprint.yaml
index 327b94b..ebe62f4 100644
--- a/blueprint.yaml
+++ b/blueprint.yaml
@@ -727,7 +727,7 @@ trigger_variables:
   last_click: "sensor.{{ nspanel_name_trigger }}_last_click"
   last_click_lightsettings: "sensor.{{ nspanel_name_trigger }}_last_click_lightsettings"
   last_click_coversettings: "sensor.{{ nspanel_name_trigger }}_last_click_coversettings"
-  last_click_weathersettings: "sensor.{{ nspanel_name_trigger }}_last_click_weathersettings"
+#  last_click_weathersettings: "sensor.{{ nspanel_name_trigger }}_last_click_weathersettings"
   left_button: "binary_sensor.{{ nspanel_name_trigger }}_left_button"
   right_button: "binary_sensor.{{ nspanel_name_trigger }}_right_button"
   weather_forcast_button: "binary_sensor.{{ nspanel_name_trigger }}_weather_forcast"
@@ -1091,7 +1091,7 @@ trigger:
       entity_id: "{{ last_click_coversettings }}"
     id: cover_settings
 
-  ##### Page Weather Forcast - Trigger "weather_settings" - Changes Weather Page via "last_click_weathersettings" #####
+  ##### Page Weather Forcast - Trigger "weather_settings" - Changes Weather Page via "Current Page 1, 2, 3, 4, 5 #####
   - platform: event
     event_type: state_changed
     event_data:
@@ -2938,7 +2938,7 @@ action:
                       ##### Weather Page - 01 - HA DEFAULT #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ current_page == "1" }}'
+                            value_template: '{{ states(current_page) == "1" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -3046,7 +3046,7 @@ action:
                       ##### Weather Page - 02 - HA DEFAULT #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather02" }}'
+                            value_template: '{{ states(current_page) == "2" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -3178,7 +3178,7 @@ action:
                       ##### Weather Page - 03 - HA DEFAULT #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather03" }}'
+                            value_template: '{{ states(current_page) == "3" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -3310,7 +3310,7 @@ action:
                       ##### Weather Page - 04 - HA DEFAULT #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather04" }}'
+                            value_template: '{{ states(current_page) == "4" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -3442,7 +3442,7 @@ action:
                       ##### Weather Page - 05 - HA DEFAULT #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather05" }}'
+                            value_template: '{{ states(current_page) == "5" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -3580,7 +3580,7 @@ action:
                       ##### Weather Page - 01 - ACCUWEATHER #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather01" }}'
+                            value_template: '{{ states(current_page) == "1" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -3743,7 +3743,7 @@ action:
                       ##### Weather Page - 02 - ACCUWEATHER #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather02" }}'
+                            value_template: '{{ states(current_page) == "2" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -3906,7 +3906,7 @@ action:
                       ##### Weather Page - 03 - ACCUWEATHER #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather03" }}'
+                            value_template: '{{ states(current_page) == "3" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -4069,7 +4069,7 @@ action:
                       ##### Weather Page - 04 - ACCUWEATHER #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather04" }}'
+                            value_template: '{{ states(current_page) == "4" }}'
                         sequence:
                           - variables:
                               # weather PIC
@@ -4232,7 +4232,7 @@ action:
                       ##### Weather Page - 05 - ACCUWEATHER #####
                       - conditions:
                           - condition: template
-                            value_template: '{{ states(last_click_weathersettings) == "weather05" }}'
+                            value_template: '{{ states(current_page) == "5" }}'
                         sequence:
                           - variables:
                               # weather PIC
diff --git a/esphome.yaml b/esphome.yaml
index baaef5b..b74cf11 100644
--- a/esphome.yaml
+++ b/esphome.yaml
@@ -837,7 +837,7 @@ text_sensor:
     name: ${device_name} last click climatesettings
     id: disp1_lastclick_climatesettings
     update_interval: 50ms
-    component_name: weathersetting
+    component_name: climatesetting
     internal: false
     filters:
       - lambda: |-