iobroker.sprinklecontrol 1.0.3 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/README.md +8 -10
  2. package/admin/i18n/de/translations.json +7 -0
  3. package/admin/i18n/en/translations.json +7 -0
  4. package/admin/i18n/es/translations.json +7 -0
  5. package/admin/i18n/fr/translations.json +7 -0
  6. package/admin/i18n/it/translations.json +7 -0
  7. package/admin/i18n/nl/translations.json +7 -0
  8. package/admin/i18n/pl/translations.json +7 -0
  9. package/admin/i18n/pt/translations.json +7 -0
  10. package/admin/i18n/ru/translations.json +7 -0
  11. package/admin/i18n/uk/translations.json +7 -0
  12. package/admin/i18n/zh-cn/translations.json +7 -0
  13. package/admin/index_m.html +74 -56
  14. package/admin/index_m.js +10 -3
  15. package/admin/words.js +7 -0
  16. package/io-package.json +33 -31
  17. package/lib/myConfig.js +3 -1
  18. package/lib/valveControl.js +52 -40
  19. package/main.js +272 -254
  20. package/package.json +2 -2
package/README.md CHANGED
@@ -33,6 +33,14 @@ Wetterabhängige automatische Steuerung der Gartenbewässerung
33
33
  Placeholder for the next version (at the beginning of the line):
34
34
  ### **WORK IN PROGRESS**
35
35
  -->
36
+ ### 1.0.5 (2026-05-03)
37
+ * (Copilot) Adapter benötigt jetzt node.js >= 22
38
+ * (Dirk-Peter-md) Second start time added
39
+ * (Dirk-Peter-md) bug fixed in sprinklerState
40
+
41
+ ### 1.0.4 (2026-04-26)
42
+ * (Dirk-Peter-md) GitHub error message #274
43
+
36
44
  ### 1.0.3 (2026-04-25)
37
45
  * (Dirk-Peter-md) Pressure relief valve added after irrigation.
38
46
 
@@ -44,16 +52,6 @@ Wetterabhängige automatische Steuerung der Gartenbewässerung
44
52
  * (Dirk-Peter-md) Adapter configuration revised
45
53
  * (Dirk-Peter-md) ioBroker-Bot [E4041], [E4043] completed
46
54
 
47
- ### 1.0.0 (2026-03-21)
48
- * (Dirk-Peter-md) Adapter redesign => Be sure to check your configuration
49
- * (Dirk-Peter-md) Adaptation to “dasWeather” >= 4.0
50
- * (Dirk-Peter-md) Fix npm publish
51
- * (Dirk-Peter-md) dependencies updated
52
- * (Dirk-Peter-md) update dependabot
53
-
54
- ### 0.2.19 (2025-07-02)
55
- * (Dirk-Peter-md) The switch-on hysteresis of the cistern is now stored in the configuration.
56
-
57
55
  ## License
58
56
  MIT License
59
57
 
package/admin/i18n/de/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Startzeit",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Startzeit (einschließlich Feiertags- und Wochenendplan)",
4
+ "1. Start time including holiday and weekend schedule": "1. Startzeit einschließlich Feiertags- und Wochenendplan",
5
+ "2. Start time": "2. Startzeit",
6
+ "2. Start time (selection in the individual valve settings)": "2. Startzeit (Auswahl in den einzelnen Ventileinstellungen)",
2
7
  "Activation of additional watering under objects:": "Aktivierung einer zusätzlichen Bewässerung unter Objekten:",
3
8
  "Add cistern pump as priority pump": "Zisternenpumpe als Prioritätspumpe hinzufügen",
4
9
  "Additional irrigation in case of high evaporation": "Zusätzliche Bewässerung bei hoher Verdunstung",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Pushover-Instanz",
62
67
  "Rain forecast - path": "Regenvorhersage - Pfad",
63
68
  "Saturday": "Samstag",
69
+ "Second start time": "Zweite Startzeit",
64
70
  "Select": "Wählen",
65
71
  "Select the weather forecast instance": "Wählen Sie die Wettervorhersageinstanz aus",
66
72
  "Selection of notification": "Auswahl der Benachrichtigung",
73
+ "Selection of start time": "Auswahl der Startzeit",
67
74
  "Selection of watering days in the week": "Auswahl der Bewässerungstage in der Woche",
68
75
  "Sensor in the greenhouse": "Sensor im Gewächshaus",
69
76
  "Settings for Pump": "Einstellungen für Pumpe",
package/admin/i18n/en/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Start time",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Start time (including holiday and weekend schedule)",
4
+ "1. Start time including holiday and weekend schedule": "",
5
+ "2. Start time": "2. Start time",
6
+ "2. Start time (selection in the individual valve settings)": "2. Start time (selection in the individual valve settings)",
2
7
  "Activation of additional watering under objects:": "Activation of additional watering under objects:",
3
8
  "Add cistern pump as priority pump": "Add cistern pump as priority pump",
4
9
  "Additional irrigation in case of high evaporation": "Additional irrigation in case of high evaporation",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Pushover instance",
62
67
  "Rain forecast - path": "Rain forecast - path",
63
68
  "Saturday": "Saturday",
69
+ "Second start time": "Second start time",
64
70
  "Select": "Select",
65
71
  "Select the weather forecast instance": "Select the weather forecast instance",
66
72
  "Selection of notification": "Selection of notification",
73
+ "Selection of start time": "Selection of start time",
67
74
  "Selection of watering days in the week": "Selection of watering days in the week",
68
75
  "Sensor in the greenhouse": "Sensor in the greenhouse",
69
76
  "Settings for Pump": "Settings for Pump",
