Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Radiology details & assessment fix

Browse Source
merge-requests/451/head
hussam al-habibeh 4 years ago
parent f89eb0f76b
commit 26672dbb6e
3 changed files with 629 additions and 603 deletions
Show Stats Download Patch File Download Diff File

31
lib/screens/patients/profile/radiology/radiology_details_page.dart
Unescape Escape View File

@ -9,6 +9,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_head
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_button.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -80,27 +81,27 @@ class RadiologyDetailsPage extends StatelessWidget {
SizedBox(
height: 100,
),
],
),
),
],
),
),
bottomSheet: model.radImageURL.isNotEmpty ?Container(
width: double.maxFinite,
height: 100,
child: Container(
margin: EdgeInsets.only(left: 35,right: 35,top: 12,bottom: 12),
child: Button(
color: Colors.red,
onTap: () {
launch(model.radImageURL);
},
title: TranslationBase.of(context).openRad,
),
),
):null,
bottomSheet: model.radImageURL.isNotEmpty
? Container(
width: double.maxFinite,
child: Container(
margin:
EdgeInsets.only(left: 35, right: 35, top: 12, bottom: 12),
child: AppButton(
onPressed: () {
launch(model.radImageURL);
},
title: TranslationBase.of(context).openRad,
),
),
)
: null,
),
);
}

298
lib/widgets/patients/profile/soap_update/steps_widget.dart
Unescape Escape View File

