fix patient profile details

merge-requests/85/head
Mohammad ALjammal 6 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,15 +89,15 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
'key': vitalSignDetails.bodyMeasurements 'key': vitalSignDetails.bodyMeasurements
}); });
}, },
child: Expanded(
child: VitalSignItem( child: VitalSignItem(
des: 'Body Measurements', des: 'Body Measurements',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv lastVal: '137',
.patientVitalSignOrderdSubList[0].heightCm
.toString(),
unit: 'Cm', unit: 'Cm',
), ),
), ),
),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(BODY_MEASUREMENTS,
@ -106,11 +106,13 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
'key': vitalSignDetails.temperature 'key': vitalSignDetails.temperature
}); });
}, },
child: Expanded(
child: VitalSignItem( child: VitalSignItem(
des: 'Temperature', des: 'Temperature',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
), ),
), ),
),
], ],
), ),
Row( Row(
@ -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,14 +230,19 @@ class VitalSignItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Expanded(
flex: 2,
child: Text(
des, des,
style: TextStyle( style: TextStyle(
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
Column( ),
Expanded(
flex: 1,
child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceEvenly, // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
// crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@ -258,6 +266,7 @@ class VitalSignItem extends StatelessWidget {
), ),
)) ))
], ],
),
) )
], ],
), ),

Loading…
Cancel
Save