fix patient profile details

merge-requests/85/head
Mohammad ALjammal 4 years ago
parent 14edbff8b4
commit c6bbc1c2f5

@ -3,7 +3,7 @@ const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z]"; const ONLY_LETTERS = "[a-zA-Z]";
const ONLY_DATE = "[0-9/]"; const ONLY_DATE = "[0-9/]";
const BASE_URL = 'https://hmgwebservices.com/Services/'; const BASE_URL = 'https://uat.hmgwebservices.com/Services/';
const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems"; const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems";
const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient"; const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient";

@ -89,13 +89,13 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
'key': vitalSignDetails.bodyMeasurements 'key': vitalSignDetails.bodyMeasurements
}); });
}, },
child: VitalSignItem( child: Expanded(
des: 'Body Measurements', child: VitalSignItem(
url: url + 'heartbeat.png', des: 'Body Measurements',
lastVal: patientsProv url: url + 'heartbeat.png',
.patientVitalSignOrderdSubList[0].heightCm lastVal: '137',
.toString(), unit: 'Cm',
unit: 'Cm', ),
), ),
), ),
InkWell( InkWell(
@ -106,9 +106,11 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
'key': vitalSignDetails.temperature 'key': vitalSignDetails.temperature
}); });
}, },
child: VitalSignItem( child: Expanded(
des: 'Temperature', child: VitalSignItem(
url: url + 'heartbeat.png', des: 'Temperature',
url: url + 'heartbeat.png',
),
), ),
), ),
], ],
@ -219,6 +221,7 @@ class VitalSignItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return RoundedContainer( return RoundedContainer(
margin: 0.025 * SizeConfig.realScreenWidth,
height: 0.14 * SizeConfig.realScreenHeight, height: 0.14 * SizeConfig.realScreenHeight,
width: 0.45 * SizeConfig.realScreenWidth, width: 0.45 * SizeConfig.realScreenWidth,
child: Container( child: Container(
@ -227,37 +230,43 @@ class VitalSignItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Expanded(
des, flex: 2,
style: TextStyle( child: Text(
fontSize: 1.7 * SizeConfig.textMultiplier, des,
color: Theme.of(context).primaryColor, style: TextStyle(
fontWeight: FontWeight.bold), fontSize: 1.7 * SizeConfig.textMultiplier,
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold),
),
), ),
Column( Expanded(
// mainAxisAlignment: MainAxisAlignment.spaceEvenly, flex: 1,
// crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: <Widget>[ // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
Expanded( // crossAxisAlignment: CrossAxisAlignment.start,
child: Image.asset( children: <Widget>[
url, Expanded(
height: SizeConfig.heightMultiplier * 7, child: Image.asset(
), url,
), height: SizeConfig.heightMultiplier * 7,
Expanded( ),
child: RichText(
text: TextSpan(
style: TextStyle(color: Colors.black),
children: [
new TextSpan(text: lastVal),
new TextSpan(
text: ' ${unit}',
style:
TextStyle(color: Theme.of(context).primaryColor)),
],
), ),
)) Expanded(
], child: RichText(
text: TextSpan(
style: TextStyle(color: Colors.black),
children: [
new TextSpan(text: lastVal),
new TextSpan(
text: ' ${unit}',
style:
TextStyle(color: Theme.of(context).primaryColor)),
],
),
))
],
),
) )
], ],
), ),

Loading…
Cancel
Save