package/admin/i18n/es/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Hora de inicio",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Hora de inicio (incluido el calendario de días festivos y fines de semana)",
4
+ "1. Start time including holiday and weekend schedule": "1. Hora de inicio, incluido el calendario de días festivos y fines de semana.",
5
+ "2. Start time": "2. Hora de inicio",
6
+ "2. Start time (selection in the individual valve settings)": "2. Hora de inicio (selección en los ajustes individuales de las válvulas)",
2
7
  "Activation of additional watering under objects:": "Activación de riego adicional bajo objetos:",
3
8
  "Add cistern pump as priority pump": "Agregar bomba de cisterna como bomba prioritaria",
4
9
  "Additional irrigation in case of high evaporation": "Riego adicional en caso de alta evaporación",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Instancia de empuje",
62
67
  "Rain forecast - path": "Pronóstico de lluvia - trayectoria",
63
68
  "Saturday": "sábado",
69
+ "Second start time": "Segunda hora de inicio",
64
70
  "Select": "Seleccione",
65
71
  "Select the weather forecast instance": "Seleccione la instancia de pronóstico del tiempo",
66
72
  "Selection of notification": "Selección de notificación",
73
+ "Selection of start time": "Selección de hora de inicio.",
67
74
  "Selection of watering days in the week": "Selección de días de riego en la semana.",
68
75
  "Sensor in the greenhouse": "Sensor en invernadero",
69
76
  "Settings for Pump": "Configuraciones para la bomba",
package/admin/i18n/fr/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Heure de début",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Heure de début (y compris les horaires des jours fériés et du week-end)",
4
+ "1. Start time including holiday and weekend schedule": "1. Heure de début, y compris les horaires des jours fériés et du week-end",
5
+ "2. Start time": "2. Heure de début",
6
+ "2. Start time (selection in the individual valve settings)": "2. Heure de démarrage (sélection dans les réglages individuels des vannes)",
2
7
  "Activation of additional watering under objects:": "Activation d'arrosage supplémentaire sous les objets:",
3
8
  "Add cistern pump as priority pump": "Ajouter une pompe citerne comme pompe prioritaire",
4
9
  "Additional irrigation in case of high evaporation": "Irrigation supplémentaire en cas d'évaporation élevée",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Instance pushover",
62
67
  "Rain forecast - path": "Prévision de pluie - chemin",
63
68
  "Saturday": "samedi",
69
+ "Second start time": "Deuxième heure de départ",
64
70
  "Select": "Sélectionner",
65
71
  "Select the weather forecast instance": "Sélectionnez l'instance de prévision météo",
66
72
  "Selection of notification": "Sélection de la notification",
73
+ "Selection of start time": "Sélection de l'heure de début",
67
74
  "Selection of watering days in the week": "Sélection des jours d'arrosage dans la semaine",
68
75
  "Sensor in the greenhouse": "Capteur dans la serre",
69
76
  "Settings for Pump": "Paramètres de la pompe",
package/admin/i18n/it/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Ora di inizio",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Ora di inizio (incluso il programma festivo e del fine settimana)",
4
+ "1. Start time including holiday and weekend schedule": "1. Ora di inizio compreso il programma festivo e del fine settimana",
5
+ "2. Start time": "2. Ora di inizio",
6
+ "2. Start time (selection in the individual valve settings)": "2. Orario di inizio (selezione nelle impostazioni della singola valvola)",
2
7
  "Activation of additional watering under objects:": "Attivazione di ulteriori innaffiature sotto oggetti:",
3
8
  "Add cistern pump as priority pump": "Aggiungere la pompa della cisterna come pompa prioritaria",
4
9
  "Additional irrigation in case of high evaporation": "Irrigazione aggiuntiva in caso di elevata evaporazione",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Istanza di pushover",
62
67
  "Rain forecast - path": "Previsioni pioggia - percorso",
63
68
  "Saturday": "Sabato",
69
+ "Second start time": "Seconda ora di inizio",
64
70
  "Select": "Selezionare",
65
71
  "Select the weather forecast instance": "Seleziona l'istanza delle previsioni del tempo",
66
72
  "Selection of notification": "Selezione della notifica",
73
+ "Selection of start time": "Selezione dell'ora di inizio",
67
74
  "Selection of watering days in the week": "Selezione dei giorni irrigui nella settimana",
68
75
  "Sensor in the greenhouse": "Sensore in serra",
69
76
  "Settings for Pump": "Impostazioni per Pump",
package/admin/i18n/nl/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Begintijd",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Starttijd (inclusief vakantie- en weekendrooster)",
4
+ "1. Start time including holiday and weekend schedule": "1. Starttijd inclusief vakantie- en weekendrooster",
5
+ "2. Start time": "2. Begintijd",
6
+ "2. Start time (selection in the individual valve settings)": "2. Starttijd (selectie in de individuele klepinstellingen)",
2
7
  "Activation of additional watering under objects:": "Activatie van extra water onder objecten:",
3
8
  "Add cistern pump as priority pump": "Stortbakpomp toevoegen als prioriteitspomp",
4
9
  "Additional irrigation in case of high evaporation": "Additionele irrigatie in geval van hoge verdamping",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Pushover-instantie",
62
67
  "Rain forecast - path": "Regenvoorspelling - pad",
63
68
  "Saturday": "zaterdag",
69
+ "Second start time": "Tweede starttijd",
64
70
  "Select": "Selecteer",
65
71
  "Select the weather forecast instance": "Selecteer de weersvoorspelling",
66
72
  "Selection of notification": "Selectie van melding",
73
+ "Selection of start time": "Selectie van starttijd",
67
74
  "Selection of watering days in the week": "Selectie van besproeiingsdagen in de week",
68
75
  "Sensor in the greenhouse": "Sensor in de kas",
69
76
  "Settings for Pump": "Instellingen voor pomp",
package/admin/i18n/pl/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Czas rozpoczęcia",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Godzina rozpoczęcia (w tym harmonogram świąteczny i weekendowy)",
4
+ "1. Start time including holiday and weekend schedule": "1. Godzina rozpoczęcia uwzględniająca harmonogram wakacji i weekendów",
5
+ "2. Start time": "2. Czas rozpoczęcia",
6
+ "2. Start time (selection in the individual valve settings)": "2. Czas startu (wybór w indywidualnych ustawieniach zaworu)",
2
7
  "Activation of additional watering under objects:": "Aktywacja dodatkowej wody pod obiektami",
