From c3ff456645f0124cd2a9fa88c7850db26deebafe Mon Sep 17 00:00:00 2001 From: Aamir Date: Mon, 11 Dec 2023 16:17:51 +0300 Subject: [PATCH] Null Safety --- lib/core/model/dashboard/doctor_schedule.dart | 12 ++++---- .../doctor_schedule/doctor_schedule.dart | 30 ++++++------------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/lib/core/model/dashboard/doctor_schedule.dart b/lib/core/model/dashboard/doctor_schedule.dart index 5c102f7b..857a5b71 100644 --- a/lib/core/model/dashboard/doctor_schedule.dart +++ b/lib/core/model/dashboard/doctor_schedule.dart @@ -70,12 +70,12 @@ class Shiftforuser { }); factory Shiftforuser.fromJson(Map json) => Shiftforuser( - fromtimetext: json["fromtimetext"], - totimetext: json["totimetext"], - ); + fromtimetext: json["fromtimetext"], + totimetext: json["totimetext"], + ); Map toJson() => { - "fromtimetext": fromtimetext, - "totimetext": totimetext, - }; + "fromtimetext": fromtimetext, + "totimetext": totimetext, + }; } diff --git a/lib/screens/doctor_schedule/doctor_schedule.dart b/lib/screens/doctor_schedule/doctor_schedule.dart index a8fed416..bd5fb1fa 100644 --- a/lib/screens/doctor_schedule/doctor_schedule.dart +++ b/lib/screens/doctor_schedule/doctor_schedule.dart @@ -10,12 +10,10 @@ import '../../core/viewModel/project_view_model.dart'; import '../../core/viewModel/schedule_view_model.dart'; import '../../icons_app/doctor_app_icons.dart'; import '../../utils/date-utils.dart'; -import '../../utils/dr_app_toast_msg.dart'; import '../../utils/translations_delegate_base_utils.dart'; import '../../widgets/shared/app_scaffold_widget.dart'; import '../../widgets/shared/errors/error_message.dart'; import '../base/base_view.dart'; -import '../patients/register_patient/CustomEditableText.dart'; class DoctorSchedulePage extends StatefulWidget { @override @@ -188,25 +186,15 @@ class _DoctorSchedulePageState extends State { // Icon(Icons.arrow_forward, size: 16.0), ], ), - Container( - height: 45, - child: ListView - .builder( - itemCount: model - .getDoctorRotation[ - index] - .scheduleforuser![ - index2]! - .shiftforuser - !.length, - itemBuilder: (context, - index3) => - Row(children: [ - Text(model.getDoctorRotation[index].scheduleforuser![index2].shiftforuser![index3].fromtimetext.toString()), - Text(TranslationBase.of(context).to), - Text(model.getDoctorRotation[index].scheduleforuser![index2].shiftforuser![index3].totimetext.toString()) - ]))) - + Container( + height: 45, + child: ListView.builder( + itemCount: model.getDoctorRotation[index].scheduleforuser![index2]!.shiftforuser!.length, + itemBuilder: (context, index3) => Row(children: [ + Text(model.getDoctorRotation[index].scheduleforuser![index2].shiftforuser![index3].fromtimetext.toString()), + Text(" " + TranslationBase.of(context).to + " "), + Text(model.getDoctorRotation[index].scheduleforuser![index2].shiftforuser![index3].totimetext.toString()) + ]))) // ],) ]))),