diff --git a/lib/pages/medical/allergies_page.dart b/lib/pages/medical/allergies_page.dart index 726c66a4..f101195c 100644 --- a/lib/pages/medical/allergies_page.dart +++ b/lib/pages/medical/allergies_page.dart @@ -47,7 +47,7 @@ class AllergiesPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Texts(TranslationBase.of(context).remarks+" :"), - Texts(TranslationBase.of(context).description + ": " + model.allergies[index].description ?? ''), + Texts(TranslationBase.of(context).description + ": " + model.allergies[index].description! ?? ''), ], ), ) diff --git a/lib/pages/medical/medical_profile_page_new.dart b/lib/pages/medical/medical_profile_page_new.dart index ba756759..086b1b53 100644 --- a/lib/pages/medical/medical_profile_page_new.dart +++ b/lib/pages/medical/medical_profile_page_new.dart @@ -13,8 +13,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class MedicalProfilePageNew extends StatefulWidget { - Function onTap; - String a; + Function? onTap; + String? a; MedicalProfilePageNew({this.onTap}); @override _MedicalProfilePageState createState() => _MedicalProfilePageState(); @@ -23,13 +23,13 @@ class MedicalProfilePageNew extends StatefulWidget { class _MedicalProfilePageState extends State { var authProvider = new AuthProvider(); List medical =[]; - ProjectViewModel projectViewModel; + ProjectViewModel? projectViewModel; @override Widget build(BuildContext context) { projectViewModel = Provider.of(context); var appoCountProvider = Provider.of(context); - List myMedicalList = Utils.myMedicalList(projectViewModel: projectViewModel, context: context, count: appoCountProvider.count, isLogin: projectViewModel.isLogin); + List myMedicalList = Utils.myMedicalList(projectViewModel: projectViewModel, context: context, count: appoCountProvider.count, isLogin: projectViewModel!.isLogin); return BaseView( onModelReady: (model) => model.getAppointmentHistory(), builder: (_, model, widget1) => AppScaffold( @@ -46,7 +46,7 @@ class _MedicalProfilePageState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - TimeLineView(model.isLogin, projectViewModel.isArabic, model.appoitmentAllHistoryResultList), + TimeLineView(model.isLogin, projectViewModel!.isArabic, model.appoitmentAllHistoryResultList), SizedBox( height: 20, ), @@ -55,17 +55,17 @@ class _MedicalProfilePageState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - projectViewModel.isLogin + projectViewModel!.isLogin ? Text( projectViewModel?.user?.firstName ?? "", - style: TextStyle(color: Colors.black, fontSize: SizeConfig.textMultiplier * 1.8), + style: TextStyle(color: Colors.black, fontSize: SizeConfig.textMultiplier! * 1.8), ) : Container(), Text( TranslationBase.of(context).medicalFileTitle, style: TextStyle( color: Colors.black, - fontSize: SizeConfig.textMultiplier * 3, + fontSize: SizeConfig.textMultiplier! * 3, fontWeight: FontWeight.bold, ), ), @@ -102,10 +102,10 @@ class _MedicalProfilePageState extends State { } class Medical { - final String title; - final String imagePath; - final String subTitle; - final Widget page; + final String? title; + final String? imagePath; + final String? subTitle; + final Widget? page; Medical({this.title, this.imagePath, this.subTitle, this.page}); } diff --git a/lib/pages/medical/patient_sick_leave_page.dart b/lib/pages/medical/patient_sick_leave_page.dart index f68fee85..93f3bd05 100644 --- a/lib/pages/medical/patient_sick_leave_page.dart +++ b/lib/pages/medical/patient_sick_leave_page.dart @@ -59,12 +59,12 @@ class _PatientSickLeavePageState extends State { name: model.sickLeaveList[index].doctorName, date: model.sickLeaveList[index].appointmentDate, profileUrl: model.sickLeaveList[index].doctorImageURL, - rating: model.sickLeaveList[index].actualDoctorRate.toDouble(), + rating: model.sickLeaveList[index].actualDoctorRate!.toDouble(), subName: model.sickLeaveList[index].clinicName, isSortByClinic: false, isInOutPatient: model.sickLeaveList[index].isInOutPatient, isSickLeave: true, - sickLeaveStatus: model.sickLeaveList[index].status, + sickLeaveStatus: model.sickLeaveList[index].status!, onEmailTap: () { showConfirmMessage(model, index); }, @@ -76,7 +76,7 @@ class _PatientSickLeavePageState extends State { void showConfirmMessage(PatientSickLeaveViewMode model, int index) { if (model.sickLeaveList[index].status == 1) { - openWorkPlaceUpdatePage(model.sickLeaveList[index].requestNo, model.sickLeaveList[index].setupID, model, index, model.sickLeaveList[index].projectID); + openWorkPlaceUpdatePage(model.sickLeaveList[index].requestNo!, model.sickLeaveList[index]!.setupID!, model, index, model.sickLeaveList[index]!.projectID!); } else if (model.sickLeaveList[index].status == 2) { showEmailDialog(model, index); } else { @@ -101,15 +101,15 @@ class _PatientSickLeavePageState extends State { showDialog( context: context, builder: (cxt) => ConfirmSendEmailDialog( - email: model.user.emailAddress, + email: model.user!.emailAddress!, onTapSendEmail: () { model.sendSickLeaveEmail( message: TranslationBase.of(context).emailSentSuccessfully, - requestNo: model.sickLeaveList[index].requestNo, - doctorName: model.sickLeaveList[index].doctorName, - projectName: model.sickLeaveList[index].projectName, - setupID: model.sickLeaveList[index].setupID, - projectID: model.sickLeaveList[index].projectID); + requestNo: model.sickLeaveList[index].requestNo!, + doctorName: model.sickLeaveList[index].doctorName!, + projectName: model.sickLeaveList[index].projectName!, + setupID: model.sickLeaveList[index].setupID!, + projectID: model.sickLeaveList[index].projectID!); model.getSickLeave(); }, ), @@ -130,7 +130,7 @@ class _PatientSickLeavePageState extends State { LabsService service = new LabsService(); GifLoaderDialogUtils.showMyDialog(context); - service.getSickLeaveStatusByAdmissionNo(model.sickLeaveList[index].projectID, model.sickLeaveList[index].admissionNo).then((res) { + service.getSickLeaveStatusByAdmissionNo(model.sickLeaveList[index]!.projectID!, model.sickLeaveList[index].admissionNo!).then((res) { print(res); GifLoaderDialogUtils.hideDialog(context); if (res != null && res["List_GetSickLeaveStatusByAdmissionNo"] != null) {