Simple Devices update

* Leak sensor alert message option * Light sensor minimum value tracking
sergejey · Feb 4, 2022 · b21689a · b21689a
1 parent e4bae99
commit b21689a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/modules/devices/SLeak_alert.php b/modules/devices/SLeak_alert.php
@@ -1,20 +1,26 @@
 <?php
 
 $ot = $this->object_title;
-$alert_timer_title = $ot.'_alert';
+$alert_timer_title = $ot . '_alert';
 
-$description = $this->description;
-if (!$description) {
-    $description = $ot;
-}
+$message = $this->getProperty('notify_msg_reminder');
+
+if ($message) {
+    say($message, 100);
+} else {
+    $description = $this->description;
+    if (!$description) {
+        $description = $ot;
+    }
+    $location_title = processTitle($this->getProperty('location_title'));
+    if ($location_title) {
+        $description .= ' ' . LANG_LOCATED_IN_ROOM . ' ' . $location_title;
+    }
 
-$location_title=processTitle($this->getProperty('location_title'));
-if ($location_title) {
-    $description.=' '.LANG_LOCATED_IN_ROOM.' '.$location_title;
+    say(LANG_DEVICES_SENSOR_ALERT . ': ' . $description, 100);
 }
 
-say(LANG_DEVICES_SENSOR_ALERT.': '.$description,100);
 clearTimeOut($alert_timer_title);
 if ($this->getProperty('notify_eliminated')) {
-    setTimeOut($alert_timer_title,'cm("'.$ot.'.alert");',60);
+    setTimeOut($alert_timer_title, 'cm("' . $ot . '.alert");', 60);
 }
diff --git a/modules/devices/SLightSensors_periodMinValueUpdated.php b/modules/devices/SLightSensors_periodMinValueUpdated.php
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/modules/devices/SLightSensors_valueUpdated.php b/modules/devices/SLightSensors_valueUpdated.php
@@ -0,0 +1,16 @@
+<?php
+
+$ot = $this->object_title;
+
+$period = $this->getProperty('periodTime');
+if (!$period) $period = 60 * 60;
+
+$min_value = getHistoryMin($ot . '.value', (-1) * $period);
+$value = (float)$this->getProperty('value');
+if (is_null($min_value) || $value < $min_value) {
+    $min_value = $value;
+}
+
+if (!is_null($min_value)) {
+    $this->setProperty('periodMinValue', $min_value);
+}
diff --git a/modules/devices/devices_structure.inc.php b/modules/devices/devices_structure.inc.php
@@ -328,6 +328,7 @@
         'CLASS'=>'SLeak',
         'PROPERTIES'=>array(
             'notify_eliminated'=>array('DESCRIPTION'=>LANG_DEVICES_NOTIFY_ELIMINATED,'_CONFIG_TYPE'=>'yesno'),
+            'notify_msg_reminder'=>array('DESCRIPTION'=>LANG_DEVICES_MSG_REMINDER,'_CONFIG_TYPE'=>'text'),
             'blocked'=>array('DESCRIPTION'=>'Is blocked'),
         ),
         'METHODS'=>array(
@@ -484,7 +485,13 @@
         'CLASS'=>'SLightSensors',
         'PROPERTIES'=>array(
             'unit'=>array('DESCRIPTION'=>LANG_DEVICES_UNIT,'_CONFIG_TYPE'=>'text'),
+            'periodMinValue'=>array('DESCRIPTION'=>'Minimum value for period','ONCHANGE'=>'periodMinValueUpdated','KEEP_HISTORY'=>365),
+            'periodTime'=>array('DESCRIPTION'=>'Period to calculate minimum value (seconds)','_CONFIG_TYPE'=>'num','_CONFIG_HELP'=>'SdSensorPeriodTime'),
             ),
+        'METHODS'=>array(
+            'valueUpdated'=>array('DESCRIPTION'=>'Value Updated'),
+            'periodMinValueUpdated'=>array('DESCRIPTION'=>'Period Min value updated'),
+        ),
     ),
 );
 

diff --git a/templates/classes/views/SLightSensors.html b/templates/classes/views/SLightSensors.html
@@ -1,6 +1,6 @@
-<div class="device-widget sensor %.alive|"offline;online"%" onclick="var url=('<#ROOTHTML#>pChart/?p=%.object_title%'+'.value&op=log&subop=24h');parent.$.fancybox.open({ src: url, type: 'iframe',iframe:{preload:false} });return false;">
+<div class="device-widget sensor %.alive|"offline;online"%" onclick="var url=('<#ROOTHTML#>pChart/?p[]=%.object_title%'+'.value&p[]=%.object_title%'+'.periodMinValue&op=log&subop=24h');parent.$.fancybox.open({ src: url, type: 'iframe',iframe:{preload:false} });return false;">
     <div class="device-icon light-sensor"></div>
-    <div class="device-header">%.value% %.unit%
+<div class="device-header">%.value% %.unit% <sub>(min: %.periodMinValue% )</sub>
         <span>%.direction|"-1=&#9660;1=&#9650;0=&#8801"%</span>
     </div>
     <div class="device-details">%.object_description%</div>