Fix additional merge issues

admin_dashboard.yaml

@@ -1190,10 +1190,6 @@ views:
                   name_template: >-
                     {{ states('input_text.tony_custom_med_name_p1') + ' Notify'
                     }}
-                - entity: input_boolean.tony_custom_meds_reminder_p1
-                  name: Reminders Active
-                - entity: counter.tony_custom_meds_reminder_count_p1
-                  name: Reminder Count
             visibility:
               - condition: state
                 entity: input_boolean.tony_custom_meds_tracker_p1
@@ -1203,15 +1199,8 @@ views:
             show_header_toggle: false
             entities:
               - entity: input_boolean.tony_ibuprofen_taken
-                name: Ibuprofen Taken
               - entity: input_datetime.tony_ibuprofen_taken
-                name: Ibuprofen Taken
               - entity: input_datetime.tony_ibuprofen_notify
-                name: Ibuprofen Notify
-              - entity: input_boolean.tony_ibuprofen_reminder
-                name: Reminders Active
-              - entity: counter.tony_ibuprofen_reminder_count
-                name: Reminder Count
             visibility:
               - condition: state
                 entity: input_boolean.tony_ibuprofen_active
@@ -1221,15 +1210,8 @@ views:
             show_header_toggle: false
             entities:
               - entity: input_boolean.tony_tylenol_taken
-                name: Tylenol Taken
               - entity: input_datetime.tony_tylenol_taken
-                name: Tylenol Taken
               - entity: input_datetime.tony_tylenol_notify
-                name: Tylenol Notify
-              - entity: input_boolean.tony_tylenol_reminder
-                name: Reminders Active
-              - entity: counter.tony_tylenol_reminder_count
-                name: Reminder Count
             visibility:
               - condition: state
                 entity: input_boolean.tony_tylenol_active

mobile_dashboard.yaml

@@ -4215,26 +4215,16 @@ views:
           - condition: state
             entity: input_boolean.tony_awake
             state: 'on'
-        color: >-
-          {% set counter = states('counter.tony_morning_meds_reminder_count') |
-          int %}
-
+        color: |-
+          {% set counter = states('counter.tony_morning_meds_reminder_count') | int %}
           {% if is_state('input_boolean.tony_morning_meds_taken','on') %}
-
           var(--success-color)
-
           {% elif counter >= 3 %}
-
           var(--error-color)
-
           {% elif counter >= 1 %}
-
           var(--warning-color)
-
           {% else %}
-
           ''
-
           {% endif %}
       - type: custom:mushroom-template-badge
         content: >-
@@ -4246,9 +4236,8 @@ views:
           endif %}
         icon: mdi:medication
         color: >-
-          {% set counter = states('counter.tony_afternoon_meds_reminder_count')
-          | int %} {% if
-          is_state('input_boolean.tony_afternoon_meds_taken','on') %}
+          {% set counter = states('counter.tony_afternoon_meds_reminder_count') | int
+          %} {% if is_state('input_boolean.tony_afternoon_meds_taken','on') %}
           var(--success-color) {% elif counter >= 3 %} var(--error-color) {%
           elif counter >= 1 %} var(--warning-color) {% else %} '' {% endif %}
         entity: input_datetime.tony_afternoon_meds_taken
@@ -4283,26 +4272,16 @@ views:
           else %} {{ input_datetime_read('input_datetime.tony_night_meds_taken')
           }} {% endif %}
         icon: mdi:medication
-        color: >-
-          {% set counter = states('counter.tony_night_meds_reminder_count') |
-          int %}
-
+        color: |-
+          {% set counter = states('counter.tony_night_meds_reminder_count') | int %}
           {% if is_state('input_boolean.tony_night_meds_taken','on') %}
-
           var(--success-color)
-
           {% elif counter >= 3 %}
-
           var(--error-color)
-
           {% elif counter >= 1 %}
-
           var(--warning-color)
-
           {% else %}
-
           ''
-
           {% endif %}
         entity: input_datetime.tony_night_meds_taken
         label: Tony Night Meds
