Merge branch 'episode_fixes_dev' into 'episode_fixes_dev_merge'

fix issue related to outpatient

See merge request Cloud_Solution/doctor_app_flutter!785
merge-requests/786/merge
Elham Ali 5 years ago
commit 3d7cd70df6

@ -251,6 +251,8 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage>
widget.patientInfo.admissionNo.isNotEmpty) { widget.patientInfo.admissionNo.isNotEmpty) {
listHisProgNotePhysicalExaminationVM.admissionNo = listHisProgNotePhysicalExaminationVM.admissionNo =
int.parse(widget.patientInfo.admissionNo); int.parse(widget.patientInfo.admissionNo);
} else {
listHisProgNotePhysicalExaminationVM.admissionNo = 0;
} }
postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM
.add(listHisProgNotePhysicalExaminationVM); .add(listHisProgNotePhysicalExaminationVM);

@ -51,7 +51,7 @@ class StepsWidget extends StatelessWidget {
child: Center( child: Center(
child: Container( child: Container(
width: MediaQuery.of(context).size.width * width: MediaQuery.of(context).size.width *
(patientInfo.admissionNo == null && (patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty patientInfo.admissionNo.isEmpty
? 0.9 ? 0.9
: 0.85), : 0.85),
@ -114,8 +114,8 @@ class StepsWidget extends StatelessWidget {
), ),
Positioned( Positioned(
top: circleTop, top: circleTop,
left: patientInfo.admissionNo == null && left: patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty patientInfo.admissionNo.isEmpty
? MediaQuery.of(context).size.width * 0.25 ? MediaQuery.of(context).size.width * 0.25
: MediaQuery.of(context).size.width * 0.71, : MediaQuery.of(context).size.width * 0.71,
child: InkWell( child: InkWell(
@ -166,8 +166,8 @@ class StepsWidget extends StatelessWidget {
), ),
), ),
), ),
if (patientInfo.admissionNo == null && if (patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty) patientInfo.admissionNo.isEmpty)
Positioned( Positioned(
top: circleTop, top: circleTop,
left: MediaQuery.of(context).size.width * 0.47, left: MediaQuery.of(context).size.width * 0.47,
@ -221,8 +221,8 @@ class StepsWidget extends StatelessWidget {
), ),
), ),
), ),
if (patientInfo.admissionNo == null && if (patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty) patientInfo.admissionNo.isEmpty)
Positioned( Positioned(
top: circleTop, top: circleTop,
right: 0, right: 0,
@ -288,8 +288,8 @@ class StepsWidget extends StatelessWidget {
top: 30, top: 30,
child: Center( child: Center(
child: Container( child: Container(
width: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null && width: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty?0.9:0.85), patientInfo.admissionNo.isEmpty?0.9:0.85),
child: Divider( child: Divider(
color: Colors.grey, color: Colors.grey,
height: 0.75, height: 0.75,
@ -348,8 +348,8 @@ class StepsWidget extends StatelessWidget {
), ),
Positioned( Positioned(
top: circleTop, top: circleTop,
right: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null && right: MediaQuery.of(context).size.width * (patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty?0.25:0.71), patientInfo.admissionNo.isEmpty?0.25:0.71),
child: InkWell( child: InkWell(
onTap: () => index >= 2 ? changeCurrentTab(1) : null, onTap: () => index >= 2 ? changeCurrentTab(1) : null,
child: Column( child: Column(
@ -395,8 +395,8 @@ class StepsWidget extends StatelessWidget {
), ),
), ),
), ),
if (patientInfo.admissionNo == null && if (patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty) patientInfo.admissionNo.isEmpty)
Positioned( Positioned(
top: circleTop, top: circleTop,
right: MediaQuery.of(context).size.width * 0.50, right: MediaQuery.of(context).size.width * 0.50,
@ -450,8 +450,8 @@ class StepsWidget extends StatelessWidget {
), ),
), ),
), ),
if (patientInfo.admissionNo == null && if (patientInfo.admissionNo == null ||
patientInfo.admissionNo.isEmpty) patientInfo.admissionNo.isEmpty)
Positioned( Positioned(
top: circleTop, top: circleTop,
left: 0, left: 0,

Loading…
Cancel
Save