Merge pull request #37 from walli545/dev

Release 2.0.0

Author: walli545

.eslintrc.js

@@ -42,6 +42,9 @@ module.exports = {
 		'@typescript-eslint/no-non-null-assertion': 'off', // This is necessary for Map.has()/get()!
 		'no-var': 'error',
 		'prefer-const': 'error',
+		"prettier/prettier": ["error", {
+			"endOfLine":"auto"
+		}],
 	},
 	overrides: [
 		{

.gitignore

@@ -17,4 +17,8 @@ coverage
 
 # i18n intermediate files
 admin/i18n/flat.txt
-admin/i18n/*/flat.txt
+admin/i18n/*/flat.txt
+
+# Upload scripts to dev env
+go_dev.sh
+go_dev_docker.sh

.travis.yml

@@ -5,7 +5,7 @@ os:
 
 language: node_js
 node_js:
-  - '8'
+  - 'node'
   - '10'
   - '12'
 
@@ -26,8 +26,11 @@ before_script:
   - 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm; fi'
   - npm -v
 script:
+  - npm run lint
   - npm run test:package
+  - nyc --reporter=lcov npm run test:ts
   - npm run test:unit
-  - npm run test:ts
   - export DEBUG=testing:*
   - npm run test:integration
+
+after_success: codecov

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 walli545 <walli5446@gmail.com>
+Copyright (c) 2020 walli545 <walli5446@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,51 +5,47 @@
 [![Downloads](https://img.shields.io/npm/dm/iobroker.time-switch.svg)](https://www.npmjs.com/package/iobroker.time-switch)
 [![Dependency Status](https://img.shields.io/david/walli545/iobroker.time-switch.svg)](https://david-dm.org/walli545/iobroker.time-switch)
 [![Known Vulnerabilities](https://snyk.io/test/github/walli545/ioBroker.time-switch/badge.svg)](https://snyk.io/test/github/walli545/ioBroker.time-switch)
+[![Travis-CI](http://img.shields.io/travis/walli545/ioBroker.time-switch/master.svg)](https://travis-ci.org/walli545/ioBroker.time-switch)
+[![codecov](https://codecov.io/gh/walli545/ioBroker.time-switch/branch/master/graph/badge.svg)](https://codecov.io/gh/walli545/ioBroker.time-switch)
 
 [![NPM](https://nodei.co/npm/iobroker.time-switch.png?downloads=true)](https://nodei.co/npm/iobroker.time-switch/)
 
-**Tests:**: [![Travis-CI](http://img.shields.io/travis/walli545/ioBroker.time-switch/master.svg)](https://travis-ci.org/walli545/ioBroker.time-switch)
 
 ## time-switch adapter for ioBroker
 
 This adapter allows the user to switch devices on and off using time schedules. 
 The schedules can be fully configured by a vis widget.
-One schedule switches one ioBroker state and consists of one or more actions that define when and how the state should be switched. 
-It is possible to configure at which time and on which weekdays the action should be triggered. There can be custom on/off values also.
+One schedule switches one or more ioBroker states and consists of one or more triggers that define when and how the state should be switched. 
+It is possible to configure at which time and on which weekdays the trigger should be triggered. There can be custom on/off values also.
 In the widget the schedule can be disabled temporarily and the switched state can be controlled manually.
 
 ![Preview](widgets/time-switch/img/prev/prev-device-schedule.jpg)
 
-## How to setup a schedule
+## Setup
 
-  1. Install the adapter and create an instance (one instance can handle many schedules) 
-  2. Go to the instance settings and click "Add schedule" to create a new schedule (one schedule can switch one ioBroker state).
-     
-     Keep the schedule OID of the newly created schedule in mind, we will need that later.
-  3. Now go to the vis editor and open the view where the schedule should be visible.
-     Create a new "Device-Schedule" widget and adjust it's size and position to fit your layout.
-  4. Now configure the widget with the following properties found under the "Common" attributes:
-   
-     - dataId: Open the select OID dialog and select the schedule OID that you remembered earlier. It can be found under "time-switch.0".
-     - stateId: Select the OID of the state that should be switched by the schedule, e.g. on/off status of a wall plug.
-     - onValue/offValue: Enter the values that represent the devices on/off state, e.g. 0/1, true/false, ON/OFF, ... .
-  5. Everything else can be configured in the view part of the widget.
-   
-     - Enable/Disable automatic switching
-     - Change the current value of the state
-     - Add/Delete/Edit actions
-     - Change the heading of the schedule plan
+For setup instructions visit the [wiki](https://github.com/walli545/ioBroker.time-switch/wiki) (German instructions available also).
 
 ## Possible features in the future
 
 - Translations for schedule widget
 - Astro actions (switch on sunrise, etc.)
 - Conditional actions
-- Switching for device groups
 - Switching of arbitrary values
 
 ## Changelog
 
+### 2.0.0
+**Attention**: Due to breaking changes in the schedule data structure, schedules created with versions 1.x are not compatible with 2.x.
+
+*Before upgrading, remove all schedules in the instance settings and remove widgets in vis.*
+* (walli545)
+    * Value type can now be configured, this enables switching of real booleans and numbers (#19)
+    * Added a new state for each schedule to disable/enable automatic switching (#24)
+    * Added option to hide current value switch in widget (#23)
+    * Switching of multiple states with one schedule. This allows the creation of groups for devices of the same type.
+    * Added translations to widget (#35)
+    * Fixed widget not working on Safari and fully browser
+
 ### 1.1.0
 * (walli545) 
     * New option to hide switched oid in widget (#20)
@@ -65,7 +61,7 @@ In the widget the schedule can be disabled temporarily and the switched state ca
 ## License
 MIT License
 
-Copyright (c) 2019 walli545 <walli5446@gmail.com>
+Copyright (c) 2020 walli545 <walli5446@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

admin/i18n/de/translations.json

@@ -0,0 +1,52 @@
+{
+    "Add On/Off schedule": "An/Aus Schaltplan hinzufügen",
+    "Friday": "Freitag",
+    "Monday": "Montag",
+    "Saturday": "Samstag",
+    "Sunday": "Sonntag",
+    "Thursday": "Donnerstag",
+    "Tuesday": "Dienstag",
+    "Wednesday": "Mittwoch",
+    "addTrigger": "Auslöser hinzufügen",
+    "allOff": "Alle aus",
+    "allOn": "Alle an",
+    "automaticSwitchingEnabled": "Automatisches Schalten aktiviert",
+    "boolean": "Wahrheitswert",
+    "cancelEdit": "Bearbeiten abbrechen",
+    "currentValue": "Aktueller Wert",
+    "dataId": "Id für Schaltplandaten",
+    "editName": "Namen bearbeiten",
+    "editTrigger": "Auslöser bearbeiten",
+    "enabled": "Aktiv",
+    "false": "nein",
+    "manualSwitching": "Manuelles Schalten",
+    "name": "Name",
+    "needToEnterValidNumberOff": "Geben Sie eine gültige Zahl als Aus-Wert ein, wenn Typ Zahl ist!",
+    "needToEnterValidNumberOn": "Geben Sie eine gültige Zahl für den An-Wert ein, wenn Typ Zahl ist!",
+    "needToEnterValidStringValue": "Ein-/Aus-Wert darf nicht leer sein, wenn der Typ Zeichenfolge ist!",
+    "needToSelectDataId": "Wählen Sie eine Schaltplandaten Id aus, um das Widget zu verwenden!",
+    "needToSelectStateId": "Wählen Sie mindestens eine geschaltete State Id aus, um das Widget zu verwenden!",
+    "needToSelectValidDataId": "Wählen Sie eine gültige Schaltplandaten Id (mit dem Muster 'time-switch.0.onoff.*.data')!",
+    "number": "Zahl",
+    "off": "aus",
+    "offValue": "Wert für aus",
+    "on": "an",
+    "onValue": "Wert für an",
+    "removeSchedule": "Zeitplan entfernen",
+    "removeTrigger": "Auslöser entfernen",
+    "saveChanges": "Änderungen speichern",
+    "saveName": "Name speichern",
+    "scheduleId": "Schaltplandaten Id",
+    "showId": "Anzeigen des geschaltenen States",
+    "showManualSwitch": "Anzeigen der manuellen Schalter",
+    "stateId": "Id vom geschaltenen State",
+    "statesCount": "Anzahl geschaltener States",
+    "string": "Zeichenkette",
+    "switchedType": "Geschaltener Datentyp",
+    "switchedValue": "Geschalteter Wert",
+    "time-switch adapter settings": "Adaptereinstellungen für time-switch",
+    "trigger": "Auslöser",
+    "trigger count": "Anzahl Auslöser",
+    "true": "ja",
+    "valueType": "Werttyp"
+}

admin/i18n/en/translations.json

@@ -0,0 +1,52 @@
+{
+    "Add On/Off schedule": "Add On/Off schedule",
+    "Friday": "Friday",
+    "Monday": "Monday",
+    "Saturday": "Saturday",
+    "Sunday": "Sunday",
+    "Thursday": "Thursday",
+    "Tuesday": "Tuesday",
+    "Wednesday": "Wednesday",
+    "addTrigger": "Add trigger",
+    "allOff": "All off",
+    "allOn": "All on",
+    "automaticSwitchingEnabled": "Automatic switching enabled",
+    "boolean": "boolean",
+    "cancelEdit": "Cancel edit",
+    "currentValue": "Current value",
+    "dataId": "Schedule data id",
+    "editName": "Edit name",
+    "editTrigger": "Edit trigger",
+    "enabled": "Enabled",
+    "false": "false",
+    "manualSwitching": "Manual switching",
+    "name": "Name",
+    "needToEnterValidNumberOff": "Enter a valid number for switched off value when type is number!",
+    "needToEnterValidNumberOn": "Enter a valid number for switched on value when type is number!",
+    "needToEnterValidStringValue": "On/Offvalue cannot be empty when type is string!",
+    "needToSelectDataId": "Select a schedule data id to use the widget!",
+    "needToSelectStateId": "Select at least one switched state id to use the widget!",
+    "needToSelectValidDataId": "Select a valid schedule data id (with pattern 'time-switch.0.onoff.*.data')!",
+    "number": "number",
+    "off": "Off",
+    "offValue": "Value for off",
+    "on": "On",
+    "onValue": "Value for on",
+    "removeSchedule": "Remove schedule",
+    "removeTrigger": "Remove trigger",
+    "saveChanges": "Save changes",
+    "saveName": "Save name",
+    "scheduleId": "Schedule data id",
+    "showId": "Show switched state id",
+    "showManualSwitch": "Show manual switch",
+    "stateId": "Switched state id",
+    "statesCount": "Count of switched states",
+    "string": "string",
+    "switchedType": "Switched type",
+    "switchedValue": "Switched value",
+    "time-switch adapter settings": "Adapter settings for time-switch",
+    "trigger": "Trigger",
+    "trigger count": "Trigger count",
+    "true": "true",
+    "valueType": "Value type"
+}

admin/i18n/es/translations.json

@@ -0,0 +1,52 @@
+{
+    "Add On/Off schedule": "Agregar horario de encendido / apagado",
+    "Friday": "viernes",
+    "Monday": "lunes",
+    "Saturday": "sábado",
+    "Sunday": "domingo",
+    "Thursday": "jueves",
+    "Tuesday": "martes",
+    "Wednesday": "miércoles",
+    "addTrigger": "Agregar disparador",
+    "allOff": "Todo apagado",
+    "allOn": "Todo en",
+    "automaticSwitchingEnabled": "Conmutación automática habilitada",
+    "boolean": "booleano",
+    "cancelEdit": "Cancelar edición",
+    "currentValue": "Valor actual",
+    "dataId": "Programar ID de datos",
+    "editName": "Editar nombre",
+    "editTrigger": "Editar disparador",
+    "enabled": "Habilitado",
+    "false": "falso",
+    "manualSwitching": "Cambio manual",
+    "name": "Nombre",
+    "needToEnterValidNumberOff": "¡Ingrese un número válido para el valor apagado cuando type es number!",
+    "needToEnterValidNumberOn": "¡Ingrese un número válido para el valor activado cuando type es number!",
+    "needToEnterValidStringValue": "On / Offvalue no puede estar vacío cuando type es string",
+    "needToSelectDataId": "¡Seleccione una identificación de datos de programación para usar el widget!",
+    "needToSelectStateId": "¡Seleccione al menos un ID de estado cambiado para usar el widget!",
+    "needToSelectValidDataId": "¡Seleccione una identificación de datos de programación válida (con el patrón 'time-switch.0.onoff. *. Data')!",
+    "number": "número",
+    "off": "Apagado",
+    "offValue": "Valor para apagado",
+    "on": "En",
+    "onValue": "Valor para en",
+    "removeSchedule": "Eliminar horario",
+    "removeTrigger": "Eliminar gatillo",
+    "saveChanges": "Guardar cambios",
+    "saveName": "Guardar nombre",
+    "scheduleId": "Programar ID de datos",
+    "showId": "Mostrar ID de estado cambiado",
+    "showManualSwitch": "Mostrar interruptor manual",
+    "stateId": "ID de estado conmutado",
+    "statesCount": "Conteo de estados conmutados",
+    "string": "cuerda",
+    "switchedType": "Tipo conmutado",
+    "switchedValue": "Valor conmutado",
+    "time-switch adapter settings": "Ajustes del adaptador para time-switch",
+    "trigger": "Desencadenar",
+    "trigger count": "Recuento de disparadores",
+    "true": "cierto",
+    "valueType": "Tipo de valor"
+}

admin/i18n/fr/translations.json

@@ -0,0 +1,52 @@
+{
+    "Add On/Off schedule": "Ajouter un programme On / Off",
+    "Friday": "Vendredi",
+    "Monday": "Lundi",
+    "Saturday": "samedi",
+    "Sunday": "dimanche",
+    "Thursday": "Jeudi",
+    "Tuesday": "Mardi",
+    "Wednesday": "Mercredi",
+    "addTrigger": "Ajouter un déclencheur",
+    "allOff": "Tout éteint",
+    "allOn": "Tout sur",
+    "automaticSwitchingEnabled": "Commutation automatique activée",
+    "boolean": "booléen",
+    "cancelEdit": "Annuler la modification",
+    "currentValue": "Valeur actuelle",
+    "dataId": "Planifier l'identifiant des données",
+    "editName": "Modifier le nom",
+    "editTrigger": "Modifier le déclencheur",
+    "enabled": "Activée",
+    "false": "faux",
+    "manualSwitching": "Commutation manuelle",
+    "name": "Nom",
+    "needToEnterValidNumberOff": "Entrez un nombre valide pour la valeur désactivée lorsque le type est un nombre!",
+    "needToEnterValidNumberOn": "Entrez un nombre valide pour la valeur activée lorsque le type est un nombre!",
+    "needToEnterValidStringValue": "La valeur On / Off ne peut pas être vide lorsque le type est une chaîne",
+    "needToSelectDataId": "Sélectionnez un identifiant de données de planification pour utiliser le widget!",
+    "needToSelectStateId": "Sélectionnez au moins un identifiant d'état commuté pour utiliser le widget!",
+    "needToSelectValidDataId": "Sélectionnez un identifiant de données de planification valide (avec le modèle 'time-switch.0.onoff. *. Data')!",
+    "number": "nombre",
+    "off": "De",
+    "offValue": "Valeur pour off",
+    "on": "Sur",
+    "onValue": "Valeur pour on",
+    "removeSchedule": "Supprimer le calendrier",
+    "removeTrigger": "Supprimer la gâchette",
+    "saveChanges": "Sauvegarder les modifications",
+    "saveName": "Enregistrer le nom",
+    "scheduleId": "Planifier l'identifiant des données",
+    "showId": "Afficher l'ID de l'état commuté",
+    "showManualSwitch": "Afficher le commutateur manuel",
+    "stateId": "Identifiant d'état commuté",
+    "statesCount": "Nombre d'états commutés",
+    "string": "chaîne",
+    "switchedType": "Type commuté",
+    "switchedValue": "Valeur commutée",
+    "time-switch adapter settings": "Paramètres d'adaptateur pour time-switch",
+    "trigger": "Déclencheur",
+    "trigger count": "Nombre de déclencheurs",
+    "true": "vrai",
+    "valueType": "Type de valeur"
+}