@@ -4328,32 +4307,22 @@ views:
       - type: custom:mushroom-template-badge
         content: >-
           {% from 'time.jinja' import input_datetime_read %} {% if
-          is_state('input_boolean.tina_morning_meds_reminder','on') %} Waiting:
-          {{ states('counter.tina_morning_meds_reminder_count') | int }}
-          reminders {% else %} {{
+          is_state('input_boolean.tina_morning_meds_reminder','on') %} Waiting: {{
+          states('counter.tina_morning_meds_reminder_count') | int }} reminders
+          {% else %} {{
           input_datetime_read('input_datetime.tina_morning_meds_taken') }} {%
           endif %}
         icon: mdi:medication
-        color: >-
-          {% set counter = states('counter.tina_morning_meds_reminder_count') |
-          int %}
-
+        color: |-
+          {% set counter = states('counter.tina_morning_meds_reminder_count') | int %}
           {% if is_state('input_boolean.tina_morning_meds_taken','on') %}
-
           var(--success-color)
-
           {% elif counter >= 3 %}
-
           var(--error-color)
-
           {% elif counter >= 1 %}
-
           var(--warning-color)
-
           {% else %}
-
           ''
-
           {% endif %}
         entity: input_datetime.tina_morning_meds_taken
         label: Tina Morning Meds
@@ -4384,26 +4353,16 @@ views:
           else %} {{ input_datetime_read('input_datetime.tina_night_meds_taken')
           }} {% endif %}
         icon: mdi:medication
-        color: >-
-          {% set counter = states('counter.tina_night_meds_reminder_count') |
-          int %}
-
+        color: |-
+          {% set counter = states('counter.tina_night_meds_reminder_count') | int %}
           {% if is_state('input_boolean.tina_night_meds_taken','on') %}
-
           var(--success-color)
-
           {% elif counter >= 3 %}
-
           var(--error-color)
-
           {% elif counter >= 1 %}
-
           var(--warning-color)
-
           {% else %}
-
           ''
-
           {% endif %}
         entity: input_datetime.tina_night_meds_taken
         label: Tina Night Meds
@@ -4436,8 +4395,8 @@ views:
           endif %}
         icon: mdi:medication
         color: >-
-          {% set counter = states('counter.kallen_morning_meds_reminder_count')
-          | int %}
+          {% set counter = states('counter.kallen_morning_meds_reminder_count') | int
+          %}
 
           {% if is_state('input_boolean.kallen_morning_meds_taken','on') %}
 
@@ -4490,26 +4449,16 @@ views:
           input_datetime_read('input_datetime.kallen_night_meds_taken') }} {%
           endif %}
         icon: mdi:medication
-        color: >-
-          {% set counter = states('counter.kallen_night_meds_reminder_count') |
-          int %}
-
+        color: |-
+          {% set counter = states('counter.kallen_night_meds_reminder_count') | int %}
           {% if is_state('input_boolean.kallen_night_meds_taken','on') %}
-
           var(--success-color)
-
           {% elif counter >= 3 %}
-
           var(--error-color)
-
           {% elif counter >= 1 %}
-
           var(--warning-color)
-
           {% else %}
-
           ''
-
           {% endif %}
         entity: input_datetime.kallen_night_meds_taken
         label: Kallen Night Meds
@@ -5468,10 +5417,6 @@ views:
                   name_template: >-
                     {{ states('input_text.tony_custom_med_name_p1') + ' Notify'
                     }}
-                - entity: input_boolean.tony_custom_meds_reminder_p1
-                  name: Reminders Active
-                - entity: counter.tony_custom_meds_reminder_count_p1
-                  name: Reminder Count
             visibility:
               - condition: state
                 entity: input_boolean.tony_custom_meds_tracker_p1
@@ -5481,15 +5426,8 @@ views:
             show_header_toggle: false
             entities:
               - entity: input_boolean.tony_ibuprofen_taken
-                name: Ibuprofen Taken
               - entity: input_datetime.tony_ibuprofen_taken
-                name: Ibuprofen Taken
               - entity: input_datetime.tony_ibuprofen_notify
-                name: Ibuprofen Notify
-              - entity: input_boolean.tony_ibuprofen_reminder
-                name: Reminders Active
-              - entity: counter.tony_ibuprofen_reminder_count
-                name: Reminder Count
             visibility:
               - condition: state
                 entity: input_boolean.tony_ibuprofen_active
@@ -5499,15 +5437,8 @@ views:
             show_header_toggle: false
             entities:
               - entity: input_boolean.tony_tylenol_taken
