fix merge issues

merge-update-with-lab-changes
Mohammad Aljammal 6 years ago
parent 2e0afdb49c
commit 5cee1cef4e

@ -4,7 +4,7 @@ import 'dart:io';
const MAX_SMALL_SCREEN = 660; const MAX_SMALL_SCREEN = 660;
const BASE_URL = 'https://uat.hmgwebservices.com/Services'; const BASE_URL = 'https://hmgwebservices.com/Services';
const GET_PROJECT = '/Lists.svc/REST/GetProject'; const GET_PROJECT = '/Lists.svc/REST/GetProject';

@ -1,6 +1,7 @@
import 'dart:math'; import 'dart:math';
import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/sliver_app_bar_delegate.dart'; import 'package:diplomaticquarterapp/widgets/others/sliver_app_bar_delegate.dart';
@ -64,9 +65,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
Expanded( Expanded(
flex: 1, flex: 1,
child: InkWell( child: InkWell(
onTap: (){ onTap: () {},
},
child: MedicalProfileItem( child: MedicalProfileItem(
title: 'Lab', title: 'Lab',
imagePath: 'lab_result_icon.png', imagePath: 'lab_result_icon.png',
@ -81,7 +80,8 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
Expanded( Expanded(
flex: 1, flex: 1,
child: InkWell( child: InkWell(
onTap: () => Navigator.push(context, FadePage(page: RadiologyHomePage())), onTap: () => Navigator.push(
context, FadePage(page: RadiologyHomePage())),
child: MedicalProfileItem( child: MedicalProfileItem(
title: 'Radiology', title: 'Radiology',
imagePath: 'radiology_icon.png', imagePath: 'radiology_icon.png',
@ -125,8 +125,8 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
flex: 1, flex: 1,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(context,
context, FadePage(page: InsuranceApproval())); FadePage(page: InsuranceApproval()));
}, },
child: MedicalProfileItem( child: MedicalProfileItem(
title: 'Insurance Approval', title: 'Insurance Approval',
@ -137,8 +137,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
) )
], ],
), ),
Row( Row(children: <Widget>[
children: <Widget>[
Expanded( Expanded(
flex: 1, flex: 1,
child: MedicalProfileItem( child: MedicalProfileItem(
@ -154,7 +153,12 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
imagePath: 'medical_history_icon.png', imagePath: 'medical_history_icon.png',
subTitle: 'Reports', subTitle: 'Reports',
), ),
) ),
]),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
@ -166,16 +170,27 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
subTitle: 'Card', subTitle: 'Card',
), ),
), ),
), Expanded(
flex: 1,
child: InkWell(
onTap: () {
},
child: MedicalProfileItem(
title: 'new',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
), ),
],
), ),
)
],
)
], ],
), ),
), ),
), ),
), ),
], ]),
),
); );
} }
} }

Loading…
Cancel
Save