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

drug list

Browse Source
merge-requests/234/head
hussam al-habibeh 4 years ago
parent 76cc4d11f8
commit f997561bb8
8 changed files with 1340 additions and 903 deletions
Show Stats Download Patch File Download Diff File

10
lib/core/service/prescription_service.dart
Unescape Escape View File

@ -11,6 +11,8 @@ class PrescriptionService extends BaseService {
List<PrescriptionModel> get prescriptionList => _prescriptionList; List<PrescriptionModel> get prescriptionList => _prescriptionList;
List<SearchDrugModel> _drugsList = List(); List<SearchDrugModel> _drugsList = List();
List<SearchDrugModel> get drugsList => _drugsList; List<SearchDrugModel> get drugsList => _drugsList;
List<dynamic> doctorsList = [];
List<dynamic> specialityList = [];
PrescriptionReqModel _prescriptionReqModel = PrescriptionReqModel( PrescriptionReqModel _prescriptionReqModel = PrescriptionReqModel(
patientMRN: 3120877, patientMRN: 3120877,
@ -26,7 +28,8 @@ class PrescriptionService extends BaseService {
PostPrescriptionReqModel _postPrescriptionReqModel = PostPrescriptionReqModel _postPrescriptionReqModel =
PostPrescriptionReqModel(); PostPrescriptionReqModel();
Future getPrescription() async { Future getPrescription({int mrn}) async {
_prescriptionReqModel = PrescriptionReqModel(patientMRN: 3120877);
hasError = false; hasError = false;
_prescriptionList.clear(); _prescriptionList.clear();
await baseAppClient.post(GET_PRESCRIPTION_LIST, await baseAppClient.post(GET_PRESCRIPTION_LIST,
@ -41,10 +44,11 @@ class PrescriptionService extends BaseService {
Future getDrugs() async { Future getDrugs() async {
hasError = false; hasError = false;
_drugsList.clear();
await baseAppClient.post(SEARCH_DRUG, await baseAppClient.post(SEARCH_DRUG,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_drugsList.add(SearchDrugModel.fromJson(response['MedicationList'])); doctorsList = [];
doctorsList = response['MedicationList']['entityList'];
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;

14
lib/core/viewModel/prescription_view_model.dart
Unescape Escape View File

@ -12,13 +12,13 @@ class PrescriptionViewModel extends BaseViewModel {
List<PrescriptionModel> get prescriptionList => List<PrescriptionModel> get prescriptionList =>
_prescriptionService.prescriptionList; _prescriptionService.prescriptionList;
List<SearchDrugModel> get drugsList => _prescriptionService.drugsList; List<dynamic> get drugsList => _prescriptionService.doctorsList;
Future getPrescription() async { Future getPrescription({int mrn}) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _prescriptionService.getPrescription(); await _prescriptionService.getPrescription(mrn: mrn);
if (_prescriptionService.hasError) { if (_prescriptionService.hasError) {
error = _prescriptionService.error; error = _prescriptionService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
@ -27,7 +27,7 @@ class PrescriptionViewModel extends BaseViewModel {
} }
Future postPrescription( Future postPrescription(
PostPrescriptionReqModel postProcedureReqModel) async { PostPrescriptionReqModel postProcedureReqModel, int mrn) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
@ -36,13 +36,13 @@ class PrescriptionViewModel extends BaseViewModel {
error = _prescriptionService.error; error = _prescriptionService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
await getPrescription(); await getPrescription(mrn: mrn);
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }
Future updatePrescription( Future updatePrescription(
PostPrescriptionReqModel updatePrescriptionReqModel) async { PostPrescriptionReqModel updatePrescriptionReqModel, int mrn) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
@ -51,7 +51,7 @@ class PrescriptionViewModel extends BaseViewModel {
error = _prescriptionService.error; error = _prescriptionService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
await getPrescription(); await getPrescription(mrn: mrn);
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }

119
lib/screens/patients/profile/admission-request/admission-request-detail-screen.dart
Unescape Escape View File

@ -124,7 +124,10 @@ class _AdmissionRequestDetailScreenState
ListSelectDialog dialog = ListSelectDialog dialog =
ListSelectDialog( ListSelectDialog(
list: model.speciality, list: model.speciality,
attributeName: model.selectedLanguage == 'ar' ? 'nameAr' :'nameEn' , attributeName:
model.selectedLanguage == 'ar'
? 'nameAr'
: 'nameEn',
attributeValueId: 'id', attributeValueId: 'id',
okText: okText:
TranslationBase.of(context) TranslationBase.of(context)
@ -149,7 +152,12 @@ class _AdmissionRequestDetailScreenState
TranslationBase.of(context) TranslationBase.of(context)
.speciality, .speciality,
_selectedSpeciality != null _selectedSpeciality != null
? model.selectedLanguage == 'ar' ? _selectedSpeciality['nameAr'] : _selectedSpeciality['nameEn'] ? model.selectedLanguage ==
'ar'
? _selectedSpeciality[
'nameAr']
: _selectedSpeciality[
'nameEn']
: null, : null,
true), true),
enabled: false, enabled: false,
@ -163,36 +171,42 @@ class _AdmissionRequestDetailScreenState
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: model.doctorsList != null && onTap: model.doctorsList != null &&
model.doctorsList.length > 0 model.doctorsList.length > 0
? () { ? () {
ListSelectDialog dialog = ListSelectDialog dialog =
ListSelectDialog( ListSelectDialog(
list: model.doctorsList, list: model.doctorsList,
attributeName: 'DoctorName', attributeName: 'DoctorName',
attributeValueId: 'DoctorID', attributeValueId: 'DoctorID',
okText: TranslationBase.of(context).ok, okText:
okFunction: (selectedValue) { TranslationBase.of(context)
setState(() { .ok,
_selectedDoctor = selectedValue; okFunction: (selectedValue) {
}); setState(() {
}, _selectedDoctor =
); selectedValue;
showDialog( });
barrierDismissible: false, },
context: context, );
builder: (BuildContext context) { showDialog(
return dialog; barrierDismissible: false,
}, context: context,
); builder: (BuildContext context) {
} return dialog;
},
);
}
: null, : null,
child: TextField( child: TextField(
decoration: Helpers.textFieldSelectorDecoration( decoration:
TranslationBase.of(context).doctor, Helpers.textFieldSelectorDecoration(
_selectedDoctor != null TranslationBase.of(context)
? _selectedDoctor['DoctorName'] .doctor,
: null, _selectedDoctor != null
true), ? _selectedDoctor[
'DoctorName']
: null,
true),
enabled: false, enabled: false,
), ),
), ),
@ -202,23 +216,22 @@ class _AdmissionRequestDetailScreenState
), ),
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
decoration: decoration: Helpers.containerBorderDecoration(
Helpers.containerBorderDecoration( Color(0xFFEEEEEE), Color(0xFFCCCCCC),
Color(0xFFEEEEEE),
Color(0xFFCCCCCC),
borderWidth: 0.0), borderWidth: 0.0),
child: InkWell( child: InkWell(
onTap: () => null, onTap: () => null,
child: TextField( child: TextField(
decoration: decoration:
Helpers.textFieldSelectorDecoration( Helpers.textFieldSelectorDecoration(
TranslationBase.of(context).referringDate, TranslationBase.of(context)
null, .referringDate,
true, null,
suffixIcon: Icon( true,
Icons.calendar_today, suffixIcon: Icon(
color: Color(0xFFCCCCCC), Icons.calendar_today,
)), color: Color(0xFFCCCCCC),
)),
enabled: false, enabled: false,
), ),
), ),
@ -228,17 +241,19 @@ class _AdmissionRequestDetailScreenState
), ),
Container( Container(
decoration: decoration:
Helpers.containerBorderDecoration( Helpers.containerBorderDecoration(
Color(0xFFEEEEEE), Color(0xFFEEEEEE),
Color(0xFFCCCCCC), Color(0xFFCCCCCC),
borderWidth: 0.0), borderWidth: 0.0),
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: TextField( child: TextField(
decoration: decoration:
Helpers.textFieldSelectorDecoration( Helpers.textFieldSelectorDecoration(
TranslationBase.of(context).referringDoctor, TranslationBase.of(context)
null, .referringDoctor,
true, dropDownColor: Color(0xFFCCCCCC)), null,
true,
dropDownColor: Color(0xFFCCCCCC)),
enabled: false, enabled: false,
// controller: _remarksController, // controller: _remarksController,
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
@ -255,8 +270,10 @@ class _AdmissionRequestDetailScreenState
child: AppButton( child: AppButton(
title: TranslationBase.of(context).next, title: TranslationBase.of(context).next,
color: HexColor("#B8382B"), color: HexColor("#B8382B"),
onPressed: (){ onPressed: () {
Navigator.of(context).pushNamed(PATIENT_ADMISSION_REQUEST_2, arguments: {'patient': patient}); Navigator.of(context).pushNamed(
PATIENT_ADMISSION_REQUEST_2,
arguments: {'patient': patient});
}, },
), ),
), ),

129
lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
Unescape Escape View File

@ -139,13 +139,13 @@ class _AdmissionRequestSecondScreenState
_emergencyAdmission = newValue; _emergencyAdmission = newValue;
}); });
}, },
controlAffinity: ListTileControlAffinity.leading, controlAffinity:
ListTileControlAffinity.leading,
contentPadding: EdgeInsets.all(0), contentPadding: EdgeInsets.all(0),
), ),
CheckboxListTile( CheckboxListTile(
title: AppText( title: AppText(
TranslationBase.of(context) TranslationBase.of(context).patientPregnant,
.patientPregnant,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: SizeConfig.textMultiplier * 2.1, fontSize: SizeConfig.textMultiplier * 2.1,
), ),
@ -155,28 +155,32 @@ class _AdmissionRequestSecondScreenState
_patientPregnant = newValue; _patientPregnant = newValue;
}); });
}, },
controlAffinity: ListTileControlAffinity.leading, controlAffinity:
ListTileControlAffinity.leading,
contentPadding: EdgeInsets.all(0), contentPadding: EdgeInsets.all(0),
), ),
Container( Container(
child: TextField( child: TextField(
decoration: Helpers.textFieldSelectorDecoration( decoration:
TranslationBase.of(context).treatmentLine, Helpers.textFieldSelectorDecoration(
TranslationBase.of(context)
.treatmentLine,
null, null,
false), false),
enabled: true, enabled: true,
controller: _treatmentLineController, controller: _treatmentLineController,
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
minLines: 4, minLines: 4,
maxLines: 6, maxLines: 6,
)), )),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: /*model.doctorsList != null && onTap:
/*model.doctorsList != null &&
model.doctorsList.length > 0 model.doctorsList.length > 0
? () { ? () {
ListSelectDialog dialog = ListSelectDialog dialog =
@ -199,14 +203,17 @@ class _AdmissionRequestSecondScreenState
}, },
); );
} }
:*/ null, :*/
null,
child: TextField( child: TextField(
decoration: Helpers.textFieldSelectorDecoration( decoration:
TranslationBase.of(context).ward, Helpers.textFieldSelectorDecoration(
/* _selectedWard != null TranslationBase.of(context).ward,
/* _selectedWard != null
? _selectedWard['DoctorName'] ? _selectedWard['DoctorName']
:*/ null, :*/
true), null,
true),
enabled: false, enabled: false,
), ),
), ),
@ -224,13 +231,15 @@ class _AdmissionRequestSecondScreenState
_preAnesthesiaReferred = newValue; _preAnesthesiaReferred = newValue;
}); });
}, },
controlAffinity: ListTileControlAffinity.leading, controlAffinity:
ListTileControlAffinity.leading,
contentPadding: EdgeInsets.all(0), contentPadding: EdgeInsets.all(0),
), ),
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: /*model.doctorsList != null && onTap:
/*model.doctorsList != null &&
model.doctorsList.length > 0 model.doctorsList.length > 0
? () { ? () {
ListSelectDialog dialog = ListSelectDialog dialog =
@ -253,14 +262,18 @@ class _AdmissionRequestSecondScreenState
}, },
); );
} }
:*/ null, :*/
null,
child: TextField( child: TextField(
decoration: Helpers.textFieldSelectorDecoration( decoration:
TranslationBase.of(context).admissionType, Helpers.textFieldSelectorDecoration(
/* _admissionType != null TranslationBase.of(context)
.admissionType,
/* _admissionType != null
? _admissionType['DoctorName'] ? _admissionType['DoctorName']
:*/ null, :*/
true), null,
true),
enabled: false, enabled: false,
), ),
), ),
@ -271,7 +284,8 @@ class _AdmissionRequestSecondScreenState
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: /*model.doctorsList != null && onTap:
/*model.doctorsList != null &&
model.doctorsList.length > 0 model.doctorsList.length > 0
? () { ? () {
ListSelectDialog dialog = ListSelectDialog dialog =
@ -294,14 +308,18 @@ class _AdmissionRequestSecondScreenState
}, },
); );
} }
:*/ null, :*/
null,
child: TextField( child: TextField(
decoration: Helpers.textFieldSelectorDecoration( decoration:
TranslationBase.of(context).diagnosis, Helpers.textFieldSelectorDecoration(
/* _admissionType != null TranslationBase.of(context)
.diagnosis,
/* _admissionType != null
? _admissionType['DoctorName'] ? _admissionType['DoctorName']
:*/ null, :*/
true), null,
true),
enabled: false, enabled: false,
), ),
), ),
@ -311,23 +329,26 @@ class _AdmissionRequestSecondScreenState
), ),
Container( Container(
child: TextField( child: TextField(
decoration: Helpers.textFieldSelectorDecoration( decoration:
TranslationBase.of(context).preOperativeOrders, Helpers.textFieldSelectorDecoration(
TranslationBase.of(context)
.preOperativeOrders,
null, null,
false), false),
enabled: true, enabled: true,
controller: _preOperativeOrdersController, controller: _preOperativeOrdersController,
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
minLines: 4, minLines: 4,
maxLines: 6, maxLines: 6,
)), )),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: /*model.doctorsList != null && onTap:
/*model.doctorsList != null &&
model.doctorsList.length > 0 model.doctorsList.length > 0
? () { ? () {
ListSelectDialog dialog = ListSelectDialog dialog =
@ -350,14 +371,18 @@ class _AdmissionRequestSecondScreenState
}, },
); );
} }
:*/ null, :*/
null,
child: TextField( child: TextField(
decoration: Helpers.textFieldSelectorDecoration( decoration:
TranslationBase.of(context).allergies, Helpers.textFieldSelectorDecoration(
/* _admissionType != null TranslationBase.of(context)
.allergies,
/* _admissionType != null
? _admissionType['DoctorName'] ? _admissionType['DoctorName']
:*/ null, :*/
true), null,
true),
enabled: false, enabled: false,
), ),
), ),
@ -374,8 +399,10 @@ class _AdmissionRequestSecondScreenState
child: AppButton( child: AppButton(
title: TranslationBase.of(context).next, title: TranslationBase.of(context).next,
color: HexColor("#B8382B"), color: HexColor("#B8382B"),
onPressed: (){ onPressed: () {
Navigator.of(context).pushNamed(PATIENT_ADMISSION_REQUEST_3, arguments: {'patient': patient}); Navigator.of(context).pushNamed(
PATIENT_ADMISSION_REQUEST_3,
arguments: {'patient': patient});
}, },
), ),
), ),

