diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart index 0a3b346c..2663d931 100644 --- a/lib/pages/device_managment/all_devices/models/devices_model.dart +++ b/lib/pages/device_managment/all_devices/models/devices_model.dart @@ -291,25 +291,25 @@ SOS return [ //IF Functions PresenceStateFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), CurrentDistanceFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), IlluminanceValueFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), PresenceTimeFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), //THEN Functions FarDetectionFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), MotionSensitivityFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), MotionLessSensitivityFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), IndicatorFunction( deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'), NoOneTimeFunction( - deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'), + deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'), // FarDetectionSliderFunction( // deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN') diff --git a/lib/pages/routines/models/wps/wps_functions.dart b/lib/pages/routines/models/wps/wps_functions.dart index d090686a..4f48300e 100644 --- a/lib/pages/routines/models/wps/wps_functions.dart +++ b/lib/pages/routines/models/wps/wps_functions.dart @@ -1,5 +1,3 @@ - - import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart'; import 'package:syncrow_web/pages/routines/models/device_functions.dart'; import 'package:syncrow_web/pages/routines/models/wps/wps_operational_value.dart'; @@ -195,7 +193,7 @@ class NoOneTimeFunction extends WpsFunctions { WpsOperationalValue( icon: icon, description: 'Custom $unit', - value: null, + value: null, ) ]; } @@ -216,12 +214,12 @@ class PresenceStateFunction extends WpsFunctions { WpsOperationalValue( icon: Assets.assetsAcPower, description: "None", - value: true, + value: 'none', ), WpsOperationalValue( icon: Assets.presenceStateIcon, description: "Presence", - value: false, + value: 'presence', ), ]; } @@ -238,7 +236,7 @@ class CurrentDistanceFunction extends WpsFunctions { step = 1, super( type: type, - code: 'current_distance', + code: 'dis_current', operationName: 'Current Distance', icon: Assets.currentDistanceIcon, ); diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart index 960b22de..ee91b321 100644 --- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart +++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart @@ -252,7 +252,7 @@ class _ValueSelector extends StatelessWidget { } bool _isSliderFunction(String function) => [ - 'current_distance', + 'dis_current', 'presence_time', 'illuminance_value' ].contains(function); @@ -382,7 +382,7 @@ class _ValueDisplay extends StatelessWidget { switch (functionCode) { case 'presence_time': return '$intValue Min'; - case 'current_distance': + case 'dis_current': return '$intValue CM'; case 'illuminance_value': return '$intValue Lux'; @@ -421,7 +421,7 @@ class _FunctionSlider extends StatelessWidget { switch (functionCode) { case 'presence_time': return (0, 65535); - case 'current_distance': + case 'dis_current': return (1, 600); case 'illuminance_value': return (0, 10000);