-                name: Tylenol Taken
               - entity: input_datetime.tony_tylenol_taken
-                name: Tylenol Taken
               - entity: input_datetime.tony_tylenol_notify
-                name: Tylenol Notify
-              - entity: input_boolean.tony_tylenol_reminder
-                name: Reminders Active
-              - entity: counter.tony_tylenol_reminder_count
-                name: Reminder Count
             visibility:
               - condition: state
                 entity: input_boolean.tony_tylenol_active
@@ -6159,63 +6090,6 @@ views:
                 black
               {% endif %}
         column_span: 1
-      - type: grid
-        cards:
-          - type: heading
-            heading_style: title
-            heading: College Hockey
-          - type: custom:teamtracker-card
-            entity: sensor.michigan_wolverines_hockey
-            visibility:
-              - condition: state
-                entity: sensor.michigan_wolverines_hockey
-                state_not: NOT_FOUND
-              - condition: state
-                entity: sensor.michigan_wolverines_hockey
-                state_not: BYE
-              - condition: state
-                entity: binary_sensor.michigan_wolverines_hockey_inhibit
-                state: 'off'
-            show_league: false
-          - type: custom:teamtracker-card
-            entity: sensor.minnesota_golden_gophers_hockey
-            visibility:
-              - condition: state
-                entity: sensor.minnesota_golden_gophers_hockey
-                state_not: NOT_FOUND
-              - condition: state
-                entity: sensor.minnesota_golden_gophers_hockey
-                state_not: BYE
-              - condition: state
-                entity: binary_sensor.minnesota_golden_gophers_hockey_inhibit
-                state: 'off'
-            show_league: false
-          - type: custom:teamtracker-card
-            entity: sensor.minnesota_state_mavericks_hockey
-            visibility:
-              - condition: state
-                entity: sensor.minnesota_state_mavericks_hockey
-                state_not: NOT_FOUND
-              - condition: state
-                entity: sensor.minnesota_state_mavericks_hockey
-                state_not: BYE
-              - condition: state
-                entity: binary_sensor.minnesota_state_mavericks_hockey_inhibit
-                state: 'off'
-            show_league: false
-        column_span: 3
-        visibility:
-          - condition: or
-            conditions:
-              - condition: state
-                entity: binary_sensor.michigan_wolverines_hockey_inhibit
-                state: 'off'
-              - condition: state
-                entity: binary_sensor.minnesota_golden_gophers_hockey_inhibit
-                state: 'off'
-              - condition: state
-                entity: binary_sensor.minnesota_state_mavericks_hockey_inhibit
-                state: 'off'
     max_columns: 5
     cards: []
     subview: true
@@ -6348,94 +6222,6 @@ views:
               - condition: state
                 entity: input_boolean.master_bedroom_aircon_installed
                 state: 'on'
