Calendar URLs could not be identified in remote answer.
Try using ICS calendar service'; + $this->error('Calendar: CalDav', 'Read request failed with message'.$calError ); + } return $calurls; } diff --git a/lib/calendar/service/service_disabled.php b/lib/calendar/service/service_disabled.php index 34bf0608a..f71141077 100644 --- a/lib/calendar/service/service_disabled.php +++ b/lib/calendar/service/service_disabled.php @@ -15,5 +15,19 @@ * @hide calendar_name * @hide calendar_color */ +require_once '../../../lib/includes.php'; +require_once const_path_system . 'calendar/calendar.php'; + +class calendar_disabled extends calendar +{ + public function __construct(){ + parent::__construct(null); + + $this->error('Calendar service', 'Calendar service is disabled. Select a web service or "offline" for a demo.
'. + 'Remove the widget from your pages if you don\'t need the service.'); + } +} +$service = new calendar_disabled(array_merge($_GET, $_POST)); +echo $service->json(); ?> \ No newline at end of file diff --git a/lib/config.php b/lib/config.php index cd72a30e8..9765fae88 100644 --- a/lib/config.php +++ b/lib/config.php @@ -30,7 +30,7 @@ public function __construct() */ public function get($source = 'all') { - $config = $this->config_by_source[$source]; + $config = (isset($this->config_by_source[$source]) ? $this->config_by_source[$source] : null); // only read if source was not read before if($config == null) { @@ -53,21 +53,24 @@ public function get($source = 'all') case 'globalonly': if (is_file(const_path.'config.ini')) $config = parse_ini_file(const_path.'config.ini', true, self::INI_SCANNER); - elseif (is_file(const_path.'config.php')) { + + //drop support for legacy config.php as of v3.1 + // + //elseif (is_file(const_path.'config.php')) { // read legacy config.php - $configphp = file_get_contents(const_path.'config.php'); - preg_match_all("/define\s*\s*\('config_(.*?)'\s*,\s*(.*)\s*\)\s*;\s*[\r\n]+/", $configphp, $matches, PREG_SET_ORDER); - - $config = array(); - foreach($matches as $match) { - $config[$match[1]] = eval('return '.$match[2].';'); - } - } + // $configphp = file_get_contents(const_path.'config.php'); + // preg_match_all("/define\s*\s*\('config_(.*?)'\s*,\s*(.*)\s*\)\s*;\s*[\r\n]+/", $configphp, $matches, PREG_SET_ORDER); + + // $config = array(); + // foreach($matches as $match) { + // $config[$match[1]] = eval('return '.$match[2].';'); + // } + //} break; // configuration per pages (config.ini in current pages folder) case 'pages': - if ($_REQUEST['pages'] != '') // pages in request + if (isset($_REQUEST['pages']) && $_REQUEST['pages'] != '') // pages in request $config_for_pages['pages'] = $_REQUEST['pages']; else { // configuration of pages in cookie @@ -121,21 +124,29 @@ public function save($target, $options, $pages) { break; case 'cookie': $basepath = substr(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH), 0, -strlen(substr($_SERVER['SCRIPT_FILENAME'], strlen(const_path)))); - // generate unique cache folder for cookie (combination of remote IP, forwarded IP and time should be unique) - if(!isset($config['cachefolder']) || $config['cachefolder'] == 'global') - $config['cachefolder'] = md5($_SERVER['REMOTE_ADDR'] . ($_SERVER['HTTP_CLIENT_IP'] ?: $_SERVER['HTTP_X_FORWARDED_FOR'] ?: $_SERVER['HTTP_X_FORWARDED'] ?: $_SERVER['HTTP_FORWARDED_FOR'] ?: $_SERVER['HTTP_FORWARDED']) . time()); + if (isset($config['cache'])) { + // generate unique cache folder for cookie (combination of remote IP, forwarded IP and time should be unique) + if(!isset($config['cachefolder']) || $config['cachefolder'] == 'global') + $config['cachefolder'] = md5($_SERVER['REMOTE_ADDR'] . ($_SERVER['HTTP_CLIENT_IP'] ?: $_SERVER['HTTP_X_FORWARDED_FOR'] ?: $_SERVER['HTTP_X_FORWARDED'] ?: $_SERVER['HTTP_FORWARDED_FOR'] ?: $_SERVER['HTTP_FORWARDED']) . time()); + } else + unset($config['cachefolder']); + if(count($config) > 0){ // some options are set + foreach ($config as $key=>&$val) { + $val = ($val == "true") ? "1" : $val; + $val = ($val == "false") ? "" : $val; + } $confexpire = time()+3600*24*364*10; // expires after 10 years $success = setcookie('config', json_encode($config), ['expires' => $confexpire, 'path' => $basepath, 'samesite' => 'Lax']); } else - $success = setcookie('config', '', time() - 3600, $basepath); // delete cookie + $success = setcookie('config', '', time() - 3600, $basepath); // delete cookie break; } if($success) $this->config_by_source[$target] = $config; - + return $success; } diff --git a/lib/functions_twig.php b/lib/functions_twig.php index c3bdc1b00..b79845f60 100644 --- a/lib/functions_twig.php +++ b/lib/functions_twig.php @@ -8,6 +8,7 @@ * ----------------------------------------------------------------------------- */ +const SmartvisuButtonTypes = array('micro', 'mini', 'midi', 'icon'); // ----------------------------------------------------------------------------- // Filters for Twig @@ -28,7 +29,7 @@ function twig_bit($val) function twig_substr($val, $start, $end = null) { - if ($end) + if (isset($end)) $ret = substr($val, $start, $end); else $ret = substr($val, $start); @@ -221,7 +222,13 @@ function twig_docu($filenames = null) } else $p['valid_values'] = explode(',', substr($tag[5],1,-1)); + + if ($p['type'] == 'type') + $p['valid_values'] = array_merge(SmartvisuButtonTypes, $p['valid_values']); } + elseif ($p['type'] == 'type') + $p['valid_values'] = SmartvisuButtonTypes; + $p['optional'] = $tag[6] != ''; if($p['optional'] && $tag[6] != '=') $p['default'] = substr($tag[6],1); @@ -229,7 +236,8 @@ function twig_docu($filenames = null) // valid_values // array_form must may } - $rettmp['param'][trim($params[$param++])] = $p; + if (isset($params[$param])) //wvhn@v3.1: hidden parameter starting with "_" must be omitted + $rettmp['param'][trim($params[$param++])] = $p; } elseif ($tag[1] == 'see') { @@ -327,10 +335,11 @@ function twig_lang($subset, $key, $subkey = null) if (!$lang) $lang = get_lang(); - if($subkey == null) + if(!isset($subkey)) return $lang[$subset][$key]; - else - return $lang[$subset][$key][$subkey]; + else + if (isset($lang[$subset][$key][$subkey])) + return $lang[$subset][$key][$subkey]; } /** @@ -422,7 +431,7 @@ function twig_items () { // function twig_asset_exists($file) { $fileExists = 0; - $requestpages = ($_REQUEST['pages'] != '') ? $_REQUEST['pages'] : config_pages; + $requestpages = (isset($_REQUEST['pages']) && $_REQUEST['pages'] != '') ? $_REQUEST['pages'] : config_pages; if(strpos($file, '/') === false) { if(is_file(const_path . 'widgets/'. $file)) $fileExists = 1; if(is_file(const_path . 'dropins/'. $file)) $fileExists = 1; diff --git a/lib/getdir.php b/lib/getdir.php new file mode 100644 index 000000000..49e2d9ea7 --- /dev/null +++ b/lib/getdir.php @@ -0,0 +1,29 @@ + + + \ No newline at end of file diff --git a/lib/includes.php b/lib/includes.php index abbb607b1..979990cd5 100644 --- a/lib/includes.php +++ b/lib/includes.php @@ -77,4 +77,18 @@ */ date_default_timezone_set(config_timezone); +/** +* Set Handling of PHP WARNINGS +* TO DO: make a concept for integrating php error messages into SV notifications +*/ +set_error_handler( + function($errno, $errstr, $errfile, $errline) + { + if (defined('config_debug') && config_debug == 1) + return false; // hand over to standard error reporting + else + return true; // ignore warnings + } + ,E_WARNING); + ?> \ No newline at end of file diff --git a/lib/pagecache.php b/lib/pagecache.php index 033a552b9..b31c0a015 100644 --- a/lib/pagecache.php +++ b/lib/pagecache.php @@ -98,7 +98,7 @@ private function filewrite($content) if (!is_dir($dir)) mkdir($dir, 0775, true); - $this->tmpFile = tempnam($dir, basename($file)); + $this->tmpFile = tempnam($dir, basename($this->file)); } file_put_contents($this->tmpFile, $content, FILE_APPEND); diff --git a/lib/phone/phone.php b/lib/phone/phone.php index 7ff8bc76b..d8a186c7e 100644 --- a/lib/phone/phone.php +++ b/lib/phone/phone.php @@ -31,7 +31,7 @@ public function __construct($request) */ public function init($request) { - $this->debug = ($request['debug'] == 1); + parent::init($request); $this->server = config_phone_server; $this->port = config_phone_port; @@ -66,7 +66,7 @@ public function prepare() $ds['text'] = trans('phone', 'unknown'); // combine the infos, if type is present - if ($ds['type'] != '') + if (isset($ds['type']) && $ds['type'] != '') $ds['text'] = $ds['name'].' ('.$ds['type'].')'; // dir == 0 missed diff --git a/lib/phone/service/fritz!box.php b/lib/phone/service/fritz!box.php index b4036f136..1cd9f00ab 100644 --- a/lib/phone/service/fritz!box.php +++ b/lib/phone/service/fritz!box.php @@ -6,6 +6,7 @@ * @copyright 2012 - 2015 * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- + * @deprecated true */ diff --git a/lib/phone/service/fritz!box_TR-064.php b/lib/phone/service/fritz!box_TR-064.php index dcf6e4b64..5e3fb8729 100644 --- a/lib/phone/service/fritz!box_TR-064.php +++ b/lib/phone/service/fritz!box_TR-064.php @@ -133,41 +133,48 @@ private function TransformCallList() $url = $this->call_list_url . '&max=' . $this->max_calls_to_fetch; $this->debug($url, "URL for call_list"); // download xml file and put it to xml parser - $GetCallListXml = file_get_contents($url, false, stream_context_create(array('http://' => array('ssl' => $self->context_ssl)))); - $simplexml = simplexml_load_string($GetCallListXml); - $this->debug($GetCallListXml, "GetCallListXml"); - /* - [Id] => 1767 - [Type] => 1 - [Caller] => 0175000000 - [Called] => Amt ISDN 123456789 - [Name] => Mustermann, Max - [Numbertype] => isdn - [Device] => Wohnzimmer - [Port] => 10 - [Date] => 08.02.14 12:43 - [Duration] => 0:32 - */ - // map fritz box xml values to the smartvisu standard - foreach ($simplexml->xpath('//Call') as $call) { - // check if we got german date format and translate to ISO date - //(smartvisu is using strtotime later on) - if (preg_match("/[0-3]\d\.[0-1]\d\.\d{2}\s([0-1][0-9]|[2][0-3]):([0-5][0-9])/", $call->Date)) { - $date = DateTime::createFromFormat('d.m.y H:i', $call->Date); - $call->Date = $date->format('Y-m-d H:i'); - } - // bulid data array for smartvisu - $this->data[] = array( - 'pos' => (string) $call->Id, - 'dir' => (string) ($call->Type == 1 ? 1 : ($call->Type == 2 ? 0 : -1)), - 'date' => (string) $call->Date, - 'number' => (string) $call->Caller, - 'name' => (string) $call->Name, - 'called' => (string) $call->Called, - 'duration' => (string) $call->Duration - ); - $call = ''; - } + $loadError = ''; + $GetCallListXml = file_get_contents($url, false, stream_context_create(array('http://' => array('ssl' => $this->context_ssl)))); + if (substr($this->errorMessage, 0, 17) == 'file_get_contents') { + $loadError = substr(strrchr($this->errorMessage, ':'), 2); + $this->error('Phone: fritz!box_TR-064', 'Read request failed with message: '.$loadError); + } + else { + $simplexml = simplexml_load_string($GetCallListXml); + $this->debug($GetCallListXml, "GetCallListXml"); + /* + [Id] => 1767 + [Type] => 1 + [Caller] => 0175000000 + [Called] => Amt ISDN 123456789 + [Name] => Mustermann, Max + [Numbertype] => isdn + [Device] => Wohnzimmer + [Port] => 10 + [Date] => 08.02.14 12:43 + [Duration] => 0:32 + */ + // map fritz box xml values to the smartvisu standard + foreach ($simplexml->xpath('//Call') as $call) { + // check if we got german date format and translate to ISO date + //(smartvisu is using strtotime later on) + if (preg_match("/[0-3]\d\.[0-1]\d\.\d{2}\s([0-1][0-9]|[2][0-3]):([0-5][0-9])/", $call->Date)) { + $date = DateTime::createFromFormat('d.m.y H:i', $call->Date); + $call->Date = $date->format('Y-m-d H:i'); + } + // bulid data array for smartvisu + $this->data[] = array( + 'pos' => (string) $call->Id, + 'dir' => (string) ($call->Type == 1 ? 1 : ($call->Type == 2 ? 0 : -1)), + 'date' => (string) $call->Date, + 'number' => (string) $call->Caller, + 'name' => (string) $call->Name, + 'called' => (string) $call->Called, + 'duration' => (string) $call->Duration + ); + $call = ''; + } + } } public function run() { diff --git a/lib/phone/service/fritz!box_v5.20.php b/lib/phone/service/fritz!box_v5.20.php index cdf3144b9..478f39384 100644 --- a/lib/phone/service/fritz!box_v5.20.php +++ b/lib/phone/service/fritz!box_v5.20.php @@ -6,6 +6,7 @@ * @copyright 2012 - 2015 * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- + * @deprecated true */ diff --git a/lib/phone/service/fritz!box_v5.20_cable6360.php b/lib/phone/service/fritz!box_v5.20_cable6360.php index f79eefe1d..c135b19ba 100644 --- a/lib/phone/service/fritz!box_v5.20_cable6360.php +++ b/lib/phone/service/fritz!box_v5.20_cable6360.php @@ -6,6 +6,7 @@ * @copyright 2012 - 2015 * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- + * @deprecated true */ diff --git a/lib/phone/service/fritz!box_v5.50.php b/lib/phone/service/fritz!box_v5.50.php index 535667ac1..56a4fde85 100644 --- a/lib/phone/service/fritz!box_v5.50.php +++ b/lib/phone/service/fritz!box_v5.50.php @@ -6,6 +6,7 @@ * @copyright 2012 - 2015 * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- + * @deprecated true */ diff --git a/lib/phone/service/service_disabled.php b/lib/phone/service/service_disabled.php index 96813f7b4..c2465aeba 100644 --- a/lib/phone/service/service_disabled.php +++ b/lib/phone/service/service_disabled.php @@ -14,4 +14,19 @@ * @hide phone_pass */ +require_once '../../../lib/includes.php'; +require_once const_path_system . 'phone/phone.php'; + +class phone_disabled extends phone +{ + public function __construct(){ + parent::__construct(null); + + $this->error('Phone service', 'Phone service is disabled. Select a device driver or "offline" for a demo.
' + .'Remove the widget from your pages if you don\'t need the service.'); + } +} +$service = new phone_disabled(array_merge($_GET, $_POST)); +echo $service->json(); + ?> diff --git a/lib/service.php b/lib/service.php index 38e92a9d4..358c9484a 100644 --- a/lib/service.php +++ b/lib/service.php @@ -23,6 +23,7 @@ class service var $data = array(); var $error = array(); + var $errorMessage = ''; /** * constructor @@ -37,8 +38,20 @@ public function __construct($request) */ public function init($request) { - $this->debug = ($request['debug'] == 1); - error_reporting($this->debug ? E_ALL : 0); + if (isset($request['debug'])) + $this->debug =($request['debug'] == 1); + error_reporting(E_ALL); + + set_error_handler( + function($errno, $errstr, $errfile, $errline) + { + $this->errorMessage = $errstr; + if ($this->debug == 1) + return false; // hand over to standard error reporting + else + return true; + } + ,E_ALL); // the following section has been deactivated by wvhn // all services bring their own init functions which define the needed communication parameters diff --git a/lib/templatechecker/Developers.md b/lib/templatechecker/Developers.md index e829f36ef..df764058a 100644 --- a/lib/templatechecker/Developers.md +++ b/lib/templatechecker/Developers.md @@ -1,4 +1,4 @@ -#SmartVISU Template Checker Developer Documentation +# SmartVISU Template Checker Developer Documentation This file describes the general syntax to configure the widget parameter checker @@ -17,42 +17,48 @@ The widget parameter configuration is a multilevel associative array with the fo [... more elements for further widgets ...] ); -`'[variable].[widget]'` has to be all lowercase, independent from the case of the actual variable/widget name. +The array will be filled by the twig_docu() function in ./lib/functions_twig.php which collects all widgets residing in the widget folders +which are defined in the loader path for smartVISU. `[parameter index]` is a zero based numeric value: 0 means the first parameter, 1 the second, 2 the third, ... -`'[type]'` indicates the type of the parameter. Supported types are described in the next section. - -Valid values for `'[additional setting]'` depend on `'[type]'`. They are described in the next section, too. - -If you want an widget not to be reported as unknown, but not to be checked either, just assign an empty array to `'[variable].[widget]'`. +`'[type]'` indicates the type of the parameter. Supported types are described in the next section. Parameter types and all other settings +are collected from the widgets docstring. See description in the subsequent sections. # Widget Parameter Configuration -* `'type' => '[type]'` - type of parameter: see below for valid values. - -## General settings, applicable for all types of parameters -* `'optional' => [TRUE|FALSE]` -Optional, Default: FALSE -Set to TRUE if parameter is optional. -If unset or FALSE, parameter is considered to be mandatory and will cause an error if parameter is missing or empty. - -* `'default' => [value]` -Optional. -In case of optional parameters: Default-Value of parameter - -##Parameter type 'id' -Parameter is id of widget. Usually the id is required to be unique within a file. The template checker reports if an id is being used multiple +The docstring of a widget must contain descriptions for each individual parameter - starting with the identifier `@param`. The parameter +name is defined in the arguments list of the macro call. The sequence of arguments and parameter descriptions must correspond. + +``` +/** +* example for docstring +* +* @param definition for first_argument +* @param definition for second_argument +* @param definition for third_argument +* +* @author wvhn +*/ +{% macro example(first_argument, second_argument, third_argument) &} +``` + +The parameter description is composed as follows: `* @param {type[array form](valid values)
'.$add : '!')); } } @@ -104,47 +112,6 @@ function icon($name, $sm = 'sun_') return $ret; } - function getDirection($degree) - { - $direction = ''; - - if ($degree > 348 or $degree <= 11) { - $direction = translate('dir_n', 'darksky'); - } elseif ($degree > 11 and $degree <= 34) { - $direction = translate('dir_nne', 'darksky'); - } elseif ($degree > 34 and $degree <= 56) { - $direction = translate('dir_ne', 'darksky'); - } elseif ($degree > 56 and $degree <= 79) { - $direction = translate('dir_ene', 'darksky'); - } elseif ($degree > 79 and $degree <= 101) { - $direction = translate('dir_e', 'darksky'); - } elseif ($degree > 101 and $degree <= 123) { - $direction = translate('dir_ese', 'darksky'); - } elseif ($degree > 123 and $degree <= 146) { - $direction = translate('dir_se', 'darksky'); - } elseif ($degree > 146 and $degree <= 169) { - $direction = translate('dir_sse', 'darksky'); - } elseif ($degree > 169 and $degree <= 191) { - $direction = translate('dir_s', 'darksky'); - } elseif ($degree > 191 and $degree <= 214) { - $direction = translate('dir_ssw', 'darksky'); - } elseif ($degree > 214 and $degree <= 236) { - $direction = translate('dir_sw', 'darksky'); - } elseif ($degree > 236 and $degree <= 259) { - $direction = translate('dir_wsw', 'darksky'); - } elseif ($degree > 259 and $degree <= 281) { - $direction = translate('dir_w', 'darksky'); - } elseif ($degree > 281 and $degree <= 304) { - $direction = translate('dir_wnw', 'darksky'); - } elseif ($degree > 304 and $degree <= 326) { - $direction = translate('dir_nw', 'darksky'); - } elseif ($degree > 326 and $degree <= 348) { - - $direction = translate('dir_nnw', 'darksky'); - } - - return $direction; - } } diff --git a/lib/weather/service/met.no.md b/lib/weather/service/met.no.md new file mode 100644 index 000000000..11d810365 --- /dev/null +++ b/lib/weather/service/met.no.md @@ -0,0 +1,13 @@ +# met.no weather service for smartVISU + +## Installation +1. in SmartVISU config page +- choose met.no, +- enter geographical coordinates for your location, e.g. lat=47.1234&lon=9.1234&altitude=123 + +## Troubleshooting/Debug: +1. check for files smartVISU/temp/met.no_lat47.1234lon9.1234altitude123.json . + This is the api response from met.no after you have called the service once. + View it with a json viewer (i.e. addon to chrome) +2. debug the service by calling YOURSERVER/smartVISU/lib/weather/service/met.no.php?debug=1 +3. check for 'met.no' entries in var/log/nginx/error.log (or /var/log/apache2/) diff --git a/lib/weather/service/met.no.php b/lib/weather/service/met.no.php new file mode 100644 index 000000000..9f400674e --- /dev/null +++ b/lib/weather/service/met.no.php @@ -0,0 +1,313 @@ +location).'.json'); + + if ($cache->hit($this->cache_duration_minutes)) + $content = $cache->read(); + else + { + $loadError = ''; + $opts = array( + 'http'=>array( + 'method'=>"GET", + 'header'=>"User-Agent: smartVISU" + ) + ); + $context = stream_context_create($opts); + $url = 'https://api.met.no/weatherapi/locationforecast/2.0/complete?'.$this->location; + $content = file_get_contents($url, false, $context); + if (substr($this->errorMessage, 0, 17) != 'file_get_contents') + $cache->write($content); + else + $loadError = substr(strrchr($this->errorMessage, ':'), 2); + } + + $parsed_json = json_decode($content); + $this->debug($parsed_json); + + if ($parsed_json->{'properties'}->{'timeseries'}['0']) { + // night or day symbol of today + $actualconditions = $parsed_json->{'properties'}->{'timeseries'}['0']->{'data'}->{'next_1_hours'}->{'summary'}->{'symbol_code'}; + $actualTimeSymbol = substr(strrchr($actualconditions, '_'),1); + if ($actualTimeSymbol != '') { + $actualconditions = substr($actualconditions, 0, strpos($actualconditions, '_')); + $actualTimeSymbol = ($actualTimeSymbol == 'night') ? 'moon_' : 'sun_'; + } + else + $actualTimeSymbol = ($this->icon_sm != '') ? $this->icon_sm : 'sun_'; + + $actualdata = $parsed_json->{'properties'}->{'timeseries'}['0']->{'data'}->{'instant'}->{'details'}; + $wind_dir = weather::getDirection((float)$actualdata->{'wind_from_direction'}); + $wind_speed = transunit('speed',round(3.6*(float)$actualdata->{'wind_speed'}, 1)); + if (substr($wind_speed,-3) =='mph') + $wind_speed = transunit('speed',round(2.24*(float)$actualdata->{'wind_speed'}, 1)); + $wind_desc = weather::getWindDescription($wind_speed); + + $this->data['current']['temp'] = transunit('temp', (float)$actualdata->{'air_temperature'}); + $this->data['current']['wind'] = $wind_desc.' '.translate('from', 'weather').' '.$wind_dir.' '.translate('at', 'weather').' '.$wind_speed; + $this->data['current']['more'] = translate('humidity', 'weather')." ".transunit('%', (float)$actualdata->{'relative_humidity'}); + $this->data['current']['misc'] = translate('air pressure', 'weather')." ".(float)$actualdata->{'air_pressure_at_sea_level'}.' hPa'; + $this->data['current']['conditions'] = translate($actualconditions, 'met.no'); + $this->data['current']['icon'] = $this->icon($actualconditions, $actualTimeSymbol); + + // forecast + // met.no times are UTC based. We need to sustract timezone from local time in order to fit to the UTC data raster. + // next_12_hours tag contains a conditions summary for 12 hours -> we use the forecast of 06.00 for the day + // next_6_hours tag contains values for min and max temperatures + // -> we use all data from 00.00, 06.00, 12.00 and 18.00 to compute min/max temperature + // if actual time is before 13.00 we use the rest of the day as forecast, and conditions from 12.00 + + $forecastCondition = 'NA'; + $timezone = (int)date('Z', strtotime($parsed_json->{'properties'}->{'timeseries'}[0]->{'time'}))/3600; + $i = 0; + $dayready = 0; + $nextday = (int)(date('w', strtotime($parsed_json->{'properties'}->{'timeseries'}[0]->{'time'}) - $timezone * 3600)+1) %7; + $startTime = (24+ (int)date('G', strtotime($parsed_json->{'properties'}->{'timeseries'}[0]->{'time'})) - $timezone) %24; + $maxtemp = -100; + $mintemp = 100; + + + foreach ($parsed_json->{'properties'}->{'timeseries'} as $dataset) { + $timezone = (int)date('Z', strtotime($dataset->{'time'}))/3600; + $day = (int)date('w', strtotime($dataset->{'time'})- $timezone * 3600); + $actualTime = (24 +(int)date('G', strtotime($dataset->{'time'})) - $timezone) % 24; + + // first day if requested before 12:00 + if ($startTime <= 12 && $i == 0 && $actualTime <= 23 ) { + $temps = (float)$dataset->{'data'}->{'instant'}->{'details'}->{'air_temperature'}; + if($temps > $maxtemp) $maxtemp = $temps; + if($temps < $mintemp) $mintemp = $temps; + if ($actualTime == 12) + $forecastCondition = $dataset->{'data'}->{'next_1_hours'}->{'summary'}->{'symbol_code'}; + if ($actualTime == 23 ) { + $dayready = 1; + $nextday = $day; + } + } + + $searchTimes = array (0, 6, 12, 18); + if ($day == $nextday && $dayready == 0) { + if (in_array ($actualTime, $searchTimes)) { + $mintemp_6h = (float)$dataset->{'data'}->{'next_6_hours'}->{'details'}->{'air_temperature_min'}; + $maxtemp_6h = (float)$dataset->{'data'}->{'next_6_hours'}->{'details'}->{'air_temperature_max'}; + if($maxtemp_6h > $maxtemp) $maxtemp = $maxtemp_6h; + if($mintemp_6h < $mintemp) $mintemp = $mintemp_6h; + if ($actualTime == 6) + $forecastCondition = $dataset->{'data'}->{'next_12_hours'}->{'summary'}->{'symbol_code'}; + if ($actualTime == 18) + $dayready = 1; + } + } + + if ($dayready == 1) { + if (strpos ($forecastCondition,'_') > 0) + $forecastCondition = substr($forecastCondition, 0, strpos($forecastCondition, '_')); + $this->data['forecast'][$i]['date'] = date('Y-m-d', strtotime($dataset->{'time'})-$timezone*3600); + $this->data['forecast'][$i]['conditions'] = translate($forecastCondition, 'met.no'); + $this->data['forecast'][$i]['icon'] = $this->icon($forecastCondition); + $this->data['forecast'][$i]['temp'] = round($maxtemp, 0).'°C'.'/'.round($mintemp, 0).'°C'; + + $maxtemp = -100; + $mintemp = 100; + $dayready = 0; + $nextday = ($nextday + 1) %7; + + $i++; + if ($i == 4) break; + } + + } + } + else + { + if ($loadError != '') + $add = ' with message:
'.$loadError; + else + $add = ':
'.$this->errorMessage; + + $this->error('Weather: met.no', 'Read request failed'.$add ); + } + } + + /* + * Icon-Mapper + */ + function icon($name, $sm = 'sun_') + { + $ret = ''; + + $icon['clearsky'] = $sm.'1'; + $icon['fair'] = $sm.'2'; + $icon['partlycloudy'] = $sm.'3'; + $icon['cloudy'] = $sm.'5'; + $icon['lightrainshowers'] = $sm.'7'; + $icon['rainshowers'] = $sm.'7'; + $icon['heavyrainshowers'] = $sm.'8'; + $icon['lightrainshowersandthunder'] = $sm.'9'; + $icon['rainshowersandthunder'] = $sm.'9'; + $icon['heavyrainshowersandthunder'] = $sm.'10'; + $icon['lightsleetshowersandthunder']= $sm.'10'; + $icon['sleetshowersandthunder'] = $sm.'10'; + $icon['heavysleetshowersandthunder']= $sm.'10'; + $icon['lightsnowshowersandthunder'] = $sm.'10'; + $icon['snowshowersandthunder'] = $sm.'10'; + $icon['heavysnowshowersandthunder'] = $sm.'10'; + $icon['lightsleetshowers'] = $sm.'11'; + $icon['sleetshowers'] = $sm.'11'; + $icon['heavysleetshowers'] = $sm.'12'; + $icon['lightsnowshowers'] = $sm.'13'; + $icon['snowshowers'] = $sm.'13'; + $icon['heavysnowshowers'] = $sm.'13'; + $icon['fog'] = 'cloud_6'; + $icon['lightrain'] = 'cloud_7'; + $icon['rain'] = 'cloud_7'; + $icon['heavyrain'] = 'cloud_8'; + $icon['lightrainandthunder'] = 'cloud_9'; + $icon['rainandthunder'] = 'cloud_9'; + $icon['heavyrainandthunder'] = 'cloud_10'; + $icon['lightsleet'] = 'cloud_11'; + $icon['sleet'] = 'cloud_11'; + $icon['heavysleet'] = 'cloud_11'; + $icon['lightsnow'] = 'cloud_12'; + $icon['snow'] = 'cloud_12'; + $icon['heavysnow'] = 'cloud_13'; + $icon['lightsnowandthunder'] = 'cloud_15'; + $icon['snowandthunder'] = 'cloud_15'; + $icon['heavysnowandthunder'] = 'cloud_15'; + $icon['lightsleetandthunder'] = 'cloud_17'; + $icon['sleetandthunder'] = 'cloud_17'; + $icon['heavysleetandthunder'] = 'cloud_17'; + $icon['NA'] = 'na'; + $ret = $icon[$name]; + + return $ret; + } + +} + + +// ----------------------------------------------------------------------------- +// i c o n - f o r m a t +// ----------------------------------------------------------------------------- + +/* "clearsky_day", + "clearsky_night", + "clearsky_polartwilight", + "fair_day", + "fair_night", + "fair_polartwilight", + "lightssnowshowersandthunder_day", + "lightssnowshowersandthunder_night", + "lightssnowshowersandthunder_polartwilight", + "lightsnowshowers_day", + "lightsnowshowers_night", + "lightsnowshowers_polartwilight", + "heavyrainandthunder", + "heavysnowandthunder", + "rainandthunder", + "heavysleetshowersandthunder_day", + "heavysleetshowersandthunder_night", + "heavysleetshowersandthunder_polartwilight", + "heavysnow", + "heavyrainshowers_day", + "heavyrainshowers_night", + "heavyrainshowers_polartwilight", + "lightsleet", + "heavyrain", + "lightrainshowers_day", + "lightrainshowers_night", + "lightrainshowers_polartwilight", + "heavysleetshowers_day", + "heavysleetshowers_night", + "heavysleetshowers_polartwilight", + "lightsleetshowers_day", + "lightsleetshowers_night", + "lightsleetshowers_polartwilight", + "snow", + "heavyrainshowersandthunder_day", + "heavyrainshowersandthunder_night", + "heavyrainshowersandthunder_polartwilight", + "snowshowers_day", + "snowshowers_night", + "snowshowers_polartwilight", + "fog", + "snowshowersandthunder_day", + "snowshowersandthunder_night", + "snowshowersandthunder_polartwilight", + "lightsnowandthunder", + "heavysleetandthunder", + "lightrain", + "rainshowersandthunder_day", + "rainshowersandthunder_night", + "rainshowersandthunder_polartwilight", + "rain", + "lightsnow", + "lightrainshowersandthunder_day", + "lightrainshowersandthunder_night", + "lightrainshowersandthunder_polartwilight", + "heavysleet", + "sleetandthunder", + "lightrainandthunder", + "sleet", + "lightssleetshowersandthunder_day", + "lightssleetshowersandthunder_night", + "lightssleetshowersandthunder_polartwilight", + "lightsleetandthunder", + "partlycloudy_day", + "partlycloudy_night", + "partlycloudy_polartwilight", + "sleetshowersandthunder_day", + "sleetshowersandthunder_night", + "sleetshowersandthunder_polartwilight", + "rainshowers_day", + "rainshowers_night", + "rainshowers_polartwilight", + "snowandthunder", + "sleetshowers_day", + "sleetshowers_night", + "sleetshowers_polartwilight", + "cloudy", + "heavysnowshowersandthunder_day", + "heavysnowshowersandthunder_night", + "heavysnowshowersandthunder_polartwilight", + "heavysnowshowers_day", + "heavysnowshowers_night", + "heavysnowshowers_polartwilight" +*/ + + +// ----------------------------------------------------------------------------- +// call the service +// ----------------------------------------------------------------------------- + +$service = new weather_met(array_merge($_GET, $_POST)); +echo $service->json(); + +?> diff --git a/lib/weather/service/openweathermap.md b/lib/weather/service/openweathermap.md index 80de71362..fa2511b6e 100644 --- a/lib/weather/service/openweathermap.md +++ b/lib/weather/service/openweathermap.md @@ -1,11 +1,17 @@ -##Openweathermap.org weather service for smartVISU +# Openweathermap.org weather service for smartVISU -##Installation +## Installation 1. register at openweathermap.org to get an api key 2. in SmartVISU config page 1. choose openweather.org, 2. enter your location (i.e. Köln) 3. enter your api key + Location can be entered in the following ways: + * use latitude and longitude of your location e.g. `lat=50.93331&lon=6.95` + * use the city ID provided by openweathermap.org e.g. `id=2886242` + * use the ZIP code of your location, e.g. `zip=50667,DE` + * use the city name e.g. `Köln,DE` - -##Troubleshooting/Debug: +## Troubleshooting/Debug: 1. check for file smartVISU/temp/openweathermap_YOURCITY.json - this is the api response from openweathermap.org. View it with a json viewer (i.e. addon to chrome) -2. check for 'openweathermaps' entries in Logs/nginx/error.log (or Logs/apache2/) + this is the api response from openweathermap.org after you have called the service once. + View it with a json viewer (i.e. addon to chrome) +2. debug the service by calling YOURSERVER/smartVISU/lib/weather/service/openweathermap.org.php?debug=1 +3. check for 'openweathermap.org' entries in var/log/nginx/error.log (or /var/log/apache2/) diff --git a/lib/weather/service/openweathermap.org.php b/lib/weather/service/openweathermap.org.php index f452e5f95..454a51cd7 100644 --- a/lib/weather/service/openweathermap.org.php +++ b/lib/weather/service/openweathermap.org.php @@ -43,11 +43,19 @@ public function run() } else { - //error_log('nohit'); - $url_current = 'http://api.openweathermap.org/data/2.5/weather?q='.$this->location.'&lang='.trans('openweathermap', 'lang').'&units=metric&appid='.config_weather_key; - $url_forecast = 'http://api.openweathermap.org/data/2.5/forecast?q='.$this->location.'&lang='.trans('openweathermap', 'lang').'&units=metric&appid='.config_weather_key; + //no cache hit + $loadError = ''; + //if location is given by id=..., lat=...&lon= or zip=... (postal code), a '=' is in the string + //otherwise consider it to be the city name + if (strpos($this->location,'=') === false) + $this->location = 'q='.$this->location; + $url_current = 'http://api.openweathermap.org/data/2.5/weather?'.$this->location.'&lang='.trans('openweathermap', 'lang').'&units='.trans('openweathermap','units').'&appid='.config_weather_key; + $url_forecast = 'http://api.openweathermap.org/data/2.5/forecast?'.$this->location.'&lang='.trans('openweathermap', 'lang').'&units='.trans('openweathermap','units').'&appid='.config_weather_key; $content = '{"today":'.file_get_contents($url_current).', "forecast":'.file_get_contents($url_forecast).'}'; - $cache->write($content); + if (substr($this->errorMessage, 0, 17) != 'file_get_contents') + $cache->write($content); + else + $loadError = substr(strrchr($this->errorMessage, ':'), 2); } $parsed_json = json_decode($content); @@ -59,8 +67,12 @@ public function run() $this->data['current']['temp'] = transunit('temp', (float)$parsed_json->{'today'}->{'main'}->{'temp'}); $this->data['current']['icon'] = $this->icon(substr((string)$parsed_json->{'today'}->{'weather'}[0]->{'icon'}, 0, -1), $this->icon_sm); $this->data['current']['conditions'] = (string)$parsed_json->{'today'}->{'weather'}[0]->{'description'}; - $this->data['current']['wind'] = translate('wind', 'openweathermap').' '.transunit('speed', (float)$parsed_json->{'today'}->{'wind'}->{'speed'}); - $this->data['current']['more'] = translate('humidity', 'openweathermap').' '.(float)$parsed_json->{'today'}->{'main'}->{'humidity'}.'%, '.(float)$parsed_json->{'today'}->{'main'}->{'pressure'}.' hPa'; + $wind_speed = transunit('speed', (float)$parsed_json->{'today'}->{'wind'}->{'speed'}); + $wind_dir = weather::getDirection((float)$parsed_json->{'today'}->{'wind'}->{'deg'}); + $wind_desc = weather::getWindDescription ($wind_speed); + $this->data['current']['wind'] = $wind_desc.' '.translate('from', 'weather').' '.$wind_dir.' '.translate('at', 'weather').' '.$wind_speed; + $this->data['current']['more'] = translate('humidity', 'weather').' '.(float)$parsed_json->{'today'}->{'main'}->{'humidity'}.'%'; + $this->data['current']['misc'] = translate('air pressure', 'weather').' '.(float)$parsed_json->{'today'}->{'main'}->{'pressure'}.' hPa'; // forecast // openweathermap provides forecast infos for 5days in 3h slots (free account) @@ -77,7 +89,7 @@ public function run() if($i >= 0) { $init = false; - $this->data['forecast'][$i]['temp'] = round($tempMax, 0).'°/'.round($tempMin, 0).'°'; + $this->data['forecast'][$i]['temp'] = transunit('weathertemp', round($tempMax, 0)).'/'.transunit('weathertemp', round($tempMin, 0)); $add = $add." ID:".$i.$this->data['forecast'][$i]['temp']; } $nextday = ($fday+1) % 7; @@ -103,8 +115,12 @@ public function run() } else { - $add = $parsed_json->{'response'}->{'error'}->{'description'}; - $this->error('Weather: openweathermap.org', 'Read request failed'.($add ? ': '.$add : '').'!'); + if ($loadError != '') + $add = $loadError; + else + $add = $parsed_json->{'response'}->{'error'}->{'description'}; + + $this->error('Weather: openweathermap.org', 'Read request failed'.($add ? ' with message:
'.$add : '!')); } } diff --git a/lib/weather/service/weather.com.md b/lib/weather/service/weather.com.md index add647110..69857ee22 100644 --- a/lib/weather/service/weather.com.md +++ b/lib/weather/service/weather.com.md @@ -1,6 +1,6 @@ -##Weather.com weather service for smartVISU +# Weather.com weather service for smartVISU -##Installation +## Installation 1. register at weather.com to get an api key or use the public key 6532d6454b8aa370768e63d6ba5a832e 2. in SmartVISU config page - choose weather.com, @@ -8,9 +8,9 @@ - enter your api key - enter your postal code followed by ":" and the country code, e.g. 70000:DE - -##Troubleshooting/Debug: +## Troubleshooting/Debug: 1. check for files smartVISU/temp/weather_YOURSTATION_current.json andn weather_YOURSTATION_forecast.json. - These are the api responses from weather.com. View them with a json viewer (i.e. addon to chrome) + These are the api responses from weather.com after you have called the service once. + View them with a json viewer (i.e. addon to chrome) 2. debug the service by calling YOURSERVER/smartVISU/lib/weather/service/weather.com.php?debug=1 -2. check for 'weather.com' entries in var/log/nginx/error.log (or /var/log/apache2/) +3. check for 'weather.com' entries in var/log/nginx/error.log (or /var/log/apache2/) diff --git a/lib/weather/service/weather.com.php b/lib/weather/service/weather.com.php index dc9fdfcc2..d85f5a687 100644 --- a/lib/weather/service/weather.com.php +++ b/lib/weather/service/weather.com.php @@ -24,8 +24,10 @@ class weather_weather extends weather */ public function run() { - $units = 'm'; + $units = trans('weather.com', 'units'); $data_node = 'metric'; + if ($units == "e") $data_node = 'imperial'; + if ($units == "h") $data_node = 'uk_hybrid'; // api call $cache = new class_cache('weather_'.$this->location.'_current.json'); @@ -35,9 +37,13 @@ public function run() } else { + $loadError_current = ''; $url = 'https://api.weather.com/v2/pws/observations/current?stationId='.$this->location.'&format=json&units='.$units.'&apiKey='.config_weather_key; $content = file_get_contents($url); - $cache->write($content); + if (substr($this->errorMessage, 0, 17) != 'file_get_contents') + $cache->write($content); + else + $loadError_current = substr(strrchr($this->errorMessage, ':'), 2); } $cache_forecast = new class_cache('weather_'.$this->location.'_forecast.json'); @@ -47,9 +53,13 @@ public function run() } else { - $url_forecast = 'https://api.weather.com/v3/wx/forecast/daily/5day?postalKey='.config_weather_postal.'&units=m&language='.config_lang.'&format=json&apiKey='.config_weather_key; + $loadError_forecast = ''; + $url_forecast = 'https://api.weather.com/v3/wx/forecast/daily/5day?postalKey='.config_weather_postal.'&units='.$units.'&language='.trans('weather', 'lang').'&format=json&apiKey='.config_weather_key; $content_forecast = file_get_contents($url_forecast); - $cache_forecast->write($content_forecast); + if (substr($this->errorMessage, 0, 17) != 'file_get_contents') + $cache_forecast->write($content_forecast); + else + $loadError_forecast = substr(strrchr($this->errorMessage, ':'), 2); } // parse current @@ -66,18 +76,22 @@ public function run() $wind_speed = transunit('speed', (float)$parsed_json->{'observations'}[0]->{$data_node}->{'windSpeed'}); $wind_gust = transunit('speed', (float)$parsed_json->{'observations'}[0]->{$data_node}->{'windGust'}); - $wind_direction = $this->getDirection((float)$parsed_json->{'observations'}[0]->{'winddir'}); - - $this->data['current']['wind'] = translate('wind', 'wunderground')." ".$from." ".$wind_direction.", ".translate('wind_speed', 'wunderground')." ".$wind_speed; + $wind_dir = weather::getDirection((float)$parsed_json->{'observations'}[0]->{'winddir'}); + $wind_desc = weather::getWindDescription($wind_speed); + $this->data['current']['wind'] = $wind_desc." ".translate('from', 'weather'). ' '. $wind_dir." ".translate('at', 'weather')." ".$wind_speed; if ($wind_gust > 0) $this->data['current']['wind'] .= ", ".translate('wind_gust', 'wunderground')." ".$wind_gust; - $this->data['current']['more'] = translate('humidity', 'wunderground')." ".(string)$parsed_json->{'observations'}[0]->{'humidity'}." %"; + $this->data['current']['more'] = translate('humidity', 'weather')." ".(string)$parsed_json->{'observations'}[0]->{'humidity'}." %"; + $this->data['current']['misc'] = translate('air pressure', 'weather')." ".(string)$parsed_json->{'observations'}[0]->{$data_node}->{'pressure'}." hPa"; } else { - $add = $parsed_json->{'response'}->{'error'}->{'description'}; - $this->error('Weather: weather.com', 'Current read request failed'.($add ? ': '.$add : '').'!'); + if ($loadError_current != '') + $add = $loadError_current; + else + $add = $parsed_json->{'response'}->{'error'}->{'description'}; + $this->error('Weather: weather.com', 'Current read request failed'.($add ? ' with message:
'.$add : '!')); } // parse forecast @@ -100,23 +114,19 @@ public function run() $this->data['forecast'][$i]['date'] = (string)$parsed_json_forecast->{'daypart'}[0]->{'daypartName'}[$i]; $this->data['forecast'][$i]['conditions'] = (string)$parsed_json_forecast->{'daypart'}[0]->{'wxPhraseLong'}[$i]; $this->data['forecast'][$i]['icon'] = $this->icon((int)$parsed_json_forecast->{'daypart'}[0]->{'iconCode'}[$i]); - $this->data['forecast'][$i]['temp'] = (float)$parsed_json_forecast->{'daypart'}[0]->{'temperature'}[$i].'°'; + $this->data['forecast'][$i]['temp'] = transunit('weathertemp',(float)$parsed_json_forecast->{'daypart'}[0]->{'temperature'}[$i]); } } else { - $add = $parsed_json->{'response'}->{'error'}->{'description'}; - $this->error('Weather: weather.com', 'Forecast read request failed'.($add ? ': '.$add : '').'!'); + if ($loadError_forecast != '') + $add = $loadError_forecast; + else + $add = $parsed_json->{'response'}->{'error'}->{'description'}; + $this->error('Weather: weather.com', 'Forecast read request failed'.($add ? ' with message:
'.$add : '!')); } - } - function getDirection($b) - { - $dirs = array('NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE', 'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW', 'N'); - return $dirs[round(abs(($b - 11.25) % 360)/ 22.5)]; - } - /* * Icon-Mapper */ diff --git a/lib/weather/service/wunderground.com.php b/lib/weather/service/wunderground.com.php index f2c2e32cf..309ff0ccd 100644 --- a/lib/weather/service/wunderground.com.php +++ b/lib/weather/service/wunderground.com.php @@ -6,6 +6,7 @@ * @copyright 2012 - 2015 * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- + * @deprecated true */ diff --git a/lib/weather/service/yr.no.php b/lib/weather/service/yr.no.php index 08f2c542b..be00ec3b8 100644 --- a/lib/weather/service/yr.no.php +++ b/lib/weather/service/yr.no.php @@ -7,6 +7,7 @@ * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- * @hide weather_postal + * @deprecated true */ diff --git a/lib/weather/weather.php b/lib/weather/weather.php index a214f56c8..87c63405d 100644 --- a/lib/weather/weather.php +++ b/lib/weather/weather.php @@ -27,9 +27,13 @@ class weather extends service public function init($request) { parent::init($request); - - $this->location = $request['location']; - + + // enable debug display of weather data + if ($this->debug == "1" && !isset($request->location)) + $this->location = config_weather_location; + else + $this->location = $request['location']; + // reduce real cache duration by 2 seconds to avoid getting old weather on calling repeat on widget if (isset($request['cache_duration_minutes'])) $this->cache_duration_minutes = $request['cache_duration_minutes'] - (2/60); @@ -54,7 +58,55 @@ public function prepare() $this->data['forecast'][$id]['date'] = transdate('D', strtotime($ds['date'])); } } + + /** + * Translate wind directions + */ + public function getDirection($angle) + { + $dirs = array('n', 'nne', 'ne', 'ene', 'e', 'ese', 'se', 'sse', 's', 'ssw', 'sw', 'wsw', 'w', 'wnw', 'nw', 'nnw', 'n'); + return translate($dirs[round(($angle % 360)/ 22.5, 0)], 'weather'); + } + + /** + * Translate wind speed with unit (string). Unit must be km/h or mph ! + * Source: https://www.windfinder.com/wind/windspeed.htm + */ + public function getWindDescription($wind_speed) + { + $windspeed = (float)(substr($wind_speed, 0, strpos($wind_speed, ' '))); + if (substr($wind_speed,-3) =='mph') + $windspeed = $windspeed * 0.62; + + $description = ''; + if ($windspeed >= 0 and $windspeed < 1) { + $description = translate('calm', 'weather'); + } elseif ($windspeed >= 1 and $windspeed < 6) { + $description = translate('light air', 'weather'); + } elseif ($windspeed >= 6 and $windspeed < 12) { + $description = translate('light breeze', 'weather'); + } elseif ($windspeed >= 12 and $windspeed < 20) { + $description = translate('gentle breeze', 'weather'); + } elseif ($windspeed >= 20 and $windspeed < 29) { + $description = translate('moderate breeze', 'weather'); + } elseif ($windspeed >= 29 and $windspeed < 39) { + $description = translate('fresh breeze', 'weather'); + } elseif ($windspeed >= 39 and $windspeed < 50) { + $description = translate('strong breeze', 'weather'); + } elseif ($windspeed >= 50 and $windspeed <62) { + $description = translate('near gale', 'weather'); + } elseif ($windspeed >= 62 and $windspeed < 75) { + $description = translate('gale', 'weather'); + } elseif ($windspeed >= 75 and $windspeed < 89) { + $description = translate('strong gale', 'weather'); + } elseif ($windspeed >= 89 and $windspeed < 103) { + $description = translate('storm', 'weather'); + } elseif ($windspeed >= 103 and $windspeed < 118) { + $description = translate('violent storm', 'weather'); + } elseif ($windspeed >= 118) { + $description = translate('hurricane', 'weather'); + } + return $description; + } } - -?> diff --git a/lib/widget_assistant/README.html b/lib/widget_assistant/README.html index 0f6464688..d7429ced3 100644 --- a/lib/widget_assistant/README.html +++ b/lib/widget_assistant/README.html @@ -54,10 +54,11 @@
smartvisu - Widget Assistant
Table of Content
- How it works -
- ChangeLog new -
- Hot-Keys new -
- Known issues new -
- Logics to create masteritem.json new +
- ChangeLog Update +
- Hot-Keys +
- Known issues +
- Logics to create masteritem.json from shNG new +
- Script to create masteritem.json for FHEM new
How it works
@@ -80,6 +81,12 @@Example :
Change-Log
+2021.05.01 - Version 1.2.0
+-
+
- added support for all valid values of widget-types from twig-docu +
- some optical changes +
- added widget specific colours to autocomplete dict for colors (for example 'hidden','blank' for basic.print) +
2021.01.18 - Version 1.1.0
- changed handling for "render in new window" - if there is no Window a new one will be opened, else the opened window would be refreshed, also if there is a twig error @@ -207,6 +214,7 @@
Known Issues
then everthing is working again. (STRG+F5 / CTRL + Shift + R)Logic to create masteritem.json from shNG
+Only needed for smarthomeNG <= v1.7.2. As of v1.8 the smartvisu plugin writes the file as default.
#!/usr/bin/env python3
# create_master_item.py
@@ -221,5 +229,8 @@ Logic to create masteritem.js
f.write(json.dumps(item_list))
f.close()
Script to create masteritem.json for FHEM
+A script can be found in the fronthem / smartVISU Forum
+https://forum.fhem.de/index.php/topic,118508.msg1135044.html#msg1135044
\-TAG
## Change-Log
+#### 2021.05.01 - Version 1.2.0
+
+- added support for all valid values of widget-types from twig-docu
+- some optical changes
+- added widget specific colours to autocomplete dict for colors (for example 'hidden','blank' for basic.print)
+
#### 2021.01.18 - Version 1.1.0
- changed handling for "render in new window" - if there is no Window a new one will be opened, else the opened window would be refreshed, also if there is a twig error
- more fixes for "nasty", "nested" widgets
@@ -140,3 +147,9 @@ f.write(json.dumps(item_list))
f.close()
+
+## Script to create masteritem.json for FHEM
+
+A script can be found in the fronthem / smartVISU Forum+https://forum.fhem.de/index.php/topic,118508.msg1135044.html#msg1135044 + diff --git a/lib/widget_assistant/widget_assistant.js b/lib/widget_assistant/widget_assistant.js index c2499cdbc..37611e759 100644 --- a/lib/widget_assistant/widget_assistant.js +++ b/lib/widget_assistant/widget_assistant.js @@ -1,7 +1,7 @@ // ---------------------------------------------------------------------------- // --- widget_assistant.js // ---------------------------------------------------------------------------- -// Version 1.1.0 - for smartvisu3.0 release +// Version 1.2.0 - for smartvisu3.02 release // // Widget für das Erstellen von Widgeteinträgen mit Hilfe von Autocomplete und // Prüfung der Anzahl Parameter, Hilfstexte werden zu den einzelnen Parameter @@ -164,61 +164,94 @@ function getall() } } + +// ************************************************************************ +// ChangeDictbyMouse - Dict was changed by Mouse +// ************************************************************************ +function ChangeDictbyMouse(e) +{ + if (window.event == undefined) // triggered by Mouse + { + myDict = parseInt($("#select_autocomplete").val()); + actDictMode = 2 + ChangeDict(myDict,'','',true) + } +} // ************************************************************************ // ChangeDict - set acutal Dict for autocomplete // ************************************************************************ -function ChangeDict(selectedDict,myKey,displayKey) +function ChangeDict(selectedDict,myKey,displayKey,sl_SendNoChange) { + if (actDictMode == 1 && ( last_Param == actParam && actParam != '' )) { return } last_Param = actParam + console.log('Change Dict') switch (selectedDict) { case 1: + if (sl_SendNoChange != true) + { $("#select_autocomplete").val("1").change(); } second_regex = new RegExp('\\|\\ Item.*', 'i'); - document.getElementById("selected_dict").innerHTML = 'Items' - document.getElementById("td_selected_dict").style.backgroundColor="" + document.getElementById("selected_dict").innerHTML ="" + document.getElementById("td_selected_dict").style.backgroundColor="" break; case 2: + if (sl_SendNoChange != true) + { $("#select_autocomplete").val("2").change(); } second_regex = new RegExp('\\|\\ Widget.*', 'i'); - document.getElementById("selected_dict").innerHTML = 'Widgets' - document.getElementById("td_selected_dict").style.backgroundColor="" + document.getElementById("selected_dict").innerHTML ="" + document.getElementById("td_selected_dict").style.backgroundColor="" break; case 3: + if (sl_SendNoChange != true) + { $("#select_autocomplete").val("3").change(); } second_regex = new RegExp('\\|\\ Icon.*', 'i'); - document.getElementById("selected_dict").innerHTML = 'Icons' - document.getElementById("td_selected_dict").style.backgroundColor="" + document.getElementById("selected_dict").innerHTML = "" + document.getElementById("td_selected_dict").style.backgroundColor="" break; case 4: + if (sl_SendNoChange != true) + { $("#select_autocomplete").val("4").change(); } second_regex = new RegExp('.*', 'i'); - document.getElementById("selected_dict").innerHTML = 'ALL' - document.getElementById("td_selected_dict").style.backgroundColor="" + document.getElementById("selected_dict").innerHTML ="" + document.getElementById("td_selected_dict").style.backgroundColor="" break; case 5: - second_regex = new RegExp('\\|\\ Color.*', 'i'); - document.getElementById("selected_dict").innerHTML = 'Colors' - document.getElementById("selected_dict").style.backgroundColor="" + if (sl_SendNoChange != true) + { $("#select_autocomplete").val("5").change(); } + colFilter = actParam+'@'+actWidgetName+'*' + second_regex = new RegExp('Std-Color.*|'+colFilter, 'i'); + document.getElementById("selected_dict").innerHTML ="" + document.getElementById("td_selected_dict").style.backgroundColor="" break; case 6: + if (sl_SendNoChange != true) + { $("#select_autocomplete").val("6").change(); } second_regex = new RegExp('\\|\\ XXXXX.*', 'i'); - document.getElementById("selected_dict").innerHTML = 'Off' + document.getElementById("selected_dict").innerHTML ="" document.getElementById("td_selected_dict").style.backgroundColor="" break; case 9: + second_regex = new RegExp('\\|\\ '+myKey+'.*', 'i'); - document.getElementById("selected_dict").innerHTML = ''+myKey+'' + document.getElementById("selected_dict").innerHTML = 'Types filtered by
'+myKey+'' document.getElementById("td_selected_dict").style.backgroundColor="rebeccapurple" break; case 10: + if (sl_SendNoChange != true) + { $("#select_autocomplete").val("1").change(); } second_regex = new RegExp(myKey, 'i'); - document.getElementById("selected_dict").innerHTML = ''+displayKey+'' + document.getElementById("selected_dict").innerHTML = 'Items filtered by
'+displayKey+'' document.getElementById("td_selected_dict").style.backgroundColor="green" break; default: + + document.getElementById("selected_dict").innerHTML ="" document.getElementById("td_selected_dict").style.backgroundColor="" break } @@ -256,25 +289,23 @@ function get_colors() 'sandybrown','seagreen','seashell','sienna','silver','skyblue', 'slateblue','slategray','slategrey','snow','springgreen','steelblue', 'tan','teal','thistle','tomato','turquoise','violet','wheat','white', - 'whitesmoke','yellow','yellowgreen','icon0','icon1'] - myStdColors = ['black','maroon','green','olive','navy','purple','teal','silver', - 'grey','red','lime','yellow','blue','fuchsia','aqua','white','icon0','icon1'] + 'whitesmoke','yellow','yellowgreen'] + result = myColors for (i = 0; i < result.length; i++) { - myColorsDict.push({ text: "'"+result[i]+"'" , displayText: ''+result[i]+" | Color" }); - myCompleteDict.push({ text: ""+result[i]+"", displayText: ''+result[i]+" | Color" }); - myCompleteDictwithQuotes.push({ text: "'"+result[i]+"'", displayText: ''+result[i]+" | Color" }); + myDisplayText = result[i] + " " + myColorsDict.push({ text: "'"+result[i]+"'" , displayText: ''+myDisplayText.substr(0,18)+" | Std-Color" }); + myCompleteDict.push({ text: ""+result[i]+"", displayText: ''+myDisplayText.substr(0,18)+" | Std-Color" }); + myCompleteDictwithQuotes.push({ text: "'"+result[i]+"'", displayText: ''+myDisplayText.substr(0,18)+" | Std-Color" }); } - result = myStdColors - /* - * for (i = 0; i < result.length; i++) { myCompleteDict.push({ text: - * "'"+result[i]+"'" , displayText: ''+result[i]+" | Color" }); } - */ + document.getElementById("colors_loaded").src = 'pics/led/lamp_green.png' - $("#colors_loaded").closest("td")[0].childNodes[2].data="Colors loaded [ "+ myColorsDict.length +" ]" + Label=$("#colors_loaded").closest("td").html() + newLabel = Label.replace("Colors loaded","Colors loaded [ "+ myColorsDict.length +" ]") + $("#colors_loaded").closest("td").html(newLabel) } // ************************************************************************ @@ -303,7 +334,9 @@ function get_Icons() icons_loaded = true document.getElementById("icons_loaded").src = 'pics/led/lamp_green.png' - $("#icons_loaded").closest("td")[0].childNodes[2].data="Icons loaded [ "+ myIcons.length +" ]" + Label=$("#icons_loaded").closest("td").html() + newLabel = Label.replace("Icons loaded","Icons loaded [ "+ myIcons.length +" ]") + $("#icons_loaded").closest("td").html(newLabel) }, error: function (result) { console.log("Error while receiving icons") @@ -346,7 +379,9 @@ function get_Items() CodeMirror.showHint(cm, CodeMirror.hint.autocompleteHint); } document.getElementById("items_loaded").src = 'pics/led/lamp_green.png' - $("#items_loaded").closest("td")[0].childNodes[2].data="Items loaded [ "+ myItems.length +" ]" + Label=$("#items_loaded").closest("td").html() + newLabel = Label.replace("Items loaded","Items loaded [ "+ myItems.length +" ]") + $("#items_loaded").closest("td").html(newLabel) }, error: function (result) { console.log("Error while receiving items") @@ -371,15 +406,14 @@ function render_template() txtCode = txtCode.split("\n").join("") renderSuccess = false; - - while (txtCode.search('{{') >= 0) - { - txtCode = txtCode.replace("{{","") - } - while (txtCode.search('}}') >=0 ) - { - txtCode = txtCode.replace("}}","") - } + txtCode = txtCode.split(" ").join("") + if (txtCode.substr(0,2) == "{{") + { + txtCode = txtCode.substr(2) + } + txtCode = txtCode.split("}}
{{").join("
") + if (txtCode.substr(-3) == ")}}") + { txtCode = txtCode.substr(0,txtCode.length-2) } // ********* [txtTest,allBracketsClosed] = removeBalancedBrackets(txtCode) if (allBracketsClosed == false) @@ -420,7 +454,7 @@ function render_template() txtClipboard += '\n
' } - // Value for rendering + // Value for rendering txtCode = txtClipboard txtClipboard = '' WidgetArray.forEach(function(element){ @@ -509,8 +543,6 @@ function get_widgets() } if (myWidgetJson[widget].hasOwnProperty("param")) { - CheckParam2Dict(widget, true) - myWidgets.push({ text: widget+"", displayText: widget+" | Widget" }); myCompleteDict.push({ text: widget+"", displayText: widget+" | Widget" }); myCompleteDictwithQuotes.push({ text: ""+widget+"", displayText: widget+" | Widget" }); @@ -520,6 +552,9 @@ function get_widgets() myText += 'got : ' + widget + ' - without params
' } } + // Get the specific Params + myParamType = false + CheckValidValues() widgets_loaded = true for (widget in Widget2Remove) { @@ -527,7 +562,10 @@ function get_widgets() console.log("removed deprecated widget :"+Widget2Remove[widget]) } document.getElementById("widgets_loaded").src = 'pics/led/lamp_green.png' - $("#widgets_loaded").closest("td")[0].childNodes[2].data="Widgets loaded [ "+ myWidgets.length +" ]" + Label=$("#widgets_loaded").closest("td").html() + newLabel = Label.replace("Widgets loaded","Widgets loaded [ "+ myWidgets.length +" ]") + $("#widgets_loaded").closest("td").html(newLabel) + if (myText != '') { clearInterval(myInterval); @@ -584,25 +622,17 @@ function TooltipChecker(cm) } - // First remove the brace - braceCount = 0 - while (txtBeforeCursor.search('{{') >= 0) + txtBeforeCursor = txtBeforeCursor.split(" ").join("") + if (txtBeforeCursor.substr(0,2) == "{{") { - txtBeforeCursor = txtBeforeCursor.replace("{{","") - braceCount++ + txtBeforeCursor = txtBeforeCursor.substr(2) } - actColumn = actColumn - braceCount*2 - while (txtBeforeCursor.search('}}') >=0 ) - { - txtBeforeCursor = txtBeforeCursor.replace("}}","") - } - - // For Tests + // remove all closed brackets [txtBeforeCursor,allBracketsClosed] = removeBalancedBrackets(txtBeforeCursor) - // = removeBalancedBrackets(txtBeforeCursor) + var myIcon ="" var myIconVisible = "hidden" var myActColor = "" @@ -617,7 +647,7 @@ function TooltipChecker(cm) myIcon ="icons/ws/"+cm.state.completionActive.data.list[selectedHint].text.replace("'","").replace("'","")+'.svg' myIconVisible = "visible" } - if (cm.state.completionActive.data.list[selectedHint].displayText.search(' Color') > 0 ) + if (cm.state.completionActive.data.list[selectedHint].displayText.search(' Std-Color') > 0 ) { myActColor ="background-color: "+cm.state.completionActive.data.list[selectedHint].text.replace("'","").replace("'","")+';' @@ -692,12 +722,6 @@ function TooltipChecker(cm) txtCode = txtCode.replace(myPattern,'') } - // Special verification for nasty widget definitions - nested with same - // dynamic Icons - /* - * if (txtCode.split(actWidgetName).length > 1) { txtCode = actWidgetName + - * txtCode.split(actWidgetName)[txtCode.split(actWidgetName).length-1] } - */ if (txtCode.split('(').length > 1) { myWidgetStep1 = txtCode.split("(") @@ -706,8 +730,7 @@ function TooltipChecker(cm) txtCode = '(' + myWidgetStep1[myWidgetStep1.length-1] } - if (txtCode.search('\\(') >= 0 )// && openBracketArray.length != - // closeBracketArray.length) + if (txtCode.search('\\(') >= 0 ) { myToolParam = myWidgetJson[actWidgetName]['params'] // Text for // Parmeterlist @@ -799,7 +822,6 @@ function TooltipChecker(cm) } case (txtCompleteDict.search(actParam+"@"+actWidgetName) > -1): { - console.log("Found type parameters in dict") ChangeDict(9,actParam+"@"+actWidgetName) break } @@ -914,7 +936,6 @@ function registerAutocompleteHelper(name, curDict) { curWord = "..." var regex = new RegExp('' + curWord, 'i'); } - // "Pattern 1 : /\\|\\ W.*/Pattern 2: /.*lig.*/" if (curWord.length >= 3) { var oCompletions = { @@ -994,63 +1015,65 @@ function closeTooltip() } // ************************************************************************ -// function to check if parameter should be added to the autocomplete dict +// function to close the filter-window // ************************************************************************ -function CheckParam2Dict(widget2check, add2Dict) +function closeFilterTip() +{ + myToolTip= document.getElementById("filteroverlay") + myToolTip.style.display = "none"; +} + +// ************************************************************************ +// function to add to dict +// *********************************************************************** +function add_2_Dict(add2Dict,widget2check) { - if (widget2check == "stateengine.state") - { - console.log("stateengine.state") - } - myParamType = false - if (myWidgetJson[widget2check]['param'].hasOwnProperty("type")) - { myParamType = "type" } - else if (myWidgetJson[widget2check]['param'].hasOwnProperty("mode")) - { myParamType = "mode" } - else if (myWidgetJson[widget2check]['param'].hasOwnProperty("style")) - { myParamType = "style" } - else if (myWidgetJson[widget2check]['param'].hasOwnProperty("colormodel")) - { myParamType = "colormodel" } - else if (myWidgetJson[widget2check]['param'].hasOwnProperty("orientation")) - { myParamType = "orientation" } - else if (myWidgetJson[widget2check]['param'].hasOwnProperty("valueType")) - { myParamType = "valueType" } - if (myParamType != false && add2Dict) - { - if (myWidgetJson[widget2check]['param'][myParamType].hasOwnProperty("desc")) - { - myPattern = patt1 = new RegExp("\'.*?\'","g") - myTypes = [] - myTypes =myWidgetJson[widget2check]["param"][myParamType]["desc"].match(patt1) - myTypes = String(myTypes).split("'").join("").split(",") - myUniqueTypes = [] - try + { + myValidValues = myWidgetJson[widget2check]['param'][myParamType]['valid_values'] + + for (Entry in myValidValues) { - while (myTypes.length > 0) - { - myItem2Push = myTypes.pop().toLowerCase() - if (String(myUniqueTypes).search(myItem2Push) < 0 ) - { - myUniqueTypes.push(myItem2Push) - } - } - } - catch (e) {} - while (myUniqueTypes.length > 0) - { - myValue = myUniqueTypes.pop() - myDisplayText = myValue + " " - myCompleteDict.push({ text: ""+myValue+"", displayText: myDisplayText.substr(0,18)+" | " + myParamType+"@"+widget }); - myCompleteDictwithQuotes.push({ text: "'"+myValue+"'", displayText: myDisplayText.substr(0,18)+" | " + myParamType+"@"+widget }); - console.log("added spec. Parameter to dict :" + myValue+" | " + myParamType+"@"+widget ) - } + myValue = myValidValues[Entry] + myDisplayText = myValue + " " + myCompleteDict.push({ text: ""+myValue+"", displayText: myDisplayText.substr(0,18)+" | " + myParamType+"@"+widget }); + myCompleteDictwithQuotes.push({ text: "'"+myValue+"'", displayText: myDisplayText.substr(0,18)+" | " + myParamType+"@"+widget }); + console.log("added spec. Parameter to dict :" + myValue+" | " + myParamType+"@"+widget ) } - } + } - return myParamType } +// ************************************************************************ +// function to check if parameter should be added to the autocomplete dict +// ************************************************************************ +function CheckValidValues() +{ + for (widget in myWidgetJson) + { + if (myWidgetJson[widget].hasOwnProperty("param")) + { + for (actParam in myWidgetJson[widget]["param"]) + { + myParamType + if (myWidgetJson[widget]['param'][actParam].hasOwnProperty("valid_values")) + { + if(myWidgetJson[widget]['param'][actParam]['type'] != 'item') + { + console.log(widget + '-> Param : '+actParam + '-> valid_values :' + myWidgetJson[widget]['param'][actParam]['valid_values']+'|') + myParamType = actParam + add_2_Dict(true,widget) + + } + } + } + } + } +} + +//************************************************************************ +//function to change Dict to Auto-close quotes +//*********************************************************************** function changeCloseBrackets(byKey) { quotestate = document.getElementById("switch_quotes").checked diff --git a/pages/_template/rooms_menu.html b/pages/_template/rooms_menu.html index 1199783b7..d43880590 100644 --- a/pages/_template/rooms_menu.html +++ b/pages/_template/rooms_menu.html @@ -13,7 +13,7 @@
Sleeping
+Sleeping
diff --git a/pages/base/base.css b/pages/base/base.css index d8ce61728..051df3796 100755 --- a/pages/base/base.css +++ b/pages/base/base.css @@ -569,7 +569,7 @@ a.ui-slider-handle-semicircle { input.ui-slider-input.ui-slider-no-input { visibility: hidden; } -input.ui-slider-input.ui-slider-no-input[orientation='semicircle'] { +input.ui-slider-input.ui-slider-no-input[data-orientation='semicircle'] { display: none; } .ui-slider-track.ui-slider-no-input { @@ -684,6 +684,7 @@ input.ui-slider-input.ui-slider-no-input[orientation='semicircle'] { margin: 0 5px 13px 5px; } +.ui-popup-container .image img, .block .image img { width: 100%; } diff --git a/pages/base/config.html b/pages/base/config.html index c8ceb9707..0c7c0d89b 100644 --- a/pages/base/config.html +++ b/pages/base/config.html @@ -51,10 +51,13 @@{{ lang('configuration_page', 'userinterface'
{{ lang('configuration_page', 'interface', 'label') }}
{{ forms.config_select(source, values, 'pages', dir('pages', '^(?!base|apps)(.+?)') ) }}
- {{ forms.config_select(source, values, 'design', dir('designs', '(.+?).css')) }}
- /** get icon colors out of design.css meta data */
- {{ forms.config_hidden(source, values, 'design_icon0') }}
- {{ forms.config_hidden(source, values, 'design_icon1') }}
+ {{ forms.config_row(source, values, 'design',
+ [
+ forms.config_select(source, values, 'design', dir('designs', '(.+?).css'), 'true')
+ ,forms.config_hidden(source, values, 'design_icon0')
+ ,forms.config_hidden(source, values, 'design_icon1')
+ ]
+ ) }}
{{ forms.config_flip(source, values, 'cache', '') }}
{{ forms.check_cache ( source, values, 'cache') }}
diff --git a/pages/base/configure.php b/pages/base/configure.php
index 5276202fe..a9a01bbfe 100755
--- a/pages/base/configure.php
+++ b/pages/base/configure.php
@@ -13,7 +13,7 @@
header('Content-Type: application/json');
// just clear pagecache
-if($_GET['clear_cache']) {
+if(isset($_GET['clear_cache']) && $_GET['clear_cache']) {
$success = delTree(const_path.'temp/pagecache') || ! is_dir(const_path.'temp/pagecache');
if($success) {
$success = delTree(const_path.'temp/twigcache') || ! is_dir(const_path.'temp/pagecache');
@@ -34,7 +34,7 @@
$config = new config();
$success = $config->save($_GET['target'], $_POST, $_GET['pages']);
if($success) {
- $success = delTree(const_path.'temp/pagecache') || ! is_dir(const_path.'temp/pagecache');
+ $success = delTree(const_path.'temp/pagecache/'.config_cachefolder) || ! is_dir(const_path.'temp/pagecache/'.config_cachefolder);
if($success)
echo json_encode(array('title' => 'Configuration', 'text' => 'Configuration changes saved.'));
else { // save fails
diff --git a/pages/base/root.html b/pages/base/root.html
index 5d5ec9034..86fbc5e2d 100755
--- a/pages/base/root.html
+++ b/pages/base/root.html
@@ -30,7 +30,6 @@
-
@@ -94,9 +93,9 @@
{%- endfor %}
{% endif %}
-
+
-
-
-
+
/** JavaScript assets **/
{% set jsFiles = [
'lib/base/jquery.mobile.slider.js',
'vendor/plot.highcharts/highstock.js',
'vendor/plot.highcharts/highcharts-more.js',
- 'vendor/plot.highcharts/draggable-points.js',
+ 'vendor/plot.highcharts/modules/draggable-points.js',
'vendor/plot.highcharts/modules/solid-gauge.js',
'vendor/jquery.cycle2/jquery.cycle2.js',
'vendor/jquery.roundslider/jquery-1.61.roundslider.js',
@@ -162,7 +161,7 @@
{% endfor %}
{% endif %}
{%- if config_cache and mbstring_available -%} /** only use minified and merged version if page cache is activated and mbstring available. otherwise use original single files. **/
-
+
{%- endif -%}
{%- endfor -%}
{%- if config_cache and not mbstring_available %}
-
+
{%- endif -%}
{% endif %}
{% block head %}{% endblock %}
-
Example
diff --git a/pages/docu/basic/widget_basic.roundslider.html b/pages/docu/basic/widget_basic.roundslider.html
index a08246627..ff5a50ee6 100644
--- a/pages/docu/basic/widget_basic.roundslider.html
+++ b/pages/docu/basic/widget_basic.roundslider.html
@@ -11,7 +11,7 @@
{% extends "widget_basic.html" %}
{% block example %}
-
+
{% endblock %}
{% block footer %}
-
Example
diff --git a/pages/docu/quad/widget_quad.blind.html b/pages/docu/quad/widget_quad.blind.html
index ee6bd9495..e7da6312e 100755
--- a/pages/docu/quad/widget_quad.blind.html
+++ b/pages/docu/quad/widget_quad.blind.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block example %}
-
{% set stateengine = {} %}
-{% set stateengine_items = {
-'item1': ['item1.automatik.lock', 'item1.automatik.settings.suspendduration', '0', '60', '5', 'item1.automatik.settings.sollwert', '0', '250', '5', 'item1.automatik.settings.sperren', '0', '1', 'sperren', 'autoblind', 'standard', 'morning']
-} %}
+{% set stateengine_items = {'item1': ['item1.automatik.lock', 'item1.automatik.settings.suspendduration', '0', '60', '5', 'item1.automatik.settings.sollwert', '0', '250', '5', 'item1.automatik.settings.sperren', '0', '1', 'sperren', 'autoblind', 'standard', 'morning']} %}
{% for item,content in stateengine_items %}
{% set itemname = item|replace({'.': '_'}) %}
@@ -57,15 +55,11 @@
{% endif %}
{% set halloweendate = 'now'|date('m/d') == '10/31' %}
{% set advent1 = 'now'|date('m/d') > '12/01' and 'now'|date('m/d') < '12/31' %}
- {% set advent2 = 'now'|date('m/d') > '01/01' and 'now'|date('m/d') < '01/15' %}
+ {% set advent2 = 'now'|date('m/d') < '01/15' and 'now'|date('m/d') > '01/01' %}
- {% set stateengine = stateengine|merge(
- {itemname: ['stateengine', suspendtext, suspend, sollwerttext, 'standard' in content ? standard, 'morning' in content ? morning, 'halloween' in content and halloweendate ? halloween, 'advent' in content and advent1 or advent2 ? advent]}
- ) %}
+ {% set stateengine = stateengine|merge({itemname: ['stateengine', suspendtext, suspend, sollwerttext, 'standard' in content ? standard, 'morning' in content ? morning, 'halloween' in content and halloweendate ? halloween, 'advent' in content and advent1 or advent2 ? advent]}) %}
{% endfor %}
-
-
Example
['plot', 'uzsu', ['move_down', 'stop', 'move_up'],'pos_popup_blind', 'stateengine'] with stateengine popup
@@ -75,7 +69,7 @@ Example
- {{ quad.blind('blind1', 'Blind Popup. Quad-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', 'blind.automatik', (stateengine['item1']), '', 'place3', 'place4', ['plot', 'uzsu', ['move_down', 'stop', 'move_up'],'pos_popup_blind', 'stateengine']) }}
+ {{ quad.blind('blind01', 'Blind Popup. Quad-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', 'blind.automatik', (stateengine['item1']), '', 'place3', 'place4', ['plot', 'uzsu', ['move_down', 'stop', 'move_up'],'pos_popup_blind', 'stateengine']) }}
['move_down', 'move_up','pos_slider', 'plot', 'uzsu', '40']
@@ -86,7 +80,7 @@ Example
- {{ quad.blind('blind2', 'Blind Slider. Standard-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', '', '', 'place3', 'place4', ['move_down', 'move_up','pos_slider', 'plot', 'uzsu', '40']) }}
+ {{ quad.blind('blind02', 'Blind Slider. Standard-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', '', '', 'place3', 'place4', ['move_down', 'move_up','pos_slider', 'plot', 'uzsu', '40']) }}
['move_down', 'move_up', ' ', ['pos1', 'pos2'], 'extpopup']
@@ -97,7 +91,7 @@ Example
- {{ quad.blind('blind3', 'Blind with position selector', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], ['blind.hoehe', '50', '80', '0'], 'place3', 'place4', ['move_down', 'move_up', ' ', ['pos1', 'pos2'], 'extpopup']) }}
+ {{ quad.blind('blind03', 'Blind with position selector', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], ['blind.hoehe', '50', '80', '0'], 'place3', 'place4', ['move_down', 'move_up', ' ', ['pos1', 'pos2'], 'extpopup']) }}
[40, 'move_down', 'move_up', 'pos_popup_blind', 'pos_popup_shutter']
@@ -108,7 +102,7 @@ Example
- {{ quad.blind('blind4', 'Blind 2 different popups', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', ['time_automatic', 'time_automatic', 'num', [0,255,10], 'icon1', 'icon0'], 'blind.hoehe', '', '', '', '', 'place3', 'place4', [40, 'move_down', 'move_up', 'pos_popup_blind', 'pos_popup_shutter']) }}
+ {{ quad.blind('blind04', 'Blind 2 different popups', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', ['time_automatic', 'time_automatic', 'num', [0,255,10], 'icon1', 'icon0'], 'blind.hoehe', '', '', '', '', 'place3', 'place4', [40, 'move_down', 'move_up', 'pos_popup_blind', 'pos_popup_shutter']) }}
no column_order
@@ -119,6 +113,6 @@ Example
- {{ quad.blind('blind5', 'Blind Standard witz UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter') }}
+ {{ quad.blind('blind05', 'Blind Standard witz UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter') }}
{% endblock %}
diff --git a/pages/docu/quad/widget_quad.color.html b/pages/docu/quad/widget_quad.color.html
index f582fa6b2..e4df12c7b 100755
--- a/pages/docu/quad/widget_quad.color.html
+++ b/pages/docu/quad/widget_quad.color.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block example %}
-
Example
@@ -33,7 +32,7 @@ Example
-{{ quad.mixed('mixed', 'Mixed line', [basic.symbol('', '', '', 'weather_light_meter.svg'), basic.input('', 'this', 'date')], basic.symbol('', 'that', '', ['status_light_off.svg', 'status_light_high.svg'], [0,2], '', ['icon0', 'icon1']),
+{{ quad.mixed('mixed1', 'Mixed line', [basic.symbol('', '', '', 'weather_light_meter.svg'), basic.input('', 'this', 'date')], basic.symbol('', 'that', '', ['status_light_off.svg', 'status_light_high.svg'], [0,2], '', ['icon0', 'icon1']),
basic.stateswitch('', 'that', '', [0,2], '', ['0','2'])) }}
diff --git a/pages/docu/quad/widget_quad.playercontrol.html b/pages/docu/quad/widget_quad.playercontrol.html
index b9ce07915..ee0d03535 100755
--- a/pages/docu/quad/widget_quad.playercontrol.html
+++ b/pages/docu/quad/widget_quad.playercontrol.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block example %}
-
Example
@@ -37,7 +35,7 @@ Example
-{{ quad.playercontrol('volume', 'Volume Slider, UZSU and Plot', '', '', '', '', '', '', '', '', '', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, '', '', '', '', '', 'speakerAB', 'uzsu', ['', '', 'uzsu_value', '', 'icon1', 'icon0'], 'Volume.Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_up','volume_down'],'volume_slider']) }}
+{{ quad.playercontrol('volume1', 'Volume Slider, UZSU and Plot', '', '', '', '', '', '', '', '', '', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, '', '', '', '', '', 'speakerAB', 'uzsu', ['', '', 'uzsu_value', '', 'icon1', 'icon0'], 'Volume.Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_up','volume_down'],'volume_slider']) }}
Player Control with standard columns
@@ -48,7 +46,7 @@ Example
-{{ quad.playercontrol('player', 'Squeezebox', 'Previous', '', 'Pause', 'Stop', 'Next', '', 'Eject', 'Repeat', 'Shuffle', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot') }}
+{{ quad.playercontrol('player1', 'Squeezebox', 'Previous', '', 'Pause', 'Stop', 'Next', '', 'Eject', 'Repeat', 'Shuffle', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot') }}
Player Control with ['uzsu','plot',['volume_down','volume_up','power'], 'source']
@@ -59,7 +57,7 @@ Example
-{{ quad.playercontrol('player2', 'Source as Icons', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'icon', ['10', 'edit_numeric_1.svg'], ['13', 'edit_numeric_2.svg']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', 'speakerAB', 'uzsu', '', 'Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_down','volume_up','power'], 'source']) }}
+{{ quad.playercontrol('player02', 'Source as Icons', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'icon', ['10', 'edit_numeric_1.svg'], ['13', 'edit_numeric_2.svg']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', 'speakerAB', 'uzsu', '', 'Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_down','volume_up','power'], 'source']) }}
Player Control with [['pause', 'stop'], ['cover', 'album'], 'shuffle', 'song_position']
@@ -70,7 +68,7 @@ Example
-{{ quad.playercontrol('player3', 'With Album Art', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'menu', ['10', '', '10'], ['13', '', '13']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot', '', '', '', '', '', '', [['pause', 'stop'], 'cover', 'shuffle', 'song_position']) }}
+{{ quad.playercontrol('player03', 'With Album Art', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'menu', ['10', '', '10'], ['13', '', '13']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot', '', '', '', '', '', '', [['pause', 'stop'], 'cover', 'shuffle', 'song_position']) }}
diff --git a/pages/docu/quad/widget_quad.print.html b/pages/docu/quad/widget_quad.print.html
index 110715430..7b1943c81 100755
--- a/pages/docu/quad/widget_quad.print.html
+++ b/pages/docu/quad/widget_quad.print.html
@@ -13,13 +13,12 @@
{% endblock %}
{% block example %}
-
Example
@@ -37,7 +36,7 @@ Example
-{{ quad.print('formatvalue', 'that', '%', '', [10,150], ['#0f0','#ff0','#f00'], '', 'placeholder', 'one % value with thresholds', 'that') }}
+{{ quad.print('formatvalue1', 'that', '%', '', [10,150], ['#0f0','#ff0','#f00'], '', 'placeholder', 'one % value with thresholds', 'that') }}
Multiple print
@@ -48,7 +47,7 @@ Example
- {{ quad.print('formatvalue2', ['this','that'], ['%','°'], ['','VAR*2'], [0,[15,300]], [['#0f0','#ff0'],['#0f0','#ff0','#f00']], '', 'place', 'two values, with 2* formula', ['this','that'], ['this.plot', 'that.plot']) }}
+ {{ quad.print('formatvalue02', ['this','that'], ['%','°'], ['','VAR*2'], [0,[15,300]], [['#0f0','#ff0'],['#0f0','#ff0','#f00']], '', 'place', 'two values, with 2* formula', ['this','that'], ['this.plot', 'that.plot']) }}
Four different prints
@@ -59,7 +58,7 @@ Example
- {{ quad.print('formatvalue3', ['this','that', ' ', 'theother'], ['%','°'], ['VAR*2','','',''], [[1,5],'', '',''], [['#0f0','#ff0','#f00'],['#0f0','#ff0'],'',''], '', 'placeholder', '3 values, 1 empty column', ['this','that', '', 'theother']) }}
+ {{ quad.print('formatvalue03', ['this','that', ' ', 'theother'], ['%','°'], ['VAR*2','','',''], [[1,5],'', '',''], [['#0f0','#ff0','#f00'],['#0f0','#ff0'],'',''], '', 'placeholder', '3 values, 1 empty column', ['this','that', '', 'theother']) }}
Using Scripts to change other elements. Leave the item empty and give the column an id name
diff --git a/pages/docu/quad/widget_quad.rtr.html b/pages/docu/quad/widget_quad.rtr.html
index 086e3a0b0..02c47775d 100755
--- a/pages/docu/quad/widget_quad.rtr.html
+++ b/pages/docu/quad/widget_quad.rtr.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block example %}
-
Example
@@ -34,7 +33,7 @@ Example
- {{ quad.rtr('normal', 'Standard Order with plot and offset', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'state') }}
+ {{ quad.rtr('normal1', 'Standard Order with plot and offset', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'state') }}
Reverse order
@@ -48,6 +47,6 @@ Example
- {{ quad.rtr('reverse', 'Reverse Order', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'heizen', 'Text', 0.10, '', [device.uzsuicon('','uzsuitem','Presence','','','list','Present:1,Absent:2,Night:3'),icon.heating('','','istwert',0,23)], '#ff0', 'blink', '', '', '', '', [3,2,1]) }}
+ {{ quad.rtr('reverse1', 'Reverse Order', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'heizen', 'Text', 0.10, '', [device.uzsuicon('','uzsuitem','Presence','','','list','Present:1,Absent:2,Night:3'),icon.heating('','','istwert',0,23)], '#ff0', 'blink', '', '', '', '', [3,2,1]) }}
{% endblock %}
diff --git a/pages/docu/quad/widget_quad.select.html b/pages/docu/quad/widget_quad.select.html
index 898f2baa3..247dea828 100755
--- a/pages/docu/quad/widget_quad.select.html
+++ b/pages/docu/quad/widget_quad.select.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block example %}
-
{% set extpopup = {
'extra': ['edit_favorites.svg', [['linetext', 'select', 'switch'], 'Text', ['item.automatik.settings.sollwert', 'mini', [0,4,6]], ['item.automatik.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], [['switch', 'slider'], ['item.automatik.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']], ['item.automatik.settings.suspendduration', '0', '60', '5', '', 'handle']], [['slider'], ['item.automatik.settings.sollwert', '0', '1', '0']], [['linetext', 'flip'], 'Flip:', ['licht.og.kueche.automatik.lock', 'On', 'Off', '1', '0']]],
@@ -43,7 +42,7 @@ Example
-{{ quad.select('select1', ['this', 'that'], ['menu', 'menu'], [[0,3],[4,5]], [['edit_numeric_0.svg','edit_numeric_3.svg'],['edit_numeric_4.svg','edit_numeric_5.svg']], [['0','3'],['4','5']], ['',''], ['',''], '', '', 'Select as menu', ['Select1', 'Select2'], ['this.uszu','that.uzsu'], ['', ''], ['plotitem1', 'plotitem2']) }}
+{{ quad.select('select01', ['this', 'that'], ['menu', 'menu'], [[0,3],[4,5]], [['edit_numeric_0.svg','edit_numeric_3.svg'],['edit_numeric_4.svg','edit_numeric_5.svg']], [['0','3'],['4','5']], ['',''], ['',''], '', '', 'Select as menu', ['Select1', 'Select2'], ['this.uszu','that.uzsu'], ['', ''], ['plotitem1', 'plotitem2']) }}
Single select Item [['uzsu','select'], '10', ['plot','stateengine', 'extpopup'], '10', 'locks']
@@ -54,7 +53,7 @@ Example
-{{ quad.select('select2', 'this', 'icon', [0,1,2,3], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg'], ['','','',''], '', 'horizontal', '', '', 'Select as horizontal group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', (extpopup['extra']), ['this.sperren'], 'this.slider', '', '', [['uzsu','select'], '10', ['plot','stateengine', 'extpopup'], '10', 'locks']) }}
+{{ quad.select('select02', 'this', 'icon', [0,1,2,3], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg'], ['','','',''], '', 'horizontal', '', '', 'Select as horizontal group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', (extpopup['extra']), ['this.sperren'], 'this.slider', '', '', [['uzsu','select'], '10', ['plot','stateengine', 'extpopup'], '10', 'locks']) }}
Single select item
@@ -65,7 +64,7 @@ Example
-{{ quad.select('select3', 'this', 'icon', [0,1,2,3,4], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg','edit_numeric_4.svg'], ['','','','',''], '', '', '', '', 'Select as none group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', '', ['this.sperren'], ['dies.timer', 0, 10, 1, 'min', 'handle'], '', '', ['select', 'plot', 'uzsu']) }}
+{{ quad.select('select03', 'this', 'icon', [0,1,2,3,4], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg','edit_numeric_4.svg'], ['','','','',''], '', '', '', '', 'Select as none group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', '', ['this.sperren'], ['dies.timer', 0, 10, 1, 'min', 'handle'], '', '', ['select', 'plot', 'uzsu']) }}
Single select item without column order
diff --git a/pages/docu/quad/widget_quad.shutter.html b/pages/docu/quad/widget_quad.shutter.html
index 52b316a7c..7ba3cd72f 100755
--- a/pages/docu/quad/widget_quad.shutter.html
+++ b/pages/docu/quad/widget_quad.shutter.html
@@ -13,63 +13,55 @@
{% endblock %}
{% block example %}
-
{% set stateengine = {} %}
-{% set stateengine_items = {
-'item1': ['item1.automatik.lock', 'item1.automatik.settings.suspendduration', '0', '60', '5', 'item1.automatik.settings.sollwert', '0', '250', '5', 'item1.automatik.settings.sperren', '0', '1', 'sperren', 'autoblind', 'standard', 'morning']
-} %}
+{% set stateengine_items = {'item1': ['item1.automatik.lock', 'item1.automatik.settings.suspendduration', '0', '60', '5', 'item1.automatik.settings.sollwert', '0', '250', '5', 'item1.automatik.settings.sperren', '0', '1', 'sperren', 'autoblind', 'standard', 'morning']} %}
{% for item,content in stateengine_items %}
{% set itemname = item|replace({'.': '_'}) %}
- {% set suspend = [['switch', 'slider'], [content[0], 'icon', [0,1], ['secur_open.svg','secur_locked.svg']], [content[1], content[2], content[3], content[4], '', 'handle']] %}
- {% set sollwerte = {} %}
- {% set sollwerte = sollwerte|merge({'standard': content[5]~'.standard'}) %}
- {% set sollwerte = sollwerte|merge({'morning': content[5]~'.morning'}) %}
- {% set sperrwerte = {} %}
- {% set sperrwerte = sperrwerte|merge({'standard': content[9]~'.standard'}) %}
- {% set sperrwerte = sperrwerte|merge({'morning': content[9]~'.morning'}) %}
-
- {% if 'standard' in content %}
- {% set standard = [['switch', (content[8] == '0') ? 'flip', (not content[8] == '0' and not content[8] == '') ? 'slider', (content[12] == 'sperren') ? 'switch', (content[12] == 'prio') ? 'select'], ['item1.automatik.settings.standard.active', 'icon', [0,1], ['time_automatic.svg','time_automatic.svg']], (content[8] == '0') ? ([sollwerte.standard, '', '', content[6], content[7]]), (not content[8] == '0' and not content[8] == '') ? ([sollwerte.standard, content[6], content[7], content[8], '', 'handle']), (content[12] == 'sperren') ? ([sperrwerte.standard, 'icon', [content[10]|default(0),content[11]|default(1)], ['secur_open.svg','secur_locked.svg']]), (content[12] == 'prio') ? ([sperrwerte.standard, 'icon', [0,2,3], ['control_minus.svg','light_light_dim_00.svg','light_light_dim_90.svg']]) ] %}
- {% endif %}
- {% if 'morning' in content %}
- {% set morning = [['switch', (content[8] == '0') ? 'flip', (not content[8] == '0' and not content[8] == '') ? 'slider', (content[12] == 'sperren') ? 'switch', (content[12] == 'prio') ? 'select'], ['item1.automatik.settings.morning.active', 'icon', [0,1], ['weather_sunrise.svg','weather_sunrise.svg']], (content[8] == '0') ? ([sollwerte.morning, '', '', content[6], content[7]]), (not content[8] == '0' and not content[8] == '') ? ([sollwerte.morning, content[6], content[7], content[8], '', 'handle']), (content[12] == 'sperren') ? ([sperrwerte.morning, 'icon', [content[10]|default(0),content[11]|default(1)], ['secur_open.svg','secur_locked.svg']]), (content[12] == 'prio') ? ([sperrwerte.morning, 'icon', [0,2,3], ['control_minus.svg','light_light_dim_00.svg','light_light_dim_90.svg']]) ] %}
- {% endif %}
-
-
- {% set suspendtext = ['header', 'Suspendzeit'] %}
- {% if content[12] == 'sperren' %}
- {% set sollwerttext = ['header', 'Sperrwerte'] %}
- {% elseif content[12] == 'prio' and not content[8] == '' %}
- {% set sollwerttext = ['header', 'Soll- und Priowerte'] %}
- {% elseif content[12] == 'prio' and (content[8] == '' or content[8] == '0')%}
- {% set sollwerttext = ['header', 'Priowerte'] %}
- {% else %}
- {% set sollwerttext = ['header', 'Sollwerte'] %}
- {% endif %}
- {% set halloweendate = 'now'|date('m/d') == '10/31' %}
- {% set advent1 = 'now'|date('m/d') > '12/01' and 'now'|date('m/d') < '12/31' %}
- {% set advent2 = 'now'|date('m/d') > '01/01' and 'now'|date('m/d') < '01/15' %}
-
- {% set stateengine = stateengine|merge(
- {itemname: ['stateengine', suspendtext, suspend, sollwerttext, 'standard' in content ? standard, 'morning' in content ? morning, 'halloween' in content and halloweendate ? halloween, 'advent' in content and advent1 or advent2 ? advent]}
- ) %}
+ {% set suspend = [['switch', 'slider'], [content[0], 'icon', [0,1], ['secur_open.svg','secur_locked.svg']], [content[1], content[2], content[3], content[4], '', 'handle']] %}
+ {% set sollwerte = {} %}
+ {% set sollwerte = sollwerte|merge({'standard': content[5]~'.standard'}) %}
+ {% set sollwerte = sollwerte|merge({'morning': content[5]~'.morning'}) %}
+ {% set sperrwerte = {} %}
+ {% set sperrwerte = sperrwerte|merge({'standard': content[9]~'.standard'}) %}
+ {% set sperrwerte = sperrwerte|merge({'morning': content[9]~'.morning'}) %}
+
+ {% if 'standard' in content %}
+ {% set standard = [['switch', (content[8] == '0') ? 'flip', (not content[8] == '0' and not content[8] == '') ? 'slider', (content[12] == 'sperren') ? 'switch', (content[12] == 'prio') ? 'select'], ['item1.automatik.settings.standard.active', 'icon', [0,1], ['time_automatic.svg','time_automatic.svg']], (content[8] == '0') ? ([sollwerte.standard, '', '', content[6], content[7]]), (not content[8] == '0' and not content[8] == '') ? ([sollwerte.standard, content[6], content[7], content[8], '', 'handle']), (content[12] == 'sperren') ? ([sperrwerte.standard, 'icon', [content[10]|default(0),content[11]|default(1)], ['secur_open.svg','secur_locked.svg']]), (content[12] == 'prio') ? ([sperrwerte.standard, 'icon', [0,2,3], ['control_minus.svg','light_light_dim_00.svg','light_light_dim_90.svg']]) ] %}
+ {% endif %}
+ {% if 'morning' in content %}
+ {% set morning = [['switch', (content[8] == '0') ? 'flip', (not content[8] == '0' and not content[8] == '') ? 'slider', (content[12] == 'sperren') ? 'switch', (content[12] == 'prio') ? 'select'], ['item1.automatik.settings.morning.active', 'icon', [0,1], ['weather_sunrise.svg','weather_sunrise.svg']], (content[8] == '0') ? ([sollwerte.morning, '', '', content[6], content[7]]), (not content[8] == '0' and not content[8] == '') ? ([sollwerte.morning, content[6], content[7], content[8], '', 'handle']), (content[12] == 'sperren') ? ([sperrwerte.morning, 'icon', [content[10]|default(0),content[11]|default(1)], ['secur_open.svg','secur_locked.svg']]), (content[12] == 'prio') ? ([sperrwerte.morning, 'icon', [0,2,3], ['control_minus.svg','light_light_dim_00.svg','light_light_dim_90.svg']]) ] %}
+ {% endif %}
+
+ {% set suspendtext = ['header', 'Suspendzeit'] %}
+ {% if content[12] == 'sperren' %}
+ {% set sollwerttext = ['header', 'Sperrwerte'] %}
+ {% elseif content[12] == 'prio' and not content[8] == '' %}
+ {% set sollwerttext = ['header', 'Soll- und Priowerte'] %}
+ {% elseif content[12] == 'prio' and (content[8] == '' or content[8] == '0')%}
+ {% set sollwerttext = ['header', 'Priowerte'] %}
+ {% else %}
+ {% set sollwerttext = ['header', 'Sollwerte'] %}
+ {% endif %}
+ {% set halloweendate = 'now'|date('m/d') == '10/31' %}
+ {% set advent1 = 'now'|date('m/d') > '12/01' and 'now'|date('m/d') < '12/31' %}
+ {% set advent2 = 'now'|date('m/d') < '01/15' and 'now'|date('m/d') > '01/01' %}
+
+ {% set stateengine = stateengine|merge({itemname: ['stateengine', suspendtext, suspend, sollwerttext, 'standard' in content ? standard, 'morning' in content ? morning, 'halloween' in content and halloweendate ? halloween, 'advent' in content and advent1 or advent2 ? advent]}) %}
{% endfor %}
-
-
Example
-
- ['extpopup', 'pos_shutter_ext']
+
+ ['extpopup', 'pos_shutter_ext']
{% filter trim|escape|nl2br %}{% raw %}
{{ quad.shutter('shutter1', 'Shutter with picture', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80, 'place1', 'place2', 'shutter.hoehe.zeitschalter', '', 'shutter.hoehe', '', 'shutter.automatik', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], 'place3', 'place4', ['extpopup', 'pos_shutter_ext']) }}
@@ -77,8 +69,9 @@ Example
- {{ quad.shutter('shutter1', 'Shutter with picture', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80, 'place1', 'place2', 'shutter.hoehe.zeitschalter', '', 'shutter.hoehe', '', 'shutter.automatik', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], 'place3', 'place4', ['extpopup', 'pos_shutter_ext']) }}
-
+ {{ quad.shutter('shutter01', 'Shutter with picture', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80, 'place1', 'place2', 'shutter.hoehe.zeitschalter', '', 'shutter.hoehe', '', 'shutter.automatik', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], 'place3', 'place4', ['extpopup', 'pos_shutter_ext']) }}
+
+
no column order defined
@@ -88,7 +81,8 @@ Example
- {{ quad.shutter('shutter2', 'Shutter, Standard', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80) }}
-
+ {{ quad.shutter('shutter02', 'Shutter, Standard', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80) }}
+
+
{% endblock %}
diff --git a/pages/docu/quad/widget_quad.stateswitch.html b/pages/docu/quad/widget_quad.stateswitch.html
index b9ea8352c..54fc8bb70 100755
--- a/pages/docu/quad/widget_quad.stateswitch.html
+++ b/pages/docu/quad/widget_quad.stateswitch.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block example %}
-
{% set extpopup = {
@@ -48,7 +47,7 @@ Example
-{{ quad.stateswitch('stateswitch11', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], '', '', 'blink', '', '', '', '', '', 'one switch, standard order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['extra']), [['this.sperren'], 'bwm.this.sperren','this.zwangvalue']) }}
+{{ quad.stateswitch('stateswitch011', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], '', '', 'blink', '', '', '', '', '', 'one switch, standard order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['extra']), [['this.sperren'], 'bwm.this.sperren','this.zwangvalue']) }}
[['uzsu','switch'], '10', ['plot','stateengine'], '10', 'locks'] with extpopup
@@ -59,7 +58,7 @@ Example
-{{ quad.stateswitch('stateswitch12', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], ['','',''], ['','#ff0','#00f'], 'blink', '', '', '', '', '', 'One item with column_order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['stateengine']), ['this.sperren'], '', '', '', [['uzsu','switch'], '10', ['plot','stateengine'], '10', 'locks']) }}
+{{ quad.stateswitch('stateswitch012', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], ['','',''], ['','#ff0','#00f'], 'blink', '', '', '', '', '', 'One item with column_order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['stateengine']), ['this.sperren'], '', '', '', [['uzsu','switch'], '10', ['plot','stateengine'], '10', 'locks']) }}
don't use column_order for multiple switches.
@@ -70,7 +69,7 @@ Example
-{{ quad.stateswitch('stateswitch14', ['this', 'that', 'theother'], ['icon','mini','midi'], [[1,0],'',[0,150]], [['edit_numeric_1.svg','edit_numeric_0.svg'],'',['edit_numeric_0.svg','edit_numeric_9.svg']], ['', ['0','1']], [['',''],'',['','']], ['blink','','blink'], '', '', '', 'place1', 'place2', 'Mixed types with one slider', ['', '', ''], ['this.uszu','','theother.uszu'], ['','',''], '', '', '', '', '', [['this.timer', 0, 10, 1, 'min', 'handle'],'','']) }}
+{{ quad.stateswitch('stateswitch014', ['this', 'that', 'theother'], ['icon','mini','midi'], [[1,0],'',[0,150]], [['edit_numeric_1.svg','edit_numeric_0.svg'],'',['edit_numeric_0.svg','edit_numeric_9.svg']], ['', ['0','1']], [['',''],'',['','']], ['blink','','blink'], '', '', '', 'place1', 'place2', 'Mixed types with one slider', ['', '', ''], ['this.uszu','','theother.uszu'], ['','',''], '', '', '', '', '', [['this.timer', 0, 10, 1, 'min', 'handle'],'','']) }}
@@ -81,7 +80,7 @@ Example
-{{ quad.stateswitch('stateswitch19', ['this', 'that', 'theother'], ['icon','icon','icon'], [[0,1],[0,1],[0,1]], [['edit_numeric_0.svg','edit_numeric_1.svg'],['edit_numeric_0.svg','edit_numeric_2.svg'],['edit_numeric_0.svg','edit_numeric_3.svg']], '', [['',''],['',''],['','']], ['blink','blink','blink'], '', '', '', '', '', '3 columns with different features', ['a', 'b', 'c'], ['this.uzsu','',''], ['','',''], ['','that.plot',''], '', 'this.automatik', ['', '', (extpopup['extra'])], ['',['that.sperren','bwm.that.sperren','that.zwangvalue'], '']) }}
+{{ quad.stateswitch('stateswitch019', ['this', 'that', 'theother'], ['icon','icon','icon'], [[0,1],[0,1],[0,1]], [['edit_numeric_0.svg','edit_numeric_1.svg'],['edit_numeric_0.svg','edit_numeric_2.svg'],['edit_numeric_0.svg','edit_numeric_3.svg']], '', [['',''],['',''],['','']], ['blink','blink','blink'], '', '', '', '', '', '3 columns with different features', ['a', 'b', 'c'], ['this.uzsu','',''], ['','',''], ['','that.plot',''], '', 'this.automatik', ['', '', (extpopup['extra'])], ['',['that.sperren','bwm.that.sperren','that.zwangvalue'], '']) }}
diff --git a/pages/docu/quad/widget_quad.symbol.html b/pages/docu/quad/widget_quad.symbol.html
index cc3bd8cec..b979a47e0 100755
--- a/pages/docu/quad/widget_quad.symbol.html
+++ b/pages/docu/quad/widget_quad.symbol.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block example %}
-
+
+ Examples
+
+ Map the display items to the json field names by using the title, subtitle, content and level parameters.
+
+
+
+ json data:
+ {"alm_sn":"XXX","alert_id":"c01262d5-04fd-459f-8e7c-a7064af21fa9","headline":"Maeher benoetigt Hilfe.","date":"2016-07-27T10:03:15.377Z","message":"Ihr Indego hat sich festgefahren. Bitte stellen Sie den Maeher auf eine ebene Rasenflaeche und folgen Sie den Anweisungen im Display des Maehers.","read_status":"unread","flag":"warning"},{"alm_sn":"XXXX","alert_id":"5d5b5efc-7974-4f46-827b-50c3e42fb129","headline":"Maeher benoetigt Hilfe.","date":"2016-07-26T07:36:04.509Z","message":"Ihr Indego hat sich festgefahren. Bitte stellen Sie den Maeher auf eine ebene Rasenflaeche und folgen Sie den Anweisungen im Display des Maehers.","read_status":"unread","flag":"warning"}
+
+ Widget call:
+ {{ status.activelist('', 'bath.list', 'headline', 'date', 'message', 'flag') }}
+
+
+
+ {{ status.activelist('', 'bath.list', 'headline', 'date', 'message', 'flag') }}
+
+
+{% endblock %}
+
+
diff --git a/pages/docu/status/widget_status.collapse.html b/pages/docu/status/widget_status.collapse.html
index 28993836b..dbfbf8c0f 100644
--- a/pages/docu/status/widget_status.collapse.html
+++ b/pages/docu/status/widget_status.collapse.html
@@ -14,8 +14,8 @@
Examples
-You may use this widget to collapse some html. To bind some divs to that widget you have to use the "data-bind" attribute in the div - tag.
-In this example the div is binded to the status.collapse and will be controled by it. The additional class="hide" will hide the div at startup.
+You may use this widget to hide or collapse some html. To bind divs to the widget, use the "data-bind" attribute in the div - tag.
+In this example the div is bound to the status.collapse and will be controled by it. The additional class="hide" will hide the div at startup.
{% filter trim|escape|nl2br %}{% verbatim %}
@@ -56,7 +56,7 @@ Examples
-Or use it to show and hide collapsable sections:
+Or use it to show and hide collapsible sections:
{{ basic.flip('f3', 'bath.alert.error') }}
{{ status.collapse('w3', 'bath.alert.error') }}
@@ -74,4 +74,37 @@ Block
+
+New in v3.1: a list of values can be used to make collapsing more flexible
+Select a value to show the effects.
+ {{ basic.select('s1', 'bath.multistate', 'mini', [0, 1, '2', 3, 4], '', [0, 1, 2, 3, 4] ) }}
+
+ {% filter trim|escape|nl2br %}{% verbatim %}
+ {{ status.collapse('w4', 'bath.multistate', [1, 2, 4]) }}
+ {{ status.collapse('w5', 'bath.multistate', [0, 3]) }}
+
+
+ {{ basic.symbol('', 'bath.multistate', '', ['secur_locked', 'audio_sound'], [0, 3]) }}
+ This section is collapsed if values match 1, 2 or 4
+
+
+ Now you've been choosing 1, 2 or 4.
+ {{ basic.symbol('', 'bath.multistate', '', ['audio_play', 'audio_pause', 'audio_stop'], [1, 2, 4]) }}
+
+ {% endverbatim %}{% endfilter %}
+
+
+
+ {{ status.collapse('w4', 'bath.multistate', [1, 2, 4]) }}
+ {{ status.collapse('w5', 'bath.multistate', [0, 3]) }}
+
+ Result:
+
+ {{ basic.symbol('', 'bath.multistate', '', ['secur_locked', 'audio_sound'], [0, 3]) }}
+ This section is collapsed if values match 1, 2 or 4
+
+
+ Now you've been choosing 1, 2 or 4. {{ basic.symbol('', 'bath.multistate', '', ['audio_play', 'audio_pause', 'audio_stop'], [1, 2, 4]) }}
+
+
{% endblock %}
diff --git a/pages/docu/status/widget_status.toast.html b/pages/docu/status/widget_status.toast.html
index 3a3967a59..12d5b41dc 100644
--- a/pages/docu/status/widget_status.toast.html
+++ b/pages/docu/status/widget_status.toast.html
@@ -10,7 +10,7 @@
{% extends "widget_status.html" %}
{% block example %}
-
- Schließen
-
-{% endmacro %}
-
-/**
- * Displays a colordisc-rgb-selector
- *
- * @param {id} unique id for this widget
- * @param {text=} popup-info of the colordisc (optional)
- * @param {percent} icon position from left side
- * @param {percent} icon position from top side
- * @param {item(bool,num)} a gad/item for on/off switching
- * @param {text=On} text for the 'on' state (optional, default 'On')
- * @param {text=Off} text for the 'off' state (optional, default 'Off')
- * @param {item(num)} a gad/item for the r - value (0-255)
- * @param {item(num)} a gad/item for the g - value (0-255)
- * @param {item(num)} a gad/item for the b - value (0-255)
- * @param {value=} the minimum value if the light is off (optional, for future use)
- * @param {value=255} the maximum value if the light is full on (optional, default 255)
- * @param {value=8} the granularity of the rings (optional, default 8)
- * @param {value=10} the number of colored segments (optional, default 10)
- * @param {type=mini} type: 'micro', 'mini', 'midi' (optional, default: mini)
- * @param {value=0} hide on mobile displays (optional value 1)
-*/
-{% macro colordisc (id, info, left, top, gad, txt_on, txt_off, gad_r, gad_g, gad_b, min, max, step, colors, type, hide) %}
- {% set uid = uid(page, id) %}
- {% import "basic.html" as basic %}
-
-
-
- Schließen
-
- {{ basic.flip("{{ id }}-flip", gad, txt_on, txt_off) }}{% if info %} {{ info }} {% endif %}
-
-
-
-
-
-
-
-{% endmacro %}
-
-
/**
* Camera
@@ -350,18 +109,18 @@
{% if txt %}title="{{ txt }}"{% endif %}
{% if hide == 1 %}class="hide-mobile"{% endif %}
style="position: absolute; top: {{ top }}; left: {{ left }}; ">
- 
+
Schließen
{% if txt %} {{ txt }} {% endif %}
-
{{ lang('configuration_page', 'interface', 'label') }}
{{ forms.config_select(source, values, 'pages', dir('pages', '^(?!base|apps)(.+?)') ) }} - {{ forms.config_select(source, values, 'design', dir('designs', '(.+?).css')) }} - /** get icon colors out of design.css meta data */ - {{ forms.config_hidden(source, values, 'design_icon0') }} - {{ forms.config_hidden(source, values, 'design_icon1') }} + {{ forms.config_row(source, values, 'design', + [ + forms.config_select(source, values, 'design', dir('designs', '(.+?).css'), 'true') + ,forms.config_hidden(source, values, 'design_icon0') + ,forms.config_hidden(source, values, 'design_icon1') + ] + ) }} {{ forms.config_flip(source, values, 'cache', '') }} {{ forms.check_cache ( source, values, 'cache') }}Example
['plot', 'uzsu', ['move_down', 'stop', 'move_up'],'pos_popup_blind', 'stateengine'] with stateengine popup
@@ -75,7 +69,7 @@
Example
-
- {{ quad.blind('blind1', 'Blind Popup. Quad-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', 'blind.automatik', (stateengine['item1']), '', 'place3', 'place4', ['plot', 'uzsu', ['move_down', 'stop', 'move_up'],'pos_popup_blind', 'stateengine']) }}
+ {{ quad.blind('blind01', 'Blind Popup. Quad-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', 'blind.automatik', (stateengine['item1']), '', 'place3', 'place4', ['plot', 'uzsu', ['move_down', 'stop', 'move_up'],'pos_popup_blind', 'stateengine']) }}
Example
-
- {{ quad.blind('blind2', 'Blind Slider. Standard-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', '', '', 'place3', 'place4', ['move_down', 'move_up','pos_slider', 'plot', 'uzsu', '40']) }}
+ {{ quad.blind('blind02', 'Blind Slider. Standard-UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', '', '', 'place3', 'place4', ['move_down', 'move_up','pos_slider', 'plot', 'uzsu', '40']) }}
-
- {{ quad.blind('blind3', 'Blind with position selector', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], ['blind.hoehe', '50', '80', '0'], 'place3', 'place4', ['move_down', 'move_up', ' ', ['pos1', 'pos2'], 'extpopup']) }}
+ {{ quad.blind('blind03', 'Blind with position selector', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', '', 'blind.hoehe', '', '', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], ['blind.hoehe', '50', '80', '0'], 'place3', 'place4', ['move_down', 'move_up', ' ', ['pos1', 'pos2'], 'extpopup']) }}
-
- {{ quad.blind('blind4', 'Blind 2 different popups', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', ['time_automatic', 'time_automatic', 'num', [0,255,10], 'icon1', 'icon0'], 'blind.hoehe', '', '', '', '', 'place3', 'place4', [40, 'move_down', 'move_up', 'pos_popup_blind', 'pos_popup_shutter']) }}
+ {{ quad.blind('blind04', 'Blind 2 different popups', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter', ['time_automatic', 'time_automatic', 'num', [0,255,10], 'icon1', 'icon0'], 'blind.hoehe', '', '', '', '', 'place3', 'place4', [40, 'move_down', 'move_up', 'pos_popup_blind', 'pos_popup_shutter']) }}
-
- {{ quad.blind('blind5', 'Blind Standard witz UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter') }}
+ {{ quad.blind('blind05', 'Blind Standard witz UZSU', 'blind.lz', 'blind.kz', 'blind.hoehe', 'blind.kz', 'blind.lamellen', 0, 100, 5, '', '', 'blind.hoehe.zeitschalter') }}
-
-{{ quad.mixed('mixed', 'Mixed line', [basic.symbol('', '', '', 'weather_light_meter.svg'), basic.input('', 'this', 'date')], basic.symbol('', 'that', '', ['status_light_off.svg', 'status_light_high.svg'], [0,2], '', ['icon0', 'icon1']),
+{{ quad.mixed('mixed1', 'Mixed line', [basic.symbol('', '', '', 'weather_light_meter.svg'), basic.input('', 'this', 'date')], basic.symbol('', 'that', '', ['status_light_off.svg', 'status_light_high.svg'], [0,2], '', ['icon0', 'icon1']),
basic.stateswitch('', 'that', '', [0,2], '', ['0','2'])) }}
-
-{{ quad.playercontrol('volume', 'Volume Slider, UZSU and Plot', '', '', '', '', '', '', '', '', '', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, '', '', '', '', '', 'speakerAB', 'uzsu', ['', '', 'uzsu_value', '', 'icon1', 'icon0'], 'Volume.Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_up','volume_down'],'volume_slider']) }}
+{{ quad.playercontrol('volume1', 'Volume Slider, UZSU and Plot', '', '', '', '', '', '', '', '', '', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, '', '', '', '', '', 'speakerAB', 'uzsu', ['', '', 'uzsu_value', '', 'icon1', 'icon0'], 'Volume.Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_up','volume_down'],'volume_slider']) }}
-
-{{ quad.playercontrol('player', 'Squeezebox', 'Previous', '', 'Pause', 'Stop', 'Next', '', 'Eject', 'Repeat', 'Shuffle', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot') }}
+{{ quad.playercontrol('player1', 'Squeezebox', 'Previous', '', 'Pause', 'Stop', 'Next', '', 'Eject', 'Repeat', 'Shuffle', '', 'Mute', 'Volume', 'VolumeUp', 'VolumeDown', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot') }}
-
-{{ quad.playercontrol('player2', 'Source as Icons', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'icon', ['10', 'edit_numeric_1.svg'], ['13', 'edit_numeric_2.svg']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', 'speakerAB', 'uzsu', '', 'Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_down','volume_up','power'], 'source']) }}
+{{ quad.playercontrol('player02', 'Source as Icons', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'icon', ['10', 'edit_numeric_1.svg'], ['13', 'edit_numeric_2.svg']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', 'speakerAB', 'uzsu', '', 'Plot', '', '', '', '', '', '', ['uzsu','plot',['volume_down','volume_up','power'], 'source']) }}
-
-{{ quad.playercontrol('player3', 'With Album Art', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'menu', ['10', '', '10'], ['13', '', '13']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot', '', '', '', '', '', '', [['pause', 'stop'], 'cover', 'shuffle', 'song_position']) }}
+{{ quad.playercontrol('player03', 'With Album Art', 'Previous', 'Play', 'Pause', 'Stop', 'Next', 'Power', 'Eject', 'Repeat', 'Shuffle', ['Source', 'menu', ['10', '', '10'], ['13', '', '13']], 'Mute', 'Volume', 'Volume_Up', 'Volume_Down', 0, 100, 1, 0, 100, 80, 'Album', 'Artist', 'Title', 'Time', 'Duration', '', 'uzsu', '', 'Plot', '', '', '', '', '', '', [['pause', 'stop'], 'cover', 'shuffle', 'song_position']) }}
Example
-
-{{ quad.print('formatvalue', 'that', '%', '', [10,150], ['#0f0','#ff0','#f00'], '', 'placeholder', 'one % value with thresholds', 'that') }}
+{{ quad.print('formatvalue1', 'that', '%', '', [10,150], ['#0f0','#ff0','#f00'], '', 'placeholder', 'one % value with thresholds', 'that') }}
-
- {{ quad.print('formatvalue2', ['this','that'], ['%','°'], ['','VAR*2'], [0,[15,300]], [['#0f0','#ff0'],['#0f0','#ff0','#f00']], '', 'place', 'two values, with 2* formula', ['this','that'], ['this.plot', 'that.plot']) }}
+ {{ quad.print('formatvalue02', ['this','that'], ['%','°'], ['','VAR*2'], [0,[15,300]], [['#0f0','#ff0'],['#0f0','#ff0','#f00']], '', 'place', 'two values, with 2* formula', ['this','that'], ['this.plot', 'that.plot']) }}
-
- {{ quad.print('formatvalue3', ['this','that', ' ', 'theother'], ['%','°'], ['VAR*2','','',''], [[1,5],'', '',''], [['#0f0','#ff0','#f00'],['#0f0','#ff0'],'',''], '', 'placeholder', '3 values, 1 empty column', ['this','that', '', 'theother']) }}
+ {{ quad.print('formatvalue03', ['this','that', ' ', 'theother'], ['%','°'], ['VAR*2','','',''], [[1,5],'', '',''], [['#0f0','#ff0','#f00'],['#0f0','#ff0'],'',''], '', 'placeholder', '3 values, 1 empty column', ['this','that', '', 'theother']) }}
-
- {{ quad.rtr('normal', 'Standard Order with plot and offset', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'state') }}
+ {{ quad.rtr('normal1', 'Standard Order with plot and offset', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'state') }}
-
- {{ quad.rtr('reverse', 'Reverse Order', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'heizen', 'Text', 0.10, '', [device.uzsuicon('','uzsuitem','Presence','','','list','Present:1,Absent:2,Night:3'),icon.heating('','','istwert',0,23)], '#ff0', 'blink', '', '', '', '', [3,2,1]) }}
+ {{ quad.rtr('reverse1', 'Reverse Order', 'istwert', 'soll', 'komfort', 'nacht', 'frostschutz', 'heizen', 'Text', 0.10, '', [device.uzsuicon('','uzsuitem','Presence','','','list','Present:1,Absent:2,Night:3'),icon.heating('','','istwert',0,23)], '#ff0', 'blink', '', '', '', '', [3,2,1]) }}
-
-{{ quad.select('select1', ['this', 'that'], ['menu', 'menu'], [[0,3],[4,5]], [['edit_numeric_0.svg','edit_numeric_3.svg'],['edit_numeric_4.svg','edit_numeric_5.svg']], [['0','3'],['4','5']], ['',''], ['',''], '', '', 'Select as menu', ['Select1', 'Select2'], ['this.uszu','that.uzsu'], ['', ''], ['plotitem1', 'plotitem2']) }}
+{{ quad.select('select01', ['this', 'that'], ['menu', 'menu'], [[0,3],[4,5]], [['edit_numeric_0.svg','edit_numeric_3.svg'],['edit_numeric_4.svg','edit_numeric_5.svg']], [['0','3'],['4','5']], ['',''], ['',''], '', '', 'Select as menu', ['Select1', 'Select2'], ['this.uszu','that.uzsu'], ['', ''], ['plotitem1', 'plotitem2']) }}
-
-{{ quad.select('select2', 'this', 'icon', [0,1,2,3], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg'], ['','','',''], '', 'horizontal', '', '', 'Select as horizontal group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', (extpopup['extra']), ['this.sperren'], 'this.slider', '', '', [['uzsu','select'], '10', ['plot','stateengine', 'extpopup'], '10', 'locks']) }}
+{{ quad.select('select02', 'this', 'icon', [0,1,2,3], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg'], ['','','',''], '', 'horizontal', '', '', 'Select as horizontal group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', (extpopup['extra']), ['this.sperren'], 'this.slider', '', '', [['uzsu','select'], '10', ['plot','stateengine', 'extpopup'], '10', 'locks']) }}
-
-{{ quad.select('select3', 'this', 'icon', [0,1,2,3,4], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg','edit_numeric_4.svg'], ['','','','',''], '', '', '', '', 'Select as none group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', '', ['this.sperren'], ['dies.timer', 0, 10, 1, 'min', 'handle'], '', '', ['select', 'plot', 'uzsu']) }}
+{{ quad.select('select03', 'this', 'icon', [0,1,2,3,4], ['edit_numeric_0.svg','edit_numeric_1.svg','edit_numeric_2.svg','edit_numeric_3.svg','edit_numeric_4.svg'], ['','','','',''], '', '', '', '', 'Select as none group', '', 'this.uszu', '', 'plotitem', 'measure_power_meter.svg', 'this.automatik', '', ['this.sperren'], ['dies.timer', 0, 10, 1, 'min', 'handle'], '', '', ['select', 'plot', 'uzsu']) }}
{% filter trim|escape|nl2br %}{% raw %}
{{ quad.shutter('shutter1', 'Shutter with picture', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80, 'place1', 'place2', 'shutter.hoehe.zeitschalter', '', 'shutter.hoehe', '', 'shutter.automatik', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], 'place3', 'place4', ['extpopup', 'pos_shutter_ext']) }}
@@ -77,8 +69,9 @@ Example
-
- {{ quad.shutter('shutter1', 'Shutter with picture', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80, 'place1', 'place2', 'shutter.hoehe.zeitschalter', '', 'shutter.hoehe', '', 'shutter.automatik', ['edit_favorites.svg', ['switch', ['item1.lock', 'icon', [0,1], ['secur_open.svg','secur_locked.svg']]], ['flip', ['item1.flip', 'on', 'off', '0', '1']] ], 'place3', 'place4', ['extpopup', 'pos_shutter_ext']) }}
-
Example
-
- {{ quad.shutter('shutter2', 'Shutter, Standard', 'shutter.lz', 'shutter.kz', 'shutter.hoehe', 'shutter.kz', 'shutter.lamellen', 'shutter.hoehe', 0, 100, 1, 'full', '', 50, 80) }}
-
-
-{{ quad.stateswitch('stateswitch11', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], '', '', 'blink', '', '', '', '', '', 'one switch, standard order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['extra']), [['this.sperren'], 'bwm.this.sperren','this.zwangvalue']) }}
+{{ quad.stateswitch('stateswitch011', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], '', '', 'blink', '', '', '', '', '', 'one switch, standard order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['extra']), [['this.sperren'], 'bwm.this.sperren','this.zwangvalue']) }}
-
-{{ quad.stateswitch('stateswitch12', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], ['','',''], ['','#ff0','#00f'], 'blink', '', '', '', '', '', 'One item with column_order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['stateengine']), ['this.sperren'], '', '', '', [['uzsu','switch'], '10', ['plot','stateengine'], '10', 'locks']) }}
+{{ quad.stateswitch('stateswitch012', 'this', 'icon', [0,3,155], ['edit_numeric_0.svg','edit_numeric_3.svg','edit_numeric_5.svg'], ['','',''], ['','#ff0','#00f'], 'blink', '', '', '', '', '', 'One item with column_order', 'Switch1', 'this.uszu', '', 'this.plot', '', 'this.stateengine', (extpopup['stateengine']), ['this.sperren'], '', '', '', [['uzsu','switch'], '10', ['plot','stateengine'], '10', 'locks']) }}
-
-{{ quad.stateswitch('stateswitch14', ['this', 'that', 'theother'], ['icon','mini','midi'], [[1,0],'',[0,150]], [['edit_numeric_1.svg','edit_numeric_0.svg'],'',['edit_numeric_0.svg','edit_numeric_9.svg']], ['', ['0','1']], [['',''],'',['','']], ['blink','','blink'], '', '', '', 'place1', 'place2', 'Mixed types with one slider', ['', '', ''], ['this.uszu','','theother.uszu'], ['','',''], '', '', '', '', '', [['this.timer', 0, 10, 1, 'min', 'handle'],'','']) }}
+{{ quad.stateswitch('stateswitch014', ['this', 'that', 'theother'], ['icon','mini','midi'], [[1,0],'',[0,150]], [['edit_numeric_1.svg','edit_numeric_0.svg'],'',['edit_numeric_0.svg','edit_numeric_9.svg']], ['', ['0','1']], [['',''],'',['','']], ['blink','','blink'], '', '', '', 'place1', 'place2', 'Mixed types with one slider', ['', '', ''], ['this.uszu','','theother.uszu'], ['','',''], '', '', '', '', '', [['this.timer', 0, 10, 1, 'min', 'handle'],'','']) }}
Example
-
-{{ quad.stateswitch('stateswitch19', ['this', 'that', 'theother'], ['icon','icon','icon'], [[0,1],[0,1],[0,1]], [['edit_numeric_0.svg','edit_numeric_1.svg'],['edit_numeric_0.svg','edit_numeric_2.svg'],['edit_numeric_0.svg','edit_numeric_3.svg']], '', [['',''],['',''],['','']], ['blink','blink','blink'], '', '', '', '', '', '3 columns with different features', ['a', 'b', 'c'], ['this.uzsu','',''], ['','',''], ['','that.plot',''], '', 'this.automatik', ['', '', (extpopup['extra'])], ['',['that.sperren','bwm.that.sperren','that.zwangvalue'], '']) }}
+{{ quad.stateswitch('stateswitch019', ['this', 'that', 'theother'], ['icon','icon','icon'], [[0,1],[0,1],[0,1]], [['edit_numeric_0.svg','edit_numeric_1.svg'],['edit_numeric_0.svg','edit_numeric_2.svg'],['edit_numeric_0.svg','edit_numeric_3.svg']], '', [['',''],['',''],['','']], ['blink','blink','blink'], '', '', '', '', '', '3 columns with different features', ['a', 'b', 'c'], ['this.uzsu','',''], ['','',''], ['','that.plot',''], '', 'this.automatik', ['', '', (extpopup['extra'])], ['',['that.sperren','bwm.that.sperren','that.zwangvalue'], '']) }}
+ json data:
+ {"alm_sn":"XXX","alert_id":"c01262d5-04fd-459f-8e7c-a7064af21fa9","headline":"Maeher benoetigt Hilfe.","date":"2016-07-27T10:03:15.377Z","message":"Ihr Indego hat sich festgefahren. Bitte stellen Sie den Maeher auf eine ebene Rasenflaeche und folgen Sie den Anweisungen im Display des Maehers.","read_status":"unread","flag":"warning"},{"alm_sn":"XXXX","alert_id":"5d5b5efc-7974-4f46-827b-50c3e42fb129","headline":"Maeher benoetigt Hilfe.","date":"2016-07-26T07:36:04.509Z","message":"Ihr Indego hat sich festgefahren. Bitte stellen Sie den Maeher auf eine ebene Rasenflaeche und folgen Sie den Anweisungen im Display des Maehers.","read_status":"unread","flag":"warning"}
+
+ Widget call:
+ {{ status.activelist('', 'bath.list', 'headline', 'date', 'message', 'flag') }}
+
+ {% filter trim|escape|nl2br %}{% verbatim %}
@@ -56,7 +56,7 @@ Examples
{{ status.collapse('w3', 'bath.alert.error') }} @@ -74,4 +74,37 @@
Block
{% filter trim|escape|nl2br %}{% verbatim %}
+ {{ status.collapse('w4', 'bath.multistate', [1, 2, 4]) }}
+ {{ status.collapse('w5', 'bath.multistate', [0, 3]) }}
+
+
+ {{ basic.symbol('', 'bath.multistate', '', ['secur_locked', 'audio_sound'], [0, 3]) }}
+ This section is collapsed if values match 1, 2 or 4
+
+
+ Now you've been choosing 1, 2 or 4.
+ {{ basic.symbol('', 'bath.multistate', '', ['audio_play', 'audio_pause', 'audio_stop'], [1, 2, 4]) }}
+
+ {% endverbatim %}{% endfilter %}
+
- {{ basic.flip("{{ id }}-flip", gad, txt_on, txt_off) }}{% if info %} {{ info }} {% endif %}
-
-
-
-
- {{ txt }}
{% endif %}