3
8
  "Add cistern pump as priority pump": "Dodaj pompę cysterny jako pompę priorytetową",
4
9
  "Additional irrigation in case of high evaporation": "Dodatkowe irygacje w przypadku wysokich parowania",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Instancja pushover",
62
67
  "Rain forecast - path": "Prognoza opadów - ścieżka",
63
68
  "Saturday": "sobota",
69
+ "Second start time": "Drugi czas rozpoczęcia",
64
70
  "Select": "Wybierz",
65
71
  "Select the weather forecast instance": "Wybierz instancję prognozy pogody",
66
72
  "Selection of notification": "Wybór powiadomienia",
73
+ "Selection of start time": "Wybór czasu rozpoczęcia",
67
74
  "Selection of watering days in the week": "Wybór dni nawadniania w tygodniu",
68
75
  "Sensor in the greenhouse": "Czujnik w szklarni",
69
76
  "Settings for Pump": "Ustawienia dla pompy",
package/admin/i18n/pt/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Hora de início",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Horário de início (incluindo feriados e fins de semana)",
4
+ "1. Start time including holiday and weekend schedule": "1. Horário de início, incluindo feriados e fins de semana",
5
+ "2. Start time": "2. Hora de início",
6
+ "2. Start time (selection in the individual valve settings)": "2. Hora de início (seleção nas configurações individuais da válvula)",
2
7
  "Activation of additional watering under objects:": "Ativação de rega adicional sob objetos:",
3
8
  "Add cistern pump as priority pump": "Adicione a bomba de cisterna como bomba prioritária",
4
9
  "Additional irrigation in case of high evaporation": "Irrigação adicional em caso de alta evaporação",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Instância pushover",
62
67
  "Rain forecast - path": "Previsão de chuva - caminho",
63
68
  "Saturday": "sábado",
69
+ "Second start time": "Segunda hora de início",
64
70
  "Select": "Selecione",
65
71
  "Select the weather forecast instance": "Selecione a instância de previsão do tempo",
66
72
  "Selection of notification": "Seleção de notificação",
73
+ "Selection of start time": "Seleção do horário de início",
67
74
  "Selection of watering days in the week": "Seleção de dias de rega na semana",
68
75
  "Sensor in the greenhouse": "Sensor na estufa",
69
76
  "Settings for Pump": "Configurações para a bomba",
package/admin/i18n/ru/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Время начала",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Время начала (включая график праздников и выходных)",
4
+ "1. Start time including holiday and weekend schedule": "1. Время начала, включая график праздников и выходных.",
5
+ "2. Start time": "2. Время начала",
6
+ "2. Start time (selection in the individual valve settings)": "2. Время запуска (выбор в индивидуальных настройках клапана)",
2
7
  "Activation of additional watering under objects:": "Активация дополнительного полива под объектами:",
3
8
  "Add cistern pump as priority pump": "Добавьте насос цистерны в качестве приоритетного насоса",
4
9
  "Additional irrigation in case of high evaporation": "Дополнительное орошение в случае высокой испарения",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Экземпляр Pushover",
62
67
  "Rain forecast - path": "Прогноз дождя - путь",
63
68
  "Saturday": "Суббота",
69
+ "Second start time": "Второе время начала",
64
70
  "Select": "Выбрать",
65
71
  "Select the weather forecast instance": "Выберите экземпляр прогноза погоды",
66
72
  "Selection of notification": "Выбор уведомления",
73
+ "Selection of start time": "Выбор времени начала",
67
74
  "Selection of watering days in the week": "Выбор дней полива на неделе",
68
75
  "Sensor in the greenhouse": "Датчик в теплице",
69
76
  "Settings for Pump": "Настройки для насоса",
package/admin/i18n/uk/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1. Час початку",
3
+ "1. Start time (including holiday and weekend schedule)": "1. Час початку (включаючи розклад святкових і вихідних днів)",
4
+ "1. Start time including holiday and weekend schedule": "1. Час початку, включаючи розклад святкових і вихідних днів",
5
+ "2. Start time": "2. Час початку",
6
+ "2. Start time (selection in the individual valve settings)": "2. Час початку (вибір в індивідуальних налаштуваннях клапана)",
2
7
  "Activation of additional watering under objects:": "Активація додаткового поливу під об'єктами:",
3
8
  "Add cistern pump as priority pump": "Додайте цистерну як пріоритетну",
4
9
  "Additional irrigation in case of high evaporation": "Додатковий полив при сильному випаровуванні",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Примірник Pushover",
62
67
  "Rain forecast - path": "Прогноз дощу - шлях",
63
68
  "Saturday": "Субота",
69
+ "Second start time": "Другий час старту",
64
70
  "Select": "Виберіть",
65
71
  "Select the weather forecast instance": "Виберіть екземпляр прогнозу погоди",
66
72
  "Selection of notification": "Вибір повідомлення",
73
+ "Selection of start time": "Вибір часу початку",
67
74
  "Selection of watering days in the week": "Вибір днів поливу в тижні",
68
75
  "Sensor in the greenhouse": "Датчик в теплиці",
69
76
  "Settings for Pump": "Налаштування насоса",
