Merge pull request #1811 from MichaelDvP/dev

Make remote timeout editable #1774, dev-16

interface/src/i18n/de/index.ts

@@ -120,7 +120,10 @@ const de: Translation = {
   BYPASS_TOKEN: 'Zugriffstoken-Autorisierung bei API-Aufrufen umgehen',
   READONLY: 'Nur-Lese-Modus aktivieren (blockiert alle ausgehenden EMS Tx Write-Befehle)',
   UNDERCLOCK_CPU: 'CPU-Geschwindigkeit untertakten',
+  REMOTE_TIMEOUT: 'Timeout',
+  REMOTE_TIMEOUT_EN: 'Deaktitiere Remote bei fehender Temperatur',
   HEATINGOFF: 'Heizen ausschalten beim EMS-ESP Start',
+  MIN_DURATION: 'Dauer bis die Dusche erkannt wrid',
   ENABLE_SHOWER_TIMER: 'Duschtimer aktivieren',
   ENABLE_SHOWER_ALERT: 'Duschalarm aktivieren',
   TRIGGER_TIME: 'Auslösezeit',

interface/src/i18n/en/index.ts

@@ -120,7 +120,10 @@ const en: Translation = {
   BYPASS_TOKEN: 'Bypass Access Token authorization on API calls',
   READONLY: 'Enable read-only mode (blocks all outgoing EMS Tx Write commands)',
   UNDERCLOCK_CPU: 'Underclock CPU speed',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
   HEATINGOFF: 'Start boiler with forced heating off',
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Enable Shower Timer',
   ENABLE_SHOWER_ALERT: 'Enable Shower Alert',
   TRIGGER_TIME: 'Trigger Time',

interface/src/i18n/fr/index.ts

@@ -121,6 +121,9 @@ const fr: Translation = {
   READONLY: 'Activer le mode lecture uniquement (bloque toutes les commandes EMS sortantes en écriture Tx)',
   UNDERCLOCK_CPU: 'Underclock du CPU',
   HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Activer la minuterie de la douche',
   ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche',
   TRIGGER_TIME: 'Durée avant déclenchement',

interface/src/i18n/it/index.ts

@@ -120,7 +120,10 @@ const it: Translation = {
   BYPASS_TOKEN: 'Ignora autorizzazione del token di accesso sulle chiamate API',
   READONLY: 'Abilita modalità sola-lettura (blocca tutti i comandi di scrittura EMS Tx in uscita)',
   UNDERCLOCK_CPU: 'Abbassa velocità della CPU',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
   HEATINGOFF: 'Avviamento caldaia con riscaldamento forzato spento',
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Abilita timer doccia',
   ENABLE_SHOWER_ALERT: 'Abilita avviso doccia',
   TRIGGER_TIME: 'Tempo di avvio',

interface/src/i18n/nl/index.ts

@@ -120,7 +120,10 @@ const nl: Translation = {
   BYPASS_TOKEN: 'API Access Token authenticatie uitschakelen',
   READONLY: 'Activeer read-only modus (blokkeert alle outgaande EMS Tx schrijf commandos)',
   UNDERCLOCK_CPU: 'Underclock CPU snelheid',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
   HEATINGOFF: 'Start ketel met geforceerde verwarming uit',
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)',
   ENABLE_SHOWER_ALERT: 'Activeer Douchemelding',
   TRIGGER_TIME: 'Trigger tijd',

interface/src/i18n/no/index.ts

@@ -120,7 +120,10 @@ const no: Translation = {
   BYPASS_TOKEN: 'Utelat Aksess Token authorisering av API kall',
   READONLY: 'Aktiver read-only modus (blokker all EMS Tx Skriving)',
   UNDERCLOCK_CPU: 'Underklokking av prosessorhastighet',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature',
   HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Aktiver Dusjtimer',
   ENABLE_SHOWER_ALERT: 'Aktiver Dusj-varsling',
   TRIGGER_TIME: 'Aktiveringstid',

interface/src/i18n/pl/index.ts

@@ -120,7 +120,10 @@ const pl: BaseTranslation = {
   BYPASS_TOKEN: 'Pomiń autoryzację tokenem w wywołaniach API',
   READONLY: 'Tryb pracy "tylko do odczytu" (blokuje wszystkie komendy zapisu na magistralę EMS)',
   UNDERCLOCK_CPU: 'Obniż taktowanie CPU',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature',
   HEATINGOFF: 'Uruchom kocioł z wymuszonym wyłączonym grzaniem',
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Aktywuj minutnik prysznica',
   ENABLE_SHOWER_ALERT: 'Aktywuj alarm prysznica',
   TRIGGER_TIME: 'Wyzwalaj po czasie',

interface/src/i18n/sk/index.ts

@@ -120,7 +120,10 @@ const sk: Translation = {
   BYPASS_TOKEN: 'Vynechajte autorizáciu prístupového tokenu pri volaniach API',
   READONLY: 'Povoliť režim len na čítanie (blokuje všetky odchádzajúce príkazy EMS Tx Write)',
   UNDERCLOCK_CPU: 'Podtaktovanie rýchlosti procesora',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
   HEATINGOFF: 'Spustiť kotol s vynúteným vykurovaním',
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Povoliť časovač sprchovania',
   ENABLE_SHOWER_ALERT: 'Povoliť upozornenie na sprchu',
   TRIGGER_TIME: 'Čas spustenia',

interface/src/i18n/sv/index.ts

@@ -120,7 +120,10 @@ const sv: Translation = {
   BYPASS_TOKEN: 'Inaktivera Token-autensiering för API-anrop',
   READONLY: 'Aktivera read-only (blockerar alla utgående skrivkommandon mot EMS-bussen)',
   UNDERCLOCK_CPU: 'Nedklocka Processorhastighet',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
   HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Aktivera Dusch-timer',
   ENABLE_SHOWER_ALERT: 'Aktivera Dusch-varning',
   TRIGGER_TIME: 'Aktiveringstid',

interface/src/i18n/tr/index.ts

@@ -120,7 +120,10 @@ const tr: Translation = {
   BYPASS_TOKEN: 'API bağlantılarında Erişim Jeton onaylamasını geç',
   READONLY: 'Salt okunur modu devreye al (bütün giden EMS Tx Yazma komutlarını engeller)',
   UNDERCLOCK_CPU: 'İşlemci hızını düşür',
+  REMOTE_TIMEOUT: 'Remote timeout',
+  REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
   HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
+  MIN_DURATION: 'Time for detection shower',
   ENABLE_SHOWER_TIMER: 'Duş Sayacını Devreye Al',
   ENABLE_SHOWER_ALERT: 'Duş Alarmını Devreye Al',
   TRIGGER_TIME: 'Tetikleme Zamanı',

interface/src/project/ApplicationSettings.tsx

@@ -507,6 +507,45 @@ const ApplicationSettings: FC = () => {
           label={LL.HEATINGOFF()}
           disabled={saving}
         />
+        <Grid
+          container
+          spacing={1}
+          direction="row"
+          justifyContent="flex-start"
+          alignItems="flex-start"
+        >
+          <Grid item xs={12} sm={6} md={4}>
+            <BlockFormControlLabel
+              control={
+                <Checkbox
+                  checked={data.remote_timeout_en}
+                  onChange={updateFormValue}
+                  name="remote_timeout_en"
+                />
+              }
+              label={LL.REMOTE_TIMEOUT_EN()}
+            />
+          </Grid>
+          {data.remote_timeout_en && (
+            <Grid item xs={12} sm={6} md={4}>
+              <ValidatedTextField
+                fieldErrors={fieldErrors}
+                name="remote_timeout"
+                label={LL.REMOTE_TIMEOUT()}
+                InputProps={{
+                  endAdornment: (
+                    <InputAdornment position="end">{LL.HOURS()}</InputAdornment>
+                  )
+                }}
+                fullWidth
+                variant="outlined"
+                value={numberValue(data.remote_timeout)}
+                type="number"
+                onChange={updateFormValue}
+              />
+            </Grid>
+          )}
+        </Grid>
         <Grid
           container
           spacing={0}
@@ -551,8 +590,7 @@ const ApplicationSettings: FC = () => {
               <ValidatedTextField
                 fieldErrors={fieldErrors}
                 name="shower_min_duration"
-                // TODO translate
-                label="Dp this"
+                  label={LL.MIN_DURATION()}
                 InputProps={{
                   endAdornment: (
                     <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>

interface/src/project/types.ts

@@ -8,6 +8,8 @@ export interface Settings {
   syslog_host: string;
   syslog_port: number;
   boiler_heatingoff: boolean;
+  remote_timeout_en: boolean;
+  remote_timeout: number;
   shower_timer: boolean;
   shower_alert: boolean;
   shower_alert_coldshot: number;

interface/src/project/validators.ts

@@ -261,6 +261,16 @@ export const createSettingsValidator = (settings: Settings) =>
           message: 'Time must be between 1 and 10 seconds'
         }
       ]
+    }),
+    ...(settings.remote_timeout_en && {
+      remote_timeout: [
+        {
+          type: 'number',
+          min: 1,
+          max: 240,
+          message: 'Timeout must be between 1 and 240 hours'
+        }
+      ]
     })
   });