Simple devices updates

* Motion sensor mini-template fix
* Linked actions: ability to use min/max/average for period to control devices by sensors
* Remove of new year decoration :)

Author: sergejey

3rdparty/duration-picker/html-duration-picker.min.js

@@ -44,6 +44,12 @@
     width:75px;
 }
 
+.device-widget.mini.motion {
+    min-width:75px;
+    max-width:75px;
+    width:75px;
+}
+
 .device-widget.offline {
     background-color:#aaaaaa;
 }

css/devices.css

@@ -1263,6 +1263,12 @@
     'DEVICES_LINK_SET_COLOR_DESCRIPTION' => 'Change color when action triggered',
     'DEVICES_LINK_SET_COLOR_PARAM_ACTION_COLOR' => 'Color',
 
+    'DEVICES_LINK_SENSOR_VALUE_TYPE' => 'Source value',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_CURRENT' => 'Current sensor value',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_MIN' => 'Minimum sensor value for period',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_AVG' => 'Average sensor value for period',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_MAX' => 'Maximum sensor value for period',
+    'DEVICES_LINK_SENSOR_VALUE_FOR_PERIOD' => 'For period',
 
     'DEVICES_LINK_SENSOR_SWITCH' => 'Sensor control',
     'DEVICES_LINK_SENSOR_SWITCH_DESCRIPTION' => 'Control another devices based on sensor\'s value',

languages/default.php

@@ -1259,6 +1259,13 @@
     'DEVICES_LINK_SET_COLOR_DESCRIPTION' => 'Установить цвет по событию',
     'DEVICES_LINK_SET_COLOR_PARAM_ACTION_COLOR' => 'Цвет',
 
+    'DEVICES_LINK_SENSOR_VALUE_TYPE' => 'Исходное значение',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_CURRENT' => 'Текущее значение сенсора',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_MIN' => 'Минимальное значение за период',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_AVG' => 'Среднее значение за период',
+    'DEVICES_LINK_SENSOR_VALUE_TYPE_MAX' => 'Максимальное значение за период',
+    'DEVICES_LINK_SENSOR_VALUE_FOR_PERIOD' => 'Использовать период',
+
     'DEVICES_LINK_SENSOR_SWITCH' => 'Условное управление',
     'DEVICES_LINK_SENSOR_SWITCH_DESCRIPTION' => 'Управление другим устройством по показаниям датчика',
     'DEVICES_LINK_SENSOR_SWITCH_PARAM_CONDITION' => 'Тип условия',

languages/ru.php

@@ -23,6 +23,9 @@
         foreach($link_details['PARAMS'] as &$p) {
             if (isset($settings[$p['PARAM_NAME']])) {
                 $p['VALUE']=$settings[$p['PARAM_NAME']];
+                if ($p['PARAM_TYPE']=='duration') {
+                    $p['VALUE'] = gmdate("H:i:s", $p['VALUE']);
+                }
             }
         }
         }
@@ -46,8 +49,12 @@
         $config=array();
         $total = count($params);
         for ($i = 0; $i < $total; $i++) {
-            global ${$params[$i]['PARAM_NAME'].'_value'};
-            $config[$params[$i]['PARAM_NAME']]=${$params[$i]['PARAM_NAME'].'_value'};
+            //global ${$params[$i]['PARAM_NAME'].'_value'};
+            //$config[$params[$i]['PARAM_NAME']]=${$params[$i]['PARAM_NAME'].'_value'};
+            $config[$params[$i]['PARAM_NAME']] = gr($params[$i]['PARAM_NAME'].'_value');
+            if ($params[$i]['PARAM_TYPE']=='duration' && preg_match('/(\d+):(\d+):(\d+)/',$config[$params[$i]['PARAM_NAME']],$m)) {
+                $config[$params[$i]['PARAM_NAME']] = $m[1]*60*60+$m[2]*60+$m[3];
+            }
         }
         $link_rec['LINK_SETTINGS']=serialize($config);
         if ($ok) {

modules/devices/devices_links.inc.php

@@ -318,6 +318,19 @@
         } elseif ($settings['action_type'] == 'close' && !gg($object . '.status')) {
             $action_string = 'callMethodSafe("' . $object . '.close' . '",array("link_source"=>"' . $device1['LINKED_OBJECT'] . '"));';
         }
+
+        if ($settings['source_value_type']!='') {
+            $period = (int)$settings['source_value_time'];
+            if ($period<1) $period=1;
+            if ($settings['source_value_type'] == 'avg') {
+                $value = getHistoryAvg($device1['LINKED_OBJECT'] . '.value',(-1)*$period);
+            } elseif ($settings['source_value_type'] == 'min') {
+                $value = getHistoryMin($device1['LINKED_OBJECT'] . '.value',(-1)*$period);
+            } elseif ($settings['source_value_type'] == 'max') {
+                $value = getHistoryMax($device1['LINKED_OBJECT'] . '.value',(-1)*$period);
+            }
+        }
+
         if ($settings['condition_type'] == 'above' && $value >= (float)$settings['condition_value']) {
             //do the action
         } elseif ($settings['condition_type'] == 'below' && $value < (float)$settings['condition_value']) {