code update in progress

merge-update-with-lab-changes
Sultan khan 2 years ago
parent 40656a65d8
commit 6a8de14d5d

@ -47,7 +47,7 @@ class AllergiesPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(TranslationBase.of(context).remarks+" :"), Texts(TranslationBase.of(context).remarks+" :"),
Texts(TranslationBase.of(context).description + ": " + model.allergies[index].description ?? ''), Texts(TranslationBase.of(context).description + ": " + model.allergies[index].description! ?? ''),
], ],
), ),
) )

@ -13,8 +13,8 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class MedicalProfilePageNew extends StatefulWidget { class MedicalProfilePageNew extends StatefulWidget {
Function onTap; Function? onTap;
String a; String? a;
MedicalProfilePageNew({this.onTap}); MedicalProfilePageNew({this.onTap});
@override @override
_MedicalProfilePageState createState() => _MedicalProfilePageState(); _MedicalProfilePageState createState() => _MedicalProfilePageState();
@ -23,13 +23,13 @@ class MedicalProfilePageNew extends StatefulWidget {
class _MedicalProfilePageState extends State<MedicalProfilePageNew> { class _MedicalProfilePageState extends State<MedicalProfilePageNew> {
var authProvider = new AuthProvider(); var authProvider = new AuthProvider();
List<Medical> medical =[]; List<Medical> medical =[];
ProjectViewModel projectViewModel; ProjectViewModel? projectViewModel;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectViewModel = Provider.of(context); projectViewModel = Provider.of(context);
var appoCountProvider = Provider.of<ToDoCountProviderModel>(context); var appoCountProvider = Provider.of<ToDoCountProviderModel>(context);
List<Widget> myMedicalList = Utils.myMedicalList(projectViewModel: projectViewModel, context: context, count: appoCountProvider.count, isLogin: projectViewModel.isLogin); List<Widget> myMedicalList = Utils.myMedicalList(projectViewModel: projectViewModel, context: context, count: appoCountProvider.count, isLogin: projectViewModel!.isLogin);
return BaseView<MedicalViewModel>( return BaseView<MedicalViewModel>(
onModelReady: (model) => model.getAppointmentHistory(), onModelReady: (model) => model.getAppointmentHistory(),
builder: (_, model, widget1) => AppScaffold( builder: (_, model, widget1) => AppScaffold(
@ -46,7 +46,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePageNew> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
TimeLineView(model.isLogin, projectViewModel.isArabic, model.appoitmentAllHistoryResultList), TimeLineView(model.isLogin, projectViewModel!.isArabic, model.appoitmentAllHistoryResultList),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
@ -55,17 +55,17 @@ class _MedicalProfilePageState extends State<MedicalProfilePageNew> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
projectViewModel.isLogin projectViewModel!.isLogin
? Text( ? Text(
projectViewModel?.user?.firstName ?? "", projectViewModel?.user?.firstName ?? "",
style: TextStyle(color: Colors.black, fontSize: SizeConfig.textMultiplier * 1.8), style: TextStyle(color: Colors.black, fontSize: SizeConfig.textMultiplier! * 1.8),
) )
: Container(), : Container(),
Text( Text(
TranslationBase.of(context).medicalFileTitle, TranslationBase.of(context).medicalFileTitle,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.textMultiplier * 3, fontSize: SizeConfig.textMultiplier! * 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
@ -102,10 +102,10 @@ class _MedicalProfilePageState extends State<MedicalProfilePageNew> {
} }
class Medical { class Medical {
final String title; final String? title;
final String imagePath; final String? imagePath;
final String subTitle; final String? subTitle;
final Widget page; final Widget? page;
Medical({this.title, this.imagePath, this.subTitle, this.page}); Medical({this.title, this.imagePath, this.subTitle, this.page});
} }

@ -59,12 +59,12 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
name: model.sickLeaveList[index].doctorName, name: model.sickLeaveList[index].doctorName,
date: model.sickLeaveList[index].appointmentDate, date: model.sickLeaveList[index].appointmentDate,
profileUrl: model.sickLeaveList[index].doctorImageURL, profileUrl: model.sickLeaveList[index].doctorImageURL,
rating: model.sickLeaveList[index].actualDoctorRate.toDouble(), rating: model.sickLeaveList[index].actualDoctorRate!.toDouble(),
subName: model.sickLeaveList[index].clinicName, subName: model.sickLeaveList[index].clinicName,
isSortByClinic: false, isSortByClinic: false,
isInOutPatient: model.sickLeaveList[index].isInOutPatient, isInOutPatient: model.sickLeaveList[index].isInOutPatient,
isSickLeave: true, isSickLeave: true,
sickLeaveStatus: model.sickLeaveList[index].status, sickLeaveStatus: model.sickLeaveList[index].status!,
onEmailTap: () { onEmailTap: () {
showConfirmMessage(model, index); showConfirmMessage(model, index);
}, },
@ -76,7 +76,7 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
void showConfirmMessage(PatientSickLeaveViewMode model, int index) { void showConfirmMessage(PatientSickLeaveViewMode model, int index) {
if (model.sickLeaveList[index].status == 1) { 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) { } else if (model.sickLeaveList[index].status == 2) {
showEmailDialog(model, index); showEmailDialog(model, index);
} else { } else {
@ -101,15 +101,15 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
showDialog( showDialog(
context: context, context: context,
builder: (cxt) => ConfirmSendEmailDialog( builder: (cxt) => ConfirmSendEmailDialog(
email: model.user.emailAddress, email: model.user!.emailAddress!,
onTapSendEmail: () { onTapSendEmail: () {
model.sendSickLeaveEmail( model.sendSickLeaveEmail(
message: TranslationBase.of(context).emailSentSuccessfully, message: TranslationBase.of(context).emailSentSuccessfully,
requestNo: model.sickLeaveList[index].requestNo, requestNo: model.sickLeaveList[index].requestNo!,
doctorName: model.sickLeaveList[index].doctorName, doctorName: model.sickLeaveList[index].doctorName!,
projectName: model.sickLeaveList[index].projectName, projectName: model.sickLeaveList[index].projectName!,
setupID: model.sickLeaveList[index].setupID, setupID: model.sickLeaveList[index].setupID!,
projectID: model.sickLeaveList[index].projectID); projectID: model.sickLeaveList[index].projectID!);
model.getSickLeave(); model.getSickLeave();
}, },
), ),
@ -130,7 +130,7 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
LabsService service = new LabsService(); LabsService service = new LabsService();
GifLoaderDialogUtils.showMyDialog(context); 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); print(res);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (res != null && res["List_GetSickLeaveStatusByAdmissionNo"] != null) { if (res != null && res["List_GetSickLeaveStatusByAdmissionNo"] != null) {

Loading…
Cancel
Save