From 22561272c9c8a3afbcee6dcb282fb07a82e43785 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 6 Jul 2017 09:40:40 +0530 Subject: [PATCH 1/2] adding radio button option to ring virtual fire alarm --- .../private/config.json | 16 +++++++++++++++- .../resources/devicetypes/virtual_firealarm.xml | 3 --- .../resources/devicetypes/virtual_firealarm.xml | 3 --- 3 files changed, 15 insertions(+), 7 deletions(-) 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.type-view/private/config.json 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.type-view/private/config.json index 5252c86943..bc738551ea 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.type-view/private/config.json +++ 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.type-view/private/config.json @@ -8,7 +8,21 @@ ], "features": { "buzz": { - "icon" : "fw-dial-up" + "icon" : "fw-dial-up", + "formParams": [ + { + "type": "radio", + "id": "buz_on", + "label": "Buzzer On", + "name": "state" + }, + { + "type": "radio", + "id": "buz_off", + "label": "Buzzer Off", + "name": "state" + } + ] } } } diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml index 59ed4bcb4b..55196f13f5 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml @@ -23,9 +23,6 @@ Control buzzer Control buzzer on Virtual Firealarm - - state - diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml index aedb9e7fae..e9fa36ef26 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml @@ -23,9 +23,6 @@ Control buzzer Control buzzer on Virtual Firealarm - - state - From 5fb6cf09af243cace386259ec58ee049ce1c8db6 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 6 Jul 2017 10:20:08 +0530 Subject: [PATCH 2/2] adding values for radio buttons --- .../private/config.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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.type-view/private/config.json 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.type-view/private/config.json index bc738551ea..9970944746 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.type-view/private/config.json +++ 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.type-view/private/config.json @@ -14,13 +14,15 @@ "type": "radio", "id": "buz_on", "label": "Buzzer On", - "name": "state" + "name": "state", + "value":"ON" }, { "type": "radio", "id": "buz_off", "label": "Buzzer Off", - "name": "state" + "name": "state", + "value":"OFF" } ] }