Merge branch 'medical-file' into 'development'

Medical file

See merge request Cloud_Solution/doctor_app_flutter!240
merge-requests/244/merge
Mohammad Aljammal 5 years ago
commit e60cc5ec4a

@ -135,7 +135,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
'Visit Date : ', 'Visit Date : ',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText(model AppText(model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
@ -160,7 +168,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
'Doctor : '.toUpperCase(), 'Doctor : '.toUpperCase(),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[0]
@ -181,7 +197,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
'Clinic : ', 'Clinic : ',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[0]
@ -199,7 +223,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
'Episode Number : ', 'Episode Number : ',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[0]
@ -219,7 +251,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
color: Colors.grey.shade400, color: Colors.grey.shade400,
), ),
SizedBox(height: 25.0), SizedBox(height: 25.0),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
HeaderBodyExpandableNotifier( HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: Row(
mainAxisAlignment: mainAxisAlignment:
@ -305,7 +345,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
SizedBox( SizedBox(
height: 30, height: 30,
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
HeaderBodyExpandableNotifier( HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: Row(
mainAxisAlignment: mainAxisAlignment:
@ -463,7 +511,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
SizedBox( SizedBox(
height: 30, height: 30,
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
HeaderBodyExpandableNotifier( HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: Row(
mainAxisAlignment: mainAxisAlignment:
@ -610,7 +666,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
SizedBox( SizedBox(
height: 30, height: 30,
), ),
if (model.medicalFileList.length != 0) if (model.medicalFileList.length != 0 &&
model
.medicalFileList[0]
.entityList[0]
.timelines[encounterNumber]
.timeLineEvents[0]
.consulations
.length !=
0)
HeaderBodyExpandableNotifier( HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: Row(
mainAxisAlignment: mainAxisAlignment:

@ -112,12 +112,15 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
dynamic frequency; dynamic frequency;
dynamic duration; dynamic duration;
dynamic doseTime; dynamic doseTime;
dynamic indication;
List<dynamic> strengthList; List<dynamic> strengthList;
List<dynamic> routeList; List<dynamic> routeList;
List<dynamic> frequencyList; List<dynamic> frequencyList;
List<dynamic> durationList; List<dynamic> durationList;
List<dynamic> doseTimeList; List<dynamic> doseTimeList;
List<dynamic> indicationList;
//PatiantInformtion patient; //PatiantInformtion patient;
dynamic _strength; dynamic _strength;
dynamic _selectedBranch; dynamic _selectedBranch;
@ -130,6 +133,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
frequencyList = List(); frequencyList = List();
durationList = List(); durationList = List();
doseTimeList = List(); doseTimeList = List();
indicationList = List();
dynamic regularOrder = {"id": 1, "name": "regular Order"}; dynamic regularOrder = {"id": 1, "name": "regular Order"};
dynamic urgentOrder = {"id": 2, "name": "urgent Order"}; dynamic urgentOrder = {"id": 2, "name": "urgent Order"};
@ -176,6 +180,30 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
dynamic doseTime10 = {"id": 10, "name": "While wake"}; dynamic doseTime10 = {"id": 10, "name": "While wake"};
dynamic doseTime11 = {"id": 12, "name": "Any Time"}; dynamic doseTime11 = {"id": 12, "name": "Any Time"};
dynamic doseTime12 = {"id": 21, "name": "Bed Time"}; dynamic doseTime12 = {"id": 21, "name": "Bed Time"};
dynamic indication1 = {"id": 545, "name": "Gingival Hyperplasia"};
dynamic indication2 = {"id": 546, "name": "Mild Drowsiness"};
dynamic indication3 = {"id": 547, "name": "Hypertrichosis"};
dynamic indication4 = {"id": 548, "name": "Mild Dizziness"};
dynamic indication5 = {"id": 549, "name": "Enlargement of Facial Features"};
dynamic indication6 = {
"id": 550,
"name": "Phenytoin Hypersensitivity Syndrome"
};
dynamic indication7 = {"id": 551, "name": "Asterixis"};
dynamic indication8 = {"id": 552, "name": "Bullous Dermatitis"};
dynamic indication9 = {"id": 554, "name": "Purpuric Dermatitis"};
dynamic indication10 = {"id": 555, "name": "Systemic Lupus Erythematosus"};
indicationList.add(indication1);
indicationList.add(indication2);
indicationList.add(indication3);
indicationList.add(indication4);
indicationList.add(indication5);
indicationList.add(indication6);
indicationList.add(indication7);
indicationList.add(indication8);
indicationList.add(indication9);
indicationList.add(indication10);
doseTimeList.add(doseTime1); doseTimeList.add(doseTime1);
doseTimeList.add(doseTime2); doseTimeList.add(doseTime2);
@ -521,24 +549,46 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
), ),
SizedBox(height: spaceBetweenTextFileds), SizedBox(height: spaceBetweenTextFileds),
Container( Container(
decoration: BoxDecoration( height: screenSize.height * 0.070,
borderRadius: BorderRadius.all( child: InkWell(
Radius.circular(6.0)), onTap: indicationList != null
border: Border.all( ? () {
width: 1.0, ListSelectDialog dialog =
color: HexColor("#CCCCCC"))), ListSelectDialog(
child: TextFields( list: indicationList,
hintText: TranslationBase.of(context) attributeName: 'name',
.indication, attributeValueId: 'id',
controller: indicationController, okText:
keyboardType: TextInputType.number, TranslationBase.of(context)
validator: (value) { .ok,
if (value.isEmpty) okFunction: (selectedValue) {
return TranslationBase.of(context) setState(() {
.emptyMessage; indicationList =
else selectedValue;
return null; _selectedBranch = null;
}, });
},
);
showDialog(
barrierDismissible: false,
context: context,
builder:
(BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context)
.indication,
indication != null
? indication['name']
: null,
true),
enabled: false,
),
), ),
), ),
SizedBox(height: spaceBetweenTextFileds), SizedBox(height: spaceBetweenTextFileds),

Loading…
Cancel
Save