commit message

directman66 · Jan 16, 2019 · ba7b97e · ba7b97e
1 parent e232e30
commit ba7b97e
Show file tree

Hide file tree

Showing 586 changed files with 179,734 additions and 8 deletions.
diff --git a/modules/zigbee2mqtt/map.inc.php b/modules/zigbee2mqtt/map.inc.php
@@ -0,0 +1,33 @@
+<?php
+//$maparray=SQLSelectOne ('select * from zigbee2mqtt where value like "digraph%"');
+$maparray=SQLSelectOne ('select * from zigbee2mqtt where path like "zigbee2mqtt/bridge/networkmap/raw"');
+
+$out['map_array']=$maparray['VALUE'];
+
+$nodess=json_decode($maparray['VALUE'],true);
+
+//debmes ($maparray['VALUE'],'zigbee2mqtt');
+//debmes ($nodess,'zigbee2mqtt');
+/*
+        foreach($nodess as $k=>$v) { 
+//        {id: 11, font:{size:30}, size:40, label: 'coordinator', shape: 'circularImage', image: '/templates/zigbee2mqtt/img/cc2531.jpg', shapeProperties: {borderDashes:[15,5]}},	
+	if (is_array($v))
+ 	        foreach($v as $kk=>$vv)
+		{}
+
+echo $k.":".$v;
+ }
+
+*/
+  $nodes = <<<EOD
+        {id: 1, font:{size:30},          label: 'circle',  shape: 'circle' , shapeProperties:{borderDashes:[5,5]}},
+        {id: 11, font:{size:30}, size:40, label: 'coordinator', shape: 'circularImage', image: '/templates/zigbee2mqtt/img/cc2531.jpg', shapeProperties: {borderDashes:[15,5]}},	
+EOD;
+
+$out['NODES']=$nodes
+
+
+
+
+?>
+
diff --git a/modules/zigbee2mqtt/mqtt_edit.inc.php b/modules/zigbee2mqtt/mqtt_edit.inc.php
@@ -69,7 +69,7 @@
    $rec['LINKED_METHOD']=$linked_method;
 
 
