ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-07-10 15:17:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update function handling in routine dialogs

Browse Source
This commit is contained in:
mohammad
2025-06-18 14:40:25 +03:00
parent b9a3b9c719
commit 63da660ece
13 changed files with 158 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart
View File

@ -13,6 +13,35 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
on<AddFunction>(_onAddFunction); on<AddFunction>(_onAddFunction);
on<SelectFunction>(_onSelectFunction); on<SelectFunction>(_onSelectFunction);
} }
// void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
// final functions = List<DeviceFunctionData>.from(state.addedFunctions);
// final existingIndex = functions.indexWhere(
// (f) => f.functionCode == event.functionData.functionCode,
// );
// if (existingIndex != -1) {
// final existingData = functions[existingIndex];
// functions[existingIndex] = DeviceFunctionData(
// entityId: event.functionData.entityId,
// functionCode: event.functionData.functionCode,
// operationName: event.functionData.operationName,
// value: event.functionData.value ?? existingData.value,
// valueDescription: event.functionData.valueDescription ??
// existingData.valueDescription,
// condition: event.functionData.condition ?? existingData.condition,
// step: event.functionData.step ?? existingData.step,
// );
// } else {
// functions.clear();
// functions.add(event.functionData);
// }
// emit(state.copyWith(
// addedFunctions: functions,
// selectedFunction: event.functionData.functionCode,
// ));
// }
void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) { void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
final functions = List<DeviceFunctionData>.from(state.addedFunctions); final functions = List<DeviceFunctionData>.from(state.addedFunctions);
final existingIndex = functions.indexWhere( final existingIndex = functions.indexWhere(
@ -20,19 +49,10 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
); );
if (existingIndex != -1) { if (existingIndex != -1) {
final existingData = functions[existingIndex]; // Update the function value
functions[existingIndex] = DeviceFunctionData( functions[existingIndex] = event.functionData;
entityId: event.functionData.entityId,
functionCode: event.functionData.functionCode,
operationName: event.functionData.operationName,
value: event.functionData.value ?? existingData.value,
valueDescription: event.functionData.valueDescription ??
existingData.valueDescription,
condition: event.functionData.condition ?? existingData.condition,
step: event.functionData.step ?? existingData.step,
);
} else { } else {
functions.clear(); // Add new function value
functions.add(event.functionData); functions.add(event.functionData);
} }

54
lib/pages/routines/helper/save_routine_helper.dart
View File

@ -17,9 +17,10 @@ class SaveRoutineHelper {
builder: (context) { builder: (context) {
return BlocBuilder<RoutineBloc, RoutineState>( return BlocBuilder<RoutineBloc, RoutineState>(
builder: (context, state) { builder: (context, state) {
final selectedConditionLabel = state.selectedAutomationOperator == 'and' final selectedConditionLabel =
? 'All Conditions are met' state.selectedAutomationOperator == 'and'
: 'Any Condition is met'; ? 'All Conditions are met'
: 'Any Condition is met';
return AlertDialog( return AlertDialog(
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
@ -37,10 +38,11 @@ class SaveRoutineHelper {
Text( Text(
'Create a scene: ${state.routineName ?? ""}', 'Create a scene: ${state.routineName ?? ""}',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headlineMedium!.copyWith( style:
color: ColorsManager.primaryColorWithOpacity, Theme.of(context).textTheme.headlineMedium!.copyWith(
fontWeight: FontWeight.bold, color: ColorsManager.primaryColorWithOpacity,
), fontWeight: FontWeight.bold,
),
), ),
const SizedBox(height: 18), const SizedBox(height: 18),
_buildDivider(), _buildDivider(),
@ -58,7 +60,8 @@ class SaveRoutineHelper {
_buildIfConditions(state, context), _buildIfConditions(state, context),
Container( Container(
width: 1, width: 1,
color: ColorsManager.greyColor.withValues(alpha: 0.8), color: ColorsManager.greyColor
.withValues(alpha: 0.8),
), ),
_buildThenActions(state, context), _buildThenActions(state, context),
], ],
@ -97,7 +100,8 @@ class SaveRoutineHelper {
child: Row( child: Row(
spacing: 16, spacing: 16,
children: [ children: [
Expanded(child: Text('IF: $selectedConditionLabel', style: textStyle)), Expanded(
child: Text('IF: $selectedConditionLabel', style: textStyle)),
const Expanded(child: Text('THEN:', style: textStyle)), const Expanded(child: Text('THEN:', style: textStyle)),
], ],
), ),
@ -109,7 +113,7 @@ class SaveRoutineHelper {
spacing: 16, spacing: 16,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
DialogFooterButton( DialogFooterButton(
text: 'Back', text: 'Back',
onTap: () => Navigator.pop(context), onTap: () => Navigator.pop(context),
), ),
@ -143,7 +147,8 @@ class SaveRoutineHelper {
child: ListView( child: ListView(
// shrinkWrap: true, // shrinkWrap: true,
children: state.thenItems.map((item) { children: state.thenItems.map((item) {
final functions = state.selectedFunctions[item['uniqueCustomId']] ?? []; final functions =
state.selectedFunctions[item['uniqueCustomId']] ?? [];
return functionRow(item, context, functions); return functionRow(item, context, functions);
}).toList(), }).toList(),
), ),
@ -203,19 +208,20 @@ class SaveRoutineHelper {
), ),
), ),
child: Center( child: Center(
child: item['type'] == 'tap_to_run' || item['type'] == 'scene' child:
? Image.memory( item['type'] == 'tap_to_run' || item['type'] == 'scene'
base64Decode(item['icon']), ? Image.memory(
width: 12, base64Decode(item['icon']),
height: 22, width: 12,
fit: BoxFit.scaleDown, height: 22,
) fit: BoxFit.scaleDown,
: SvgPicture.asset( )
item['imagePath'], : SvgPicture.asset(
width: 12, item['imagePath'],
height: 12, width: 12,
fit: BoxFit.scaleDown, height: 12,
), fit: BoxFit.scaleDown,
),
), ),
), ),
Flexible( Flexible(

4
lib/pages/routines/models/pc/energy_clamp_functions.dart
View File

@ -405,8 +405,8 @@ class PowerFactorCStatusFunction extends EnergyClampFunctions {
code: 'PowerFactorC', code: 'PowerFactorC',
operationName: 'Power Factor C', operationName: 'Power Factor C',
icon: Assets.speedoMeter, icon: Assets.speedoMeter,
min: 0.00, min: 0.0,
max: 1.00, max: 1.0,
step: 0.1, step: 0.1,
unit: "", unit: "",
); );

14
lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
View File

@ -117,10 +117,22 @@ class ACHelper {
}, },
onConfirm: state.addedFunctions.isNotEmpty onConfirm: state.addedFunctions.isNotEmpty
? () { ? () {
final selectedFunctionData =
state.addedFunctions.firstWhere(
(f) =>
f.functionCode == state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode: state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
/// add the functions to the routine bloc /// add the functions to the routine bloc
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
uniqueCustomId, uniqueCustomId,
), ),
); );

12
lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
View File

@ -78,12 +78,22 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
onCancel: () => Navigator.pop(context), onCancel: () => Navigator.pop(context),
onConfirm: state.addedFunctions.isNotEmpty onConfirm: state.addedFunctions.isNotEmpty
? () { ? () {
final selectedFunctionData =
state.addedFunctions.firstWhere(
(f) => f.functionCode == state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode: state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
final functions = _updateValuesForAddedFunctions( final functions = _updateValuesForAddedFunctions(
state.addedFunctions, state.addedFunctions,
); );
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
functions, [selectedFunctionData],
'${widget.uniqueCustomId}', '${widget.uniqueCustomId}',
), ),
); );

11
lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart
View File

@ -192,9 +192,18 @@ class _WallPresenceSensorState extends State<FlushPresenceSensor> {
onCancel: () => Navigator.pop(context), onCancel: () => Navigator.pop(context),
onConfirm: state.addedFunctions.isNotEmpty onConfirm: state.addedFunctions.isNotEmpty
? () { ? () {
final selectedFunctionData = state.addedFunctions.firstWhere(
(f) => f.functionCode == state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode: state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
widget.uniqueCustomId!, widget.uniqueCustomId!,
), ),
); );

11
lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
View File

@ -115,9 +115,18 @@ class _GatewayDialogState extends State<GatewayDialog> {
onCancel: () => Navigator.pop(context), onCancel: () => Navigator.pop(context),
onConfirm: state.addedFunctions.isNotEmpty onConfirm: state.addedFunctions.isNotEmpty
? () { ? () {
final selectedFunctionData = state.addedFunctions.firstWhere(
(f) => f.functionCode == state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode: state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
widget.uniqueCustomId ?? '-1', widget.uniqueCustomId ?? '-1',
), ),
); );

2
lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
View File

@ -147,7 +147,7 @@ class OneGangSwitchHelper {
// } // }
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
uniqueCustomId, uniqueCustomId,
), ),
); );

11
lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_clamp_dialog.dart
View File

@ -250,9 +250,18 @@ class _EnergyClampDialogState extends State<EnergyClampDialog> {
onCancel: () => Navigator.pop(context), onCancel: () => Navigator.pop(context),
onConfirm: state.addedFunctions.isNotEmpty onConfirm: state.addedFunctions.isNotEmpty
? () { ? () {
final selectedFunctionData = state.addedFunctions.firstWhere(
(f) => f.functionCode == state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode: state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
widget.uniqueCustomId!, widget.uniqueCustomId!,
), ),
); );

11
lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_value_selector_widget.dart
View File

@ -27,17 +27,16 @@ class EnergyValueSelectorWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final selectedFn = final selectedFn = functions.firstWhere((f) => f.code == selectedFunction);
functions.firstWhere((f) => f.code == selectedFunction);
final values = selectedFn.getOperationalValues(); final values = selectedFn.getOperationalValues();
final step = selectedFn.step ?? 1.0; final step = selectedFn.step;
final _unit = selectedFn.unit ?? ''; final _unit = selectedFn.unit ?? '';
final (double, double) sliderRange = final (double, double) sliderRange =
(selectedFn.min ?? 0.0, selectedFn.max ?? 100.0); (selectedFn.min ?? 0.0, selectedFn.max ?? 100.0);
if (_isSliderFunction(selectedFunction)) { if (_isSliderFunction(selectedFunction)) {
return CustomRoutinesTextbox( return CustomRoutinesTextbox(
withSpecialChar: false, withSpecialChar: true,
currentCondition: functionData.condition, currentCondition: functionData.condition,
dialogType: dialogType, dialogType: dialogType,
sliderRange: sliderRange, sliderRange: sliderRange,
@ -60,14 +59,14 @@ class EnergyValueSelectorWidget extends StatelessWidget {
entityId: device?.uuid ?? '', entityId: device?.uuid ?? '',
functionCode: selectedFunction, functionCode: selectedFunction,
operationName: functionData.operationName, operationName: functionData.operationName,
value: value.toInt(), value: value,
condition: functionData.condition, condition: functionData.condition,
), ),
), ),
), ),
unit: _unit, unit: _unit,
dividendOfRange: 1, dividendOfRange: 1,
stepIncreaseAmount: step, stepIncreaseAmount: step!,
); );
} }

