From 32938404dd65d20e8d3f8e3ce2b7d9baf020a889 Mon Sep 17 00:00:00 2001 From: Rafeek-Khoudare Date: Mon, 30 Jun 2025 09:28:09 +0300 Subject: [PATCH] PR requested changes --- .../all_devices/models/device_status.dart | 14 ++++++++++++-- .../schedule_device/bloc/schedule_bloc.dart | 10 +++++----- .../schedule_widgets/schedule_table.dart | 1 - 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lib/pages/device_managment/all_devices/models/device_status.dart b/lib/pages/device_managment/all_devices/models/device_status.dart index b3d582f1..f4efe36b 100644 --- a/lib/pages/device_managment/all_devices/models/device_status.dart +++ b/lib/pages/device_managment/all_devices/models/device_status.dart @@ -35,8 +35,8 @@ class DeviceStatus { } class Status { - String code; - dynamic value; + final String code; + final dynamic value; Status({ required this.code, @@ -57,6 +57,16 @@ class Status { }; } + Status copyWith({ + String? code, + dynamic value, + }) { + return Status( + code: code ?? this.code, + value: value ?? this.value, + ); + } + factory Status.fromJson(String source) => Status.fromMap(json.decode(source)); String toJson() => json.encode(toMap()); diff --git a/lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart b/lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart index f84f95e7..0db1445f 100644 --- a/lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart +++ b/lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart @@ -288,18 +288,18 @@ class ScheduleBloc extends Bloc { final dateTime = DateTime.parse(event.time); Status status = Status(code: '', value: ''); if (event.category == 'CUR_2') { - status.code = 'control'; - status.value = event.functionOn == true ? 'open' : 'close'; + status = status.copyWith( + code: 'control', + value: event.functionOn == true ? 'open' : 'close'); } else { - status.code = event.category; - status.value = event.functionOn; + status = + status.copyWith(code: event.category, value: event.functionOn); } final updatedSchedule = ScheduleEntry( scheduleId: event.scheduleId, category: event.category, time: getTimeStampWithoutSeconds(dateTime).toString(), function: status, - // Status(code: event.category, value: event.functionOn), days: event.selectedDays, ); final success = await DevicesManagementApi().editScheduleRecord( diff --git a/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart b/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart index 213afd61..84d8e1f5 100644 --- a/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart +++ b/lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart @@ -226,7 +226,6 @@ class _ScheduleTableView extends StatelessWidget { category: schedule.category, time: updatedSchedule.time, functionOn: temp, - // updatedSchedule.function.value, selectedDays: updatedSchedule.days), ); }