package/admin/i18n/zh-cn/translations.json CHANGED
@@ -1,4 +1,9 @@
1
1
  {
2
+ "1. Start time": "1.开始时间",
3
+ "1. Start time (including holiday and weekend schedule)": "1. 开始时间（含节假日及周末时间表）",
4
+ "1. Start time including holiday and weekend schedule": "1.开始时间包括节假日和周末时间表",
5
+ "2. Start time": "2. 开始时间",
6
+ "2. Start time (selection in the individual valve settings)": "2. 启动时间（在各个阀门设置中选择）",
2
7
  "Activation of additional watering under objects:": "目标下增加水的行为:",
3
8
  "Add cistern pump as priority pump": "添加水箱泵作为优先泵",
4
9
  "Additional irrigation in case of high evaporation": "在高蒸气的情况下,更多的灌溉",
@@ -61,9 +66,11 @@
61
66
  "Pushover instance": "Pushover实例",
62
67
  "Rain forecast - path": "降雨预报 - 路径",
63
68
  "Saturday": "周六",
69
+ "Second start time": "第二次开始时间",
64
70
  "Select": "选择",
65
71
  "Select the weather forecast instance": "选择天气预报实例",
66
72
  "Selection of notification": "选择通知",
73
+ "Selection of start time": "选择开始时间",
67
74
  "Selection of watering days in the week": "一周内浇水天数的选择",
68
75
  "Sensor in the greenhouse": "温室中的传感器",
69
76
  "Settings for Pump": "泵的设置",
package/admin/index_m.html CHANGED
@@ -77,31 +77,32 @@
77
77
  <th data-buttons="edit copy up down delete" style="width: 120px; background: #174475"></th>
78
78
  <!-- **************************************** *** only for temp states *** **************************************** -->
79
79
  <th data-name="triggerID" id="events_col_5" data-type="text" style="width: 0; background: #174475" class="translate"></th>
80
- <th data-name="wateringTime" id="events_col_6" data-type="number" style="width: 0" class="translate"></th>
81
- <th data-name="wateringAdd" id="events_col_7" data-type="number" style="width: 0" class="translate"></th>
82
- <th data-name="wateringIntervalOff" id="events_col_8" data-type="number" style="width: 0" class="translate"></th>
83
- <th data-name="wateringIntervalOn" id="events_col_9" data-type="number" style="width: 0" class="translate"></th>
84
- <th data-name="addWateringTime" id="events_col_10" data-type="number" style="width: 0" class="translate"></th>
85
- <th data-name="addTriggersIrrigation" id="events_col_11" data-type="number" style="width: 0" class="translate"></th>
86
- <th data-name="maxSoilMoistureIrrigation" id="events_col_12" data-type="number" style="width: 0" class="translate"></th>
87
- <th data-name="maxSoilMoistureRainPct" id="events_col_13" data-type="number" style="width: 0" class="translate"></th>
88
- <th data-name="triggersIrrigation" id="events_col_14" data-type="number" style="width: 0" class="translate"></th>
89
- <th data-name="pipeFlow" id="events_col_15" data-type="number" style="width: 0" class="translate"></th>
90
- <th data-name="booster" id="events_col_16" data-type="checkbox" style="width: 0" class="translate"></th>
91
- <th data-name="endIrrigation" id="events_col_17" data-type="checkbox" style="width: 0" class="translate"></th>
92
- <th data-name="methodControlSM" id="events_col_18" data-type="text" style="width: 0" class="translate"></th>
93
- <th data-name="inGreenhouse" id="events_col_19" data-type="checkbox" style="width: 0" class="translate"></th>
94
- <th data-name="triggerSM" id="events_col_20" data-type="text" style="width: 0" class="translate"></th>
95
- <th data-name="analogZPct" id="events_col_21" data-type="number" style="width: 0" class="translate"></th>
96
- <th data-name="analogOHPct" id="events_col_22" data-type="number" style="width: 0" class="translate"></th>
97
- <th data-name="startDay" id="events_col_23" data-type="text" style="width: 0" class="translate"></th>
98
- <th data-name="sun" id="events_col_24" data-type="checkbox" style="width: 0" class="translate"></th>
99
- <th data-name="mon" id="events_col_25" data-type="checkbox" style="width: 0" class="translate"></th>
100
- <th data-name="tue" id="events_col_26" data-type="checkbox" style="width: 0" class="translate"></th>
101
- <th data-name="wed" id="events_col_27" data-type="checkbox" style="width: 0" class="translate"></th>
102
- <th data-name="thur" id="events_col_28" data-type="checkbox" style="width: 0" class="translate"></th>
103
- <th data-name="fri" id="events_col_29" data-type="checkbox" style="width: 0" class="translate"></th>
104
- <th data-name="sat" id="events_col_30" data-type="checkbox" style="width: 0" class="translate"></th>
80
+ <th data-name="startTimeSelection" id="events_col_6" data-type="text" style="width: 0" class="translate"></th>
81
+ <th data-name="wateringTime" id="events_col_7" data-type="number" style="width: 0" class="translate"></th>
82
+ <th data-name="wateringAdd" id="events_col_8" data-type="number" style="width: 0" class="translate"></th>
83
+ <th data-name="wateringIntervalOff" id="events_col_9" data-type="number" style="width: 0" class="translate"></th>
84
+ <th data-name="wateringIntervalOn" id="events_col_10" data-type="number" style="width: 0" class="translate"></th>
85
+ <th data-name="addWateringTime" id="events_col_11" data-type="number" style="width: 0" class="translate"></th>
86
+ <th data-name="addTriggersIrrigation" id="events_col_12" data-type="number" style="width: 0" class="translate"></th>
87
+ <th data-name="maxSoilMoistureIrrigation" id="events_col_13" data-type="number" style="width: 0" class="translate"></th>
88
+ <th data-name="maxSoilMoistureRainPct" id="events_col_14" data-type="number" style="width: 0" class="translate"></th>
89
+ <th data-name="triggersIrrigation" id="events_col_15" data-type="number" style="width: 0" class="translate"></th>
90
+ <th data-name="pipeFlow" id="events_col_16" data-type="number" style="width: 0" class="translate"></th>
91
+ <th data-name="booster" id="events_col_17" data-type="checkbox" style="width: 0" class="translate"></th>
92
+ <th data-name="endIrrigation" id="events_col_18" data-type="checkbox" style="width: 0" class="translate"></th>
93
+ <th data-name="methodControlSM" id="events_col_19" data-type="text" style="width: 0" class="translate"></th>
94
+ <th data-name="inGreenhouse" id="events_col_20" data-type="checkbox" style="width: 0" class="translate"></th>
95
+ <th data-name="triggerSM" id="events_col_21" data-type="text" style="width: 0" class="translate"></th>
96
+ <th data-name="analogZPct" id="events_col_22" data-type="number" style="width: 0" class="translate"></th>
97
+ <th data-name="analogOHPct" id="events_col_23" data-type="number" style="width: 0" class="translate"></th>
98
+ <th data-name="startDay" id="events_col_24" data-type="text" style="width: 0" class="translate"></th>
99
+ <th data-name="sun" id="events_col_25" data-type="checkbox" style="width: 0" class="translate"></th>
100
+ <th data-name="mon" id="events_col_26" data-type="checkbox" style="width: 0" class="translate"></th>
101
+ <th data-name="tue" id="events_col_27" data-type="checkbox" style="width: 0" class="translate"></th>
102
+ <th data-name="wed" id="events_col_28" data-type="checkbox" style="width: 0" class="translate"></th>
103
+ <th data-name="thur" id="events_col_29" data-type="checkbox" style="width: 0" class="translate"></th>
104
+ <th data-name="fri" id="events_col_30" data-type="checkbox" style="width: 0" class="translate"></th>
105
+ <th data-name="sat" id="events_col_31" data-type="checkbox" style="width: 0" class="translate"></th>
105
106
  <!-- **************************************** *** ******************** *** **************************************** -->
106
107
  </tr>
107
108
  </thead>
@@ -223,7 +224,7 @@
223
224
  <!-- StartTime settings -->
224
225
  <li>
225
226
  <div class="collapsible-header">
226
- <i class="material-icons">expand_more</i><h6 class="translate">Start time</h6>
227
+ <i class="material-icons">expand_more</i><h6 class="translate">1. Start time (including holiday and weekend schedule)</h6>
227
228
  </div>
228
229
  <div class="collapsible-body">
229
230
  <div class="row">
@@ -250,7 +251,44 @@
250
251
  <span class="translate">Start time in the week</span>
251
252
  </div>
252
253
  </div>
254
+ <div class="row">
255
+ <div class="input-field col s12 m12 l12">
256
+ <input type="checkbox" class="value" id="publicWeekend" />
257
+ <span for="publicWeekend" class="translate">different start time on weekends</span>
258
+ </div>
259
+ <div class="input-field col s12 m4 l2 publicWeek">
260
+ <input type="text" class="timepicker value" id="weekEndLiving" />
261
+ <label for="weekEndLiving" class="translate"></label>
262
+ <span class="translate">Start time at the weekend</span>
263
+ </div>
264
+ </div>
265
+ <div class="row">
266
+ <div class="input-field col s12 m12 l12 publicWeekHol">
267
+ <input type="checkbox" class="value" id="publicHolidays" />
268
+ <span for="publicHolidays" class="translate">Start time of public holidays as on weekends</span>
269
+ </div>
270
+ <div class="input-field col s12 m4 l2 publicHol">
271
+ <select id="publicHolInstance" class="value"></select>
272
+ <label for="publicHolInstance" class="translate"></label>
273
+ <span class="translate">public holidays Instance</span>
274
+ </div>
275
+ </div>
276
+ </div>
277
+ </li>
278
+ <!-- 2. Start time (selection in the individual valve settings) -->
279
+ <li>
280
+ <div class="collapsible-header">
281
+ <i class="material-icons">expand_more</i><h6 class="translate">2. Start time (selection in the individual valve settings)</h6>
253
282
  </div>
283
+ <div class="collapsible-body">
284
+ <div class="row">
285
+ <div class="input-field col s12 m4 l2">
286
+ <input type="text" class="timepicker value" id="secondStartTime" />
287
+ <label for="secondStartTime" class="translate"></label>
288
+ <span class="translate">Second start time</span>
289
+ </div>
290
+ </div>
291
+ </div>
254
292
  </li>
255
293
  <!-- Additional start time -->
256
294
  <li>
@@ -298,36 +336,6 @@
298
336
  </div>
299
337
  </div>
300
338
  </li>
301
- <!-- Weekend & Public holiday start time -->
302
- <li>
303
- <div class="collapsible-header">
304
- <i class="material-icons">expand_more</i><h6 class="translate">Weekend start time</h6>
305
- </div>
306
- <div class="collapsible-body">
307
- <div class="row">
308
- <div class="input-field col s12 m12 l12">
309
- <input type="checkbox" class="value" id="publicWeekend" />
310
- <span for="publicWeekend" class="translate">different start time on weekends</span>
311
- </div>
312
- <div class="input-field col s12 m4 l2 publicWeek">
313
- <input type="text" class="timepicker value" id="weekEndLiving" />
314
- <label for="weekEndLiving" class="translate"></label>
315
- <span class="translate">Start time at the weekend</span>
316
- </div>
317
- </div>
318
- <div class="row">
319
- <div class="input-field col s12 m12 l12 publicWeekHol">
320
- <input type="checkbox" class="value" id="publicHolidays" />
321
- <span for="publicHolidays" class="translate">Start time of public holidays as on weekends</span>
322
- </div>
323
- <div class="input-field col s12 m4 l2 publicHol">
324
- <select id="publicHolInstance" class="value"></select>
325
- <label for="publicHolInstance" class="translate"></label>
326
- <span class="translate">public holidays Instance</span>
327
- </div>
328
- </div>
329
- </div>
330
- </li>
331
339
  <!-- Time-based irrigation restriction -->
332
340
  <li>
333
341
  <div class="collapsible-header">
@@ -822,6 +830,16 @@
822
830
  <h6 class="translate title" style="background-color:#174475;">Irrigation settings</h6>
823
831
  </div>
824
832
  </div>
833
+ <div class="row">
834
+ <div class="input-field col s12 m4">
835
+ <select type="combobox" class="value" id="startTimeSelection">
836
+ <option value="firstStartTime" class="translate">1. Start time (including holiday and weekend schedule)</option>
837
+ <option value="secondStartTime" class="translate">2. Start time</option>
838
+ </select>
839
+ <label for="startTimeSelection" class="translate"></label>
840
+ <span class="translate">Selection of start time</span>
841
+ </div>
842
+ </div>
825
843
  <div class="row">
826
844
  <div class="col s12 l3 input-field">
827
845
  <input type="number" class="form-control" id="wateringTime" min=5 max=90 />
package/admin/index_m.js CHANGED
@@ -54,6 +54,7 @@ function load(settings, onChange) {
54
54
  }
55
55
  setTimeout(function () {
56
56
  $('#events .values-input[data-name="enabled"][data-index="' + id + '"]').prop('checked', true);
57
+ $('#events .values-input[data-name="startTimeSelection"][data-index="' + id + '"]').val('firstStartTime').trigger('change');
57
58
  $('#events .values-input[data-name="wateringTime"][data-index="' + id + '"]').val('20').trigger('change');
58
59
  $('#events .values-input[data-name="wateringAdd"][data-index="' + id + '"]').val('200').trigger('change');
59
60
  $('#events .values-input[data-name="wateringIntervalOff"][data-index="' + id + '"]').val('0').trigger('change');
@@ -65,12 +66,10 @@ function load(settings, onChange) {
65
66
  $('#events .values-input[data-name="triggersIrrigation"][data-index="' + id + '"]').val('50').trigger('change');
66
67
  $('#events .values-input[data-name="pipeFlow"][data-index="' + id + '"]').val('700').trigger('change');
67
68
  $('#events .values-input[data-name="methodControlSM"][data-index="' + id + '"]').val('calculation').trigger('change');
68
- //$('#events .values-input[data-name="methodControlSM"][data-index="' + id + '"]').select().trigger('change'); // select() > val
69
- //$('#events .values-input[data-name="triggerSM"][data-index="' + id + '"]').val().trigger('change');
69
+ $('#events .values-input[data-name="triggerSM"][data-index="' + id + '"]').val('').trigger('change');
70
70
  $('#events .values-input[data-name="analogZPct"][data-index="' + id + '"]').val('0').trigger('change');
71
71
  $('#events .values-input[data-name="analogOHPct"][data-index="' + id + '"]').val('100').trigger('change');
72
72
  $('#events .values-input[data-name="startDay"][data-index="' + id + '"]').val('threeRd').trigger('change');
73
- //$('#events .values-input[data-name="startDay"][data-index="' + id + '"]').select().trigger('change');
74
73
  // boolean
75
74
  $('#events .values-input[data-name="booster"][data-index="' + id + '"]').prop('checked', false);
76
75
  $('#events .values-input[data-name="endIrrigation"][data-index="' + id + '"]').prop('checked', true);
@@ -359,6 +358,8 @@ function tableOnReady() {
359
358
  $('#events .table-values-div .table-values .values-buttons[data-command="edit"]').on('click', function () {
360
359
  const id = $(this).data('index');
361
360
  $('#triggerID').val($('#events .values-input[data-name="triggerID"][data-index="' + id + '"]').val());
361
+ $('#startTimeSelection').val($('#events .values-input[data-name="startTimeSelection"][data-index="' + id + '"]').val());
362
+ $('#startTimeSelection').select().trigger('change');
362
363
  $('#wateringTime').val($('#events .values-input[data-name="wateringTime"][data-index="' + id + '"]').val());
363
364
  $('#wateringAdd').val($('#events .values-input[data-name="wateringAdd"][data-index="' + id + '"]').val());
364
365
  $('#wateringIntervalOff').val($('#events .values-input[data-name="wateringIntervalOff"][data-index="' + id + '"]').val());
@@ -393,6 +394,7 @@ function tableOnReady() {
393
394
  setTimeout(function () {
394
395
  initDialogSprinkle(function (sid) {
395
396
  const newTriggerID = $('#triggerID').val();
397
+ const newStartTimeSelection = $('#startTimeSelection').val();
396
398
  const newWateringTime = $('#wateringTime').val();
397
399
  const newWateringAdd = $('#wateringAdd').val();
398
400
  const newWateringIntervalOff = $('#wateringIntervalOff').val();
@@ -421,6 +423,7 @@ function tableOnReady() {
421
423
  const newSat = $('#sat').prop('checked');
422
424
 
423
425
  $('#events .values-input[data-name="triggerID"][data-index="' + id + '"]').val(newTriggerID).trigger('change');
426
+ $('#events .values-input[data-name="startTimeSelection"][data-index="' + id + '"]').val(newStartTimeSelection).trigger('change');
424
427
  $('#events .values-input[data-name="wateringTime"][data-index="' + id + '"]').val(newWateringTime).trigger('change');
425
428
  $('#events .values-input[data-name="wateringAdd"][data-index="' + id + '"]').val(newWateringAdd).trigger('change');
426
429
  $('#events .values-input[data-name="wateringIntervalOff"][data-index="' + id + '"]').val(newWateringIntervalOff).trigger('change');
@@ -493,6 +496,7 @@ function showHideSettings() {
493
496
  * @type {boolean}
494
497
  */
495
498
  let selAddStartTime = false;
499
+ let mWeatherForecast = false;
496
500
 
497
501
  // Zeiteinstellungen => Feiertagseinstellung sichtbar bei combobox
498
502
  $('#wateringStartTime').on('change', function () {
@@ -587,14 +591,17 @@ function showHideSettings() {
587
591
  // individuelle Wettervorhersage
588
592
  $('#weatherForecastService').on('change', function () {
589
593
  if ($(this).val() === 'noWeatherData') {
594
+ mWeatherForecast = false;
590
595
  $('.showOwnDataPoint').hide();
591
596
  $('.showDasWetter').hide();
592
597
  $('.showThresholdRain').hide();
593
598
  } else if ($(this).val() === 'ownDataPoint') {
599
+ mWeatherForecast = true;
594
600
  $('.showOwnDataPoint').show();
595
601
  $('.showDasWetter').hide();
596
602
  $('.showThresholdRain').show();
597
603
  } else if ($(this).val() === 'dasWetter') {
604
+ mWeatherForecast = true;
598
605
  $('.showOwnDataPoint').hide();
599
606
  $('.showDasWetter').show();
600
607
  $('.showThresholdRain').show();
package/admin/words.js CHANGED
@@ -8,6 +8,11 @@
8
8
  'use strict';
9
9
 
10
10
  systemDictionary = {
11
+ "1. Start time": { "en": "", "de": "1. Startzeit", "ru": "1. Время начала", "pt": "1. Hora de início", "nl": "1. Begintijd", "fr": "1. Heure de début", "it": "1. Ora di inizio", "es": "1. Hora de inicio", "pl": "1. Czas rozpoczęcia", "uk": "1. Час початку", "zh-cn": "1.开始时间"},
12
+ "1. Start time (including holiday and weekend schedule)": {"en": "1. Start time (including holiday and weekend schedule)", "de": "1. Startzeit (einschließlich Feiertags- und Wochenendplan)", "ru": "1. Время начала (включая график праздников и выходных)", "pt": "1. Horário de início (incluindo feriados e fins de semana)", "nl": "1. Starttijd (inclusief vakantie- en weekendrooster)", "fr": "1. Heure de début (y compris les horaires des jours fériés et du week-end)", "it": "1. Ora di inizio (incluso il programma festivo e del fine settimana)", "es": "1. Hora de inicio (incluido el calendario de días festivos y fines de semana)", "pl": "1. Godzina rozpoczęcia (w tym harmonogram świąteczny i weekendowy)", "uk": "1. Час початку (включаючи розклад святкових і вихідних днів)", "zh-cn": "1. 开始时间（含节假日及周末时间表）"},
13
+ "1. Start time including holiday and weekend schedule": {"en": "", "de": "1. Startzeit einschließlich Feiertags- und Wochenendplan", "ru": "1. Время начала, включая график праздников и выходных.", "pt": "1. Horário de início, incluindo feriados e fins de semana", "nl": "1. Starttijd inclusief vakantie- en weekendrooster", "fr": "1. Heure de début, y compris les horaires des jours fériés et du week-end", "it": "1. Ora di inizio compreso il programma festivo e del fine settimana", "es": "1. Hora de inicio, incluido el calendario de días festivos y fines de semana.", "pl": "1. Godzina rozpoczęcia uwzględniająca harmonogram wakacji i weekendów", "uk": "1. Час початку, включаючи розклад святкових і вихідних днів", "zh-cn": "1.开始时间包括节假日和周末时间表"},
14
+ "2. Start time": { "en": "2. Start time", "de": "2. Startzeit", "ru": "2. Время начала", "pt": "2. Hora de início", "nl": "2. Begintijd", "fr": "2. Heure de début", "it": "2. Ora di inizio", "es": "2. Hora de inicio", "pl": "2. Czas rozpoczęcia", "uk": "2. Час початку", "zh-cn": "2. 开始时间"},
15
+ "2. Start time (selection in the individual valve settings)": {"en": "2. Start time (selection in the individual valve settings)", "de": "2. Startzeit (Auswahl in den einzelnen Ventileinstellungen)", "ru": "2. Время запуска (выбор в индивидуальных настройках клапана)", "pt": "2. Hora de início (seleção nas configurações individuais da válvula)", "nl": "2. Starttijd (selectie in de individuele klepinstellingen)", "fr": "2. Heure de démarrage (sélection dans les réglages individuels des vannes)", "it": "2. Orario di inizio (selezione nelle impostazioni della singola valvola)", "es": "2. Hora de inicio (selección en los ajustes individuales de las válvulas)", "pl": "2. Czas startu (wybór w indywidualnych ustawieniach zaworu)", "uk": "2. Час початку (вибір в індивідуальних налаштуваннях клапана)", "zh-cn": "2. 启动时间（在各个阀门设置中选择）"},
11
16
  "Activation of additional watering under objects:": {"en": "Activation of additional watering under objects:", "de": "Aktivierung einer zusätzlichen Bewässerung unter Objekten:", "ru": "Активация дополнительного полива под объектами:", "pt": "Ativação de rega adicional sob objetos:", "nl": "Activatie van extra water onder objecten:", "fr": "Activation d'arrosage supplémentaire sous les objets:", "it": "Attivazione di ulteriori innaffiature sotto oggetti:", "es": "Activación de riego adicional bajo objetos:", "pl": "Aktywacja dodatkowej wody pod obiektami", "uk": "Активація додаткового поливу під об'єктами:", "zh-cn": "目标下增加水的行为:"},
12
17
  "Add cistern pump as priority pump": { "en": "Add cistern pump as priority pump", "de": "Zisternenpumpe als Prioritätspumpe hinzufügen", "ru": "Добавьте насос цистерны в качестве приоритетного насоса", "pt": "Adicione a bomba de cisterna como bomba prioritária", "nl": "Stortbakpomp toevoegen als prioriteitspomp", "fr": "Ajouter une pompe citerne comme pompe prioritaire", "it": "Aggiungere la pompa della cisterna come pompa prioritaria", "es": "Agregar bomba de cisterna como bomba prioritaria", "pl": "Dodaj pompę cysterny jako pompę priorytetową", "uk": "Додайте цистерну як пріоритетну", "zh-cn": "添加水箱泵作为优先泵"},
13
18
  "Additional irrigation in case of high evaporation": {"en": "Additional irrigation in case of high evaporation", "de": "Zusätzliche Bewässerung bei hoher Verdunstung", "ru": "Дополнительное орошение в случае высокой испарения", "pt": "Irrigação adicional em caso de alta evaporação", "nl": "Additionele irrigatie in geval van hoge verdamping", "fr": "Irrigation supplémentaire en cas d'évaporation élevée", "it": "Irrigazione aggiuntiva in caso di elevata evaporazione", "es": "Riego adicional en caso de alta evaporación", "pl": "Dodatkowe irygacje w przypadku wysokich parowania", "uk": "Додатковий полив при сильному випаровуванні", "zh-cn": "在高蒸气的情况下,更多的灌溉"},
@@ -70,9 +75,11 @@ systemDictionary = {
70
75
  "Pushover instance": { "en": "Pushover instance", "de": "Pushover-Instanz", "ru": "Экземпляр Pushover", "pt": "Instância pushover", "nl": "Pushover-instantie", "fr": "Instance pushover", "it": "Istanza di pushover", "es": "Instancia de empuje", "pl": "Instancja pushover", "uk": "Примірник Pushover", "zh-cn": "Pushover实例"},
71
76
  "Rain forecast - path": { "en": "Rain forecast - path", "de": "Regenvorhersage - Pfad", "ru": "Прогноз дождя - путь", "pt": "Previsão de chuva - caminho", "nl": "Regenvoorspelling - pad", "fr": "Prévision de pluie - chemin", "it": "Previsioni pioggia - percorso", "es": "Pronóstico de lluvia - trayectoria", "pl": "Prognoza opadów - ścieżka", "uk": "Прогноз дощу - шлях", "zh-cn": "降雨预报 - 路径"},
72
77
  "Saturday": { "en": "Saturday", "de": "Samstag", "ru": "Суббота", "pt": "sábado", "nl": "zaterdag", "fr": "samedi", "it": "Sabato", "es": "sábado", "pl": "sobota", "uk": "Субота", "zh-cn": "周六"},
78
+ "Second start time": { "en": "Second start time", "de": "Zweite Startzeit", "ru": "Второе время начала", "pt": "Segunda hora de início", "nl": "Tweede starttijd", "fr": "Deuxième heure de départ", "it": "Seconda ora di inizio", "es": "Segunda hora de inicio", "pl": "Drugi czas rozpoczęcia", "uk": "Другий час старту", "zh-cn": "第二次开始时间"},
73
79
  "Select": { "en": "Select", "de": "Wählen", "ru": "Выбрать", "pt": "Selecione", "nl": "Selecteer", "fr": "Sélectionner", "it": "Selezionare", "es": "Seleccione", "pl": "Wybierz", "uk": "Виберіть", "zh-cn": "选择"},
74
80
  "Select the weather forecast instance": { "en": "Select the weather forecast instance", "de": "Wählen Sie die Wettervorhersageinstanz aus", "ru": "Выберите экземпляр прогноза погоды", "pt": "Selecione a instância de previsão do tempo", "nl": "Selecteer de weersvoorspelling", "fr": "Sélectionnez l'instance de prévision météo", "it": "Seleziona l'istanza delle previsioni del tempo", "es": "Seleccione la instancia de pronóstico del tiempo", "pl": "Wybierz instancję prognozy pogody", "uk": "Виберіть екземпляр прогнозу погоди", "zh-cn": "选择天气预报实例"},
75
81
  "Selection of notification": { "en": "Selection of notification", "de": "Auswahl der Benachrichtigung", "ru": "Выбор уведомления", "pt": "Seleção de notificação", "nl": "Selectie van melding", "fr": "Sélection de la notification", "it": "Selezione della notifica", "es": "Selección de notificación", "pl": "Wybór powiadomienia", "uk": "Вибір повідомлення", "zh-cn": "选择通知"},
82
+ "Selection of start time": { "en": "Selection of start time", "de": "Auswahl der Startzeit", "ru": "Выбор времени начала", "pt": "Seleção do horário de início", "nl": "Selectie van starttijd", "fr": "Sélection de l'heure de début", "it": "Selezione dell'ora di inizio", "es": "Selección de hora de inicio.", "pl": "Wybór czasu rozpoczęcia", "uk": "Вибір часу початку", "zh-cn": "选择开始时间"},
76
83
  "Selection of watering days in the week": { "en": "Selection of watering days in the week", "de": "Auswahl der Bewässerungstage in der Woche", "ru": "Выбор дней полива на неделе", "pt": "Seleção de dias de rega na semana", "nl": "Selectie van besproeiingsdagen in de week", "fr": "Sélection des jours d'arrosage dans la semaine", "it": "Selezione dei giorni irrigui nella settimana", "es": "Selección de días de riego en la semana.", "pl": "Wybór dni nawadniania w tygodniu", "uk": "Вибір днів поливу в тижні", "zh-cn": "一周内浇水天数的选择"},
77
84
  "Sensor in the greenhouse": { "en": "Sensor in the greenhouse", "de": "Sensor im Gewächshaus", "ru": "Датчик в теплице", "pt": "Sensor na estufa", "nl": "Sensor in de kas", "fr": "Capteur dans la serre", "it": "Sensore in serra", "es": "Sensor en invernadero", "pl": "Czujnik w szklarni", "uk": "Датчик в теплиці", "zh-cn": "温室中的传感器"},
78
85
  "Settings for Pump": { "en": "Settings for Pump", "de": "Einstellungen für Pumpe", "ru": "Настройки для насоса", "pt": "Configurações para a bomba", "nl": "Instellingen voor pomp", "fr": "Paramètres de la pompe", "it": "Impostazioni per Pump", "es": "Configuraciones para la bomba", "pl": "Ustawienia dla pompy", "uk": "Налаштування насоса", "zh-cn": "泵的设置"},