-          - type: heading
-            icon: m3o:schedule
-            heading: Scheduling
-            heading_style: title
-            visibility:
-              - condition: user
-                users:
-                  - f387a983651a4321a7411ff8cf36f949
-                  - c3909d27048140729f002aaef0391775
-          - type: entities
-            entities:
-              - entity: input_select.scheduled_climate_mode_master_bedroom_aircon
-                name: Scheduled Mode - Aircon
-              - entity: input_select.scheduled_climate_mode_master_bedroom_fan
-                name: Scheduled Mode - Fan
-              - entity: input_datetime.master_bedroom_cooling
-                name: Cooling
-              - entity: input_datetime.master_bedroom_fan
-                name: Fan
-              - entity: input_boolean.master_bedroom_climate_override
-                name: Climate Schedule Override
-            state_color: true
-            visibility:
-              - condition: user
-                users:
-                  - f387a983651a4321a7411ff8cf36f949
-                  - c3909d27048140729f002aaef0391775
-          - type: heading
-            icon: m3of:data-thresholding
-            heading: Thresholds
-            heading_style: title
-            visibility:
-              - condition: user
-                users:
-                  - c3909d27048140729f002aaef0391775
-          - type: entities
-            entities:
-              - entity: input_number.master_bedroom_aircon_run_threshold
-                name: Run Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_aircon_run_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.master_bedroom_aircon_mode_threshold
-                name: Mode Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_aircon_mode_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.master_bedroom_auto_cooling_threshold
-                name: MBR Auto Cooling
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_auto_cooling_threshold') |
-                  int %} {% set roomtemp =
-                  states('sensor.master_bedroom_temperature') | int %} {{
-                  'Threshold Met' if roomtemp >= threshold else '' }}
-              - entity: input_number.master_bedroom_mode_switch_threshold
-                name: MBR Mode Switch
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_mode_switch_threshold') |
-                  int %} {% set high = states('sensor.todays_high_temp') | int
-                  %} {{ 'Threshold Met' if high >= threshold else '' }}
-              - entity: input_number.master_bedroom_fan_threshold
-                name: MBR Fan
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.master_bedroom_fan_threshold') | int %}
-                  {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
-              - entity: input_boolean.master_bedroom_aircon_installed
-                name: Aircon Installed
-              - entity: input_boolean.master_bedroom_climate_protocol
-                name: Climate Automations
-            visibility:
-              - condition: and
-                conditions:
-                  - condition: state
-                    entity: input_boolean.master_bedroom_aircon_installed
-                    state: 'on'
-                  - condition: user
-                    users:
-                      - c3909d27048140729f002aaef0391775
-            show_header_toggle: false
-            state_color: true
         visibility:
           - condition: user
             users:
@@ -6481,87 +6267,6 @@ views:
               - condition: state
                 entity: input_boolean.emma_bedroom_aircon_installed
                 state: 'on'
-          - type: heading
-            icon: m3o:schedule
-            heading: Scheduling
-            heading_style: title
-            visibility:
-              - condition: user
-                users:
-                  - f387a983651a4321a7411ff8cf36f949
-                  - c3909d27048140729f002aaef0391775
-          - type: entities
-            entities:
-              - entity: input_select.scheduled_climate_mode_emma_bedroom
-                name: Scheduled Mode
-              - entity: input_datetime.emma_bedroom_cooling
-                name: Cooling
-              - entity: input_boolean.emma_bedroom_climate_override
-                name: Climate Schedule Override
-            state_color: true
-            visibility:
-              - condition: user
-                users:
-                  - f387a983651a4321a7411ff8cf36f949
-                  - c3909d27048140729f002aaef0391775
-          - type: heading
-            icon: m3of:data-thresholding
-            heading: Thresholds
-            heading_style: title
-            visibility:
-              - condition: user
-                users:
-                  - c3909d27048140729f002aaef0391775
-          - type: entities
-            entities:
-              - entity: input_number.emma_bedroom_aircon_run_threshold
-                name: Run Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_aircon_run_threshold') | int
-                  %} {% set low = states('sensor.tonights_low_temp') | int %} {{
-                  'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.emma_bedroom_aircon_mode_threshold
-                name: Mode Threshold
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_aircon_mode_threshold') |
-                  int %} {% set low = states('sensor.tonights_low_temp') | int
-                  %} {{ 'Threshold Met' if low >= threshold else '' }}
-              - entity: input_number.emma_bedroom_auto_cooling_threshold
-                name: EBR Auto Cooling
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_auto_cooling_threshold') |
-                  int %} {% set roomtemp =
-                  states('sensor.emma_bedroom_temperature') | int %} {{
-                  'Threshold Met' if roomtemp >= threshold else '' }}
-              - entity: input_number.emma_bedroom_mode_switch_threshold
-                name: EBR Mode Switch
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_bedroom_mode_switch_threshold') |
-                  int %} {% set high = states('sensor.todays_high_temp') | int
-                  %} {{ 'Threshold Met' if high >= threshold else '' }}
-              - entity: input_boolean.emma_bedroom_aircon_installed
-                name: Aircon Installed
-              - entity: input_boolean.emma_bedroom_heater_installed
-                name: Heater Installed
-              - entity: input_boolean.emma_bedroom_climate_protocol
-                name: Climate Automations
-              - entity: switch.emma_bedroom_climate_watchdog
-                name: Climate Watchdog
-            visibility:
-              - condition: and
-                conditions:
-                  - condition: state
-                    entity: input_boolean.emma_bedroom_aircon_installed
-                    state: 'on'
-                  - condition: user
-                    users:
-                      - c3909d27048140729f002aaef0391775
-            show_header_toggle: false
-            state_color: true
         visibility:
           - condition: user
             users: