From c4fcaaf498ca131e00c0b850b57ff05c8dd820dc Mon Sep 17 00:00:00 2001 From: dunithd Date: Wed, 21 Jun 2017 04:08:51 +0530 Subject: [PATCH 1/7] Applying new UX for Android device details page --- .../device-view.hbs | 324 ++++-------------- .../public/img/android_app_icon.png | Bin 0 -> 6932 bytes .../public/js/device-detail.js | 2 + .../public/templates/applications-list.hbs | 40 +-- .../public/templates/policy-compliance.hbs | 79 ++--- 5 files changed, 100 insertions(+), 345 deletions(-) create mode 100644 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/img/android_app_icon.png 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 774fe4fc5..50085f8de 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 @@ -4,279 +4,91 @@ {{#if deviceFound}} {{#if isAuthorized}} - {{#zone "device-details-header"}} -

- Device {{device.name}} - {{#if device.model}} - - ( {{device.vendor}} {{device.model}} ) - - {{/if}} -

+ {{#zone "device-thumbnail"}} + {{/zone}} - {{#zone "overview-section"}} -
-
Device - Overview -
- - - {{#if device.deviceIdentifier}} - - - - - {{/if}} - {{#if device.name}} - - - - - {{/if}} - {{#if device.vendor}} - {{#if device.model}} - - - - - {{/if}} - {{/if}} - {{#if device.status}} - - - - - {{/if}} - {{#if device.owner}} - - - - - {{/if}} - {{#if device.ownership}} - - - - - {{/if}} - {{#if device.imei}} - - - - - {{/if}} - {{#if device.udid}} - - - - - {{/if}} - {{#if device.osBuildDate}} - - - - - {{/if}} - {{#if device.phoneNumber}} - - - - - {{/if}} - {{#if device.lastUpdatedTime}} - - - - - {{/if}} - -
Device ID{{device.deviceIdentifier}}
Name{{device.name}}
Model{{device.vendor}} - {{device.model}}
Status - {{#equal device.status "ACTIVE"}}Active{{/equal}} - {{#equal device.status "INACTIVE"}}Inactive{{/equal}} - {{#equal device.status "BLOCKED"}}Blocked{{/equal}} - {{#equal device.status "REMOVED"}}Removed{{/equal}} - {{#equal device.status "UNREACHABLE"}}Unreachable{{/equal}} -
Owner{{device.owner}}
Ownership{{device.ownership}}
IMEI{{device.imei}}
UDID{{device.udid}}
Firmware Build - Date - {{device.osBuildDate}}
Phone Number{{device.phoneNumber}}
Last Update{{device.lastUpdatedTime}}
-
+ {{#zone "device-details-header"}} +

+ {{device.owner}}'s {{device.name}} + + + +

+ {{#if device.model}} +

{{device.vendor}} {{device.model}}

+ {{/if}} +

Ownership - {{device.ownership}}

+

Device is + + {{#equal device.status "ACTIVE"}}Active{{/equal}} + {{#equal device.status "INACTIVE"}}Inactive{{/equal}} + {{#equal device.status "BLOCKED"}}Blocked{{/equal}} + {{#equal device.status "REMOVED"}}Removed{{/equal}} + {{#equal device.status "UNREACHABLE"}}Unreachable{{/equal}} + +

{{/zone}} - {{#zone "device-opetations"}} {{#if device.isNotRemoved}} -
- Operations -
-
+
+
+

Device Operations

+
{{unit "cdmf.unit.device.type.android.operation-bar" device=device backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
{{/if}} {{/zone}} - {{#zone "device-details-tab-injected"}} - - - + {{#zone "device-details"}} + {{#if device.deviceInfoAvailable}} + {{#if device.BatteryLevel}} +

{{device.BatteryLevel.value}}%

+ {{/if}} + {{#if device.ramUsage}} +

{{device.ramUsage.value}}%

+ {{/if}} + {{#if device.internalMemory}} +

{{device.internalMemory.usage}} + GB/{{device.internalMemory.total}}GB

+ {{/if}} + {{#if device.externalMemory}} +

{{device.externalMemory.usage}} + GB/{{device.externalMemory.total}}GB

+ {{/if}} + {{else}} +

Battery, RAM and Storage related information are not + available yet.

+ {{/if}} {{/zone}} - {{#zone "device-details-tab-contents"}} -
- - -
-
-
- - {{#if device.deviceInfoAvailable}} - {{#if device.BatteryLevel}} -
-
-
-
BATTERY
-
-
-
- {{device.BatteryLevel - .value}} % -
-
-
-
-
- {{/if}} - - - - - - - - - - - - - - - - {{#if device.ramUsage}} -
-
-
-
RAM Usage
-
-
-
- {{device.ramUsage - .value}} % -
-
-
-
-
- {{/if}} - {{#if device.internalMemory}} -
-
-
-
Local Storage
-
-
-
-
- {{device.internalMemory - .usage}} % - - TOTAL OF {{device.internalMemory - .total}} GB - -
-
-
-
-
- {{/if}} - {{#if device.externalMemory}} -
-
-
-
External Storage
-
-
-
- {{device.externalMemory - .usage}} % - - TOTAL OF {{device.externalMemory - .total}} GB - -
-
-
-
-
- {{/if}} - {{else}} -
-

- - Battery, RAM and Storage related information are not - available yet. -

-
- {{/if}} -
-
-
-
+ {{#zone "device-details-tab-injected"}} +
  • Location
    • +
  • Applications
    • +
  • Policy Compliance
    • {{/zone}} {{#zone "device-view-tab-injected-conents"}} +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    "); 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/applications-list.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/applications-list.hbs index ec6029dcc..c25f353df 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/public/templates/applications-list.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/applications-list.hbs @@ -1,31 +1,9 @@ -
    -
    - {{#each applications}} - - {{#equal platform "android"}}{{/equal}} - {{#equal platform "ios"}}{{/equal}} - {{#equal platform "windows"}}{{/equal}} - {{#equal isActive true}} - - -  Active - - {{name}} - V:{{version}} - {{#if memoryUsage}} - - Memory Usage - - - ( {{memoryUsage}} Bytes ) - - {{/if}} - {{/equal}} - {{#equal isActive false}} - {{name}} - V:{{version}} - {{/equal}} - - {{/each}} -
    -
    \ No newline at end of file +{{#each applications}} +
    + +
    +

    {{name}}

    +

    v{{version}}

    +
    +
    +{{/each}} 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 8fba741a6..61590d984 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/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 @@ -1,63 +1,26 @@ -
    - -
    -
    - - {{#equal deviceType "android"}} - - {{/equal}} - {{#equal deviceType "ios"}} - - {{/equal}} - {{#equal deviceType "windows"}} - - {{/equal}} - - -

    {{policy.policyName}}

    - {{deviceType}} -     -
    -
    -
    -
    -
    - Ownership Type : {{policy.ownershipType}} -
    -
    -
    -
    - Compliance Type : {{policy.compliance}} -
    -
    -
    -
    - Compliance : - {{#equal compliance "COMPLIANT"}} - Compliant - {{/equal}} - {{#equal compliance "NON-COMPLIANT"}} - Not Compliant - {{/equal}} -
    -
    -
    -
    -
    - - - - - - - View - - +
    + {{#equal compliance "COMPLIANT"}} + + {{/equal}} + {{#equal compliance "NON-COMPLIANT"}} + + {{/equal}} +

    + {{policy.policyName}} + {{deviceType}} +

    +

    + Compliance Type : {{policy.compliance}} + Ownership type : {{policy.ownershipType}} +

    +
    +
    +

    + View Policy

    -
    + @@ -77,4 +40,4 @@ {{/each}}
    -
    \ No newline at end of file + From d1b0dac7233641fb655a72dbff4ebabd1f1e6ce6 Mon Sep 17 00:00:00 2001 From: savidude Date: Wed, 21 Jun 2017 15:23:18 +0530 Subject: [PATCH 2/7] Fixing error when starting agent as Daemon --- .../src/main/resources/agent/startService.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh index f85bc7a98..c4a0dced1 100644 --- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh +++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh @@ -39,11 +39,16 @@ sudo apt-get update sudo apt-get install python-pip sudo pip install paho-mqtt -#installing ada +# installing ada +echo ===Installing ADA libraries sudo apt-get install build-essential python-dev unzip Adafruit_Python_DHT -sudo python Adafruit_Python_DHT/setup.py install +cd Adafruit_Python_DHT +sudo python setup.py install +cd .. +# moving files to start the agent as Daemon +echo ===Moving files to start agent as Daemon sudo cp $currentDir/deviceConfig.properties $currentDir/src sudo cp -r $currentDir/src $destination sudo chmod 755 $destination/src/RaspberryAgent.py @@ -51,4 +56,4 @@ sudo update-rc.d -f RaspberryService.sh remove sudo cp $currentDir/RaspberryService.sh /etc/init.d sudo chmod 755 /etc/init.d/RaspberryService.sh sudo update-rc.d RaspberryService.sh defaults -sudo service RaspberryService.sh start +sudo service RaspberryService.sh start \ No newline at end of file From 16812a99433496443cef8c5ac6df5f63956313b7 Mon Sep 17 00:00:00 2001 From: dunithd Date: Wed, 21 Jun 2017 19:37:42 +0530 Subject: [PATCH 3/7] Adding new UX design for Windows/virtual fire alarm device details page --- .../device-view.hbs | 37 +- .../device-view.hbs | 18 +- .../device-view.hbs | 441 +++--------------- .../img/device_icons/windows_app_icon.png | Bin 0 -> 7453 bytes .../public/js/device-detail.js | 2 + .../public/templates/applications-list.hbs | 40 +- .../public/templates/policy-compliance.hbs | 78 +--- 7 files changed, 143 insertions(+), 473 deletions(-) create mode 100644 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/img/device_icons/windows_app_icon.png mode change 100755 => 100644 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/applications-list.hbs mode change 100755 => 100644 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 diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs index c74615782..3bf9dcff9 100644 --- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs +++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs @@ -24,16 +24,39 @@ {{/zone}} {{#zone "device-thumbnail"}} - + +{{/zone}} + +{{#zone "device-details-header"}} +

    + {{device.enrolmentInfo.owner}}'s {{device.name}} + + + +

    +

    Ownership - {{device.enrolmentInfo.ownership}}

    +

    Device is + + {{#equal device.enrolmentInfo.status "ACTIVE"}}Active{{/equal}} + {{#equal device.enrolmentInfo.status "INACTIVE"}}Inactive{{/equal}} + {{#equal device.enrolmentInfo.status "BLOCKED"}}Blocked{{/equal}} + {{#equal device.enrolmentInfo.status "REMOVED"}}Removed{{/equal}} + {{#equal device.enrolmentInfo.status "UNREACHABLE"}}Unreachable{{/equal}} + +

    {{/zone}} {{#zone "device-opetations"}} -
    - Operations -
    -
    - {{unit "cdmf.unit.device.operation-bar" device=device autoCompleteParams=autoCompleteParams - encodedFeaturePayloads=encodedFeaturePayloads}} +
    +
    +

    Device Operations

    +
    + {{unit "cdmf.unit.device.operation-bar" device=device autoCompleteParams=autoCompleteParams + encodedFeaturePayloads=encodedFeaturePayloads}}
    {{/zone}} 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 50085f8de..09121c01f 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 @@ -13,7 +13,8 @@ data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}" data-ownership="{{device.ownership}}" - data-owner="{{device.owner}}"> + data-owner="{{device.owner}}" + data-status="{{device.status}}"> {{device.owner}}'s {{device.name}} - + {{#if device.location}} + {{unit "cdmf.unit.geo-dashboard" device=device noGeoFencing=false hideSearch=true}} + {{else}} +
    +

    + + Device location information is not available. +

    +
    +

    +

    +

    + {{/if}}
    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/device-view.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/device-view.hbs index 937ab7c4b..35eac6114 100644 --- 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/device-view.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/device-view.hbs @@ -6,398 +6,87 @@ {{#if deviceFound}} {{#if isAuthorized}} - {{#zone "device-details-header"}} -

    - Device {{device.name}} - {{#if device.model}} - - ( {{device.vendor}} {{device.model}} ) - - {{/if}} -

    + {{#zone "device-thumbnail"}} + {{/zone}} - {{#zone "overview-section"}} -
    -
    Device - Overview -
    - - - {{#if device.deviceIdentifier}} - - - - - {{/if}} - {{#if device.name}} - - - - - {{/if}} - {{#if device.vendor}} - {{#if device.model}} - - - - - {{/if}} - {{/if}} - {{#if device.status}} - - - - - {{/if}} - {{#if device.owner}} - - - - - {{/if}} - {{#if device.ownership}} - - - - - {{/if}} - {{#if device.imei}} - - - - - {{/if}} - {{#if device.udid}} - - - - - {{/if}} - {{#if device.osBuildDate}} - - - - - {{/if}} - {{#if device.phoneNumber}} - - - - - {{/if}} - {{#if device.lastUpdatedTime}} - - - - - {{/if}} - -
    Device ID{{device.deviceIdentifier}}
    Name{{device.name}}
    Model{{device.vendor}} - {{device.model}}
    Status - {{#if permissions.CHANGE_DEVICE_STATUS}} - {{#equal device.status "ACTIVE"}} - - {{/equal}} - {{#equal device.status "INACTIVE"}} - - {{/equal}} - {{#equal device.status "BLOCKED"}} - - {{/equal}} - {{#equal device.status "REMOVED"}} - - {{/equal}} - {{else}} - {{#equal device.status "ACTIVE"}} Active{{/equal}} - {{#equal device.status "INACTIVE"}} Inactive{{/equal}} - {{#equal device.status "BLOCKED"}} Blocked{{/equal}} - {{#equal device.status "REMOVED"}} Removed{{/equal}} - {{/if}} -
    Owner{{device.owner}}
    Ownership{{device.ownership}}
    IMEI{{device.imei}}
    UDID{{device.udid}}
    Firmware Build - Date - {{device.osBuildDate}}
    Phone Number{{device.phoneNumber}}
    Last Update{{device.lastUpdatedTime}}
    -
    + {{#zone "device-details-header"}} +

    + {{device.owner}}'s {{device.name}} + + + +

    + {{#if device.model}} +

    {{device.vendor}} {{device.model}}

    + {{/if}} +

    Ownership - {{device.ownership}}

    +

    Device is + + {{#equal device.status "ACTIVE"}}Active{{/equal}} + {{#equal device.status "INACTIVE"}}Inactive{{/equal}} + {{#equal device.status "BLOCKED"}}Blocked{{/equal}} + {{#equal device.status "REMOVED"}}Removed{{/equal}} + {{#equal device.status "UNREACHABLE"}}Unreachable{{/equal}} + +

    {{/zone}} - {{#zone "device-opetations"}} {{#if device.isNotRemoved}} -
    - Operations -
    -
    - {{unit "cdmf.unit.device.type.windows.new.operation-bar" device=device - backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}} +
    +
    +

    Device Operations

    +
    + {{unit "cdmf.unit.device.type.windows.new.operation-bar" device=device + backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
    {{/if}} {{/zone}} - {{#zone "device-details-tab-injected"}} - - - + {{#zone "device-details"}} + {{#if device.deviceInfoAvailable}} + {{#if device.BatteryLevel}} +

    {{device.BatteryLevel.value}}%

    + {{/if}} + {{#if device.ramUsage}} +

    {{device.ramUsage.value}} MB

    + {{/if}} + {{#if device.internalMemory}} +

    {{device.internalMemory.value}} GB +

    + {{/if}} + {{else}} +

    Battery, RAM and Storage related information are not + available yet.

    + {{/if}} {{/zone}} - {{#zone "device-details-tab-contents"}} -
    - - -
    -
    -
    - - {{#if device.deviceInfoAvailable}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{#if device.ramUsage}} -
    -
    -
    -
    Available RAM
    -
    -
    -
    - {{device.ramUsage - .value}} MB -
    -
    -
    -
    -
    - {{/if}} - {{#if device.internalMemory}} -
    -
    -
    -
    Available Local Storage
    -
    -
    -
    -
    - {{device.internalMemory - .value}} GB -
    -
    -
    -
    -
    - {{/if}} - {{else}} -
    -

    - - Battery, RAM and Storage related information are not - available yet. -

    -
    - {{/if}} -
    -
    -
    -
    + {{#zone "device-details-tab-injected"}} +
  • Location
    • +
  • Applications
    • +
  • Policy Compliance
    • {{/zone}} {{#zone "device-view-tab-injected-conents"}} -
    - - -
    -
    - - - - - - -
    -
    -
    -
    +
    +
    - -
    - - -
    -
    - {{#if device.location}} -
    -
    - {{else}} -
    -

    - - Device location information is not available. -

    -
    -

    -

    -

    - {{/if}} -
    -
    +
    +
    +
    - -
    - - -
    -
    - - - - - - -
    -
    -

    - - No applications found. -

    -

    Please try refreshing in a while.

    -
    -
    -
    -
    +
    +
    +
    {{/zone}} @@ -434,4 +123,4 @@ {{js "js/load-map.js"}} {{/if}} -{{/zone}} \ No newline at end of file +{{/zone}} 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/img/device_icons/windows_app_icon.png 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/img/device_icons/windows_app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b373460318b10225a3a2e4bea58510e1ca221d3b GIT binary patch literal 7453 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

    No applications found.

    " + 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/applications-list.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/applications-list.hbs old mode 100755 new mode 100644 index ec6029dcc..c25f353df --- 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/applications-list.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/applications-list.hbs @@ -1,31 +1,9 @@ -
    -
    - {{#each applications}} - - {{#equal platform "android"}}{{/equal}} - {{#equal platform "ios"}}{{/equal}} - {{#equal platform "windows"}}{{/equal}} - {{#equal isActive true}} - - -  Active - - {{name}} - V:{{version}} - {{#if memoryUsage}} - - Memory Usage - - - ( {{memoryUsage}} Bytes ) - - {{/if}} - {{/equal}} - {{#equal isActive false}} - {{name}} - V:{{version}} - {{/equal}} - - {{/each}} -
    -
    \ No newline at end of file +{{#each applications}} +
    + +
    +

    {{name}}

    +

    v{{version}}

    +
    +
    +{{/each}} 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 old mode 100755 new mode 100644 index 1eb233dfe..d87b813f1 --- 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 @@ -1,61 +1,27 @@ -
    - -
    -
    - - {{#equal deviceType "android"}} - - {{/equal}} - {{#equal deviceType "ios"}} - - {{/equal}} - {{#equal deviceType "windows"}} - - {{/equal}} - - -

    {{policy.policyName}}

    - {{deviceType}} -     +
    + {{#equal compliance "COMPLIANT"}} + + {{/equal}} + {{#equal compliance "NON-COMPLIANT"}} + + {{/equal}} +

    + {{policy.policyName}} + {{deviceType}} +

    +

    + Compliance Type : {{policy.compliance}} + Ownership type : {{policy.ownershipType}} +

    +
    +
    +

    + View Policy

    -
    -
    -
    -
    - Ownership Type : {{policy.ownershipType}} -
    -
    -
    -
    - Compliance Type : {{policy.compliance}} -
    -
    -
    -
    - Compliance : - {{#equal compliance "COMPLIANT"}} - Compliant - {{/equal}} - {{#equal compliance "NON-COMPLIANT"}} - Not Compliant - {{/equal}} -
    -
    -
    -
    -
    - - - - - - - View - - +
    +

    Revoke Policy

    -
    @@ -76,4 +42,4 @@ {{/each}}
    -
    \ No newline at end of file + From 239487d30a2ea132503169d53dd45a65a9097f6d Mon Sep 17 00:00:00 2001 From: savidude Date: Wed, 21 Jun 2017 19:42:54 +0530 Subject: [PATCH 4/7] Providing a client ID to the agent --- .../iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java | 4 ++-- .../service/impl/constants/RaspberrypiConstants.java | 2 +- .../src/main/resources/agent/src/mqttConnector.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java index fdd36862a..93999db63 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java @@ -112,8 +112,8 @@ public class RaspberryPiServiceImpl implements RaspberryPiService { @QueryParam("from") long from, @QueryParam("to") long to) { String fromDate = String.valueOf(from); String toDate = String.valueOf(to); - String query = "deviceId:" + deviceId + " AND deviceType:" + - RaspberrypiConstants.DEVICE_TYPE + " AND time : [" + fromDate + " TO " + toDate + "]"; + String query = "meta_deviceId:" + deviceId + " AND meta_deviceType:" + + RaspberrypiConstants.DEVICE_TYPE + " AND meta_time : [" + fromDate + " TO " + toDate + "]"; String sensorTableName = RaspberrypiConstants.TEMPERATURE_EVENT_TABLE; try { if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized(new DeviceIdentifier(deviceId, diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java index 5936cfb35..c19928ab7 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java @@ -26,7 +26,7 @@ public class RaspberrypiConstants { public static final String BULB_CONTEXT = "BULB"; //sensor events summerized table name - public static final String TEMPERATURE_EVENT_TABLE = "DEVICE_TEMPERATURE_SUMMARY"; + public static final String TEMPERATURE_EVENT_TABLE = "IOT_PER_DEVICE_STREAM_RASPBERRYPI_TEMPERATURE"; //mqtt tranport related constants public static final String MQTT_ADAPTER_TOPIC_PROPERTY_NAME = "mqtt.adapter.topic"; diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py index ccfa6b067..f05d8e018 100644 --- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py +++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/src/mqttConnector.py @@ -101,7 +101,7 @@ def main(): print ("MQTT_LISTENER: MQTT_TOPIC is " + TOPIC_TO_SUBSCRIBE) global mqttClient - mqttClient = mqtt.Client() + mqttClient = mqtt.Client(client_id="RaspberryPi Agent") mqttClient.on_connect = on_connect mqttClient.on_message = on_message mqttClient.on_publish = on_publish From 5755d5bbe35bcdf0d0ebb44eadd7eb45b842ba3d Mon Sep 17 00:00:00 2001 From: savidude Date: Wed, 21 Jun 2017 19:45:23 +0530 Subject: [PATCH 5/7] Restructuring RaspberryPi analytics --- .../carbonapps/raspberrypi/artifacts.xml | 3 + .../raspberrypi_execution.siddhiql | 4 +- .../temperature_publisher/artifact.xml | 22 +++++++ .../temperature_publisher.xml | 25 ++++++++ .../temperature_store/artifact.xml | 22 +++++++ ..._device_stream_raspberrypi_temperature.xml | 62 +++++++++++++++++++ .../temperature_stream/artifact.xml | 23 +++++++ ....stream.raspberrypi.temperature_1.0.0.json | 20 ++++++ .../analytics-view.js | 4 +- .../raspberrypi_receiver-carbon.super.xml | 2 +- ....per.device.stream.raspberrypi_1.0.0.json} | 2 +- 11 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/artifact.xml create mode 100644 components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/temperature_publisher.xml create mode 100644 components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/artifact.xml create mode 100644 components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/iot_per_device_stream_raspberrypi_temperature.xml create mode 100644 components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/artifact.xml create mode 100644 components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/iot.per.device.stream.raspberrypi.temperature_1.0.0.json rename features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/{org.wso2.iot.raspberrypi_1.0.0.json => iot.per.device.stream.raspberrypi_1.0.0.json} (87%) diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml index eb937c243..b54801592 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/artifacts.xml @@ -20,5 +20,8 @@ + + + diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql index a6808ef14..e20970b98 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/raspberrypi_execution/raspberrypi_execution.siddhiql @@ -6,10 +6,10 @@ /* define streams/tables and write queries here ... */ -@Import('org.wso2.iot.raspberrypi:1.0.0') +@Import('iot.per.device.stream.raspberrypi:1.0.0') define stream raspberrypi (meta_owner string, meta_deviceId string, meta_time long, temperature float); -@Export('org.wso2.iot.devices.temperature:1.0.0') +@Export('iot.per.device.stream.raspberrypi.temperature:1.0.0') define stream temperature (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, temperature float); from raspberrypi diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/artifact.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/artifact.xml new file mode 100644 index 000000000..7002e5f4d --- /dev/null +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/artifact.xml @@ -0,0 +1,22 @@ + + + + + temperature_publisher.xml + diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/temperature_publisher.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/temperature_publisher.xml new file mode 100644 index 000000000..5f8afc4f1 --- /dev/null +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_publisher/temperature_publisher.xml @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/artifact.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/artifact.xml new file mode 100644 index 000000000..b3d58b879 --- /dev/null +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/artifact.xml @@ -0,0 +1,22 @@ + + + + + iot_per_device_stream_raspberrypi_temperature.xml + diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/iot_per_device_stream_raspberrypi_temperature.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/iot_per_device_stream_raspberrypi_temperature.xml new file mode 100644 index 000000000..9d3d2621c --- /dev/null +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_store/iot_per_device_stream_raspberrypi_temperature.xml @@ -0,0 +1,62 @@ + + + + + + iot.per.device.stream.raspberrypi.temperature:1.0.0 + + EVENT_STORE + + + meta_owner + true + true + false + STRING + + + meta_deviceType + true + true + false + STRING + + + meta_deviceId + true + true + false + STRING + + + meta_time + true + true + false + LONG + + + temperature + false + false + false + FLOAT + + + \ No newline at end of file diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/artifact.xml b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/artifact.xml new file mode 100644 index 000000000..4526dfd73 --- /dev/null +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/artifact.xml @@ -0,0 +1,23 @@ + + + + + iot.per.device.stream.raspberrypi.temperature_1.0.0.json + + diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/iot.per.device.stream.raspberrypi.temperature_1.0.0.json b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/iot.per.device.stream.raspberrypi.temperature_1.0.0.json new file mode 100644 index 000000000..212705222 --- /dev/null +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/src/main/resources/carbonapps/raspberrypi/temperature_stream/iot.per.device.stream.raspberrypi.temperature_1.0.0.json @@ -0,0 +1,20 @@ +{ + "name": "iot.per.device.stream.raspberrypi.temperature", + "version": "1.0.0", + "nickName": "Temperature Data", + "description": "Temperature data received from the Device", + "metaData": [ + {"name":"owner","type":"STRING"}, + {"name":"deviceType","type":"STRING"}, + {"name":"deviceId","type":"STRING"}, + {"name":"time","type":"LONG"} + ], + "payloadData": [ + { + "name": "temperature","type": "FLOAT" + } + ] +} + + + diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js index 674dd8a59..29416c5af 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js @@ -42,7 +42,7 @@ function onRequest(context) { if (tokenPair) { token = tokenPair.accessToken; } - websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?" + websocketEndpoint = websocketEndpoint + "/secured-websocket/iot.per.device.stream.raspberrypi.temperature/1.0.0?" + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token; } else { var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username + "@" + user.domain @@ -50,7 +50,7 @@ function onRequest(context) { if (tokenPair) { token = tokenPair.accessToken; } - websocketEndpoint = websocketEndpoint + "/secured-websocket/t/" + user.domain + "/org.wso2.iot.devices.temperature/1.0.0?" + websocketEndpoint = websocketEndpoint + "/secured-websocket/t/" + user.domain + "/iot.per.device.stream.raspberrypi.temperature/1.0.0?" + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type + "&websocketToken=" + token; } diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml index 11cc1d962..498f70f4b 100644 --- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml +++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/receiver/raspberrypi_receiver-carbon.super.xml @@ -21,5 +21,5 @@ carbon.super/raspberrypi/+/temperature - + diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/org.wso2.iot.raspberrypi_1.0.0.json b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/iot.per.device.stream.raspberrypi_1.0.0.json similarity index 87% rename from features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/org.wso2.iot.raspberrypi_1.0.0.json rename to features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/iot.per.device.stream.raspberrypi_1.0.0.json index 225db3d1c..c2210f50b 100644 --- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/org.wso2.iot.raspberrypi_1.0.0.json +++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/src/main/resources/streams/iot.per.device.stream.raspberrypi_1.0.0.json @@ -1,5 +1,5 @@ { - "name": "org.wso2.iot.raspberrypi", + "name": "iot.per.device.stream.raspberrypi", "version": "1.0.0", "nickName": "raspberrypi", "description": "Temperature data received from the raspberrypi", From e39c2a1d8d308cd9be2213098cf8f0f2e65a6fbe Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 22 Jun 2017 12:42:15 +0530 Subject: [PATCH 6/7] Fixing Notification validation issue ; --- .../operation-bar.hbs | 6 + .../public/js/operation-bar.js | 313 ++++++++++-------- .../private/config.json | 4 +- pom.xml | 2 +- 4 files changed, 177 insertions(+), 148 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.operation-bar/operation-bar.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.operation-bar/operation-bar.hbs index e0b5cb412..6e2cf569a 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.operation-bar/operation-bar.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.operation-bar/operation-bar.hbs @@ -51,6 +51,7 @@
    +

    @@ -65,6 +66,11 @@ {{description}}

    + + +
    1.1.1 - 3.0.6 + 3.0.8-SNAPSHOT [3.0.0, 4.0.0) From e8aa3631ec2f5df6857ccc0e59b0acaddf1c242b Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 22 Jun 2017 12:48:21 +0530 Subject: [PATCH 7/7] removing the snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7091e90a6..3a77e5bae 100644 --- a/pom.xml +++ b/pom.xml @@ -1142,7 +1142,7 @@ 1.1.1 - 3.0.8-SNAPSHOT + 3.0.7 [3.0.0, 4.0.0)