1046
lib/screens/prescription/add_prescription_form.dart
View File

File diff suppressed because it is too large Load Diff

914
lib/screens/prescription/prescription_screen.dart
Unescape Escape View File

@ -33,452 +33,535 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final screenSize = MediaQuery.of(context).size;
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient']; patient = routeArgs['patient'];
return BaseView<PrescriptionViewModel>( return BaseView<PrescriptionViewModel>(
onModelReady: (model) => model.getPrescription(), onModelReady: (model) => model.getPrescription(mrn: patient.patientMRN),
builder: (BuildContext context, PrescriptionViewModel model, builder:
Widget child) => (BuildContext context, PrescriptionViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).prescription, appBarTitle: TranslationBase.of(context).prescription,
body: NetworkBaseView( body: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
AvatarWidget( AvatarWidget(
Icon( Icon(
patient.genderDescription == "Male" patient.genderDescription == "Male"
? DoctorApp.male ? DoctorApp.male
: DoctorApp.female_icon, : DoctorApp.female_icon,
size: 70, size: 70,
color: Colors.white, color: Colors.white,
),
),
SizedBox(
width: 20,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
patient.firstName + ' ' + patient.lastName,
color: Colors.black,
fontWeight: FontWeight.bold,
),
if (model.prescriptionList.length > 0)
Row(
children: [
AppText(
TranslationBase.of(context).age2,
color: Colors.black,
fontWeight: FontWeight.bold,
),
SizedBox(
width: 5.0,
),
AppText(
patient.age.toString(),
color: Colors.black,
fontWeight: FontWeight.normal,
),
],
), ),
AppText(
"ALLERGIC TO: FOOD, ASPIRIN",
color: Color(0xFFB9382C),
fontWeight: FontWeight.bold,
), ),
], SizedBox(
) width: 20,
], ),
), Column(
), crossAxisAlignment:
Divider( CrossAxisAlignment.start,
height: 1.0, children: [
thickness: 1.0, AppText(
color: Colors.grey, patient.firstName +
), ' ' +
if (model.prescriptionList.length != 0) patient.lastName,
SizedBox( color: Colors.black,
height: model.prescriptionList[0].rowcount == 0 fontWeight: FontWeight.bold,
? 200.0 ),
: 10.0), //if (model.prescriptionList.length > 0)
//model.prescriptionList == null Row(
if (model.prescriptionList.length != 0) children: [
model.prescriptionList[0].rowcount == 0 AppText(
? Column( TranslationBase.of(context).age2,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.stretch,
children: [
InkWell(
onTap: () {
addPrescriptionForm(context, model);
//model.postPrescription();
},
child: CircleAvatar(
radius: 65,
backgroundColor: Color(0XFFB8382C),
child: CircleAvatar(
radius: 60,
backgroundColor: Colors.white,
child: Icon(
Icons.add,
color: Colors.black, color: Colors.black,
size: 45.0, fontWeight: FontWeight.bold,
), ),
), SizedBox(
width: 5.0,
),
AppText(
patient.age.toString(),
color: Colors.black,
fontWeight: FontWeight.normal,
),
],
), ),
), AppText(
SizedBox( "ALLERGIC TO: FOOD, ASPIRIN",
height: 15.0, color: Color(0xFFB9382C),
), fontWeight: FontWeight.bold,
Row( ),
mainAxisAlignment: ],
MainAxisAlignment.center, )
children: [ ],
AppText( ),
TranslationBase.of(context) ),
.noPrescriptionListed, Divider(
color: Colors.black, height: 1.0,
fontWeight: FontWeight.w900, thickness: 1.0,
), color: Colors.grey,
], ),
), (model.prescriptionList.length != 0)
Row( ? SizedBox(
mainAxisAlignment: height:
MainAxisAlignment.center, model.prescriptionList[0].rowcount == 0
children: [ ? 200.0
AppText( : 10.0)
TranslationBase.of(context).addNow, : SizedBox(height: 200.0),
color: Color(0XFFB8382C), //model.prescriptionList == null
fontWeight: FontWeight.w900, (model.prescriptionList.length != 0)
), ? model.prescriptionList[0].rowcount == 0
], ? Column(
), mainAxisAlignment:
], MainAxisAlignment.center,
) crossAxisAlignment:
: Padding( CrossAxisAlignment.stretch,
padding: EdgeInsets.all(14.0), children: [
child: NetworkBaseView( InkWell(
baseViewModel: model, onTap: () {
child: Column( addPrescriptionForm(
mainAxisAlignment: context, model, patient);
MainAxisAlignment.start, //model.postPrescription();
children: [ },
InkWell( child: CircleAvatar(
child: Container( radius: 65,
height: 50.0, backgroundColor:
width: 450.0, Color(0XFFB8382C),
decoration: BoxDecoration( child: CircleAvatar(
border: Border.all( radius: 60,
color: Colors.grey), backgroundColor: Colors.white,
borderRadius: child: Icon(
BorderRadius.circular(10.0), Icons.add,
), color: Colors.black,
child: Padding( size: 45.0,
padding: EdgeInsets.all(8.0), ),
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
AppText(
' Add more medication',
fontWeight: FontWeight.w100,
fontSize: 12.5,
),
Icon(
Icons.add,
color: Color(0XFFB8382C),
)
],
), ),
), ),
), ),
onTap: () { SizedBox(
addPrescriptionForm(context, model); height: 15.0,
//model.postPrescription(); ),
}, Row(
), mainAxisAlignment:
SizedBox( MainAxisAlignment.center,
height: 15.0, children: [
), AppText(
...List.generate( TranslationBase.of(context)
model.prescriptionList[0].rowcount, .noPrescriptionListed,
(index) => Container( color: Colors.black,
//height: 240, fontWeight: FontWeight.w900,
child: Column( ),
children: [ ],
Row( ),
mainAxisAlignment: Row(
MainAxisAlignment mainAxisAlignment:
.spaceBetween, MainAxisAlignment.center,
// crossAxisAlignment: children: [
// CrossAxisAlignment.start, AppText(
children: [ TranslationBase.of(context)
Container( .addNow,
height: color: Color(0XFFB8382C),
MediaQuery.of(context) fontWeight: FontWeight.w900,
.size ),
.height * ],
0.23, ),
width: ],
MediaQuery.of(context) )
.size : Padding(
.width * padding: EdgeInsets.all(14.0),
0.09, child: NetworkBaseView(
child: Column( baseViewModel: model,
children: [ child: Column(
AppText( mainAxisAlignment:
'8\nDEC', MainAxisAlignment.start,
color: Colors.green, children: [
) InkWell(
], child: Container(
), height: 50.0,
width: 450.0,
decoration: BoxDecoration(
border: Border.all(
color: Colors.grey),
borderRadius:
BorderRadius.circular(
10.0),
),
child: Padding(
padding:
EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
AppText(
' Add more medication',
fontWeight:
FontWeight.w100,
fontSize: 12.5,
),
Icon(
Icons.add,
color:
Color(0XFFB8382C),
)
],
), ),
Container( ),
height: ),
MediaQuery.of(context) onTap: () {
.size addPrescriptionForm(
.height * context, model, patient);
0.282, //model.postPrescription();
width: },
MediaQuery.of(context) ),
.size SizedBox(
.width * height: 15.0,
0.77, ),
child: Column( ...List.generate(
model.prescriptionList[0]
.rowcount,
(index) => Container(
//height: 240,
child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
// crossAxisAlignment:
// CrossAxisAlignment.start,
children: [ children: [
Row( Container(
children: [ height: MediaQuery.of(
AppText( context)
'Start Date:', .size
fontWeight: .height *
FontWeight 0.23,
.w700, width: MediaQuery.of(
fontSize: 14.0, context)
), .size
Expanded( .width *
child: AppText( 0.09,
model child: Column(
.prescriptionList[ children: [
0] AppText(
.entityList[ '8\nDEC',
index] color: Colors
.startDate, .green,
fontSize: )
12.0, ],
),
),
Container(
height: MediaQuery.of(
context)
.size
.height *
0.282,
width: MediaQuery.of(
context)
.size
.width *
0.77,
child: Column(
children: [
Row(
children: [
AppText(
'Start Date:',
fontWeight:
FontWeight
.w700,
fontSize:
14.0,
),
Expanded(
child:
AppText(
model
.prescriptionList[0]
.entityList[index]
.startDate,
fontSize:
12.0,
),
),
SizedBox(
width:
6.0,
),
AppText(
'Order Type:',
fontWeight:
FontWeight
.w700,
fontSize:
14.0,
),
Expanded(
child:
AppText(
model
.prescriptionList[0]
.entityList[index]
.orderTypeDescription,
fontSize:
13.0,
),
),
],
), ),
), SizedBox(
SizedBox( height: 5.5,
width: 6.0,
),
AppText(
'Order Type:',
fontWeight:
FontWeight
.w700,
fontSize: 14.0,
),
Expanded(
child: AppText(
model
.prescriptionList[
0]
.entityList[
index]
.orderTypeDescription,
fontSize:
13.0,
), ),
), Row(
], children: [
), Container(
SizedBox( child:
height: 5.5, Expanded(
), child:
Row( AppText(
children: [ model
Container( .prescriptionList[0]
child: Expanded( .entityList[index]
child: .medicationName,
AppText( fontWeight:
model FontWeight.w700,
.prescriptionList[ fontSize:
0] 15.0,
.entityList[ ),
index] ),
.medicationName, )
fontWeight: ],
FontWeight
.w700,
fontSize:
15.0,
),
), ),
) SizedBox(
], height: 5.5,
),
SizedBox(
height: 5.5,
),
Row(
children: [
Expanded(
child: AppText(
model
.prescriptionList[
0]
.entityList[
index]
.doseDetail,
fontSize:
15.0,
), ),
) Row(
], children: [
), Expanded(
SizedBox( child:
height: 3.0, AppText(
), model
Row( .prescriptionList[0]
children: [ .entityList[index]
AppText( .doseDetail,
'Indication: ', fontSize:
fontWeight: 15.0,
FontWeight ),
.w700, )
fontSize: 17.0, ],
),
Expanded(
child: AppText(
model
.prescriptionList[
0]
.entityList[
index]
.indication,
fontSize:
15.0),
)
],
),
SizedBox(
height: 18.0,
),
Row(
children: [
Expanded(
child: AppText(
model
.prescriptionList[
0]
.entityList[
index]
.doctorName,
fontWeight:
FontWeight
.w700,
), ),
) SizedBox(
], height: 3.0,
), ),
Row( Row(
children: [ children: [
Expanded( AppText(
child: AppText( 'Indication: ',
model fontWeight:
.prescriptionList[ FontWeight
0] .w700,
.entityList[ fontSize:
index] 17.0,
.remarks, ),
fontSize: Expanded(
14.0, child: AppText(
model
.prescriptionList[0]
.entityList[index]
.indication,
fontSize: 15.0),
)
],
),
SizedBox(
height: 18.0,
),
Row(
children: [
Expanded(
child:
AppText(
model
.prescriptionList[0]
.entityList[index]
.doctorName,
fontWeight:
FontWeight.w700,
),
)
],
),
Row(
children: [
Expanded(
child:
AppText(
model
.prescriptionList[0]
.entityList[index]
.remarks,
fontSize:
14.0,
),
),
],
),
SizedBox(
height: 10.0,
), ),
),
],
),
SizedBox(
height: 10.0,
),
Divider( Divider(
height: 0, height: 0,
thickness: 1.0, thickness:
color: Colors.grey, 1.0,
color: Colors
.grey,
),
// SizedBox(
// height: 40,
// ),
],
),
), ),
// SizedBox( Container(
// height: 40, height: MediaQuery.of(
// ), context)
], .size
), .height *
), 0.05,
Container( width: MediaQuery.of(
height: context)
MediaQuery.of(context) .size
.size .width *
.height * 0.06,
0.05, child: Column(
width: children: [
MediaQuery.of(context) InkWell(
.size child: Icon(
.width * Icons
0.06, .edit),
child: Column( onTap: () {
children: [ updatePrescriptionForm(
InkWell( context,
child: Icon( model
Icons.edit), .prescriptionList[
onTap: () { 0]
updatePrescriptionForm( .entityList[
context, index]
model .medicationName,
.prescriptionList[ model
0] .prescriptionList[
.entityList[ 0]
index] .entityList[
.medicationName, index]
model .medicineCode,
.prescriptionList[ model,
0] );
.entityList[ //model.postPrescription();
index] },
.medicineCode, ),
model, ],
); ),
//model.postPrescription();
},
), ),
], ],
), ),
), ],
], ),
), ),
], ),
],
),
),
)
: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.stretch,
children: [
InkWell(
onTap: () {
addPrescriptionForm(
context, model, patient);
//model.postPrescription();
},
child: CircleAvatar(
radius: 65,
backgroundColor: Color(0XFFB8382C),
child: CircleAvatar(
radius: 60,
backgroundColor: Colors.white,
child: Icon(
Icons.add,
color: Colors.black,
size: 45.0,
), ),
), ),
), ),
], ),
), SizedBox(
), height: 15.0,
) ),
], Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
AppText(
TranslationBase.of(context)
.noPrescriptionListed,
color: Colors.black,
fontWeight: FontWeight.w900,
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
AppText(
TranslationBase.of(context).addNow,
color: Color(0XFFB8382C),
fontWeight: FontWeight.w900,
),
],
),
],
)
],
),
),
), ),
), )),
),
)),
); );
} }
selectDate(BuildContext context, PrescriptionViewModel model) async {
DateTime selectedDate;
selectedDate = DateTime.now();
final DateTime picked = await showDatePicker(
context: context,
initialDate: selectedDate,
firstDate: DateTime.now().add(Duration(hours: 2)),
lastDate: DateTime(2040),
initialEntryMode: DatePickerEntryMode.calendar,
);
if (picked != null && picked != selectedDate) {
setState(() {
selectedDate = picked;
});
}
}
void updatePrescriptionForm( void updatePrescriptionForm(
context, String drugName, int drugId, PrescriptionViewModel model) { context, String drugName, int drugId, PrescriptionViewModel model) {
TextEditingController remarksController = TextEditingController(); TextEditingController remarksController = TextEditingController();
@ -637,7 +720,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
updatePrescriptionReqModel.prescriptionRequestModel = sss; updatePrescriptionReqModel.prescriptionRequestModel = sss;
//postProcedureReqModel.procedures = controlsProcedure; //postProcedureReqModel.procedures = controlsProcedure;
await model.updatePrescription(updatePrescriptionReqModel); await model.updatePrescription(
updatePrescriptionReqModel, patient.patientMRN);
if (model.state == ViewState.ErrorLocal) { if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error); helpers.showErrorToast(model.error);

4
lib/screens/procedures/procedure_screen.dart
Unescape Escape View File

@ -509,7 +509,7 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
baseViewModel: widget.model, baseViewModel: widget.model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
height: 790, height: 810,
child: Padding( child: Padding(
padding: EdgeInsets.all(12.0), padding: EdgeInsets.all(12.0),
child: Column( child: Column(
@ -566,7 +566,7 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
maxLines: 5, maxLines: 5,
), ),
SizedBox( SizedBox(
height: 80.0, height: 50.0,
), ),
Container( Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),

7
lib/widgets/shared/dialogs/dailog-list-select.dart
Unescape Escape View File

@ -66,10 +66,13 @@ class _ListSelectDialogState extends State<ListSelectDialog> {
...widget.list ...widget.list
.map((item) => RadioListTile( .map((item) => RadioListTile(
title: Text("${item[widget.attributeName].toString()}"), title: Text("${item[widget.attributeName].toString()}"),
groupValue: widget.selectedValue[widget.attributeValueId].toString(), groupValue: widget.selectedValue[widget.attributeValueId]
.toString(),
value: item[widget.attributeValueId].toString(), value: item[widget.attributeValueId].toString(),
activeColor: Colors.blue.shade700, activeColor: Colors.blue.shade700,
selected: item[widget.attributeValueId].toString() == widget.selectedValue[widget.attributeValueId].toString(), selected: item[widget.attributeValueId].toString() ==
widget.selectedValue[widget.attributeValueId]
.toString(),
onChanged: (val) { onChanged: (val) {
setState(() { setState(() {
widget.selectedValue = item; widget.selectedValue = item;

Write Preview
Loading…
Cancel
Save