@ -46,24 +46,24 @@ class StepsWidget extends StatelessWidget {
border: index == 0
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 0
? null
: Border.all(
color: Colors.black, width: 0.75),
? null
: Border.all(
color: Colors.black, width: 0.75),
shape: BoxShape.circle,
color: index == 0
? Color(0xFFCC9B14)
: index > 0
? Color(0xFF359846)
: Color(0xFFCCCCCC),
? Color(0xFF359846)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
SizedBox(
height:5
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(height: 5),
Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
@ -72,8 +72,10 @@ class StepsWidget extends StatelessWidget {
fontWeight: FontWeight.bold,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 0,),
StatusLabel(
selectedStepId: index,
stepId: 0,
),
],
),
],
@ -82,10 +84,7 @@ class StepsWidget extends StatelessWidget {
),
Positioned(
top: 50,
left: MediaQuery
.of(context)
.size
.width * 0.28,
left: MediaQuery.of(context).size.width * 0.28,
child: InkWell(
onTap: () => index >= 1 ? changeCurrentTab(1) : null,
child: Column(
@ -98,23 +97,25 @@ class StepsWidget extends StatelessWidget {
border: index == 1
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 2
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
shape: BoxShape.circle,
color: index == 1
? Color(0xFFCC9B14)
: index > 1
? Color(0xFF359846)
: Color(0xFFCCCCCC),
? Color(0xFF359846)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(
height:5,
height: 5,
),
Column(
mainAxisAlignment: MainAxisAlignment.start,
@ -124,9 +125,10 @@ class StepsWidget extends StatelessWidget {
fontWeight: FontWeight.bold,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 1,),
StatusLabel(
selectedStepId: index,
stepId: 1,
),
],
),
],
@ -135,14 +137,10 @@ class StepsWidget extends StatelessWidget {
),
Positioned(
top: 50,
left: MediaQuery
.of(context)
.size
.width * 0.52,
left: MediaQuery.of(context).size.width * 0.52,
child: InkWell(
onTap: () {
if (index >= 3)
changeCurrentTab(2);
if (index >= 3) changeCurrentTab(2);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
@ -154,23 +152,25 @@ class StepsWidget extends StatelessWidget {
border: index == 2
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 2
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
shape: BoxShape.circle,
color: index == 2
? Color(0xFFCC9B14)
: index > 2
? Color(0xFFCC9B14)
: Color(0xFFCCCCCC),
? Color(0xFF359846)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(
height:5,
height: 5,
),
Column(
mainAxisAlignment: MainAxisAlignment.start,
@ -180,7 +180,10 @@ class StepsWidget extends StatelessWidget {
fontWeight: FontWeight.bold,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 2,),
StatusLabel(
selectedStepId: index,
stepId: 2,
),
],
),
],
@ -202,38 +205,43 @@ class StepsWidget extends StatelessWidget {
border: index == 3
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 3
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
shape: BoxShape.circle,
color: index == 3
? Color(0xFFCC9B14)
: index > 3
? Color(0xFF359846)
: Color(0xFFCCCCCC),
? Color(0xFF359846)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(
height:5,
height: 5,
),
Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
AppText(
"Plan",
fontWeight: FontWeight.bold,
textAlign: TextAlign.center,
fontSize: 12,
),
StatusLabel(
selectedStepId: index,
stepId: 3,
),
],
),
),
Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
AppText(
"Plan",
fontWeight: FontWeight.bold,
textAlign: TextAlign.center,
fontSize: 12,
),
StatusLabel(selectedStepId: index, stepId: 3,),
],
),
),
],
),
),
@ -244,10 +252,7 @@ class StepsWidget extends StatelessWidget {
children: [
Container(
height: 150,
width: MediaQuery
.of(context)
.size
.width,
width: MediaQuery.of(context).size.width,
color: Colors.transparent,
child: Center(
child: Divider(
@ -272,24 +277,24 @@ class StepsWidget extends StatelessWidget {
border: index == 0
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 0
? null
: Border.all(
color: Colors.black, width: 0.75),
? null
: Border.all(
color: Colors.black, width: 0.75),
shape: BoxShape.circle,
color: index == 0
? Color(0xFFCC9B14)
: index > 0
? Color(0xFF359846)
: Color(0xFFCCCCCC),
? Color(0xFF359846)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
SizedBox(
height:5
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(height: 5),
AppText(
"شخصي",
fontWeight: FontWeight.bold,
@ -301,10 +306,7 @@ class StepsWidget extends StatelessWidget {
),
Positioned(
top: 50,
right: MediaQuery
.of(context)
.size
.width * 0.28,
right: MediaQuery.of(context).size.width * 0.28,
child: InkWell(
onTap: () => index >= 2 ? changeCurrentTab(1) : null,
child: Column(
@ -317,28 +319,28 @@ class StepsWidget extends StatelessWidget {
border: index == 1
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 2
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
shape: BoxShape.circle,
color: index == 1
? Color(0xFFCC9B14)
: index > 1
? Color(0xFF359846)
: Color(0xFFCCCCCC),
? Color(0xFF359846)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
),
SizedBox(
height:5
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(height: 5),
AppText(
"هدف",
fontWeight: FontWeight.bold,
fontSize:14,
fontSize: 14,
),
],
),
@ -346,10 +348,7 @@ class StepsWidget extends StatelessWidget {
),
Positioned(
top: 50,
right: MediaQuery
.of(context)
.size
.width * 0.52,
right: MediaQuery.of(context).size.width * 0.52,
child: InkWell(
onTap: () => index >= 3 ? changeCurrentTab(2) : null,
child: Column(
@ -362,32 +361,33 @@ class StepsWidget extends StatelessWidget {
border: index == 2
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 2
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
shape: BoxShape.circle,
color: index == 2
? Color(0xFFCC9B14)
: index > 2
? Color(0xFFCC9B14)
: Color(0xFFCCCCCC),
? Color(0xFFCC9B14)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(
height:5,
height: 5,
),
Padding(
padding: const EdgeInsets.only(right: 2),
child: AppText(
"تقدير",
fontWeight: FontWeight.bold,
fontSize:14,
),
"تقدير",
fontWeight: FontWeight.bold,
fontSize: 14,
),
),
],
),
@ -408,44 +408,48 @@ class StepsWidget extends StatelessWidget {
border: index == 3
? Border.all(color: Color(0xFFCC9B14), width: 2)
: index > 3
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
? null
: Border.all(
color: Color(0xFFCCCCCC), width: 0.75),
shape: BoxShape.circle,
color: index == 3
? Color(0xFFCC9B14)
: index > 3
? Color(0xFFCC9B14)
: Color(0xFFCCCCCC),
? Color(0xFFCC9B14)
: Color(0xFFCCCCCC),
),
child: Center(
child: Icon(FontAwesomeIcons.check, size: 20,
color: Colors.white,)
),
child: Icon(
FontAwesomeIcons.check,
size: 20,
color: Colors.white,
)),
),
SizedBox(
height:5,
height: 5,
),
Container(
margin: EdgeInsets.only(right:index == 3? 15:0),
child: AppText(
Container(
margin: EdgeInsets.only(right: index == 3 ? 15 : 0),
child: AppText(
"خطة",
fontWeight: FontWeight.bold,
fontSize:14,
),
),
fontSize: 14,
),
),
],
),
),
),
],
);
);
}
}
class StatusLabel extends StatelessWidget {
const StatusLabel({
Key key, this.stepId, this.selectedStepId,
Key key,
this.stepId,
this.selectedStepId,
}) : super(key: key);
final int stepId;
@ -457,24 +461,30 @@ class StatusLabel extends StatelessWidget {
width: 65,
padding: EdgeInsets.symmetric(horizontal: 2, vertical: 3),
decoration: BoxDecoration(
color: stepId == selectedStepId ? Color(0xFFF1E9D3) : stepId <
selectedStepId ? Color(0xFFD8E8DB) : Color(0xFFCCCCCC),
color: stepId == selectedStepId
? Color(0xFFF1E9D3)
: stepId < selectedStepId
? Color(0xFFD8E8DB)
: Color(0xFFCCCCCC),
borderRadius: BorderRadius.all(
Radius.circular(5.0),
),
border: Border.all(
color: HexColor('#707070'),
width: 0.30),
border: Border.all(color: HexColor('#707070'), width: 0.30),
),
child: AppText(
stepId == selectedStepId ? "inProgress" : stepId < selectedStepId
? "Completed"
: " Locked ",
stepId == selectedStepId
? "inProgress"
: stepId < selectedStepId
? "Completed"
: " Locked ",
fontWeight: FontWeight.bold,
textAlign: TextAlign.center,
fontSize: 10,
color: stepId == selectedStepId ? Color(0xFFCC9B14) : stepId <
selectedStepId ? Color(0xFF359846) : Color(0xFF969696),
color: stepId == selectedStepId
? Color(0xFFCC9B14)
: stepId < selectedStepId
? Color(0xFF359846)
: Color(0xFF969696),
),
);
}

