Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge issues

Browse Source
merge-requests/34/merge
Mohammad Aljammal 5 years ago
parent 2e0afdb49c
commit 5cee1cef4e
2 changed files with 139 additions and 124 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/config.dart
Unescape Escape View File

@ -4,7 +4,7 @@ import 'dart:io';
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';

261
lib/pages/medical/medical_profile_page.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'dart:math';
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/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/sliver_app_bar_delegate.dart';
@ -23,122 +24,120 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
Widget build(BuildContext context) {
return AppScaffold(
body: CustomScrollView(
physics: BouncingScrollPhysics(),
key: PageStorageKey("medical"),
slivers: <Widget>[
SliverPersistentHeader(
delegate: SliverAppBarDelegate(
maxHeight: 200.0,
minHeight: 200.0,
child: Container(
width: double.infinity,
height: 200,
color: Colors.grey,
physics: BouncingScrollPhysics(),
key: PageStorageKey("medical"),
slivers: <Widget>[
SliverPersistentHeader(
delegate: SliverAppBarDelegate(
maxHeight: 200.0,
minHeight: 200.0,
child: Container(
width: double.infinity,
height: 200,
color: Colors.grey,
),
),
),
),
SliverPersistentHeader(
delegate: SliverAppBarDelegate(
maxHeight: double.maxFinite,
minHeight: double.maxFinite,
child: Padding(
padding: EdgeInsets.symmetric(vertical: 12.0),
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: DoctorHomePage()));
},
child: MedicalProfileItem(
title: 'My Doctor',
imagePath: 'doctor_icon.png',
subTitle: 'List',
SliverPersistentHeader(
delegate: SliverAppBarDelegate(
maxHeight: double.maxFinite,
minHeight: double.maxFinite,
child: Padding(
padding: EdgeInsets.symmetric(vertical: 12.0),
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: DoctorHomePage()));
},
child: MedicalProfileItem(
title: 'My Doctor',
imagePath: 'doctor_icon.png',
subTitle: 'List',
),
),
),
),
Expanded(
flex: 1,
child: InkWell(
onTap: (){
},
child: MedicalProfileItem(
title: 'Lab',
imagePath: 'lab_result_icon.png',
subTitle: 'Result',
Expanded(
flex: 1,
child: InkWell(
onTap: () {},
child: MedicalProfileItem(
title: 'Lab',
imagePath: 'lab_result_icon.png',
subTitle: 'Result',
),
),
),
)
],
),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () => Navigator.push(context, FadePage(page: RadiologyHomePage())),
child: MedicalProfileItem(
title: 'Radiology',
imagePath: 'radiology_icon.png',
subTitle: 'Service',
)
],
),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () => Navigator.push(
context, FadePage(page: RadiologyHomePage())),
child: MedicalProfileItem(
title: 'Radiology',
imagePath: 'radiology_icon.png',
subTitle: 'Service',
),
),
),
),
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: HomePrescriptionsPage()));
},
child: MedicalProfileItem(
title: 'Medicines',
imagePath: 'prescription_icon.png',
subTitle: 'Prescriptions',
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: HomePrescriptionsPage()));
},
child: MedicalProfileItem(
title: 'Medicines',
imagePath: 'prescription_icon.png',
subTitle: 'Prescriptions',
),
),
),
)
],
),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: InsuranceCard()));
},
child: MedicalProfileItem(
title: 'Insurance',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
)
],
),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: InsuranceCard()));
},
child: MedicalProfileItem(
title: 'Insurance',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
),
),
),
),
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: InsuranceApproval()));
},
child: MedicalProfileItem(
title: 'Insurance Approval',
imagePath: 'insurance_approvals_icon.png',
subTitle: 'Card',
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: InsuranceApproval()));
},
child: MedicalProfileItem(
title: 'Insurance Approval',
imagePath: 'insurance_approvals_icon.png',
subTitle: 'Card',
),
),
),
)
],
),
Row(
children: <Widget>[
)
],
),
Row(children: <Widget>[
Expanded(
flex: 1,
child: MedicalProfileItem(
@ -154,28 +153,44 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
imagePath: 'medical_history_icon.png',
subTitle: 'Reports',
),
)
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: InsuranceUpdate()));
},
child: MedicalProfileItem(
title: 'Insurance Update',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
),
),
),
],
),
],
]),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: InsuranceUpdate()));
},
child: MedicalProfileItem(
title: 'Insurance Update',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
),
),
), Expanded(
flex: 1,
child: InkWell(
onTap: () {
},
child: MedicalProfileItem(
title: 'new',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
),
),
)
],
)
],
),
),
),
),
),
],
),
]),
);
}
}

Write Preview
Loading…
Cancel
Save