Merge pull request #1106 from ai91/feature/plans_attributes

Модуль "Планы": поддержка обновления аттрибутов через вебсокеты

Author: sergejey

lib/websockets/server/lib/WebSocket/Application/MajordomoApplication.php

@@ -407,6 +407,10 @@ private function _actionPostProperty($data)
                                 $state['TEMPLATE']=$v['TEMPLATE'];
                                 $state['ITEM']=$k;
                             }
+                            if ($v['ATTRIBUTES']) {
+                                $state['ATTRIBUTES'] = $v['ATTRIBUTES'];
+                                $state['ITEM']=$k;
+                            }
                             if (preg_match('/^component(\d+)$/',$k,$m)) {
                                 $state['COMPONENT_ID']=$m[1];
                                 $state['ITEM']=$k;
@@ -415,6 +419,14 @@ private function _actionPostProperty($data)
                             if ($state['TEMPLATE']) {
                                 unset($state['TEMPLATE']);
                             }
+                            if ($state['ATTRIBUTES'] && is_array($state['ATTRIBUTES'])) {
+                                foreach($state['ATTRIBUTES'] as &$attribute) {
+                                    if ($attribute['TEMPLATE'] != '') {
+                                        unset($attribute['TEMPLATE']);
+                                    }
+                                }
+                                unset($attribute);
+                            }
                             $send_plan_states[] = $state;
                         }
 

modules/plans/plans.class.php

@@ -356,24 +356,49 @@ function findDynamicText($content,$process = 1) {
         xml_parse_into_struct($p, $content, $vals, $index);
         xml_parser_free($p);
         foreach($vals as $val) {
-            if (isset($val['value']) && preg_match_all('/%([\w\d\.]+?)\.([\w\d\.]+?)%/',$val['value'],$m) && isset($val['attributes'])) {
+            if (isset($val['attributes'])) {
+                $item=array();
                 $id = '';
+                $dynamic = false;
+                $props=array();
+                $attributes=array();
                 foreach($val['attributes'] as $attr=>$attr_v) {
                     if (strtolower($attr)=='id') {
                         $id=$attr_v;
+                    } else if(preg_match_all('/%([\w\d\.]+?)\.([\w\d\.]+?)%/',$attr_v, $m)) {
+                        $dynamic = true;
+                        foreach($m[0] as $prop) {
+                            $prop=trim($prop,'%');
+                            $props[]=$prop;
+                        }
+                        $attribute=array('NAME'=>strtolower($attr),'TEMPLATE'=>$attr_v);
+                        if($process) {
+                            $attribute['CONTENT']=processTitle($attribute['TEMPLATE']);
+                        }
+                        $attributes[]=$attribute;
                     }
                 }
-                if ($id!='') {
-                    $props=array();
-                    foreach($m[0] as $prop) {
-                        $prop=trim($prop,'%');
-                        $props[]=$prop;
+                if($id!=''){
+                    $item['ITEM']=$id;
+                    
+                    if (isset($val['value']) && preg_match_all('/%([\w\d\.]+?)\.([\w\d\.]+?)%/',$val['value'], $m)) {
+                        $dynamic = true;
+                        foreach($m[0] as $prop) {
+                            $prop=trim($prop,'%');
+                            $props[]=$prop;
+                        }
+                        $item['TEMPLATE']=$val['value'];
+                        if ($process) {
+                            $item['CONTENT']=processTitle($item['TEMPLATE']);
+                        }
                     }
-                    $item=array('ITEM'=>$id,'TEMPLATE'=>$val['value'],'PROPERTIES'=>$props);
-                    if ($process) {
-                        $item['CONTENT']=processTitle($item['TEMPLATE']);
+                    if($dynamic) {
+                        if(!empty($attributes)) {
+                            $item['ATTRIBUTES'] = $attributes;
+                        }
+                        $item['PROPERTIES']=$props;
+                        $result[]=$item;
                     }
-                    $result[]=$item;
                 }
             }
         }
@@ -448,7 +473,7 @@ function getWatchedProperties($plans) {
                 foreach($dynData as $dynItem) {
                     //$content = str_replace($dynItem['TEMPLATE'],$dynItem['CONTENT'],$content);
                     foreach($dynItem['PROPERTIES'] as $property) {
-                        $properties[]=array('PROPERTY'=>mb_strtolower($property,'UTF-8'),'STATE_ID'=>$dynItem['ITEM'],'TEMPLATE'=>$dynItem['TEMPLATE']);
+                        $properties[]=array('PROPERTY'=>mb_strtolower($property,'UTF-8'),'STATE_ID'=>$dynItem['ITEM'],'TEMPLATE'=>$dynItem['TEMPLATE'],'ATTRIBUTES'=>$dynItem['ATTRIBUTES']);
                     }
                 }
             }
@@ -474,8 +499,18 @@ function processState(&$state) {
             if ($component['ID']) {
                 //...
             }
-        } elseif ($state['TEMPLATE']) {
-            $state['CONTENT']=processTitle($state['TEMPLATE']);
+        } else {
+            if ($state['TEMPLATE']) {
+                $state['CONTENT']=processTitle($state['TEMPLATE']);
+            }
+            if ($state['ATTRIBUTES'] && is_array($state['ATTRIBUTES'])) {
+                foreach($state['ATTRIBUTES'] as &$attribute) {
+                    if ($attribute['TEMPLATE'] != '') {
+                        $attribute['CONTENT']=processTitle($attribute['TEMPLATE']);
+                    }
+                }
+                unset($attribute);
+            }
         }
     }
 

templates/plans/preview.html

@@ -70,6 +70,12 @@
                 } else {
                     elem.text(obj[i].CONTENT);
                 }
+                if (obj[i].ATTRIBUTES instanceof Array) {
+                	var attrCnt = obj[i].ATTRIBUTES.length;
+                	for (var ai=0; ai<attrCnt; ai++) {
+                		elem.attr(obj[i].ATTRIBUTES[ai].NAME, obj[i].ATTRIBUTES[ai].CONTENT);
+                	}
+                }
             }
         }
     }