forget_password&power_clamp_issue

This commit is contained in:
mohammad
2024-10-30 09:47:18 +03:00
parent 5d10b2a35b
commit 73ab6f3d05
5 changed files with 38 additions and 21 deletions

View File

@ -589,14 +589,14 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
TextButton(
child: const Text('Cancel'),
onPressed: () {
Navigator.of(context) .pop();
Navigator.of(context).pop();
},
),
TextButton(
child: const Text('OK'),
onPressed: () {
final selectedDateTime = DateTime(selectedYear);
Navigator.of(context).pop(selectedDateTime);
Navigator.of(context).pop(selectedDateTime);
},
),
],
@ -718,7 +718,6 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
// formattedDate = newDate.toString();
});
emit(FilterRecordsState(filteredRecords: energyDataList));
}
List<EnergyData> energyDataList = [];
@ -773,7 +772,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
}
String endChartDate = '';
void selectDateRange() async {
DateTime startDate = dateTime!;
DateTime endDate = DateTime(startDate.year, startDate.month + 1, 1)

View File

@ -66,7 +66,7 @@ class SmartPowerDeviceControl extends StatelessWidget
style: TextStyle(
fontSize: 32,
fontWeight: FontWeight.w700,
color: ColorsManager.grayColor),
color: ColorsManager.textPrimaryColor),
),
],
),
@ -176,7 +176,7 @@ class SmartPowerDeviceControl extends StatelessWidget
children: [
EnergyConsumptionPage(
formattedDate:
'${blocProvider.formattedDate}${blocProvider.endChartDate}',
'${blocProvider.dateTime!.day}/${blocProvider.dateTime!.month}/${blocProvider.dateTime!.year} ${blocProvider.endChartDate}',
onTap: () {
blocProvider.add(SelectDateEvent(context: context));
blocProvider.add(FilterRecordsByDateEvent(