Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp

merge-update-with-lab-changes
Sultan Khan 5 years ago
commit c9fe036b99

@ -48,8 +48,8 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
int measuredArm = 1;
bool isButtonDisabled = false;
final List<String> measureTimeEnList = [
'Left arm ',
'Right arm',
'Left Arm ',
'Right Arm',
];
final List<String> measureTimeArList = [
'الذراع الأيسر',
@ -144,7 +144,7 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
),
InkWell(
onTap: () {
confirmSelectMeasureTimeDialog(!projectViewModel.isArabic ? measureTimeArList : measureTimeEnList);
confirmSelectMeasureTimeDialog(projectViewModel.isArabic ? measureTimeArList : measureTimeEnList);
},
child: Container(
padding: EdgeInsets.all(12),
@ -224,10 +224,12 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
bottomSheet: Container(
color: Colors.transparent,
width: double.infinity,
height: MediaQuery.of(context).size.width * 0.2,
child: Padding(
padding: const EdgeInsets.all(15.0),
child: SecondaryButton(
height: MediaQuery.of(context).size.height * 0.10,
child: FractionallySizedBox(
widthFactor: 0.9,
child: Column(
children: [
SecondaryButton(
loading: widget.model.state == ViewState.BusyLocal,
label: TranslationBase.of(context).save.toUpperCase(),
textColor: Colors.white,
@ -258,6 +260,8 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
});
}
}),
],
),
),
),
);

@ -275,9 +275,11 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
bottomSheet: Container(
color: Colors.transparent,
width: double.infinity,
height: MediaQuery.of(context).size.width * 0.2,
child: Padding(
padding: const EdgeInsets.all(15.0),
height: MediaQuery.of(context).size.height * 0.10,
child: Column(
children: [
FractionallySizedBox(
widthFactor: 0.9,
child: SecondaryButton(
label: TranslationBase.of(context).save.toUpperCase(),
textColor: Colors.white,
@ -328,6 +330,8 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
}
}),
),
],
),
),
);
}

Loading…
Cancel
Save