903
lib/widgets/patients/profile/soap_update/update_assessment_page.dart
Unescape Escape View File

@ -54,495 +54,510 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<SOAPViewModel>(
onModelReady: (model) async {
widget.mySelectedAssessmentList.clear();
GetAssessmentReqModel getAssessmentReqModel = GetAssessmentReqModel(
patientMRN: widget.patientInfo.patientMRN,
episodeID: widget.patientInfo.episodeNo.toString(),
editedBy: '',
doctorID: '',
appointmentNo: widget.patientInfo.appointmentNo);
await model.getPatientAssessment(getAssessmentReqModel);
if (model.patientAssessmentList.isNotEmpty) {
if (model.listOfDiagnosisCondition.length == 0) {
await model.getMasterLookup(MasterKeysService.DiagnosisCondition);
}
if (model.listOfDiagnosisType.length == 0) {
await model.getMasterLookup(MasterKeysService.DiagnosisType);
}
if (model.listOfICD10.length == 0) {
await model.getMasterLookup(MasterKeysService.ICD10);
}
model.patientAssessmentList.forEach((element) {
MasterKeyModel diagnosisType = model.getOneMasterKey(
masterKeys: MasterKeysService.DiagnosisType,
id: element.diagnosisTypeID,
);
MasterKeyModel selectedICD = model.getOneMasterKey(
masterKeys: MasterKeysService.ICD10,
id: element.icdCode10ID,
);
MasterKeyModel diagnosisCondition = model.getOneMasterKey(
masterKeys: MasterKeysService.DiagnosisCondition,
id: element.conditionID,
);
if (diagnosisCondition != null &&
diagnosisType != null &&
diagnosisCondition != null) {
MySelectedAssessment temMySelectedAssessment =
MySelectedAssessment(
appointmentId: element.appointmentNo,
remark: element.remarks,
selectedDiagnosisType: diagnosisType,
selectedDiagnosisCondition: diagnosisCondition,
selectedICD: selectedICD,
doctorID: element.doctorID,
doctorName: element.doctorName,
createdBy: element.createdBy,
createdOn: element.createdOn,
icdCode10ID: element.icdCode10ID);
widget.mySelectedAssessmentList.add(temMySelectedAssessment);
}
});
onModelReady: (model) async {
widget.mySelectedAssessmentList.clear();
GetAssessmentReqModel getAssessmentReqModel = GetAssessmentReqModel(
patientMRN: widget.patientInfo.patientMRN,
episodeID: widget.patientInfo.episodeNo.toString(),
editedBy: '',
doctorID: '',
appointmentNo: widget.patientInfo.appointmentNo);
await model.getPatientAssessment(getAssessmentReqModel);
if (model.patientAssessmentList.isNotEmpty) {
if (model.listOfDiagnosisCondition.length == 0) {
await model.getMasterLookup(MasterKeysService.DiagnosisCondition);
}
if (model.listOfDiagnosisType.length == 0) {
await model.getMasterLookup(MasterKeysService.DiagnosisType);
}
if (model.listOfICD10.length == 0) {
await model.getMasterLookup(MasterKeysService.ICD10);
}
model.patientAssessmentList.forEach((element) {
MasterKeyModel diagnosisType = model.getOneMasterKey(
masterKeys: MasterKeysService.DiagnosisType,
id: element.diagnosisTypeID,
);
MasterKeyModel selectedICD = model.getOneMasterKey(
masterKeys: MasterKeysService.ICD10,
id: element.icdCode10ID,
);
MasterKeyModel diagnosisCondition = model.getOneMasterKey(
masterKeys: MasterKeysService.DiagnosisCondition,
id: element.conditionID,
);
if (diagnosisCondition != null &&
diagnosisType != null &&
diagnosisCondition != null) {
MySelectedAssessment temMySelectedAssessment =
MySelectedAssessment(
appointmentId: element.appointmentNo,
remark: element.remarks,
selectedDiagnosisType: diagnosisType,
selectedDiagnosisCondition: diagnosisCondition,
selectedICD: selectedICD,
doctorID: element.doctorID,
doctorName: element.doctorName,
createdBy: element.createdBy,
createdOn: element.createdOn,
icdCode10ID: element.icdCode10ID);
widget.changeLoadingState(false);
},
builder: (_, model, w) => AppScaffold(
isShowAppBar: false,
// baseViewModel: model,
body: SingleChildScrollView(
physics: ScrollPhysics(),
child: Container(
color: Color(0xffF8F8F8),
child: Center(
child: FractionallySizedBox(
widthFactor: 0.9,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
height: 30,
widget.mySelectedAssessmentList.add(temMySelectedAssessment);
}
});
}
widget.changeLoadingState(false);
},
builder: (_, model, w) => AppScaffold(
isShowAppBar: false,
// baseViewModel: model,
body: SingleChildScrollView(
physics: ScrollPhysics(),
child: Container(
color: Color(0xffF8F8F8),
child: Center(
child: FractionallySizedBox(
widthFactor: 0.9,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
height: 30,
),
Container(
width: double.infinity,
margin: EdgeInsets.only(top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
Container(
width: double.infinity,
margin: EdgeInsets.only(top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
border: Border.all(color: Colors.grey[200], width: 0.5),
),
child: HeaderBodyExpandableNotifier(
headerWidget: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: EdgeInsets.all(12.0),
child: Row(
children: [
Texts(TranslationBase.of(context).assessment,
variant:
isAssessmentExpand ? "bodyText" : '',
bold: isAssessmentExpand ? true : false,
color: Colors.black),
Icon(
FontAwesomeIcons.asterisk,
color: Colors.black,
size: 10,
)
],
),
),
border:
Border.all(color: Colors.grey[200], width: 0.5),
InkWell(
onTap: () {
setState(() {
isAssessmentExpand = !isAssessmentExpand;
});
},
child: Icon(isAssessmentExpand
? EvaIcons.arrowUp
: EvaIcons.arrowDown))
],
),
bodyWidget: Column(children: [
SizedBox(
height: 20,
),
child: HeaderBodyExpandableNotifier(
headerWidget: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: EdgeInsets.all(12.0),
child: Row(
children: [
Texts(
TranslationBase.of(context)
.assessment,
variant: isAssessmentExpand
? "bodyText"
: '',
bold:
isAssessmentExpand ? true : false,
color: Colors.black),
Icon(
FontAwesomeIcons.asterisk,
color: Colors.black,
size: 10,
)
],
),
),
InkWell(
onTap: () {
setState(() {
isAssessmentExpand =
!isAssessmentExpand;
});
Column(
children: [
Container(
margin:
EdgeInsets.only(left: 5, right: 5, top: 15),
child: TextFields(
hintText: TranslationBase.of(context)
.addAssessment,
fontSize: 13.5,
onTapTextFields: () {
openAssessmentDialog(context,
isUpdate: false, model: model);
},
child: Icon(isAssessmentExpand
? EvaIcons.arrowUp
: EvaIcons.arrowDown))
],
),
bodyWidget: Column(children: [
readOnly: true,
suffixIcon: EvaIcons.plusSquare,
suffixIconColor: Colors.black,
fontWeight: FontWeight.w600,
validator: (value) {
if (value == null)
return TranslationBase.of(context)
.emptyMessage;
else
return null;
}),
),
SizedBox(
height: 20,
),
Column(
children: [
Container(
children: widget.mySelectedAssessmentList
.map((assessment) {
return Container(
margin: EdgeInsets.only(
left: 5, right: 5, top: 15),
child: TextFields(
hintText: TranslationBase.of(context)
.addAssessment,
fontSize: 13.5,
onTapTextFields: () {
openAssessmentDialog(context,
isUpdate: false, model: model);
},
readOnly: true,
suffixIcon: EvaIcons.plusSquare,
suffixIconColor: Colors.black,
fontWeight: FontWeight.w600,
validator: (value) {
if (value == null)
return TranslationBase.of(context)
.emptyMessage;
else
return null;
}),
),
SizedBox(
height: 20,
),
Column(
children: widget.mySelectedAssessmentList
.map((assessment) {
return Container(
margin: EdgeInsets.only(
left: 5, right: 5, top: 15),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Column(
Row(
children: [
AppText(
"ICD : ".toUpperCase(),
fontSize: 10,
color: Colors.grey,
),
Container(
child: AppText(
assessment.selectedICD.code
.trim()
.toUpperCase() ??
"",
fontWeight: FontWeight.w700,
fontSize: 11,
),
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Row(
children: [
AppText(
"ICD : ".toUpperCase(),
fontSize: 10,
color: Colors.grey,
),
Container(
child: AppText(
assessment.selectedICD
.code
.trim()
.toUpperCase() ??
"",
fontWeight:
FontWeight.w700,
fontSize: 11,
),
),
],
AppText(
TranslationBase.of(context)
.ICDName +
" : ",
fontSize: 13,
color: Colors.grey,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(
context)
.ICDName +
" : ",
fontSize: 13,
color: Colors.grey,
),
Container(
width:
MediaQuery.of(context)
.size
.width *
0.29,
child: AppText(
assessment.selectedICD
.description
.toString(),
fontWeight:
FontWeight.w700,
fontSize: 10,
),
),
],
Container(
width: MediaQuery.of(context)
.size
.width *
0.29,
child: AppText(
assessment
.selectedICD.description
.toString(),
fontWeight: FontWeight.w700,
fontSize: 10,
),
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(
context)
.appointmentNo,
fontSize: 10,
color: Colors.grey,
),
AppText(
assessment.appointmentId
.toString(),
fontSize: 11,
fontWeight:
FontWeight.w700,
),
],
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.appointmentNo,
fontSize: 10,
color: Colors.grey,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(
context)
.condition +
" : ",
fontSize: 10,
color: Colors.grey,
),
AppText(
projectViewModel.isArabic
? assessment
.selectedDiagnosisCondition
.nameAr
: assessment
.selectedDiagnosisCondition
.nameEn,
fontSize: 11,
fontWeight:
FontWeight.w700,
),
],
AppText(
assessment.appointmentId
.toString(),
fontSize: 11,
fontWeight: FontWeight.w700,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(
context)
.dType +
' : ',
fontSize: 10,
color: Colors.grey,
),
AppText(
projectViewModel.isArabic
? assessment
.selectedDiagnosisType
.nameAr
: assessment
.selectedDiagnosisType
.nameEn,
fontSize: 11,
fontWeight:
FontWeight.w700,
),
],
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.condition +
" : ",
fontSize: 10,
color: Colors.grey,
),
if (assessment.doctorName !=
null)
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(
context)
.doc,
fontSize: 10,
color: Colors.grey,
),
AppText(
assessment.doctorName ??
'',
fontSize: 11,
fontWeight:
FontWeight.w700,
),
],
AppText(
projectViewModel.isArabic
? assessment
.selectedDiagnosisCondition
.nameAr
: assessment
.selectedDiagnosisCondition
.nameEn,
fontSize: 11,
fontWeight: FontWeight.w700,
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.dType +
' : ',
fontSize: 10,
color: Colors.grey,
),
AppText(
projectViewModel.isArabic
? assessment
.selectedDiagnosisType
.nameAr
: assessment
.selectedDiagnosisType
.nameEn,
fontSize: 11,
fontWeight: FontWeight.w700,
),
],
),
if (assessment.doctorName != null)
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.doc,
fontSize: 10,
color: Colors.grey,
),
AppText(
assessment.doctorName ?? '',
fontSize: 11,
fontWeight: FontWeight.w700,
),
],
),
SizedBox(
height: 6,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
SizedBox(
height: 6,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
SizedBox(
height: 6,
),
AppText(
assessment.remark !=
null ||
assessment
.remark ==
''
? TranslationBase.of(
context)
.remarks +
" : "
: '',
fontSize: 10,
color: Colors.grey,
),
Container(
width:
MediaQuery.of(context)
.size
.width *
0.38,
child: AppText(
assessment.remark ?? "",
fontSize: 11,
fontWeight:
FontWeight.w700,
),
),
],
AppText(
assessment.remark != null ||
assessment.remark ==
''
? TranslationBase.of(
context)
.remarks +
" : "
: '',
fontSize: 10,
color: Colors.grey,
),
Container(
width: MediaQuery.of(context)
.size
.width *
0.38,
child: AppText(
assessment.remark ?? "",
fontSize: 11,
fontWeight: FontWeight.w700,
),
),
],
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
],
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Row(
children: [
Row(
children: [
AppText(
assessment.createdOn !=
AppText(
assessment.createdOn != null
? DateTime.parse(
assessment
.createdOn)
.day
.toString()
: DateTime.now()
.day
.toString(),
fontWeight: FontWeight.bold,
fontSize: 15,
),
AppText(" "),
AppText(
Helpers.getMonth(assessment
.createdOn !=
null
? DateTime.parse(
assessment
.createdOn)
.day
.toString()
.month
: DateTime.now()
.day
.toString(),
fontWeight:
FontWeight.bold,
fontSize: 15,
),
AppText(" "),
AppText(
Helpers.getMonth(assessment
.createdOn !=
null
? DateTime.parse(
assessment
.createdOn)
.month
: DateTime.now()
.month)
.toUpperCase(),
fontSize: 13,
color: Colors.grey,
),
],
),
SizedBox(
height: MediaQuery.of(context)
.size
.height *
0.05,
.month)
.toUpperCase(),
fontSize: 13,
color: Colors.grey,
),
InkWell(
onTap: () {
openAssessmentDialog(
context,
isUpdate: true,
assessment: assessment,
model: model);
},
child: Icon(EvaIcons.edit2),
)
],
),
// Column(
// children: [
// // SizedBox(
// // height: 60,
// // ),
// InkWell(
// onTap: () {
// openAssessmentDialog(
// context,
// isUpdate: true,
// assessment: assessment,
// model: model);
// },
// child: Icon(EvaIcons.edit2),
// )
// ],
// ),
SizedBox(
height: MediaQuery.of(context)
.size
.height *
0.05,
),
InkWell(
onTap: () {
openAssessmentDialog(context,
isUpdate: true,
assessment: assessment,
model: model);
},
child: Icon(EvaIcons.edit2),
)
],
),
);
}).toList(),
)
],
// Column(
// children: [
// // SizedBox(
// // height: 60,
// // ),
// InkWell(
// onTap: () {
// openAssessmentDialog(
// context,
// isUpdate: true,
// assessment: assessment,
// model: model);
// },
// child: Icon(EvaIcons.edit2),
// )
// ],
// ),
],
),
);
}).toList(),
)
]),
isExpand: isAssessmentExpand,
),
),
DividerWithSpacesAround(
height: 30,
),
Row(
children: [
Container(
width: MediaQuery.of(context).size.width * 0.4,
child: AppButton(
title: 'Previous',
color: Colors.white38,
fontColor: Colors.black,
fontWeight: FontWeight.w700,
loading: model.state == ViewState.BusyLocal,
onPressed: () async {
Navigator.pop(context);
},
),
),
SizedBox(
width: MediaQuery.of(context).size.width * 0.05,
),
Container(
width: MediaQuery.of(context).size.width * 0.4,
child: AppButton(
title: TranslationBase.of(context).next,
fontWeight: FontWeight.w700,
loading: model.state == ViewState.BusyLocal,
onPressed: () async {
if (widget.mySelectedAssessmentList.isEmpty) {
helpers.showErrorToast(
TranslationBase.of(context)
.assessmentErrorMsg);
} else {
widget.changePageViewIndex(3);
widget.changeLoadingState(true);
}
},
),
),
],
),
SizedBox(
height: 30,
),
],
],
)
]),
isExpand: isAssessmentExpand,
),
),
),
DividerWithSpacesAround(
height: 30,
),
// Row(
// children: [
// Container(
// width: MediaQuery.of(context).size.width * 0.4,
// child: AppButton(
// title: 'Previous',
// color: Colors.white38,
// fontColor: Colors.black,
// fontWeight: FontWeight.w700,
// loading: model.state == ViewState.BusyLocal,
// onPressed: () async {
// Navigator.pop(context);
// },
// ),
// ),
// SizedBox(
// width: MediaQuery.of(context).size.width * 0.05,
// ),
// Container(
// width: MediaQuery.of(context).size.width * 0.4,
// child: AppButton(
// title: TranslationBase.of(context).next,
// fontWeight: FontWeight.w700,
// loading: model.state == ViewState.BusyLocal,
// onPressed: () async {
// if (widget.mySelectedAssessmentList.isEmpty) {
// helpers.showErrorToast(
// TranslationBase.of(context)
// .assessmentErrorMsg);
// } else {
// widget.changePageViewIndex(3);
// widget.changeLoadingState(true);
// }
// },
// ),
// ),
// ],
// ),
SizedBox(
height: 130,
),
],
),
),
),
),
),
bottomSheet: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: MediaQuery.of(context).size.width * 0.4,
child: AppButton(
title: 'Previous',
color: Colors.white38,
fontColor: Colors.black,
fontWeight: FontWeight.w700,
loading: model.state == ViewState.BusyLocal,
onPressed: () async {
Navigator.pop(context);
},
),
),
)));
SizedBox(
width: MediaQuery.of(context).size.width * 0.05,
),
Container(
width: MediaQuery.of(context).size.width * 0.4,
child: AppButton(
title: TranslationBase.of(context).next,
fontWeight: FontWeight.w700,
loading: model.state == ViewState.BusyLocal,
onPressed: () async {
if (widget.mySelectedAssessmentList.isEmpty) {
helpers.showErrorToast(
TranslationBase.of(context).assessmentErrorMsg);
} else {
widget.changePageViewIndex(3);
widget.changeLoadingState(true);
}
},
),
),
],
),
),
),
);
}
openAssessmentDialog(BuildContext context,

Write Preview
Loading…
Cancel
Save