From 57f0ea7ce4712bbf8d5928ac20c23cd6ffadc77f Mon Sep 17 00:00:00 2001 From: Supun94 Date: Mon, 19 Dec 2016 04:56:50 +0530 Subject: [PATCH 1/6] Changing policy compliance view --- .../public/js/device-detail.js | 2 ++ .../public/templates/policy-compliance.hbs | 2 +- .../public/js/device-detail.js | 2 ++ .../public/templates/policy-compliance.hbs | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js index c68579335..0c08e071e 100755 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js @@ -231,6 +231,8 @@ var InitiateViewOption = null; var viewModel = {}; viewModel["applications"] = data; viewModel["deviceType"] = deviceType; + viewModel["deviceId"] = deviceId; + viewModel["appContext"] = context; var content = template(viewModel); $("#applications-list-container").html(content); } else { diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs index eac53066c..b38f5cbd5 100755 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs @@ -45,7 +45,7 @@
- diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js index a90864968..f08cfed44 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js @@ -237,6 +237,8 @@ var InitiateViewOption = null; var viewModel = {}; viewModel["applications"] = data; viewModel["deviceType"] = deviceType; + viewModel["deviceId"] = deviceId; + viewModel["appContext"] = context; var content = template(viewModel); $("#applications-list-container").html(content); } else { diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs index d20ca7a9c..1115f9ff9 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs @@ -45,7 +45,7 @@
- + From 5465cea76dddc44adf1a9aee6ad7b4ba85f543f8 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Thu, 22 Dec 2016 14:03:49 +0530 Subject: [PATCH 2/6] Fixing QR modal unit not found issue --- .../cdmf.unit.device.type.android.device-view/device-view.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs index 3842be730..1b42bdfc6 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs @@ -1,6 +1,6 @@ {{unit "cdmf.unit.device.type.android.leaflet"}} {{unit "cdmf.unit.lib.qrcode"}} -{{unit "cdmf.unit.device.type.android.qr-modal"}} +{{unit "cdmf.unit.device.type.qr-modal"}} {{#if deviceFound}} {{#if isAuthorized}} From 4add08545a979aa6415cf750fe641bebc45ccc63 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 22 Dec 2016 16:32:06 +0530 Subject: [PATCH 3/6] Removed previously created accelerometer gadgets. --- .../Accelerometer_X/conf.json | 1 - .../Accelerometer_X/css/number-chart.css | 35 ------------------- .../Accelerometer_X/gadget.json | 9 ----- .../ACCELEROMETER_Y/conf.json | 1 - .../ACCELEROMETER_Y/css/number-chart.css | 35 ------------------- .../ACCELEROMETER_Y/gadget.json | 9 ----- .../ACCELEROMETER_Z/conf.json | 1 - .../ACCELEROMETER_Z/css/number-chart.css | 35 ------------------- .../ACCELEROMETER_Z/gadget.json | 9 ----- 9 files changed, 135 deletions(-) delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/conf.json delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/css/number-chart.css delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.json delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/conf.json delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/css/number-chart.css delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.json delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/conf.json delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/css/number-chart.css delete mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.json diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/conf.json deleted file mode 100644 index 5617ac60d..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/conf.json +++ /dev/null @@ -1 +0,0 @@ -{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "x", "title" : "ACCELEROMETER X", "maxLength" : "30", "gadget-name" : "Accelerometer X", "chart-name" : "number-chart"}} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/css/number-chart.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/css/number-chart.css deleted file mode 100644 index 5dde0413a..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/css/number-chart.css +++ /dev/null @@ -1,35 +0,0 @@ -#canvas { - height: 100%; - width: 100%; -} - -p { - margin: 0; - display: block; - text-align: center; - font-weight: bold; -} - -.titlecanvasContent { - color:steelblue; - font-size:18px; - font-weight: normal; - padding: 10px 0; -} - -.valcanvasContent { - color:#438CAD; - font-size:50px; - font-weight: normal; -} - - -.diffcanvasContent { - color:#438CAD; - font-size:14px; -} - -.diffPercentagecanvasContent { - color:#ff944d; - font-size:14px; -} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.json deleted file mode 100644 index 90a89cbff..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id": "Accelerometer_X", - "title": "Accelerometer X", - "type": "gadget", - "thumbnail": "gadget/Accelerometer_X/thumbnail.png", - "data": { - "url": "gadget/Accelerometer_X/gadget.xml" - } -} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/conf.json deleted file mode 100644 index f20d0c48a..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/conf.json +++ /dev/null @@ -1 +0,0 @@ -{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "y", "title" : "ACCELEROMETER Y", "maxLength" : "30", "gadget-name" : "ACCELEROMETER Y", "chart-name" : "number-chart"}} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/css/number-chart.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/css/number-chart.css deleted file mode 100644 index 5dde0413a..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/css/number-chart.css +++ /dev/null @@ -1,35 +0,0 @@ -#canvas { - height: 100%; - width: 100%; -} - -p { - margin: 0; - display: block; - text-align: center; - font-weight: bold; -} - -.titlecanvasContent { - color:steelblue; - font-size:18px; - font-weight: normal; - padding: 10px 0; -} - -.valcanvasContent { - color:#438CAD; - font-size:50px; - font-weight: normal; -} - - -.diffcanvasContent { - color:#438CAD; - font-size:14px; -} - -.diffPercentagecanvasContent { - color:#ff944d; - font-size:14px; -} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.json deleted file mode 100644 index 16db7931b..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id": "ACCELEROMETER_Y", - "title": "ACCELEROMETER Y", - "type": "gadget", - "thumbnail": "gadget/ACCELEROMETER_Y/thumbnail.png", - "data": { - "url": "gadget/ACCELEROMETER_Y/gadget.xml" - } -} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/conf.json deleted file mode 100644 index 1940ff1dd..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/conf.json +++ /dev/null @@ -1 +0,0 @@ -{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "z", "title" : "ACCELEROMETER Z", "maxLength" : "30", "gadget-name" : "ACCELEROMETER Z", "chart-name" : "number-chart"}} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/css/number-chart.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/css/number-chart.css deleted file mode 100644 index 5dde0413a..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/css/number-chart.css +++ /dev/null @@ -1,35 +0,0 @@ -#canvas { - height: 100%; - width: 100%; -} - -p { - margin: 0; - display: block; - text-align: center; - font-weight: bold; -} - -.titlecanvasContent { - color:steelblue; - font-size:18px; - font-weight: normal; - padding: 10px 0; -} - -.valcanvasContent { - color:#438CAD; - font-size:50px; - font-weight: normal; -} - - -.diffcanvasContent { - color:#438CAD; - font-size:14px; -} - -.diffPercentagecanvasContent { - color:#ff944d; - font-size:14px; -} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.json deleted file mode 100644 index 4236c240a..000000000 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id": "ACCELEROMETER_Z", - "title": "ACCELEROMETER Z", - "type": "gadget", - "thumbnail": "gadget/ACCELEROMETER_Z/thumbnail.png", - "data": { - "url": "gadget/ACCELEROMETER_Z/gadget.xml" - } -} From f0d7e4648a6b6767c78f745604fe3447e6679b1b Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 22 Dec 2016 16:33:27 +0530 Subject: [PATCH 4/6] Android sense execution plans changed to be used with multiline charts. --- ...droid-Accelerometer-ExecutionPlan.siddhiql | 8 +- ...g_wso2_iot_android_accelerometer_stats.xml | 14 +- ...iot.android.accelerometer.stats_1.0.0.json | 10 +- ....wso2.iot.android.accelerometer_1.0.0.json | 10 +- .../Android-Sense-ExecutionPlan.siddhiql | 49 ++++- .../js/provider-libs/ws-client.js | 2 +- .../Android-Gyroscope-ExecutionPlan.siddhiql | 10 +- .../org_wso2_iot_android_gyroscope_stats.xml | 14 +- ...so2.iot.android.gyroscope.stats_1.0.0.json | 10 +- .../org.wso2.iot.android.gyroscope_1.0.0.json | 10 +- .../Android-Magnetic-ExecutionPlan.siddhiql | 7 +- .../org_wso2_iot_android_magnetic_stats.xml | 14 +- ...wso2.iot.android.magnetic.stats_1.0.0.json | 10 +- .../org.wso2.iot.android.magnetic_1.0.0.json | 10 +- .../Android-Rotation-ExecutionPlan.siddhiql | 8 +- .../org_wso2_iot_android_rotation_stats.xml | 14 +- ...wso2.iot.android.rotation.stats_1.0.0.json | 10 +- .../org.wso2.iot.android.rotation_1.0.0.json | 10 +- .../android_sense_dashboard/android-iot.json | 204 ++++++++++-------- .../carbonapps/androidsense/artifacts.xml | 12 +- 20 files changed, 214 insertions(+), 222 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql index fa0e7517d..e89e73f86 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_executionplan/Android-Accelerometer-ExecutionPlan.siddhiql @@ -3,16 +3,16 @@ @Plan:description('Process accelerometer changes.') @Import('org.wso2.iot.android.accelerometer:1.0.0') -define stream AccelerometerStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream AccelerometerStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value +float); @Export('org.wso2.iot.android.accelerometer.stats:1.0.0') -define stream AccelerometerStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, x -float, y float, z float, year int, month int, day int, hour int, minute int); +define stream AccelerometerStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float, year int, month int, day int, hour int, minute int); partition with (meta_deviceId of AccelerometerStream) begin from AccelerometerStream - select meta_owner, meta_deviceId, meta_timestamp, x, y, z, time:extract + select meta_owner, meta_deviceId, meta_timestamp, axis, value, time:extract (meta_timestamp, 'year') as year, time:extract(meta_timestamp, 'month') as month, time:extract(meta_timestamp, 'day') as day, time:extract(meta_timestamp, 'hour') as hour, time:extract(meta_timestamp, 'minute') as minute insert into AccelerometerStatsStream; end; \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml index abf3b755b..663853bfd 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/org_wso2_iot_android_accelerometer_stats.xml @@ -26,23 +26,15 @@ LONG - x + axis false false false false - FLOAT - - - y - false - false - false - false - FLOAT + STRING - z + value false false false diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json index f735e0e3b..e1e1567f1 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_streams/org.wso2.iot.android.accelerometer.stats_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" }, { diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json index 2c7bdbe54..69d9f8db0 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_streams/org.wso2.iot.android.accelerometer_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" } ] diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql index 3b4d7b32f..cbb3a64e3 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql @@ -33,19 +33,19 @@ define stream SmsStream (meta_owner string, meta_deviceId string, meta_timestamp define stream geoLocationStream (id string, timeStamp long, latitude double, longitude double, type string, speed float, heading float); @Export('org.wso2.iot.android.accelerometer:1.0.0') -define stream AccelerometerStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream AccelerometerStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); @Export('org.wso2.iot.android.gyroscope:1.0.0') -define stream GyroscopeStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream GyroscopeStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); @Export('org.wso2.iot.android.magnetic:1.0.0') -define stream MagneticStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream MagneticStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); @Export('org.wso2.iot.android.gravity:1.0.0') define stream GravityStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); @Export('org.wso2.iot.android.rotation:1.0.0') -define stream RotationStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream RotationStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); @Export('org.wso2.iot.android.pressure:1.0.0') define stream PressureStream (meta_owner string, meta_deviceId string, meta_timestamp long, pressure float); @@ -57,14 +57,39 @@ define stream LightStream (meta_owner string, meta_deviceId string, meta_timesta define stream ProximityStream (meta_owner string, meta_deviceId string, meta_timestamp long, proximity float); from AndroidSense[meta_type == 'accelerometer'] -select meta_owner, meta_deviceId, meta_timestamp, accelerometer_x as x, accelerometer_y as y, accelerometer_z as z +select meta_owner, meta_deviceId, meta_timestamp, 'X' as axis, accelerometer_x as value +insert into AccelerometerStream; + +from AndroidSense[meta_type == 'accelerometer'] +select meta_owner, meta_deviceId, meta_timestamp, 'Y' as axis, accelerometer_y as value +insert into AccelerometerStream; + +from AndroidSense[meta_type == 'accelerometer'] +select meta_owner, meta_deviceId, meta_timestamp, 'Z' as axis, accelerometer_z as value insert into AccelerometerStream; from AndroidSense[meta_type == 'gyroscope'] -select meta_owner, meta_deviceId, meta_timestamp, gyroscope_x as x, gyroscope_y as y, gyroscope_z as z +select meta_owner, meta_deviceId, meta_timestamp, 'X' as axis, gyroscope_x as value insert into GyroscopeStream; + +from AndroidSense[meta_type == 'gyroscope'] +select meta_owner, meta_deviceId, meta_timestamp, 'Y' as axis, gyroscope_y as value +insert into GyroscopeStream; + +from AndroidSense[meta_type == 'gyroscope'] +select meta_owner, meta_deviceId, meta_timestamp, 'Z' as axis, gyroscope_z as value +insert into GyroscopeStream; + from AndroidSense[meta_type == 'magnetic'] -select meta_owner, meta_deviceId, meta_timestamp, magnetic_x as x, magnetic_y as y, magnetic_z as z +select meta_owner, meta_deviceId, meta_timestamp, 'X' as axis, magnetic_x as value +insert into MagneticStream; + +from AndroidSense[meta_type == 'magnetic'] +select meta_owner, meta_deviceId, meta_timestamp, 'Y' as axis, magnetic_y as value +insert into MagneticStream; + +from AndroidSense[meta_type == 'magnetic'] +select meta_owner, meta_deviceId, meta_timestamp, 'Z' as axis, magnetic_z as value insert into MagneticStream; from AndroidSense[meta_type == 'gravity'] @@ -72,7 +97,15 @@ select meta_owner, meta_deviceId, meta_timestamp, gravity_x as x, gravity_y as y insert into GravityStream; from AndroidSense[meta_type == 'rotation'] -select meta_owner, meta_deviceId, meta_timestamp, rotation_x as x, rotation_y as y, rotation_z as z +select meta_owner, meta_deviceId, meta_timestamp, 'X' as axis, rotation_x as value +insert into RotationStream; + +from AndroidSense[meta_type == 'rotation'] +select meta_owner, meta_deviceId, meta_timestamp, 'Y' as axis, rotation_y as value +insert into RotationStream; + +from AndroidSense[meta_type == 'rotation'] +select meta_owner, meta_deviceId, meta_timestamp, 'Z' as axis, rotation_z as value insert into RotationStream; from AndroidSense[meta_type == 'pressure'] diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js index ab7263155..96c835642 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * * WSO2 Inc. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_executionplan/Android-Gyroscope-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_executionplan/Android-Gyroscope-ExecutionPlan.siddhiql index 85d502500..a90efaadf 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_executionplan/Android-Gyroscope-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_executionplan/Android-Gyroscope-ExecutionPlan.siddhiql @@ -3,16 +3,16 @@ @Plan:description('Process gyroscope changes.') @Import('org.wso2.iot.android.gyroscope:1.0.0') -define stream GyroscopeStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream GyroscopeStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); @Export('org.wso2.iot.android.gyroscope.stats:1.0.0') -define stream GyroscopeStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, x -float, y float, z float, year int, month int, day int, hour int, minute int); +define stream GyroscopeStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value +float, year int, month int, day int, hour int, minute int); partition with (meta_deviceId of GyroscopeStream) begin from GyroscopeStream - select meta_owner, meta_deviceId, meta_timestamp, x, y, z, time:extract - (meta_timestamp, 'year') as year, time:extract(meta_timestamp, 'month') as month, time:extract(meta_timestamp, 'day') as day, time:extract(meta_timestamp, 'hour') as hour, time:extract(meta_timestamp, 'minute') as minute + select meta_owner, meta_deviceId, meta_timestamp, axis, value, time:extract (meta_timestamp, 'year') as year, + time:extract(meta_timestamp, 'month') as month, time:extract(meta_timestamp, 'day') as day, time:extract(meta_timestamp, 'hour') as hour, time:extract(meta_timestamp, 'minute') as minute insert into GyroscopeStatsStream; end; \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_event_sink/org_wso2_iot_android_gyroscope_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_event_sink/org_wso2_iot_android_gyroscope_stats.xml index ba42b4ba7..c8f77320b 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_event_sink/org_wso2_iot_android_gyroscope_stats.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_event_sink/org_wso2_iot_android_gyroscope_stats.xml @@ -26,23 +26,15 @@ LONG - x + axis false false false false - FLOAT - - - y - false - false - false - false - FLOAT + STRING - z + value false false false diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_streams/org.wso2.iot.android.gyroscope.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_streams/org.wso2.iot.android.gyroscope.stats_1.0.0.json index 6282a16a5..03292564f 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_streams/org.wso2.iot.android.gyroscope.stats_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_streams/org.wso2.iot.android.gyroscope.stats_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" }, { diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_streams/org.wso2.iot.android.gyroscope_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_streams/org.wso2.iot.android.gyroscope_1.0.0.json index b7fcf81b7..05f1a3226 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_streams/org.wso2.iot.android.gyroscope_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_streams/org.wso2.iot.android.gyroscope_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" } ] diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_executionplan/Android-Magnetic-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_executionplan/Android-Magnetic-ExecutionPlan.siddhiql index d7af0016f..52f7bb7ce 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_executionplan/Android-Magnetic-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_executionplan/Android-Magnetic-ExecutionPlan.siddhiql @@ -3,16 +3,15 @@ @Plan:description('Process magnetic field changes.') @Import('org.wso2.iot.android.magnetic:1.0.0') -define stream MagneticStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream MagneticStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); @Export('org.wso2.iot.android.magnetic.stats:1.0.0') -define stream MagneticStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, x -float, y float, z float, year int, month int, day int, hour int, minute int); +define stream MagneticStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float, year int, month int, day int, hour int, minute int); partition with (meta_deviceId of MagneticStream) begin from MagneticStream - select meta_owner, meta_deviceId, meta_timestamp, x, y, z, time:extract + select meta_owner, meta_deviceId, meta_timestamp, axis, value, time:extract (meta_timestamp, 'year') as year, time:extract(meta_timestamp, 'month') as month, time:extract(meta_timestamp, 'day') as day, time:extract(meta_timestamp, 'hour') as hour, time:extract(meta_timestamp, 'minute') as minute insert into MagneticStatsStream; end; \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_event_sink/org_wso2_iot_android_magnetic_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_event_sink/org_wso2_iot_android_magnetic_stats.xml index 93328ca02..992d63505 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_event_sink/org_wso2_iot_android_magnetic_stats.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_event_sink/org_wso2_iot_android_magnetic_stats.xml @@ -26,23 +26,15 @@ LONG - x + axis false false false false - FLOAT - - - y - false - false - false - false - FLOAT + STRING - z + value false false false diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_streams/org.wso2.iot.android.magnetic.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_streams/org.wso2.iot.android.magnetic.stats_1.0.0.json index 109ba5b1d..468369cf0 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_streams/org.wso2.iot.android.magnetic.stats_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_streams/org.wso2.iot.android.magnetic.stats_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" }, { diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_streams/org.wso2.iot.android.magnetic_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_streams/org.wso2.iot.android.magnetic_1.0.0.json index a9ad5d8dc..a468cdf3e 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_streams/org.wso2.iot.android.magnetic_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_streams/org.wso2.iot.android.magnetic_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" } ] diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_executionplan/Android-Rotation-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_executionplan/Android-Rotation-ExecutionPlan.siddhiql index df2e44c6d..19f66e977 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_executionplan/Android-Rotation-ExecutionPlan.siddhiql +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_executionplan/Android-Rotation-ExecutionPlan.siddhiql @@ -3,16 +3,16 @@ @Plan:description('Process rotation field changes.') @Import('org.wso2.iot.android.rotation:1.0.0') -define stream RotationStream (meta_owner string, meta_deviceId string, meta_timestamp long, x float, y float, z float); +define stream RotationStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value float); @Export('org.wso2.iot.android.rotation.stats:1.0.0') -define stream RotationStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, x -float, y float, z float, year int, month int, day int, hour int, minute int); +define stream RotationStatsStream (meta_owner string, meta_deviceId string, meta_timestamp long, axis string, value +float, year int, month int, day int, hour int, minute int); partition with (meta_deviceId of RotationStream) begin from RotationStream - select meta_owner, meta_deviceId, meta_timestamp, x, y, z, time:extract + select meta_owner, meta_deviceId, meta_timestamp, axis, value, time:extract (meta_timestamp, 'year') as year, time:extract(meta_timestamp, 'month') as month, time:extract(meta_timestamp, 'day') as day, time:extract(meta_timestamp, 'hour') as hour, time:extract(meta_timestamp, 'minute') as minute insert into RotationStatsStream; end; \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_event_sink/org_wso2_iot_android_rotation_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_event_sink/org_wso2_iot_android_rotation_stats.xml index 018b265f6..c235a8ac2 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_event_sink/org_wso2_iot_android_rotation_stats.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_event_sink/org_wso2_iot_android_rotation_stats.xml @@ -26,23 +26,15 @@ LONG - x + axis false false false false - FLOAT - - - y - false - false - false - false - FLOAT + STRING - z + value false false false diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_streams/org.wso2.iot.android.rotation.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_streams/org.wso2.iot.android.rotation.stats_1.0.0.json index 1bf43d4d6..418c8daf1 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_streams/org.wso2.iot.android.rotation.stats_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_streams/org.wso2.iot.android.rotation.stats_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" }, { diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_streams/org.wso2.iot.android.rotation_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_streams/org.wso2.iot.android.rotation_1.0.0.json index 22e6988e2..c82c7f066 100755 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_streams/org.wso2.iot.android.rotation_1.0.0.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_streams/org.wso2.iot.android.rotation_1.0.0.json @@ -19,15 +19,11 @@ ], "payloadData": [ { - "name": "x", - "type": "FLOAT" - }, - { - "name": "y", - "type": "FLOAT" + "name": "axis", + "type": "STRING" }, { - "name": "z", + "name": "value", "type": "FLOAT" } ] diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json index 36570f484..41eaafb20 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json @@ -10,17 +10,17 @@ "hideAllMenuItems": false, "id": "android-iot", "identityServerUrl": "", - "isEditorEnable": true, + "isEditorEnable": false, "isUserCustom": false, "isanon": false, - "landing": "home", + "landing": "sensors", "menu": [ { - "id": "home", + "id": "sensors", "isanon": false, "ishidden": false, "subordinates": [], - "title": "Home" + "title": "Sensors" }, { "id": "real-time", @@ -61,7 +61,7 @@ "id": "test", "isanon": false, "ishidden": false, - "title": "test", + "title": "Test", "subordinates": [] } ], @@ -70,22 +70,23 @@ "content": { "anon": {}, "default": { - "a": [ + "a": [], + "b": [ { - "id": "ACCELEROMETER_Y-0", + "id": "ANDROID_MAGNETIC_GADGET-0", "content": { - "id": "ACCELEROMETER_Y", - "title": "ACCELEROMETER Y", + "id": "ANDROID_MAGNETIC_GADGET", + "title": "ANDROID_MAGNETIC_GADGET", "type": "gadget", - "thumbnail": "fs://gadget/ACCELEROMETER_Y/thumbnail.png", + "thumbnail": "fs://gadget/ANDROID_MAGNETIC_GADGET/thumbnail.png", "data": { - "url": "fs://gadget/ACCELEROMETER_Y/gadget.xml" + "url": "fs://gadget/ANDROID_MAGNETIC_GADGET/gadget.xml" }, "styles": { "no_heading": false, "hide_gadget": false, "titlePosition": "center", - "title": "ACCELEROMETER Y" + "title": "MAGNETIC FIELD" }, "options": { "windowSize": { @@ -97,7 +98,7 @@ } }, "locale_titles": { - "en-US": "ACCELEROMETER Y" + "en-US": "MAGNETIC FIELD" }, "settings": { "priority": "5", @@ -106,58 +107,22 @@ } } ], - "b": [ - { - "id": "ACCELEROMETER_Z-0", - "content": { - "id": "ACCELEROMETER_Z", - "title": "ACCELEROMETER Z", - "type": "gadget", - "thumbnail": "fs://gadget/ACCELEROMETER_Z/thumbnail.png", - "data": { - "url": "fs://gadget/ACCELEROMETER_Z/gadget.xml" - }, - "styles": { - "no_heading": false, - "hide_gadget": false, - "titlePosition": "center", - "title": "ACCELEROMETER Z" - }, - "options": { - "windowSize": { - "type": "STRING", - "title": "Window Size", - "value": "10", - "options": [], - "required": false - } - }, - "locale_titles": { - "en-US": "ACCELEROMETER Z" - }, - "settings": { - "priority": "5", - "timeoutInterval": "60000" - } - } - } - ], "8e564cb7a1c6519179e2111cc05a79ca": [ { - "id": "Accelerometer_X-0", + "id": "ANDROID_ACCELEROMETER_GADGET-0", "content": { - "id": "Accelerometer_X", - "title": "Accelerometer X", + "id": "ANDROID_ACCELEROMETER_GADGET", + "title": "ANDROID_ACCELEROMETER_GADGET", "type": "gadget", - "thumbnail": "fs://gadget/Accelerometer_X/thumbnail.png", + "thumbnail": "fs://gadget/ANDROID_ACCELEROMETER_GADGET/thumbnail.png", "data": { - "url": "fs://gadget/Accelerometer_X/gadget.xml" + "url": "fs://gadget/ANDROID_ACCELEROMETER_GADGET/gadget.xml" }, "styles": { "no_heading": false, "hide_gadget": false, "titlePosition": "center", - "title": "Accelerometer X" + "title": "ACCELEROMETER" }, "options": { "windowSize": { @@ -169,7 +134,7 @@ } }, "locale_titles": { - "en-US": "Accelerometer X" + "en-US": "ACCELEROMETER" }, "settings": { "priority": "5", @@ -249,43 +214,107 @@ } } } + ], + "765379a7012b8819ea13524e5b312509": [ + { + "id": "ANDROID_ROTATION_GADGET-0", + "content": { + "id": "ANDROID_ROTATION_GADGET", + "title": "ANDROID_ROTATION_GADGET", + "type": "gadget", + "thumbnail": "fs://gadget/ANDROID_ROTATION_GADGET/thumbnail.png", + "data": { + "url": "fs://gadget/ANDROID_ROTATION_GADGET/gadget.xml" + }, + "styles": { + "no_heading": false, + "hide_gadget": false, + "titlePosition": "center", + "title": "ROTATIONAL VECTOR" + }, + "options": { + "windowSize": { + "type": "STRING", + "title": "Window Size", + "value": "10", + "options": [], + "required": false + } + }, + "locale_titles": { + "en-US": "ROTATIONAL VECTOR" + }, + "settings": { + "priority": "5", + "timeoutInterval": "60000" + } + } + } + ], + "47ceaee8a089ea8ef75c91e5b83a1a36": [ + { + "id": "ANDROID_GYROSCOPE_GADGET-0", + "content": { + "id": "ANDROID_GYROSCOPE_GADGET", + "title": "ANDROID_GYROSCOPE_GADGET", + "type": "gadget", + "thumbnail": "fs://gadget/ANDROID_GYROSCOPE_GADGET/thumbnail.png", + "data": { + "url": "fs://gadget/ANDROID_GYROSCOPE_GADGET/gadget.xml" + }, + "styles": { + "no_heading": false, + "hide_gadget": false, + "titlePosition": "center", + "title": "GYROSCOPE" + }, + "options": { + "windowSize": { + "type": "STRING", + "title": "Window Size", + "value": "10", + "options": [], + "required": false + } + }, + "locale_titles": { + "en-US": "GYROSCOPE" + }, + "settings": { + "priority": "5", + "timeoutInterval": "60000" + } + } + } ] } }, - "id": "home", + "id": "sensors", "isanon": false, "layout": { "content": { "loggedIn": { "blocks": [ - { - "id": "a", - "x": 4, - "y": 0, - "width": 4, - "height": 4, - "banner": false - }, { "id": "b", - "x": 8, + "x": 6, "y": 0, - "width": 4, - "height": 4, + "width": 6, + "height": 5, "banner": false }, { "id": "8e564cb7a1c6519179e2111cc05a79ca", "x": 0, "y": 0, - "width": 4, - "height": 4, + "width": 6, + "height": 5, "banner": false }, { "id": "fdfada688ff9e7b3271eece314618532", "x": 0, - "y": 4, + "y": 5, "width": 6, "height": 3, "banner": false @@ -293,7 +322,7 @@ { "id": "46193833e958e9f7e879263f372eb508", "x": 6, - "y": 4, + "y": 5, "width": 6, "height": 3, "banner": false @@ -301,25 +330,17 @@ { "id": "765379a7012b8819ea13524e5b312509", "x": 0, - "y": 7, - "width": 4, - "height": 4, + "y": 8, + "width": 6, + "height": 5, "banner": false }, { "id": "47ceaee8a089ea8ef75c91e5b83a1a36", - "x": 8, - "y": 7, - "width": 4, - "height": 4, - "banner": false - }, - { - "id": "4a9feeb19fc2ea76e252dcd62c954279", - "x": 4, - "y": 7, - "width": 4, - "height": 4, + "x": 6, + "y": 8, + "width": 6, + "height": 5, "banner": false } ] @@ -327,7 +348,7 @@ }, "fluidLayout": false }, - "title": "Home" + "title": "Sensors" }, { "content": { @@ -1281,7 +1302,7 @@ }, { "id": "test", - "title": "test", + "title": "Test", "layout": { "content": { "loggedIn": { @@ -1438,5 +1459,6 @@ }, "shareDashboard": false, "theme": "Default Theme", - "title": "Android IOT" -} \ No newline at end of file + "title": "Android IOT", + "defaultPriority": "5" +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml index 0d9518345..3619bedc6 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml @@ -187,11 +187,7 @@ serverRole="DataAnalyticsServer"/> - - - + @@ -228,6 +226,8 @@ serverRole="DataAnalyticsServer"/> + @@ -239,6 +239,8 @@ serverRole="DataAnalyticsServer"/> + From c45a06b95a67912762e12b29ad8f5c889d355921 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 22 Dec 2016 16:34:45 +0530 Subject: [PATCH 5/6] New gadgets were added for Accelerometer, Gyroscope, Rotation and Magnetic field. --- .../ANDROID_ACCELEROMETER_GADGET/conf.json | 1 + .../gadget-controller.jag | 0 .../ANDROID_ACCELEROMETER_GADGET/gadget.json | 9 + .../ANDROID_ACCELEROMETER_GADGET}/gadget.xml | 6 +- .../js/core/gadget-core.js | 0 .../js/core/gadget-util.js | 35 +++ .../js/core/line-chart-api.js} | 39 ++- .../js/core/provider-client.js | 0 .../js/core/realtime-provider-api.js | 0 .../js/provider-libs/ws-client.js | 2 +- .../thumbnail.png | Bin .../android_accelerometer_gadget/artifact.xml | 23 ++ .../ANDROID_GYROSCOPE_GADGET/conf.json | 1 + .../gadget-controller.jag | 0 .../ANDROID_GYROSCOPE_GADGET/gadget.json | 9 + .../ANDROID_GYROSCOPE_GADGET}/gadget.xml | 6 +- .../js/core/gadget-core.js | 0 .../js/core/gadget-util.js | 2 +- .../js/core/line-chart-api.js} | 39 ++- .../js/core/provider-client.js | 0 .../js/core/realtime-provider-api.js | 0 .../js/provider-libs/ws-client.js | 2 +- .../ANDROID_GYROSCOPE_GADGET}/thumbnail.png | Bin .../artifact.xml | 4 +- .../ANDROID_MAGNETIC_GADGET/conf.json | 16 + .../gadget-controller.jag | 0 .../ANDROID_MAGNETIC_GADGET/gadget.json | 9 + .../ANDROID_MAGNETIC_GADGET}/gadget.xml | 6 +- .../js/core/gadget-core.js | 0 .../js/core/gadget-util.js | 2 +- .../js/core/line-chart-api.js} | 39 ++- .../js/core/provider-client.js | 0 .../js/core/realtime-provider-api.js | 0 .../js/provider-libs/ws-client.js | 2 +- .../ANDROID_MAGNETIC_GADGET}/thumbnail.png | Bin .../artifact.xml | 4 +- .../ANDROID_ROTATION_GADGET/conf.json | 16 + .../gadget-controller.jag | 42 +++ .../ANDROID_ROTATION_GADGET/gadget.json | 9 + .../ANDROID_ROTATION_GADGET/gadget.xml | 60 ++++ .../js/core/gadget-core.js | 64 ++++ .../js/core/gadget-util.js | 2 +- .../js/core/line-chart-api.js | 134 ++++++++ .../js/core/provider-client.js | 51 ++++ .../js/core/realtime-provider-api.js | 154 ++++++++++ .../js/provider-libs/ws-client.js | 287 ++++++++++++++++++ .../ANDROID_ROTATION_GADGET/thumbnail.png | Bin 0 -> 12971 bytes .../artifact.xml | 5 +- 48 files changed, 1031 insertions(+), 49 deletions(-) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET}/gadget-controller.jag (100%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget.json rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET}/gadget.xml (88%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET}/js/core/gadget-core.js (100%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/gadget-util.js rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/number-chart-api.js => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/line-chart-api.js} (76%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET}/js/core/provider-client.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET}/js/core/realtime-provider-api.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET}/js/provider-libs/ws-client.js (99%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET}/thumbnail.png (100%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/artifact.xml create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/gadget-controller.jag (100%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget.json rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/gadget.xml (88%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/js/core/gadget-core.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/js/core/gadget-util.js (98%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X/js/core/number-chart-api.js => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/line-chart-api.js} (76%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/js/core/provider-client.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/js/core/realtime-provider-api.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/js/provider-libs/ws-client.js (99%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET}/thumbnail.png (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget => android_gyroscope_gadget}/artifact.xml (82%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/gadget-controller.jag (100%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget.json rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/gadget.xml (88%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/js/core/gadget-core.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/js/core/gadget-util.js (98%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/number-chart-api.js => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/line-chart-api.js} (76%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/js/core/provider-client.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/js/core/realtime-provider-api.js (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/js/provider-libs/ws-client.js (99%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_z_gadget/ACCELEROMETER_Z => android_magnetic_gadget/ANDROID_MAGNETIC_GADGET}/thumbnail.png (100%) rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget => android_magnetic_gadget}/artifact.xml (82%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget-controller.jag create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.json create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.xml create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/gadget-core.js rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_x_gadget/Accelerometer_X => android_rotation_gadget/ANDROID_ROTATION_GADGET}/js/core/gadget-util.js (98%) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/line-chart-api.js create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/provider-client.js create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/realtime-provider-api.js create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/provider-libs/ws-client.js create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/thumbnail.png rename components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/{android_accelerometer_y_gadget => android_rotation_gadget}/artifact.xml (82%) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json new file mode 100644 index 000000000..3862cd4c4 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json @@ -0,0 +1 @@ +{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "TIMESTAMP", "xType" : "time", "y" : "value", "yType" : "number", "color" : "axis", "maxLength" : "30", "gadget-name" : "ANDROID_ACCELETOMETER_GADGET", "chart-name" : "line-chart"}} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget-controller.jag similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget-controller.jag rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget-controller.jag diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget.json new file mode 100644 index 000000000..171958013 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget.json @@ -0,0 +1,9 @@ +{ + "id": "ANDROID_ACCELETOMETER_GADGET", + "title": "ANDROID_ACCELETOMETER_GADGET", + "type": "gadget", + "thumbnail": "gadget/ANDROID_ACCELETOMETER_GADGET/thumbnail.png", + "data": { + "url": "gadget/ANDROID_ACCELETOMETER_GADGET/gadget.xml" + } +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget.xml similarity index 88% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.xml rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget.xml index 450b1bb05..2d138faeb 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/gadget.xml @@ -1,6 +1,6 @@ - + @@ -20,8 +20,6 @@ - - @@ -50,7 +48,7 @@ - + diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/gadget-core.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/gadget-core.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/gadget-core.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/gadget-util.js new file mode 100644 index 000000000..c16d3af15 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/gadget-util.js @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +var getGadgetLocation = function (callback) { + var gadgetLocation = "/portal/store/carbon.super/fs/gadget/ANDROID_ACCELEROMETER_GADGET"; + var PATH_SEPERATOR = "/"; + if (gadgetLocation.search("store") != -1) { + wso2.gadgets.identity.getTenantDomain(function (tenantDomain) { + var gadgetPath = gadgetLocation.split(PATH_SEPERATOR); + var modifiedPath = ''; + for (var i = 1; i < gadgetPath.length; i++) { + if (i === 3) { + modifiedPath = modifiedPath.concat(PATH_SEPERATOR, tenantDomain); + } else { + modifiedPath = modifiedPath.concat(PATH_SEPERATOR, gadgetPath[i]) + } + } + callback(modifiedPath); + }); + } else { + callback(gadgetLocation); + } +} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/number-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/line-chart-api.js similarity index 76% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/number-chart-api.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/line-chart-api.js index ef2c5da98..18f363a32 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/number-chart-api.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/line-chart-api.js @@ -24,16 +24,30 @@ var getConfig, validate, isProviderRequired, draw, update; * @param schema */ getConfig = function(schema) { - var chartConf = require(CHART_LOCATION + '/number-chart/config.json').config; + var chartConf = require(CHART_LOCATION + '/line-chart/config.json').config; /* dynamic logic goes here */ - return chartConf; + var columns = []; + + columns.push("None"); + for(var i=0; i < schema.length; i++) { + columns.push(schema[i]["fieldName"]); + } + + for(var i=0; i < chartConf.length; i++) { + if (chartConf[i]["fieldName"] == "color") { + chartConf[i]["valueSet"] = columns; + break; + } + } + + return chartConf; }; /** - * validate the user inout for the chart configurationx + * validate the user inout for the chart configuration * @param chartConfig */ validate = function(chartConfig) { @@ -55,7 +69,9 @@ var getConfig, validate, isProviderRequired, draw, update; * @param data */ draw = function(placeholder, chartConfig, _schema, data) { + _schema = updateUserPrefXYTypes(_schema, chartConfig); var schema = toVizGrammarSchema(_schema); + var view = { id: "chart-0", schema: schema, @@ -93,19 +109,26 @@ var getConfig, validate, isProviderRequired, draw, update; */ update = function(data) { wso2gadgets.onDataReady(data,"append"); - } + }; buildChartConfig = function (_chartConfig) { var conf = {}; conf.x = _chartConfig.x; + conf.xType = _chartConfig.xType; + conf.yType = _chartConfig.yType; conf.maxLength = _chartConfig.maxLength; conf.charts = []; conf.charts[0] = { - type : "number", - title : _chartConfig.title + type : "line", + y: _chartConfig.y }; + + if (_chartConfig.color != "None") { + conf.charts[0].color = _chartConfig.color; + } + return conf; }; - -}()); + +}()); \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/provider-client.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/provider-client.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/provider-client.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/realtime-provider-api.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/realtime-provider-api.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/core/realtime-provider-api.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/provider-libs/ws-client.js similarity index 99% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/provider-libs/ws-client.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/provider-libs/ws-client.js index fc49d8a35..760ecf951 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/provider-libs/ws-client.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/js/provider-libs/ws-client.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * * WSO2 Inc. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/thumbnail.png similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/thumbnail.png rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/thumbnail.png diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/artifact.xml new file mode 100644 index 000000000..576b3ce0d --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/artifact.xml @@ -0,0 +1,23 @@ + + + + + ANDROID_ACCELEROMETER_GADGET + + diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json new file mode 100644 index 000000000..1433ef60f --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json @@ -0,0 +1 @@ +{"provider-conf" : {"streamName" : "org.wso2.iot.android.gyroscope:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "TIMESTAMP", "xType" : "time", "y" : "value", "yType" : "number", "color" : "axis", "maxLength" : "30", "gadget-name" : "ANDROID_GYROSCOPE_GADGET", "chart-name" : "line-chart"}} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget-controller.jag similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget-controller.jag rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget-controller.jag diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget.json new file mode 100644 index 000000000..dd6ccb149 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget.json @@ -0,0 +1,9 @@ +{ + "id": "ANDROID_GYROSCOPE_GADGET", + "title": "ANDROID_GYROSCOPE_GADGET", + "type": "gadget", + "thumbnail": "gadget/ANDROID_GYROSCOPE_GADGET/thumbnail.png", + "data": { + "url": "gadget/ANDROID_GYROSCOPE_GADGET/gadget.xml" + } +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget.xml similarity index 88% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.xml rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget.xml index 8d098fb3e..f2dc17a74 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/gadget.xml @@ -1,6 +1,6 @@ - + @@ -20,8 +20,6 @@ - - @@ -50,7 +48,7 @@ - + diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/gadget-core.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/gadget-core.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/gadget-core.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/gadget-util.js similarity index 98% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/gadget-util.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/gadget-util.js index ffdc7ddc1..77f1a1ffe 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/gadget-util.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/gadget-util.js @@ -14,7 +14,7 @@ * limitations under the License. */ var getGadgetLocation = function (callback) { - var gadgetLocation = "/portal/store/carbon.super/fs/gadget/ACCELEROMETER_Z"; + var gadgetLocation = "/portal/store/carbon.super/fs/gadget/ANDROID_GYROSCOPE_GADGET"; var PATH_SEPERATOR = "/"; if (gadgetLocation.search("store") != -1) { wso2.gadgets.identity.getTenantDomain(function (tenantDomain) { diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/number-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/line-chart-api.js similarity index 76% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/number-chart-api.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/line-chart-api.js index ef2c5da98..18f363a32 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/number-chart-api.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/line-chart-api.js @@ -24,16 +24,30 @@ var getConfig, validate, isProviderRequired, draw, update; * @param schema */ getConfig = function(schema) { - var chartConf = require(CHART_LOCATION + '/number-chart/config.json').config; + var chartConf = require(CHART_LOCATION + '/line-chart/config.json').config; /* dynamic logic goes here */ - return chartConf; + var columns = []; + + columns.push("None"); + for(var i=0; i < schema.length; i++) { + columns.push(schema[i]["fieldName"]); + } + + for(var i=0; i < chartConf.length; i++) { + if (chartConf[i]["fieldName"] == "color") { + chartConf[i]["valueSet"] = columns; + break; + } + } + + return chartConf; }; /** - * validate the user inout for the chart configurationx + * validate the user inout for the chart configuration * @param chartConfig */ validate = function(chartConfig) { @@ -55,7 +69,9 @@ var getConfig, validate, isProviderRequired, draw, update; * @param data */ draw = function(placeholder, chartConfig, _schema, data) { + _schema = updateUserPrefXYTypes(_schema, chartConfig); var schema = toVizGrammarSchema(_schema); + var view = { id: "chart-0", schema: schema, @@ -93,19 +109,26 @@ var getConfig, validate, isProviderRequired, draw, update; */ update = function(data) { wso2gadgets.onDataReady(data,"append"); - } + }; buildChartConfig = function (_chartConfig) { var conf = {}; conf.x = _chartConfig.x; + conf.xType = _chartConfig.xType; + conf.yType = _chartConfig.yType; conf.maxLength = _chartConfig.maxLength; conf.charts = []; conf.charts[0] = { - type : "number", - title : _chartConfig.title + type : "line", + y: _chartConfig.y }; + + if (_chartConfig.color != "None") { + conf.charts[0].color = _chartConfig.color; + } + return conf; }; - -}()); + +}()); \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/provider-client.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/provider-client.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/provider-client.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/realtime-provider-api.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/realtime-provider-api.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/core/realtime-provider-api.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/provider-libs/ws-client.js similarity index 99% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/provider-libs/ws-client.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/provider-libs/ws-client.js index fc49d8a35..760ecf951 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/provider-libs/ws-client.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/js/provider-libs/ws-client.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * * WSO2 Inc. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/thumbnail.png similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/thumbnail.png rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/thumbnail.png diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/artifact.xml similarity index 82% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/artifact.xml rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/artifact.xml index 91526382f..17c0b1a75 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/artifact.xml @@ -17,7 +17,7 @@ ~ under the License. --> - - ACCELEROMETER_Z + + ANDROID_GYROSCOPE_GADGET diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json new file mode 100644 index 000000000..8bb652b7c --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json @@ -0,0 +1,16 @@ +{ + "provider-conf": { + "streamName": "org.wso2.iot.android.magnetic:1.0.0", + "provider-name": "realtime" + }, + "chart-conf": { + "x": "TIMESTAMP", + "xType": "time", + "y": "value", + "yType": "number", + "color": "axis", + "maxLength": "30", + "gadget-name": "ANDROID_MAGNETIC_GADGET", + "chart-name": "line-chart" + } +} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget-controller.jag similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget-controller.jag rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget-controller.jag diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget.json new file mode 100644 index 000000000..93efa3813 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget.json @@ -0,0 +1,9 @@ +{ + "id": "ANDROID_MAGNETIC_GADGET", + "title": "ANDROID_MAGNETIC_GADGET", + "type": "gadget", + "thumbnail": "gadget/ANDROID_MAGNETIC_GADGET/thumbnail.png", + "data": { + "url": "gadget/ANDROID_MAGNETIC_GADGET/gadget.xml" + } +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget.xml similarity index 88% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.xml rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget.xml index 77802fd2d..e3a632324 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/gadget.xml @@ -1,6 +1,6 @@ - + @@ -20,8 +20,6 @@ - - @@ -50,7 +48,7 @@ - + diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/gadget-core.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/gadget-core.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/gadget-core.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/gadget-util.js similarity index 98% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/gadget-util.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/gadget-util.js index 2ddc218d2..426dae39b 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/gadget-util.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/gadget-util.js @@ -14,7 +14,7 @@ * limitations under the License. */ var getGadgetLocation = function (callback) { - var gadgetLocation = "/portal/store/carbon.super/fs/gadget/ACCELEROMETER_Y"; + var gadgetLocation = "/portal/store/carbon.super/fs/gadget/ANDROID_MAGNETIC_GADGET"; var PATH_SEPERATOR = "/"; if (gadgetLocation.search("store") != -1) { wso2.gadgets.identity.getTenantDomain(function (tenantDomain) { diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/number-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/line-chart-api.js similarity index 76% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/number-chart-api.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/line-chart-api.js index ef2c5da98..18f363a32 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/js/core/number-chart-api.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/line-chart-api.js @@ -24,16 +24,30 @@ var getConfig, validate, isProviderRequired, draw, update; * @param schema */ getConfig = function(schema) { - var chartConf = require(CHART_LOCATION + '/number-chart/config.json').config; + var chartConf = require(CHART_LOCATION + '/line-chart/config.json').config; /* dynamic logic goes here */ - return chartConf; + var columns = []; + + columns.push("None"); + for(var i=0; i < schema.length; i++) { + columns.push(schema[i]["fieldName"]); + } + + for(var i=0; i < chartConf.length; i++) { + if (chartConf[i]["fieldName"] == "color") { + chartConf[i]["valueSet"] = columns; + break; + } + } + + return chartConf; }; /** - * validate the user inout for the chart configurationx + * validate the user inout for the chart configuration * @param chartConfig */ validate = function(chartConfig) { @@ -55,7 +69,9 @@ var getConfig, validate, isProviderRequired, draw, update; * @param data */ draw = function(placeholder, chartConfig, _schema, data) { + _schema = updateUserPrefXYTypes(_schema, chartConfig); var schema = toVizGrammarSchema(_schema); + var view = { id: "chart-0", schema: schema, @@ -93,19 +109,26 @@ var getConfig, validate, isProviderRequired, draw, update; */ update = function(data) { wso2gadgets.onDataReady(data,"append"); - } + }; buildChartConfig = function (_chartConfig) { var conf = {}; conf.x = _chartConfig.x; + conf.xType = _chartConfig.xType; + conf.yType = _chartConfig.yType; conf.maxLength = _chartConfig.maxLength; conf.charts = []; conf.charts[0] = { - type : "number", - title : _chartConfig.title + type : "line", + y: _chartConfig.y }; + + if (_chartConfig.color != "None") { + conf.charts[0].color = _chartConfig.color; + } + return conf; }; - -}()); + +}()); \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/provider-client.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/provider-client.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/provider-client.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/realtime-provider-api.js similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/js/core/realtime-provider-api.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/core/realtime-provider-api.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/provider-libs/ws-client.js similarity index 99% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/provider-libs/ws-client.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/provider-libs/ws-client.js index fc49d8a35..760ecf951 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/provider-libs/ws-client.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/js/provider-libs/ws-client.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * * WSO2 Inc. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/thumbnail.png similarity index 100% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/thumbnail.png rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/thumbnail.png diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/artifact.xml similarity index 82% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/artifact.xml rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/artifact.xml index ca8d49f23..2d203339c 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/artifact.xml +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/artifact.xml @@ -17,7 +17,7 @@ ~ under the License. --> - - Accelerometer_X + + ANDROID_MAGNETIC_GADGET diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json new file mode 100644 index 000000000..c4d09c437 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json @@ -0,0 +1,16 @@ +{ + "provider-conf": { + "streamName": "org.wso2.iot.android.rotation:1.0.0", + "provider-name": "realtime" + }, + "chart-conf": { + "x": "TIMESTAMP", + "xType": "time", + "y": "value", + "yType": "number", + "color": "axis", + "maxLength": "30", + "gadget-name": "ANDROID_ROTATION_GADGET", + "chart-name": "line-chart" + } +} \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget-controller.jag new file mode 100644 index 000000000..f84538a40 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget-controller.jag @@ -0,0 +1,42 @@ +<% +/** + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +(function () { + + response.contentType = 'application/json'; + var PROVIDER_CONF = 'provider-conf'; + var PROVIDER_NAME = 'provider-name'; + + var action = request.getParameter("action"); + var data = request.getContent(); + var providerConf = data[PROVIDER_CONF]; + var providerAPI = require('js/core/' + providerConf[PROVIDER_NAME] + '-provider-api.js'); + + if (action === 'getSchema') { + print(providerAPI.getSchema(providerConf)); + return; + } else if(action === 'getData'){ + print(providerAPI.getData(providerConf)); + return; + } + +}()); + + +%> diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.json new file mode 100644 index 000000000..1fbb053b4 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.json @@ -0,0 +1,9 @@ +{ + "id": "ANDROID_ROTATION_GADGET", + "title": "ANDROID_ROTATION_GADGET", + "type": "gadget", + "thumbnail": "gadget/ANDROID_ROTATION_GADGET/thumbnail.png", + "data": { + "url": "gadget/ANDROID_ROTATION_GADGET/gadget.xml" + } +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.xml new file mode 100644 index 000000000..3f050f24c --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/gadget.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + ]]> + + diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/gadget-core.js new file mode 100644 index 000000000..8bfc5f742 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/gadget-core.js @@ -0,0 +1,64 @@ +/* +* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +$(function () { + var gadgetLocation; + var conf; + var schema; + var pref = new gadgets.Prefs(); + + var CHART_CONF = 'chart-conf'; + var PROVIDER_CONF = 'provider-conf'; + +var init = function () { + $.ajax({ + url: gadgetLocation + '/conf.json', + method: "GET", + contentType: "application/json", + async: false, + success: function (data) { + conf = JSON.parse(data); + $.ajax({ + url: gadgetLocation + '/gadget-controller.jag?action=getSchema', + method: "POST", + data: JSON.stringify(conf), + contentType: "application/json", + async: false, + success: function (data) { + schema = data; + } + }); + + } + }); +}; + + +var drawGadget = function (){ + + draw('#canvas', conf[CHART_CONF], schema, null); + registerCallBackforPush(conf[PROVIDER_CONF], schema, function(providerData) { + update(providerData); + }); + +}; + +getGadgetLocation(function (gadget_Location) { + gadgetLocation = gadget_Location; + init(); + drawGadget(); + +}); +}); diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/gadget-util.js similarity index 98% rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/gadget-util.js rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/gadget-util.js index ccfb70698..8277d6ace 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/js/core/gadget-util.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/gadget-util.js @@ -14,7 +14,7 @@ * limitations under the License. */ var getGadgetLocation = function (callback) { - var gadgetLocation = "/portal/store/carbon.super/fs/gadget/Accelerometer_X"; + var gadgetLocation = "/portal/store/carbon.super/fs/gadget/ANDROID_ROTATION_GADGET"; var PATH_SEPERATOR = "/"; if (gadgetLocation.search("store") != -1) { wso2.gadgets.identity.getTenantDomain(function (tenantDomain) { diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/line-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/line-chart-api.js new file mode 100644 index 000000000..18f363a32 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/line-chart-api.js @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +var getConfig, validate, isProviderRequired, draw, update; + +(function() { + + var CHART_LOCATION = '/extensions/chart-templates/'; + + /** + * return the config to be populated in the chart configuration UI + * @param schema + */ + getConfig = function(schema) { + var chartConf = require(CHART_LOCATION + '/line-chart/config.json').config; + /* + dynamic logic goes here + */ + + var columns = []; + + columns.push("None"); + for(var i=0; i < schema.length; i++) { + columns.push(schema[i]["fieldName"]); + } + + for(var i=0; i < chartConf.length; i++) { + if (chartConf[i]["fieldName"] == "color") { + chartConf[i]["valueSet"] = columns; + break; + } + } + + return chartConf; + }; + + /** + * validate the user inout for the chart configuration + * @param chartConfig + */ + validate = function(chartConfig) { + return true; + }; + + /** + * TO be used when provider configuration steps need to be skipped + */ + isProviderRequired = function() { + + } + + + /** + * return the gadget content + * @param chartConfig + * @param schema + * @param data + */ + draw = function(placeholder, chartConfig, _schema, data) { + _schema = updateUserPrefXYTypes(_schema, chartConfig); + var schema = toVizGrammarSchema(_schema); + + var view = { + id: "chart-0", + schema: schema, + chartConfig: buildChartConfig(chartConfig), + data: function() { + if(data) { + var result = []; + console.log(data); + data.forEach(function(item) { + var row = []; + schema[0].metadata.names.forEach(function(name) { + row.push(item[name]); + }); + result.push(row); + }); + console.log(result); + wso2gadgets.onDataReady(result); + } + } + + }; + + try { + wso2gadgets.init(placeholder, view); + var view = wso2gadgets.load("chart-0"); + } catch (e) { + console.error(e); + } + + }; + + /** + * + * @param data + */ + update = function(data) { + wso2gadgets.onDataReady(data,"append"); + }; + + buildChartConfig = function (_chartConfig) { + var conf = {}; + conf.x = _chartConfig.x; + conf.xType = _chartConfig.xType; + conf.yType = _chartConfig.yType; + conf.maxLength = _chartConfig.maxLength; + conf.charts = []; + conf.charts[0] = { + type : "line", + y: _chartConfig.y + }; + + if (_chartConfig.color != "None") { + conf.charts[0].color = _chartConfig.color; + } + + return conf; + }; + + +}()); \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/provider-client.js new file mode 100644 index 000000000..6196677f6 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/provider-client.js @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// var registerCallBackforPush; + +(function() { + + var callback; + + /** + * TODO Need to read hostname,port, and tenantId from providerConfig + * @param providerConfig + * @param schema + */ + registerCallBackforPush = function(providerConfig, schema, _callback) { + var streamId = providerConfig['streamName']; + var hostname = window.parent.location.hostname; + var port = window.parent.location.port; + + subscribe(streamId.split(":")[0], streamId.split(":")[1], + '10', + onData, onError, + hostname, + port, + 'WEBSOCKET' + ); + callback = _callback; + }; + + function onData(streamId, data) { + callback(data); + }; + + function onError(error) { + console.error(error); + }; + +}()); + diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/realtime-provider-api.js new file mode 100644 index 000000000..7cf59af77 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/core/realtime-provider-api.js @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +var getConfig, validate, getMode, getSchema, getData, registerCallBackforPush; + +(function() { + + var PROVIDERS_LOCATION = '/extensions/providers/'; + var PROVIDER_NAME = 'realtime'; + + var log = new Log(); + var utils = require('/modules/utils.js'); + var carbon = require("carbon"); + var EventPublisherConstants = Packages.org.wso2.carbon.event.publisher.core.config.EventPublisherConstants; + var eventPublisherService = carbon.server.osgiService('org.wso2.carbon.event.publisher.core.EventPublisherService'); + var eventStreamService = carbon.server.osgiService('org.wso2.carbon.event.stream.core.EventStreamService'); + + var typeMap = { + "bool": "string", + "boolean": "string", + "string": "string", + "int": "number", + "integer": "number", + "long": "number", + "double": "number", + "float": "number", + "time": "time" + }; + + getConfig = function() { + var formConfig = require(PROVIDERS_LOCATION + '/' + PROVIDER_NAME + '/config.json'); + var datasources = []; + try { + var eventPublisherConfigurationList = eventPublisherService.getAllActiveEventPublisherConfigurations(); + for (var i = 0; i < eventPublisherConfigurationList.size(); i++) { + var eventPublisherConfiguration = eventPublisherService.getActiveEventPublisherConfiguration( + eventPublisherConfigurationList.get(i).getEventPublisherName());; + + var mappingTypeIsWso2 = eventPublisherConfiguration.getOutputMapping() + .getMappingType().equals(EventPublisherConstants.EF_WSO2EVENT_MAPPING_TYPE); + + var adapterType = null; + if (eventPublisherConfiguration.getToAdapterConfiguration() != null) { + adapterType = eventPublisherConfiguration.getToAdapterConfiguration().getType(); + } + if (mappingTypeIsWso2 && adapterType.trim() == "ui") { + var streamName = eventPublisherConfiguration.getFromStreamName(); + var streamVersion = eventPublisherConfiguration.getFromStreamVersion(); + var streamId = streamName + ":" + streamVersion; + datasources.push(streamId); + } + } + var datasourceCfg = { + "fieldLabel": "Event Stream", + "fieldName": "streamName", + "fieldType": "dropDown" + }; + datasourceCfg['valueSet'] = datasources; + } catch (e) { + log.error(e); + } + formConfig.config.push(datasourceCfg); + return formConfig; + }; + + /** + * validate the user input of provider configuration + * @param providerConfig + */ + validate = function(providerConfig) { + /* + validate the form and return + + */ + return true; + }; + + /** + * returns the data mode either push or pull + */ + getMode = function() { + return 'push'; + }; + + /** + * returns an array of column names & types + * @param providerConfig + */ + getSchema = function(providerConfig) { + var streamId = providerConfig["streamName"]; + var output = []; + + output.push({ + fieldName: "TIMESTAMP", + fieldType: "time" + }); + + if (eventStreamService != null) { + var eventStreamConfiguration = eventStreamService.getEventStreamConfiguration(streamId); + if (eventStreamConfiguration != null) { + var metaData = eventStreamConfiguration.getStreamDefinition().getMetaData(); + var correlationData = eventStreamConfiguration.getStreamDefinition().getCorrelationData(); + var payloadData = eventStreamConfiguration.getStreamDefinition().getPayloadData(); + if (metaData != null) { + for (var i = 0; i < metaData.size(); i++) { + var type = metaData.get(i).getType().toString().toLowerCase(); + output.push({ + fieldName: metaData.get(i).getName(), + fieldType: typeMap[type.toLowerCase()] + }); + } + } + if (correlationData != null) { + for (var i = 0; i < correlationData.size(); i++) { + var type = correlationData.get(i).getType().toString().toLowerCase(); + output.push({ + fieldName: correlationData.get(i).getName(), + fieldType: typeMap[type.toLowerCase()] + }); + } + } + if (payloadData != null) { + for (var i = 0; i < payloadData.size(); i++) { + var type = payloadData.get(i).getType().toString().toLowerCase(); + output.push({ + fieldName: payloadData.get(i).getName(), + fieldType: typeMap[type.toLowerCase()] + }); + } + } + } + } + return output; + }; + + getData = function(providerConfig,limit) { + var data = []; + return data; + }; + + +}()); diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/provider-libs/ws-client.js new file mode 100644 index 000000000..e498158c6 --- /dev/null +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/js/provider-libs/ws-client.js @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var CONSTANTS = { + urlSeperator: '/', + queryParamStreamName : '?streamname=', + queryParamStreamVersion : '&version=', + queryParamLastUpdatedTime : '&lastUpdatedTime=', + urlSecureTransportWebsocket : 'wss://', + urlSecureTransportHttp : 'https://', + colon : ':', + defaultIntervalTime : 10 * 1000, + defaultHostName : 'localhost', + defaultSecurePortNumber : '9443', + defaultMode : 'AUTO', + processModeHTTP : 'HTTP', + processModeWebSocket : 'WEBSOCKET', + processModeAuto : 'AUTO', + numThousand : 1000, + websocketTimeAppender : 400, + websocketSubscriptionEndpoint : 'portal/uipublisher/websocketSubscriptionEndpoint.jag', + httpEventRetrievalEndpoint : 'portal/uipublisher/httpEventRetrievalEndpoint.jag' +}; + + +var websocket = null; +var webSocketUrl; +var httpUrl; +var cepHostName; +var cepPortNumber; +var isErrorOccured = false; +var lastUpdatedtime = -1; +var polingInterval; +var stream; +var streamVersion; +var firstPollingAttempt; +var processMode; +var onSuccessFunction; +var onErrorFunction; +var terminateWebsocketInstance = false; +var pollingContinue = true; + +function subscribe(streamName,version,intervalTime, + listeningFuncSuccessData,listeningFuncErrorData,cepHost,cepPort,mode){ + stopPollingProcesses(); + stream = streamName; + streamVersion = version; + onSuccessFunction = listeningFuncSuccessData; + onErrorFunction = listeningFuncErrorData; + + if(intervalTime == null || intervalTime == ""){ + polingInterval = CONSTANTS.defaultIntervalTime; + } else{ + polingInterval = intervalTime * CONSTANTS.numThousand; + } + + if(cepHost == null || cepHost == ""){ + cepHostName = CONSTANTS.defaultHostName; + } else{ + cepHostName = cepHost; + } + + if(cepPort == null || cepPort == ""){ + cepPortNumber = CONSTANTS.defaultSecurePortNumber; + } else{ + cepPortNumber = cepPort; + } + + if(mode == null || mode == ""){ + processMode = CONSTANTS.defaultMode; + } else{ + processMode = mode; + } + + webSocketUrl = CONSTANTS.urlSecureTransportWebsocket + cepHostName + CONSTANTS.colon + cepPortNumber + + CONSTANTS.urlSeperator + CONSTANTS.websocketSubscriptionEndpoint; + + if(processMode == CONSTANTS.processModeHTTP){ + firstPollingAttempt = true; + pollingContinue = true; + startPoll(); + } else{ + initializeWebSocket(webSocketUrl); + } +} + +/** + * Initializing Web Socket + */ +function initializeWebSocket(webSocketUrl){ + websocket = new WebSocket(webSocketUrl); + websocket.onopen = webSocketOnOpen; + websocket.onmessage = webSocketOnMessage; + websocket.onclose = webSocketOnClose; + websocket.onerror = webSocketOnError; +} + +function getWebsocketSubscriptionMessage(streamName, streamVersion, streamProperties, streamValues) { + if (streamProperties.length === streamValues.length) { + var message = {}; + message.streamName = streamName; + message.streamVersion = streamVersion; + var i; + for (i = 0; i < streamProperties.length; i++) { + message.filterProps = []; + message.filterProps.push({ + 'name': streamProperties[i], + 'value': streamValues[i] + }); + } + return JSON.stringify(message); + } else { + console.log('stream properties and values are not in equal size'); + } +} + +/** + * Get the parameters as query parameters. + * This method parses those parameters and returns. + * */ +function getAllQueryParamsFromURL() { + var queryParamList = {}, qParam; + var urlQueryString = decodeURIComponent(window.top.location.search.substring(1)); + + if (urlQueryString) { + var queryStringPairs = urlQueryString.split('&'); + for (var i = 0; i < queryStringPairs.length; i++) { + qParam = queryStringPairs[i].split('='); + queryParamList[qParam[0]] = qParam[1]; + } + return queryParamList; + + } else { + return null; + } +} + +/** + * Web socket On Open + */ +var webSocketOnOpen = function () { + var params = getAllQueryParamsFromURL(); + var deviceId; + var owner; + if (params) { + owner = params["owner"]; + deviceId = params["deviceId"]; + } + var filterPropNames = ["meta_owner", "meta_deviceId"]; + var filterPropVals = [owner, deviceId]; + var data = getWebsocketSubscriptionMessage(stream, streamVersion, filterPropNames, filterPropVals); + websocket.send(data); +}; + +/** + * On server sends a message + */ +var webSocketOnMessage = function (evt) { + var event = evt.data; + var array = JSON.parse(event); + constructPayload(array); +}; + +/** + * On server close + */ +var webSocketOnClose =function (e) { + + if(isErrorOccured){ + if(processMode != CONSTANTS.processModeWebSocket){ + firstPollingAttempt = true; + pollingContinue = true; + startPoll(); + } + } else{ + if(!terminateWebsocketInstance){ + waitForSocketConnection(websocket); + } else{ + terminateWebsocketInstance = false; + } + + } +}; + +/** + * On server Error + */ +var webSocketOnError = function (err) { + var error = "Error: Cannot connect to Websocket URL:" + webSocketUrl + " .Hence closing the connection!"; + + onErrorFunction(error); + isErrorOccured = true; + +}; + +/** + * Gracefully increments the connection retry + */ +var waitTime = CONSTANTS.numThousand; +function waitForSocketConnection(socket, callback){ + setTimeout( + function () { + if (socket.readyState === 1) { + initializeWebSocket(webSocketUrl); + console.log("Connection is made"); + if(callback != null){ + callback(); + } + return; + } else { + websocket = new WebSocket(webSocketUrl); + waitTime += CONSTANTS.websocketTimeAppender; + waitForSocketConnection(websocket, callback); + } + }, waitTime); +} + +/** + * Polling to retrieve events from http request periodically + */ +function startPoll(){ + + (function poll(){ + setTimeout(function(){ + httpUrl = CONSTANTS.urlSecureTransportHttp + cepHostName + CONSTANTS.colon + cepPortNumber + + CONSTANTS.urlSeperator + CONSTANTS.httpEventRetrievalEndpoint + CONSTANTS.queryParamStreamName + stream + + CONSTANTS.queryParamStreamVersion + streamVersion + CONSTANTS.queryParamLastUpdatedTime + lastUpdatedtime;; + $.getJSON(httpUrl, function(responseText) { + if(firstPollingAttempt){ + /*var data = $("textarea#idConsole").val(); + $("textarea#idConsole").val(data + "Successfully connected to HTTP.");*/ + firstPollingAttempt = false; + } + var eventList = $.parseJSON(responseText.events); + if(eventList.length != 0){ + lastUpdatedtime = responseText.lastEventTime; + for(var i=0;i6ENwLKbHK%kA<`(x^{)D1Reg9MG9tc_-Egx1={;5qJRZK>84v$jP&HbszdA)mFe z8YxD{C?RABvsh~jSSwJEHOvG_yz`xUd1IKpn1pYU+_i2+w33gksr`K6)H?j6FcJ1@n>syQ{bCo10f_Rexqr_C!u4OGP zm}49-uVh3xP8*r1AnPo@qz8Pqo~i+bfXrQVE0ecEL6?G}Mf zVKTcPIO(@od!3PGsZy~Tpo+zW05-)vtW69?eJU(2rzN|7rukbA(vqD&)BY1>F?Wsa zvKrB-F3st}o~>zA=jN2xG(A`~>@(J8vS(fIY!)*WtHBY3-4M88A7^cfmG2dmo?%2d zLf>pVL<@HupU0cw&?yVScT2O9Aiq%7W#M&R&GvBBPQqKs&ZUhYN z2ec7G3R@1B(7%7!OCPM?Puq{2tas`|w-!z4^1kip>Omc-XUj}0U&V;>BzyKN6hY#g zAnXQ=XD<(v+Y==hY`oSHoj4begJ?+n(bRr<)F_u71A54_Hdg5o~MQic*J0{+;~n$n$Rnc(vlKnzP3Um$~;Ao z7$=BkW6U6TP%j{$HqBVDmFBG7Mdld^L0rl&l3(n$k7zw-!qCjJfmGd|1$QuelK#Y6Lc3N3* zl>Yd|My^Ih8p#QE9-{y{=QQTMvj;s|WinO9KP0ug=oA~-YU3!|e?Cd2XR7JwsWVY? zD^Kd(h7)B-evZuUGc}^bEkWWvP}q;PS6CYuXeY!e9{YR)e+@U_O6|}rgS}?(U|qN7 zO{haoBOa3oB|H&&kfz{RDJK(xlv@v#aGNSz_;lj|-Vk4TY(gLY8UX0DhO>4HYwO}s zz~XfTf#vvj)@}>5(+~TO(S37Q^N}N5Kuc{+ll5V-F`$Ew*CNxyJ2m%Fm0}fe zMtr`xke2N(;=#^vq`$yMdGeCJW+UZhtyB9>5hOf#mbLqhK7?xV3^Ts}`puS*su}1V zuOFOGR}Sb9O!PVC0HVD8{T}*Y-Tsi01uo&=jO$4cG8@IjJ^UPNzg7eZ9lEpjI&0?y zvNLY`_o|RZypgvwZD=RDn)Qs5F3z|^rNc>|{&;`~MKQvJD*l7}HS6kg%xBf2Em*)dpTKPyM+R`j_g8D zPVN^-4LwBeRQoR!L4w0GR+5sGZt*4 z*Ou?9vrUKC$sZ=39mvb~Z_R)&Rs;zQc&9K~r=RFUq?une`#T;3sEdyLyNh~rVknpc zBlJ`AH!-5@=ABcpKtklZ|1*NeiVUz$vr9HBf{1ahW{kHNeTV?n4X-cb(d1xNDfD7D z4(X_*KFAT}PhV`LH&*Vclbr{Z3yF{hfL@1mq2;kakXWj$2xEMnh#c^)Jo@Pdn)34E zpvVE2<8LqQMVlX;q{vYRb=tw=%>fgU&CWFatIP)UL1ZK98$lR)Obx?sH!Udd?qca?;=kf{UIb z`T+5b(a(QndFVzO$Va~#O|z~!CoXcN>J!FvZAt5XJ25EFphr`{b2q@8XptmZ1i8$J z9Pm_4d~u;=V;uS{9uVd$C`1RaCEl7koHwf-6rT6wS&R78=Kv(RtRWEO5+k(=M&DKc z{LYfE9Ra>4CiS7uZXd%d4JyQjZL;dYi)3dX)&RlCD_&i~lPCkITbI;lf?T8-UVeaY zed?RbEs+D21Lxg(E_dN7#1;??gge-(%7y2D?Z1`=nyT=zCP(#-AV?c|SJ*AE9^;mG zS6a#@Menrgp^La`r4XAy{0ZvTb5{(ol*$7+Kxg^!hM$afnN23MNaKwl9kq+{8*`y^ zB06q`9K$>1(t>->56Wwz5P95vZg)-;E3+*j57)l7)X2q;%pt~klaZiw0qTvvJZ(O{U zEKvlcKDuSJY%w#17z13v3+_4Jk~0PJG3Av-MzxS3S1-mhL8h_xzxs`soCBAhm11p3 zOGiLTrKQI=kkPy7K5ObRZop{2S`F!G+hw4ai$ zdIEU3zWenBeDNPyU<85O7-$^-B6lWu+z_O>rds&{-U%yHI%oc3AUE<9>KCA9eSP;h zOR*Bj%`NY&6nzA>0@Jda#tT6}jxPF*&o9^-CpN z5Fh#5qHUs&x)^oJu|^Qs9eybR@I*ZPv3zko1phEiQ=xtX`E%diGtN@R^}`>n4aQ`AaV35o@iv%HsSRn|E za=!q@4X-aZ@<8|juE5zh3{_Iozojm98U5KCkbj)=0qxOlthqhXpn#tcESNwE9?COx4>t_(1|f*fidN5clx>-)y` zklr6tezBIM0JmtPNlXxAhF-OTy)o_W71C)WsB~e)o1svDftZ(UWlPAHK`tLwCH;FW z5Cq}=8}u9Dij%Ef_4|u@2Py-j(7=FfiT7_BCB3dYa{WsB57?hFEm_gBAgU3R1i@^_KJblZF1OMMv&(x9lDLUi!=1qF1`jFt4@2V3a3 zA8n;cFRY@+=4~TqjMZv}c7e%OvQr%Hc>jAN$Iy&O5(EiSe#A085ydbE^3;V#9iwNHXA+v^&Wcf`@)zzUwAh$lE?t_j39>s+`vYW&XFR> zQ~C`^Uq=OS8O*$LkeU$~Ma*4$kQ{8FNJ_Bz^wdcScKTq=p_m&*0K`UQ)8iqB25ZJV z6$yg$Wo?RnBfM5JhB@51YT1G4;#g@FB?=rPAW3m~l}}8;;c&#nIpf@3lbkRIIW+L1 zUcp9@Zs8`#pY$8BE+CffG6Pabp1XX2lF$gEy1JT_wCz9g@uJwQc}YIjwUdIpscJ6-dMHANZo%boCN8~+CAQco8(4j+z=){Q=(&z?PW;J^VYE-t33swxt#3~+`Kuk1|tMx7@n^_5c3A&&+s{}d~> zh*g3-A~K3TSZ_WF3K#X@`D%VgT>%eGmBS?@1%$b%sECu|r=Nb}f{b3@Znx8!GiSJ< z16^8V&>PeG(K#KnxN&Z0tyf+X`sdWXbWVP)o`34psTxw**gjCVPM$o;iMME3Z2DYvnE-F67_-o1ONyu6$e5)x`i!&Tel zWXj0Mpv=rnN=r-g>1B8QT*gO`PPvUJInnN?o>f#-@X@HOtjuTB0O>k(=s>Bdsa)s( z+Yk;M^U%76G=%dDocfL~^ z%Jo71B=TIz1O+kw_~zkVl#~aF11Bozs+U*OKbP#|0=?r%DgEu+0=n+iwREhkvPNJ* z0QB?_V*K5>abwEM%cK1Kd}`UUr4KnghHtl)8PuayV?S~LiHV8)7_C~h;>T#)wk>64 zWl>U65~ZZ1aB=`2u02HGZaqrbjgl#a9S1f{le9!SaI*Y698h2Ev~WIJsxJQehsk^x7CVV$Jv zYhkp3oCycBnV)Fukb;|iZm|l)tsqxca&+bEAHa<9g)M zon!K;ywX7@PgheZYbVO9XcQyI{pWWI+wVfYZkLp=SCixyQ)^yF_=&z`SLF@5Ly3>%3Su}rh5wCtY zuzgdydT<_(t%MWsjLulF)l{4D$gH4H9j1!^+VI*W+`OpLK#GFMd4{{8!T#2O<9(mI+n zX~JU}p@?JDdpk`siP6BDH8vQ6pprtqUcJIH&1U%JkdEq!Spf2zKn~+5Q6*)mQaAKx3fx+5t0Y@1D4xTki)TK$9SeJNa3+F5D7%f{;pSHwT;}NJBqz1{EWGaCu)|Vk%rE|2-M-X}7FR|MPF?te&0Y;=aP}g_;FpJRm_f9Ta6^St5v^(Sjh0OnUJ( zgE}Y%NZ1@`urFYYBMA`6f5?&z2g=GSXz8-GR911Cr>#g4#Oa<$RZ?;)Ztg2`zA%dX zRXYHkntufV)lAx$?!KlGAjw)VD{23YDFm&F5R-6`rba zk%K>ECOBznsg%xInuUh_Wk;M?!MN_Nr1mqA=Ml0ah~JJ2cN{VO(F=RFQjE~>-Ogk5 z*ZI5o{0$@&4(pUnk4)@BZL-q1&4CCx=4W7jg+k~ss!Iz#l9&Yzm+cXn3nN*3+H3>? zX?zxGz>lpgFtFLXRQZ%CnNGjZZ z_!Olj3#PC#vTQhTGVTSiva*VnuUyApt;A{^4kz{R+k>f>;dNsVl^8+zC{l2gFa0JM zMYaSY$S~1?%rK%;^N2hgl$3eq%blDQ-l^1>Q~k#BpXl=bt!Qw5^i&tv8;z0^gw+W# zz-6SEcOoZGmePie+ugz^D}OHcy!5_jcc=99)UaM-amgvV@#aV9*s&9qBK@Uh<@Diu zGimb0W5RlVL-KRw>=4%Rqo{+x4w)T@ApP|l*8X%{;-qpSB7i>~FQzW_dYsEPwCnxb{g&-+aNfGgiL6d<-gE=69uu(jxsaGHy1R-#rxgW4S zWC~J8iXhPE?S^xlZCpSjO$^kcLdhLZna;b;%co2GwPJQi6)(<)^oDA--$Ua&)99|v zqy#X5U8m*7gfCL*DfpdWTBIWX&F z(x_kCOj@}87-go_o<8i6tc)ZY*`-zh5vfM{hQ8cQsDR^RViO9sAyouVjfQWh&SCJ#+btJ6V0n<#MuSBUv5Gy}vU6ksZ9*Y%WRSyWBOf4CV`Yj^}jR zEOaIgaz&^xwoIXGGYXOKFUZ5v&&78q-6hl z#wT*M?m(&O>{=7#Rjjg#3Z@1|CXn3QKT0mdhQbpfg7h^aNH@_45~`C4UGLC@=G}D; zpMtvWa4F?vB-3TgI3M1*mZ+F?ggF*?n3!|~VMY-&2yn1O@l0UCNZ~2z>FE&>9Y+gA zdb-QbboHbx7*_5H-!du>vVoJ5*&BfqfNgUnW{|6@l3bFhCN7O2BqV^19fuu{9m-{8 z%C8;g7n$_^9xXGa40QwZp|g>S)kX3Ez9-WvlOm0F*=h8D6O5}hLU^HCLH+T}u>fg6 z6ih_2LKIIiXjDiC={)*0j)`Jzxw*N#U|Yz*e$Q>sxGaqz&Hzgl;4{xLt&AXsDi%Lp zH9J3f*FN@-l!}FlCrEq3blgDLdsO&&M^RaPZZb?7y+Oj0ZVoqqw8m{ zp;M=a#j)O?K_)!ur9 zpRRDc?2PFTpzc+2oYZFW5XDpN9DoPxuk&|N86!uN)I@$QAPFj!f4uH6eYK@FsSTrs zB1b%pAm+~s|E#XUaWlI>T+@@T0!L0U9Pjk_BMqIlG!pHH5lT}-V)tisn%<8D}w zLm@sPQ@1z3K#*lhkfPGlrU%bXPl@ZBn3QOvM7y{+w2S>y%QnO>WM$J}Ajs7d#4p-s zHn-P(67gMo7ro5TPFXyU%Nx}W1RoPho87;|!nV|$=0vBf_%UVRiKN>^u^yY9Qk&&aT4EYc$(JTbMJ3r&B5Sk4 zD+z7D?B0n)TTc+be36r<%}0<%YV{~8EI!TWpJTBb+3te%_mq<0o;#wS+u~@HNyYun z=Q9vx`yX^>XV`HZss6ryC);-N>@lpTbV@IW=5)D7k?KbNDyAzbnNIc|O(kVjek)uB z0w%jvWj2rKvq4rwWkq0u7)&S6&=W)~cZFs7VTJgDjHAgw3#!x;#3520WP0j|^v*VEkEi=P7WY@EpO9G% zEiFl?nN*NYh4f3D&qy&(=Z=JmrJxY5(Idb>;LsDK!k<~@HpubvGwMkw#3W>L34zQs z;XqKLCx~D1E2Mmz5=0^$ML{7NkjW(k46=TU^aSx+mr7=hb6J)uC`1}ZPswRF23fzy z^+vki2$Cg{sVg&QBoqjc7G$`8Jfl8dZ=_FAR{hTjFoJj!_V3xx@l zXmdANVBbj1bHr&SV2wfKE=dctdw;X*mG#77zd#nF=ll{RrPQWH(nEDT{!A>~pHM(n zHnSTE335VDkYdeHPxCfjV5kRL*%qH2K3O59js=TGEt*pEzWJ1qEHCnB94^Yr6%+hW zxr4SASCW+^060X_nZyprNhN*yQBvbn$~mhor6kDbVj<-s69pjz$$p9Hsg!$md+uGa zSvWuZeu5x3&Yqk^+1=YvdbN{eQ>S>U3C<Sl}utfHA$k+FKp%aJtsTA@}^Cw+9E-cFwIvmL^zoMmNiPVL=cC| zMh-k@Q81MquROCcRj^LODnVQ#PbNF(3U<7*6o(~(lrw@jk|S3MMy95lK}DWDHJz1S z*7XFz0n7-3$`D~KUX7s{l>?pf0&QbY*k+(2KuD6=f5{0}B9CmOFcJpO`B}*3wej!R z0-ryTwd2_W9na}LrmV{53T!yIkH?w?rOD=WMbuc5S#;K*u*2S((Na%3{hl&wo})^3 zyulV^Q-}{BNVr>K1TiRCwaE*>SFXvR@cKq0f^5<6*`sA<$k?i&5GlxZ+P%aC*o! zl$lBd^~-J{c?3Pa!(}W?_$`+ufoA7tkQn7riL4TY$XLa~`Beu&5LbZvQLUY$^gVQj ze@@7P9fzg%8`r(1k=&D+kuEgU$8>9HI!B!kZ(9$NfpP zE8Olm=%_9&On>}?b^Fy*QiuwW-YyfcHt6gj?}udx!bdCphEbi(3lD$J40V-uq7V(p zcFr&tWaQn9ARp;BTsfeGaL7#3spq`dO#PQzhy{7xXy*r^-Ytct@trBFhegkq> z21!KK-&navJuQWZ0;-ivf+8mNwafCG15zTgKgcupb#m% zx@@P^epmJvYC)eF?QfYNGHMpQS#PRQL?J?eS}&_!8FcXP21^jwAwDHdFg%Uv+S2r7 zUR$wSx;CnULR~Ot%|4@rIDG)Q6%-dKt;+}^97U!L>ty;R)Fhg-c3((t0BGi!?{BFE zIG!tn$D>#|o-2aK3*wmJ>Mx&PuvKcm8;5k1HqJeeS&`;-)~@y5aA}{me0_AYkp5F& zZlY@jcBu0W0E@AVpOw5HJd1tcfd zNIk)fs{!5{e>1Kp-SGM{(=Y%2zw2r7eHTRSh6Zv*xZFD!Y_IuGcRcZSv+oJ_4PbPe zn&l>*GjYA%0N*p2^ks{Il~K{*%Bt;6ZQg%-3$f?DHyMmS*WP)(`hBL`&--)Fhu){=@}`4Tcap94jm=kvq|OHIH0$S3Q0sNZP)^?<_eBiJsVZ8fhhZ^86^b$_S!y<4#Lf7iZu zd5-7O-fO?>X&zQNUEW0U-p_Mxp3iF-MP780fwk8PxZNY@cDvVm&u8}9{rEP! z_NssH+kB5>*T`n~+J|b-gKR$ANk}S>pbN<3s{PxgTe1P~J&EbA^INa|YP6vB+@V_07YTl~Z-__OCHLVJ*s*1Ntt$F^g zuBvu7ZC^(Z4NDj?TVX zq)Vq-`Y$@-lC;Nwhd*8`y{y_}6V4WG-p)pk2dxNuFe3MES$)ikBi`MzZgV=pZUTxi`R3p zHxKV@Y~*P-5JxgvDN3)B@jq?ec8P&aV)z;P*djGVF*4Nk-yvT@cyAMrkTQ0N&EKO{ zBY--?-KMuuj16?5{UCS^XvljJf#+@6bkC80?(+A?*=&~5e9)=h^6pBh>~Lr^)2H+o zeYBB{9&;l_5D!WI>%9Rn5eU6mc_7bliP9?uOJMmCMaJb=tG{aUX%ow!&nP5t$qI$q z$lYu7eeoNz-~rZqW&Pb+HY0biksH@0xRv^C`tRBdZoek{HgEIE7L>Ev43B=g!PHCY z0p!nMO`F?;`R%$81Ud9yvNqm(;}etm^89?WOkd>hPknPaEx6}=k*6Uj`1W2zHiPG5 zvxVlt84<*vmo^GrMJSv3Z`mTXT%5Q17aky5E}PDdWjY{#BEy`G9!rDy{kkqCew%&+ z(u$wEVxV-uC*IRgG?m*&|MzpP>OQYqllU#FA3!HN_01L16Yn5*kUs(L4fY)BN|3#* zy`tZE{os6_h9Uz58D*<+D>N+J^wtV#uN91PgCI2IbAPl50{oiXD^vMk)-{7gtM~W; zy~9Aj zP*A`;k4OKzL3;n`mkr=c1sa$D711UL@F{Em(QmwCbT_FvBOZI?{<*7_bTn`vh>YY{ zS-S)AH}7zP7v5p*^SYjoJ%rbGn>L#G;Pqb)GhGDK1GtAVv??@A6qTN#i(gvEUuA#_ zC9hmJL}=f$c6TVwDU<{`CQ`LPj@j1_l|Be^ZDb>+3iStY`;UL&ThlZo-_CcaQRjP` zMv|B!2=F%P(&0TG1}h8e-1+|Zs=jXn0&LGKUR`2oDe>Q5)Z55Y`X+00LUnHTFkCO# z>laFY;^IEiu3zY%NS{};5bHlY&sui+EC9RqcNg^*eY8!a#l#vxibW@hX!%=Hhl>ga z3xRTyQ(jplRr5$8esRx#evn%9#shdqAx8$;7m&O1SSJYZEeU3AL0?3jEVGrWy!FzF z%xII%!%>JYAje83Z_fkB%}2i)Z4@nsye$g#IoiW`{YYk9uHT4>EbmSmA)SAPNb1OE z=S$T;Qivb5>bCb*SxPg4yg+UYR#9HA$s5HJL4e7cUg!h(u4n#Ykn};2lQVY4*Q&l& zJpfc^1cj}7Dj_eB8vzg(m>90}4L3p1?cXHQ3vV6S#i(A9u}$*wVyQCs3b6^d%Dljm z%>lpzdaJlHVzDM)#qmlI&+vDxP-(oZzfr|)A>a-~lvSqWsX}Z4=|p2^er?$^Ic;dC zKq*U8Sz8s(^R`Fm{(NFYl2@)BVzlayAy7E`;g8oTsf!aJ_&4&|uPntm0A%ORy5=0C zkFV9_is}PFfcN0I5E);u-#E-jzcj>Ozu7{Q|FOt)VwOU5fq?Hh&wOEdNj_90L7I|* zGv{GVo~S+%1o$IsGxQr#C+q$H9ch^)SaQ1GpFdOcNn#LChwu5%YHl~mtp4N;)J_ZF z>3o*8zeMUf>`}OP_mRN;3z8s4Vzu%j+`!OnRgz=u0Hei-XXn$4i?>_;E}s9p|1-j< zxFF=_H<7#+dz9|s2$6Bc)h#xx!Z5P}_|=i*IMG5Ts6u$~!Mgo?RL8OxR)Mtj08w&~ zV|b*mCt3tSvj12kk|2fIN^+wIh?5L_`g4`T6$QWz50wfr4pcz23Ow%s2Kg#YUZ|lE z1Sr=odb#LBxb~1HZ&b(EOyxqw6g8Se&JaKAiBE%4sqlR9oCCOWmuniwnTAFX4@rg_ zkpwZ4FYi20YHqt8Z+~Av-5>uXsE4K?Z)?Dl2tyoom#qRhRd~JuVqq_7@=+bFYqZD6 zy&kT4C;WiLPgXxXfiL-H74V*5*dM^uu3&Ux1u@{E`r{WH>FhuKmwOU}0iNgb2gVyM zZUbNyfjgpot@aqY@9<7MEcyWJ%i(5P4Jdkm02NB2B0E|)b{XhM;xafxj6Ot_J*+blYz36ev?Q7~v@<=(j6&JD@(ONZVANPy za5U&+z}|TBlD=j+c$c&GVW`hP@y>UI+pAx=F75~dTuknQU&1MfNPUM9UYB_ym|HMy z7$eI0J&j7nC@>(g5NYXkRZ&qd_pKX;^XU!-I7IH;s;|Ov9rcYM02X+7owa_V58+CD z;KMa_F7SX}4MrkH6thCw4F!lR%~`vT2VX-mqZ9EBlm!hiQEr_^jvvEyP4$r={QOv( z#oDioc7TiVo;j<7@}hVH@fYaEAdBqW`T7R9#ozvZ552T_hvnQU5iq@a=9L4@QixtA z_f*-i3SxaFhzHX&q9hxQCQmUn0L#0DqBXtPo(-sMLt@S|qNsz7vErRcp49$^~pWT*5~aD-|-#0G%26LDvuNSg(wFWE)_# z_+b71kb3sUbZtp5Ts6pOjSde`Lh}|)wIW53(Bki`-5F>H%sPDF!?htVh>dbHqdGUI zvE5qo1?uBXeOj{f2=6>T-B>7HHC+~{a`@a817uwBGpUXRr4>QUF-lXpdK&G3UJ<_f z7nf|8uJdXIa2Jp2+=2(XCY+UL)?-E-xc()(j_|1fUv4=Vw(?1^-R>CGjh>j)$1LMv zi>6X7iN^hCXatcSP2dW~8YJPK%MSHxRF@XK>PBzY@ERZx7IHfR1XzFI1Z_BQoWIs3 zULgypp0G0{I)|u?8j2upwAMzG$$@r)03pzYbnHk0y(`vjg!++}nZ`+zoR~oEveFr$ zQu#hTT4e^T69#Y6i8A-B$&Kt9;Dp%AwjD1!Lu-CIPDf9jsj~;qDlnl5r9TZy@OT4j zl4EVa!_gL!hD;C-CTK)yXGWC2E!@VvHflW*dB8IT&)(f*y2}uwKvSpY$IAIDf@sf? z+*5i@>$AdWov~mmy}ER#n%5ox$hf_EL>IbuY!6v4-V5Yjbu6ZCYSai~^uy5vyXZX4 zKAB>+FGdmg|KC`-hd$q27#4#*-T>7Qjt2xyQJG(IP7c(myO=x_#?!SnNP>7>JW7B+ zMUs{GFsjU1vzOjjwWmR*$0O!*<2fDa$^jj$#C)(E`2R6E*cgx3+@J~KbrS}#m&eIM ziAs3C-eGnM$P((9K`gsJKvy%|`{4s#7|vhqC`_J}1c z+4VCm+x>G~&nZFtW_YLOJm5LLXKNXQTMuM2Jk6eay;ufJ5k!1bkYM$wHllR1`hCP0 z7VJ38gK&sW2Rm^n5`YUC@tNVBa%pVWmNXN^c%$BB&vkA?a7-wI1b5Rgl1yc7yw(!J^;>W=Zz?p-lj@b%)N<(~ ztAikGUux~G`ldoDf<)#fqAt@2jVz<y4{K(^%2PF=oR2|ECs8I3`Yrx>J~&D hXH@SWyZC - - ACCELEROMETER_Y + + ANDROID_ROTATION_GADGET - From 2fcaf12373a9bcaf01dec3eae62c4ffca7dced06 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 22 Dec 2016 16:42:48 +0530 Subject: [PATCH 6/6] Code reformatting. --- .../ANDROID_ACCELEROMETER_GADGET/conf.json | 17 ++++++++++++++++- .../Android_Battery_Percentage_Chart/conf.json | 2 +- .../ANDROID_GYROSCOPE_GADGET/conf.json | 17 ++++++++++++++++- .../ANDROID_MAGNETIC_GADGET/conf.json | 2 +- .../ANDROID_ROTATION_GADGET/conf.json | 2 +- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json index 3862cd4c4..174f60c9d 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_gadget/ANDROID_ACCELEROMETER_GADGET/conf.json @@ -1 +1,16 @@ -{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "TIMESTAMP", "xType" : "time", "y" : "value", "yType" : "number", "color" : "axis", "maxLength" : "30", "gadget-name" : "ANDROID_ACCELETOMETER_GADGET", "chart-name" : "line-chart"}} \ No newline at end of file +{ + "provider-conf": { + "streamName": "org.wso2.iot.android.accelerometer:1.0.0", + "provider-name": "realtime" + }, + "chart-conf": { + "x": "TIMESTAMP", + "xType": "time", + "y": "value", + "yType": "number", + "color": "axis", + "maxLength": "30", + "gadget-name": "ANDROID_ACCELETOMETER_GADGET", + "chart-name": "line-chart" + } +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json index f8111bc8e..292ad0734 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json @@ -10,4 +10,4 @@ "provider-name": "realtime", "streamName": "org.wso2.iot.android.battery:1.0.0" } -} \ No newline at end of file +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json index 1433ef60f..4da39ae5c 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_gadget/ANDROID_GYROSCOPE_GADGET/conf.json @@ -1 +1,16 @@ -{"provider-conf" : {"streamName" : "org.wso2.iot.android.gyroscope:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "TIMESTAMP", "xType" : "time", "y" : "value", "yType" : "number", "color" : "axis", "maxLength" : "30", "gadget-name" : "ANDROID_GYROSCOPE_GADGET", "chart-name" : "line-chart"}} \ No newline at end of file +{ + "provider-conf": { + "streamName": "org.wso2.iot.android.gyroscope:1.0.0", + "provider-name": "realtime" + }, + "chart-conf": { + "x": "TIMESTAMP", + "xType": "time", + "y": "value", + "yType": "number", + "color": "axis", + "maxLength": "30", + "gadget-name": "ANDROID_GYROSCOPE_GADGET", + "chart-name": "line-chart" + } +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json index 8bb652b7c..53199e326 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_gadget/ANDROID_MAGNETIC_GADGET/conf.json @@ -13,4 +13,4 @@ "gadget-name": "ANDROID_MAGNETIC_GADGET", "chart-name": "line-chart" } -} \ No newline at end of file +} diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json index c4d09c437..aa1954d40 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_gadget/ANDROID_ROTATION_GADGET/conf.json @@ -13,4 +13,4 @@ "gadget-name": "ANDROID_ROTATION_GADGET", "chart-name": "line-chart" } -} \ No newline at end of file +}