15
lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
View File

@ -145,9 +145,22 @@ class TwoGangSwitchHelper {
// ), // ),
// ); // );
// } // }
final selectedFunctionData =
state.addedFunctions.firstWhere(
(f) =>
f.functionCode ==
state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode:
state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
uniqueCustomId, uniqueCustomId,
), ),
); );

11
lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
View File

@ -210,9 +210,18 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
onCancel: () => Navigator.pop(context), onCancel: () => Navigator.pop(context),
onConfirm: state.addedFunctions.isNotEmpty onConfirm: state.addedFunctions.isNotEmpty
? () { ? () {
final selectedFunctionData = state.addedFunctions.firstWhere(
(f) => f.functionCode == state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode: state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
widget.uniqueCustomId!, widget.uniqueCustomId!,
), ),
); );

11
lib/pages/routines/widgets/routine_dialogs/water_heater/water_heater_presence_sensor.dart
View File

@ -188,9 +188,18 @@ class _WaterHeaterDialogRoutinesState extends State<WaterHeaterDialogRoutines> {
onCancel: () => Navigator.pop(context), onCancel: () => Navigator.pop(context),
onConfirm: state.addedFunctions.isNotEmpty onConfirm: state.addedFunctions.isNotEmpty
? () { ? () {
final selectedFunctionData = state.addedFunctions.firstWhere(
(f) => f.functionCode == state.selectedFunction,
orElse: () => DeviceFunctionData(
entityId: '',
functionCode: state.selectedFunction ?? '',
operationName: '',
value: null,
),
);
context.read<RoutineBloc>().add( context.read<RoutineBloc>().add(
AddFunctionToRoutine( AddFunctionToRoutine(
state.addedFunctions, [selectedFunctionData],
widget.uniqueCustomId!, widget.uniqueCustomId!,
), ),
); );