From 03c4768e7d92af26a095b9458a9d99b91cad15ee Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Wed, 27 Apr 2016 13:44:38 +0530
Subject: [PATCH] Update new analytics components.

---
 .../analytics-view.hbs                                       | 3 +--
 .../analytics-view.js                                        | 2 +-
 .../realtime.hbs                                             | 5 ++---
 .../device-view.hbs                                          | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.hbs b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.hbs
index f45dead9d..e62ba0fd2 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.hbs
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.hbs
@@ -1,4 +1,3 @@
-
 {{#zone "topCss"}}
     {{css "css/graph.css"}}
 {{/zone}}
@@ -22,4 +21,4 @@
     {{js "js/rickshaw.min.js"}}
     {{js "js/moment.min.js"}}
     {{js "js/devicetype-graph.js"}}
-{{/zone}}
\ No newline at end of file
+{{/zone}}
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.js b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.js
index e1e302fc1..86a919157 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.js
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.js
@@ -18,7 +18,7 @@
 
 function onRequest(context) {
     var deviceType = context.uriParams.deviceType;
-    var deviceId = request.getParameter("id");
+    var deviceId = request.getParameter("deviceId");
 
     if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) {
         var deviceModule = require("/app/modules/device.js").deviceModule;
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics.realtime/realtime.hbs b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics.realtime/realtime.hbs
index a382f271b..f04d0ade7 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics.realtime/realtime.hbs
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics.realtime/realtime.hbs
@@ -1,4 +1,3 @@
-
 {{#zone "topCss"}}
     {{css "css/graph.css"}}
 {{/zone}}
@@ -17,7 +16,7 @@
     </div>
 </div>
 <a class="padding-left"
-   href="{{@app.context}}/device/analytics/{{device.type}}?id={{device.deviceIdentifier}}&deviceName={{device.name}}">
+   href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}">
     <span class="fw-stack">
         <i class="fw fw-ring fw-stack-2x"></i>
         <i class="fw fw-statistics fw-stack-1x"></i>
@@ -30,4 +29,4 @@
     {{js "js/moment.min.js"}}
     {{js "js/socket.io.min.js"}}
     {{js "js/device-stats.js"}}
-{{/zone}}
\ No newline at end of file
+{{/zone}}
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
index 987fa099c..f44b89c2a 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
@@ -102,4 +102,4 @@
     <script async defer
             src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCO-8KGLeoFkCeqID9BpY_Gh6GOKfaBPVc&callback=initMap">
     </script>
-{{/zone}}
\ No newline at end of file
+{{/zone}}