- debmes('Начинаем добавлять подписку ', 'zigbee2mqtt');
+ debmes('Íà÷èíàåì äîáàâëÿòü ïîäïèñêó ', 'zigbee2mqtt');
   //UPDATING RECORD
    if ($ok) {
 
@@ -92,7 +92,7 @@
 // echo "</script>";
 
 
-     debmes('Добавляем подписку '.$rec['LINKED_OBJECT'].$rec['LINKED_PROPERTY'].":". $this->name, 'zigbee2mqtt');
+     debmes('Äîáàâëÿåì ïîäïèñêó '.$rec['LINKED_OBJECT'].$rec['LINKED_PROPERTY'].":". $this->name, 'zigbee2mqtt');
      addLinkedProperty($rec['LINKED_OBJECT'], $rec['LINKED_PROPERTY'], $this->name);
     }
     if ($old_linked_object && $old_linked_object!=$rec['LINKED_OBJECT'] && $old_linked_property && $old_linked_property!=$rec['LINKED_PROPERTY']) {

diff --git a/modules/zigbee2mqtt/zigbee2mqtt.class.php b/modules/zigbee2mqtt/zigbee2mqtt.class.php
@@ -615,9 +615,8 @@ function admin(&$out) {
 }
 
  if ($this->tab=='map') {
-$maparray=SQLSelectOne ('select * from zigbee2mqtt where value like "digraph%"');
 
-$out['map_array']=$maparray['VALUE'];
+  require(DIR_MODULES.$this->name.'/map.inc.php');
 
 
 }
@@ -781,7 +780,7 @@ function refresh_db() {
     $res=SQLSelectOne($sql);
      if($res['ID']) { /* If path_write foud in db */
 {
-debmes($cdev.' � ������ ������','zigbee2mqtt');
+debmes($cdev.' â ñèòåìå íàéäåí','zigbee2mqtt');
 
         foreach ($json as $key=> $value) {
 if ($key=='type') $res['TYPE']=$value;
@@ -949,7 +948,7 @@ function get_map(){
 
 
 
-   $mqtt_client->publish('zigbee2mqtt/bridge/networkmap','graphviz');
+//   $mqtt_client->publish('zigbee2mqtt/bridge/networkmap','graphviz');
    $mqtt_client->publish('zigbee2mqtt/bridge/networkmap','raw');
    //$mqtt_client->publish($rec['PATH_WRITE'].'/set',$jsonvalue, (int)$rec['QOS'], (int)$rec['RETAIN']);
 
@@ -1022,7 +1021,7 @@ function dbInstall($data) {
  zigbee2mqtt: TITLE varchar(255) NOT NULL DEFAULT ''
  zigbee2mqtt: LOCATION_ID int(10) NOT NULL DEFAULT '0'
  zigbee2mqtt: UPDATED datetime
- zigbee2mqtt: VALUE varchar(255) NOT NULL DEFAULT ''
+ zigbee2mqtt: VALUE varchar(1000) NOT NULL DEFAULT ''
  zigbee2mqtt: PATH varchar(255) NOT NULL DEFAULT ''
  zigbee2mqtt: METRIKA varchar(255) NOT NULL DEFAULT ''
  zigbee2mqtt: PATH_WRITE varchar(255) NOT NULL DEFAULT ''

diff --git a/templates/zigbee2mqtt/img/1 b/templates/zigbee2mqtt/img/1
diff --git a/templates/zigbee2mqtt/map.html b/templates/zigbee2mqtt/map.html
@@ -1,4 +1,74 @@
 <br>
    <a href="?view_mode=get_map" class="btn btn-default" title="Get network map" ><i class="glyphicon glyphicon-dashboard"></i> Get network map</a>
 <br>
+
 [#map_array#]
+
+<hr>
+<!doctype html>
+<html>
+<head>
+  <title>Network | Shapes</title>
+
+  <style type="text/css">
+    #mynetwork {
+      width: 1000px;
+      height: 800px;
+      border: 1px solid lightgray;
+    }
+  </style>
+
+  <script type="text/javascript" src="/templates/zigbee2mqtt/vis-4.21.0/dist/vis.js"></script>
+  <link href="/templates/zigbee2mqtt/vis-network.min.css" rel="stylesheet" type="text/css" />
+
+
+
+  <script type="text/javascript">
+    var nodes = null;
+    var edges = null;
+    var network = null;
+
+    function draw() {
+      nodes = [
+
+[#NODES#]
+//        {id: 1, font:{size:30},          label: 'circle',  shape: 'circle' , shapeProperties:{borderDashes:[5,5]}},
+//        {id: 2, font:{size:30},          label: 'ellipse', shape: 'ellipse', shapeProperties:{borderDashes:[5,5]}},
+//        {id: 3, font:{size:30},          label: 'database',shape: 'database', shapeProperties:{borderDashes:[5,5]}},
+//        {id: 4, font:{size:30},          label: 'box',     shape: 'box'    , shapeProperties:{borderDashes:[5,5]}},
+//        {id: 5, font:{size:30}, size:40, label: 'diamond', shape: 'diamond', shapeProperties:{borderDashes:[5,5]}},
+//        {id: 6, font:{size:30}, size:40, label: 'dot',     shape: 'dot', shapeProperties:{borderDashes:[5,5]}},
+//        {id: 7, font:{size:30}, size:40, label: 'square',  shape: 'square', shapeProperties:{borderDashes:[5,5]}},
+//        {id: 8, font:{size:30}, size:40, label: 'triangle',shape: 'triangle', shapeProperties:{borderDashes:[5,5]}},
+//        {id: 9, font:{size:30}, size:40, label: 'triangleDown', shape: 'triangleDown', shapeProperties:{borderDashes:[5,5]}},
+//        {id: 10, font:{size:30}, size:40, label: 'star',    shape: 'star', shapeProperties:{borderDashes:true}},
+//        {id: 11, font:{size:30}, size:40, label: 'coordinator', shape: 'circularImage', image: '/templates/zigbee2mqtt/img/cc2531.jpg', shapeProperties: {borderDashes:[15,5]}},	
+      ];
+
+      edges = [
+      ];
+
+      // create a network
+      var container = document.getElementById('mynetwork');
+      var data = {
+        nodes: nodes,
+        edges: edges
+      };
+      var options = {physics:{barnesHut:{gravitationalConstant:-4000}}};
+      network = new vis.Network(container, data, options);
+    }
+  </script>
+
+
+<body onload="draw()">
+
+<div id="mynetwork"></div>
+
+<div id="info"></div>
+</body>
+</html>
+
+
+
+
+
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.babelrc b/templates/zigbee2mqtt/vis-4.21.0/.babelrc
@@ -0,0 +1,8 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    "transform-es3-property-literals",
+    "transform-es3-member-expression-literals",
+    "transform-runtime"
+  ]
+}
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.codeclimate.yml b/templates/zigbee2mqtt/vis-4.21.0/.codeclimate.yml
@@ -0,0 +1,26 @@
+languages:
+  JavaScript: true
+engines:
+  eslint:
+    enabled: true
+  csslint:
+    enabled: true
+  markdownlint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+        javascript:
+          mass_threshold: 300
+  fixme :
+    enabled: true
+ratings:
+  paths:
+  - "**/*.js"
+  - "**/*.css"
+  - "**/*.md"
+exclude_paths:
+  - "dist/**/*"
+  - "docs/**/*"
+  - "examples/**/*"
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.csslintrc b/templates/zigbee2mqtt/vis-4.21.0/.csslintrc
@@ -0,0 +1,6 @@
+{
+  "adjoining-classes": false,
+  "box-model": false,
+  "box-sizing": false,
+  "order-alphabetical": false
+}
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.eslintrc b/templates/zigbee2mqtt/vis-4.21.0/.eslintrc
@@ -0,0 +1,42 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true,
+    "mocha": true
+  },
+
+  "parserOptions": {
+    "sourceType": "module",
+  },
+
+  "extends": "eslint:recommended",
+
+  // For the full list of rules, see: http://eslint.org/docs/rules/
+  "rules": {
+    "complexity": [2, 55],
+    "max-statements": [2, 115],
+    "no-unreachable": 1,
+    "no-useless-escape": 0,
+
+    "no-console": 0,
+    // To flag presence of console.log without breaking linting:
+    //"no-console": ["warn", { allow: ["warn", "error"] }],
+
+    "require-jsdoc": ["error", {
+        "require": {
+            "FunctionDeclaration": true,
+            "MethodDefinition": true,
+            "ClassDeclaration": true,
+            "ArrowFunctionExpression": false
+        }
+    }],
+    "valid-jsdoc": [2, {
+      "requireReturnDescription": false,
+      "requireReturn": false,
+      "requireParamDescription": false,
+      "requireReturnType": true
+      }],
+    "guard-for-in": 1,
+  },
+}
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.github/ISSUE_TEMPLATE.md b/templates/zigbee2mqtt/vis-4.21.0/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,10 @@
+
+Please make sure to **read the following list** before creating a new issue:
+
+* This issue tracker is not supposed to be used for questions on how to use visjs. It is intended to be used for bug reports and feature requests! In case you face yourself with a usage question, then post your question e.g. on [stackoverflow](https://stackoverflow.com/questions/tagged/vis.js) tagged with "vis.js".
+* Have you already used the [github search](https://github.com/almende/vis/issues), read the [documentation](http://visjs.org/) and looked at the [examples](https://github.com/almende/vis/tree/develop/examples)?
+* Make sure to mention which vis-component (network, timeline, graph2D, graph3d) you are referring to.
+* Make sure to use the [latest version of vis.js](https://cdnjs.com/libraries/vis) for bug reports.
+* Make sure to mention which browser and OS you are using when creating a bug report.
+* Please provide a minimal code example that demonstrates your issue. We recommend using [jsbin](jsbin.com) for that.
+* Delete this list from the actual issue.
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.github/PULL_REQUEST_TEMPLATE.md b/templates/zigbee2mqtt/vis-4.21.0/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+**Thank you for contributing to vis.js!!**
+
+Please make sure to check the following requirements before creating a pull request:
+
+* [ ] All pull requests must be to the [develop branch](https://github.com/almende/vis/tree/develop). Pull requests to the `master` branch will be closed!
+* [ ] Make sure your changes are based on the latest version of the [develop branch](https://github.com/almende/vis/tree/develop). (Use e.g. `git fetch && git rebase origin develop` to update your feature branch).
+* [ ] Provide an additional or update an example to demonstrate your changes or new features.
+* [ ] Update the documentation if you introduced new behavior or changed existing behavior.
+* [ ] Reference issue numbers of issues that your pull request addresses. (If you write something like `fixes #1781` in your git commit message this issue gets closed automatically by merging your pull request).
+* [ ] Expect review comments and change requests by reviewer.
+* [ ] Delete this checklist from your pull request.
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.gitignore b/templates/zigbee2mqtt/vis-4.21.0/.gitignore
@@ -0,0 +1,15 @@
+# npm files
+node_modules
+npm-debug.log
+
+# ide or system files
+.idea
+.c9
+*.iml
+.project
+.settings/
+.directory
+
+# temporary files
+.*.sw[op]
+.commits.tmp
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.mdlrc b/templates/zigbee2mqtt/vis-4.21.0/.mdlrc
@@ -0,0 +1,7 @@
+// Markdown Lint Rules
+// https://github.com/mivok/markdownlint/blob/master/docs/RULES.md
+
+rules
+  "~MD012", // alert on multiple consecutive blank lines
+  "~MD013", // line length should be no more than 80 characters
+  "~MD014", // Dollar signs used before commands without showing output
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.npmignore b/templates/zigbee2mqtt/vis-4.21.0/.npmignore
@@ -0,0 +1,9 @@
+misc
+node_modules
+test
+tools
+.idea
+bower.json
+Jakefile.js
+.npmignore
+.gitignore
diff --git a/templates/zigbee2mqtt/vis-4.21.0/.travis.yml b/templates/zigbee2mqtt/vis-4.21.0/.travis.yml
@@ -0,0 +1,18 @@
+language: node_js
+node_js:
+  - "6"
+env:
+  - CXX=g++-4.8
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libgif-dev
+      - g++-4.8
+before_script:
+  - npm run lint
+  - npm install gulp
+script:
+  - gulp
+  - npm test
diff --git a/templates/zigbee2mqtt/vis-4.21.0/CONTRIBUTING.md b/templates/zigbee2mqtt/vis-4.21.0/CONTRIBUTING.md
@@ -0,0 +1,15 @@
+## Contributing
+
+[Contributions](//github.com/almende/vis/blob/master/misc/how_to_help.md) to the vis.js library are very welcome! [We can't do this alone](//github.com/almende/vis/blob/master/misc/we_need_help.md).
+
+### Questions
+If you have any *general question* on how to use the vis.js library in your own project please check out [stackoverflow](http://stackoverflow.com/questions/tagged/vis.js) for thinks like that. **This is NOT a JavaScript help forum!**
+
+### Bugs, Problems and Feature-Requests
+If you really want to open a new issue:
+* Please use the [search functionality](//github.com/almende/vis/issues) to make sure that there is not already an issue concerning the same topic.
+* Please make sure to **mention which module** of vis.js (network, timeline, graph3d, ...) your are referring to.
+* Note that development happens on the `develop` git branch. Be sure to submit PRs against this branch.
+* If you think you found a bug please **provide a simple example** (e.g. on [jsbin](jsbin.com)) that demonstrates the problem.
+* If you want to propose a feature-request please **describe what you are looking for in detail**, ideally providing a screenshot, drawing or something similar.
+* **Close the issue later**, when the issue is no longer needed.