Browse Source

Se actualiza vendor y template.

Maximiliano Schvindt 7 years ago
parent
commit
8157704961
3 changed files with 43 additions and 3 deletions
  1. 5 0
      composer.json
  2. 25 3
      composer.lock
  3. 13 0
      src/StatsBundle/Resources/views/Stats/onu_map.html.twig

+ 5 - 0
composer.json

@@ -96,6 +96,10 @@
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
+        },
+        {
+            "type": "vcs",
+            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git"
         }
     ],
     "require": {
@@ -107,6 +111,7 @@
         "ik/base-admin-bundle": "dev-master",
         "ik/device-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
+        "ik/leaflet-bundle": "dev-master",
         "ik/migrations-bundle": "dev-master",
         "ik/oauthclient-bundle": "dev-master",
         "ik/owner-voter-bundle": "dev-master",

+ 25 - 3
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "fae3f8bf069c907f35389e125a8de067",
+    "content-hash": "52a4fa87ec5a63187f0d15bff7a04850",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1460,6 +1460,27 @@
             ],
             "time": "2017-07-05 12:20:18"
         },
+        {
+            "name": "ik/leaflet-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
+                "reference": "3361cc3639f0e7521268cb7c1ec1afdc3af44bb6"
+            },
+            "require": {
+                "ext-curl": "*",
+                "kriswallsmith/buzz": "~0.13"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "LeafletBundle\\": ""
+                }
+            },
+            "description": "The Flowdat3 Leaflet Resource",
+            "time": "2017-08-29 15:38:12"
+        },
         {
             "name": "ik/migrations-bundle",
             "version": "dev-master",
@@ -1584,7 +1605,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/GeoserverBundle.git",
-                "reference": "bc997a4054624f1228769c4a4f9911428424e097"
+                "reference": "fd2e7e9d44dc2debc2ab6773cd1f7d4e77633d5e"
             },
             "type": "library",
             "autoload": {
@@ -1597,7 +1618,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2017-08-25 13:15:01"
+            "time": "2017-08-29 15:11:22"
         },
         {
             "name": "ik/statsd-bundle",
@@ -6033,6 +6054,7 @@
         "ik/base-admin-bundle": 20,
         "ik/device-bundle": 20,
         "ik/extra-data-bundle": 20,
+        "ik/leaflet-bundle": 20,
         "ik/migrations-bundle": 20,
         "ik/oauthclient-bundle": 20,
         "ik/owner-voter-bundle": 20,

+ 13 - 0
src/StatsBundle/Resources/views/Stats/onu_map.html.twig

@@ -186,6 +186,19 @@ function initializeMap() {
 
 }
 
+function customPopupFeature(latlng, content) {
+    
+    id = content.id;
+    ponSerialNumber = id.replace("onu.", "").toUpperCase();
+    data = "<b>" + ponSerialNumber + "</b><br /> Tx: " + content.tx + "<br /> Rx: " + content.rx + "<br /> Status: " + content.status  + "<br /> Voltage: " + content.volt + "<br /> Temperature: " + content.temp + "<br /> Muestreo: " + content.muestreo;
+    
+    popup = L.popup()
+        .setLatLng(latlng)
+        .setContent(data)
+        .openOn(window.map);
+
+}
+
 /* --------------------- Funciones ------------------------- */
 </script>
 {% endblock %}