Haroon6138
/
RSGPatientApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://34.17.182.140/Haroon6138/RSGPatientApp

Browse Source 
# Conflicts:
#	lib/core/service/client/base_app_client.dart
master
haroon amjad 2 weeks ago
parent 3077aab68b 6a87b61c35
commit f50a039582
9 changed files with 235 additions and 191 deletions
Show Stats Download Patch File Download Diff File

2
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -187,7 +187,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232
// body['PatientID'] = 11031; //4609100
// body['PatientID'] = 10715; //4609100
// body['TokenID'] = "@dm!n";
// Patient ID: 3027574

11
lib/pages/BookAppointment/BookingOptions.dart
Unescape Escape View File

@ -19,10 +19,13 @@ class _BookingOptionsState extends State<BookingOptions> {
@override
void initState() {
// locationUtils =
// new LocationUtils(isShowConfirmDialog: true, context: context);
// WidgetsBinding.instance
// .addPostFrameCallback((_) => locationUtils.getCurrentLocation());
//locationUtils =// new LocationUtils(
isShowConfirmDialog: false,
isShowLocationTimeoutDialog: false,
context: context);
//WidgetsBinding.instance//.addPostFrameCallback((_) =>
locationUtils.getCurrentLocation(
isShowConfirmDialog: false, isShowLocationTimeoutDialog: false));
super.initState();
}

122
lib/pages/ContactUs/findus/hospitrals_page.dart
Unescape Escape View File

@ -29,67 +29,67 @@ class _HospitalsPageState extends State<HospitalsPage> {
itemBuilder: (context, index) => HospitalLocation(widget.findusHospitalModelList[index]),
itemCount: widget.findusHospitalModelList.length,
),
Container(
margin: EdgeInsets.only(top: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
IconButton(
icon: new Image.asset('assets/images/new-design/youtube.png'),
iconSize: 48,
tooltip: 'Youtube',
onPressed: () {
setState(() {
launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/linkedin.png'),
tooltip: 'LinkedIn',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/twitter.png'),
tooltip: 'Twitter',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://twitter.com/HMG");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/facebook.png'),
tooltip: 'facebook',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
});
},
),
],
),
),
// Container(
// margin: EdgeInsets.only(top: 14),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.all(
// Radius.circular(10.0),
// ),
// boxShadow: [
// BoxShadow(
// color: Color(0xff000000).withOpacity(.05),
// //spreadRadius: 5,
// blurRadius: 27,
// offset: Offset(0, -3),
// ),
// ],
// color: Colors.white),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceEvenly,
// children: [
// IconButton(
// icon: new Image.asset('assets/images/new-design/youtube.png'),
// iconSize: 48,
// tooltip: 'Youtube',
// onPressed: () {
// setState(() {
// launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
// });
// },
// ),
// IconButton(
// icon: new Image.asset('assets/images/new-design/linkedin.png'),
// tooltip: 'LinkedIn',
// iconSize: 48,
// onPressed: () {
// setState(() {
// launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
// });
// },
// ),
// IconButton(
// icon: new Image.asset('assets/images/new-design/twitter.png'),
// tooltip: 'Twitter',
// iconSize: 48,
// onPressed: () {
// setState(() {
// launch("https://twitter.com/HMG");
// });
// },
// ),
// IconButton(
// icon: new Image.asset('assets/images/new-design/facebook.png'),
// tooltip: 'facebook',
// iconSize: 48,
// onPressed: () {
// setState(() {
// launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
// });
// },
// ),
// ],
// ),
// ),
],
),
);

122
lib/pages/ContactUs/findus/pharmacies_page.dart
Unescape Escape View File

@ -29,67 +29,67 @@ class _PharmaciesPageState extends State<PharmaciesPage> {
itemBuilder: (context, index) => HospitalLocation(widget.findusPharmaciesModelList[index], showCity: true),
itemCount: widget.findusPharmaciesModelList.length,
),
Container(
margin: EdgeInsets.only(top: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
IconButton(
icon: new Image.asset('assets/images/new-design/youtube.png'),
iconSize: 48,
tooltip: 'Youtube',
onPressed: () {
setState(() {
launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/linkedin.png'),
tooltip: 'LinkedIn',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/twitter.png'),
tooltip: 'Twitter',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://twitter.com/HMG");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/facebook.png'),
tooltip: 'facebook',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
});
},
),
],
),
),
// Container(
// margin: EdgeInsets.only(top: 14),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.all(
// Radius.circular(10.0),
// ),
// boxShadow: [
// BoxShadow(
// color: Color(0xff000000).withOpacity(.05),
// //spreadRadius: 5,
// blurRadius: 27,
// offset: Offset(0, -3),
// ),
// ],
// color: Colors.white),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceEvenly,
// children: [
// IconButton(
// icon: new Image.asset('assets/images/new-design/youtube.png'),
// iconSize: 48,
// tooltip: 'Youtube',
// onPressed: () {
// setState(() {
// launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
// });
// },
// ),
// IconButton(
// icon: new Image.asset('assets/images/new-design/linkedin.png'),
// tooltip: 'LinkedIn',
// iconSize: 48,
// onPressed: () {
// setState(() {
// launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
// });
// },
// ),
// IconButton(
// icon: new Image.asset('assets/images/new-design/twitter.png'),
// tooltip: 'Twitter',
// iconSize: 48,
// onPressed: () {
// setState(() {
// launch("https://twitter.com/HMG");
// });
// },
// ),
// IconButton(
// icon: new Image.asset('assets/images/new-design/facebook.png'),
// tooltip: 'facebook',
// iconSize: 48,
// onPressed: () {
// setState(() {
// launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
// });
// },
// ),
// ],
// ),
// ),
],
),
);

63
lib/pages/ErService/ErOptions.dart
Unescape Escape View File

@ -27,8 +27,10 @@ class _ErOptionsState extends State<ErOptions> {
@override
void initState() {
locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance.addPostFrameCallback((_) => locationUtils.getCurrentLocation());
locationUtils =
new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance
.addPostFrameCallback((_) => locationUtils.getCurrentLocation());
super.initState();
}
@ -46,23 +48,27 @@ class _ErOptionsState extends State<ErOptions> {
showNewAppBarTitle: true,
backgroundColor: Color(0xffF8F8F8),
body: GridView(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
childAspectRatio: 2 / 2,
crossAxisSpacing: 12,
mainAxisSpacing: 12),
physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.all(21),
shrinkWrap: true,
children: [
InkWell(
onTap: () {
if (projectViewModel.havePrivilege(63)) Navigator.push(context, FadePage(page: AmbulanceReq()));
},
child: MedicalProfileItem(
title: TranslationBase.of(context).ambulancerequest,
imagePath: 'assets/images/new-design/AM.PNG',
subTitle: TranslationBase.of(context).requestA,
isPngImage: true,
isEnable: projectViewModel.havePrivilege(63),
),
),
// InkWell(
// onTap: () {
// if (projectViewModel.havePrivilege(63)) Navigator.push(context, FadePage(page: AmbulanceReq()));
// },
// child: MedicalProfileItem(
// title: TranslationBase.of(context).ambulancerequest,
// imagePath: 'assets/images/new-design/AM.PNG',
// subTitle: TranslationBase.of(context).requestA,
// isPngImage: true,
// isEnable: projectViewModel.havePrivilege(63),
// ),
// ),
InkWell(
onTap: () {
Navigator.push(context, FadePage(page: NearestEr()));
@ -74,21 +80,22 @@ class _ErOptionsState extends State<ErOptions> {
isPngImage: true,
),
),
// InkWell(
// onTap: () {
// if (rrtLocked) Navigator.push(context, FadePage(page: RRTMainScreen()));
// },
// child: MedicalProfileItem(
// title: TranslationBase.of(context).RRTTitle,
// imagePath: 'assets/images/new-design/AM.PNG',
// subTitle: TranslationBase.of(context).RRTSubTitle,
// isPngImage: true,
// isEnable: rrtLocked,
// ),
// ),
InkWell(
onTap: () {
if (rrtLocked) Navigator.push(context, FadePage(page: RRTMainScreen()));
},
child: MedicalProfileItem(
title: TranslationBase.of(context).RRTTitle,
imagePath: 'assets/images/new-design/AM.PNG',
subTitle: TranslationBase.of(context).RRTSubTitle,
isPngImage: true,
isEnable: rrtLocked,
),
),
InkWell(
onTap: () {
if (projectViewModel.havePrivilege(81)) Navigator.push(context, FadePage(page: DdServicesPage()));
if (projectViewModel.havePrivilege(81))
Navigator.push(context, FadePage(page: DdServicesPage()));
// Navigator.push(context, FadePage(page: DdServicesPage()));
},
child: MedicalProfileItem(

14
lib/pages/insurance/insurance_card_screen.dart
Unescape Escape View File

@ -49,13 +49,13 @@ class _InsuranceCardState extends State<InsuranceCard> {
showNewAppBar: true,
showNewAppBarTitle: true,
backgroundColor: CustomColors.appBackgroudGreyColor,
floatingActionButton: FloatingActionButton.extended(
onPressed: () {
Navigator.push(context, FadePage(page: InsuranceUpdate()));
},
backgroundColor: CustomColors.accentColor,
label: Text(TranslationBase.of(context).update, style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.bold)),
),
// floatingActionButton: FloatingActionButton.extended(
// onPressed: () {
// Navigator.push(context, FadePage(page: InsuranceUpdate()));
// },
// backgroundColor: CustomColors.accentColor,
// label: Text(TranslationBase.of(context).update, style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.bold)),
// ),
body: Container(
child: ListView.separated(
itemCount: model.insurance == null ? 0 : model.insurance.length,

2
lib/pages/medical/allergies_page.dart
Unescape Escape View File

@ -47,7 +47,7 @@ class AllergiesPage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(TranslationBase.of(context).remarks+" : " + model.allergies[index].remarks! ?? ''),
Texts(TranslationBase.of(context).remarks+" : " + model.allergies[index].remarks! ?? ''),
Texts(TranslationBase.of(context).description + ": " + model.allergies[index].description! ?? ''),
],
),

70
lib/uitl/location_util.dart
Unescape Escape View File

@ -22,19 +22,35 @@ class LocationUtils {
bool isHuawei;
final GeolocatorPlatform _geolocatorPlatform = GeolocatorPlatform.instance;
LocationUtils({required this.isShowConfirmDialog, required this.context, this.isHuawei = false, this.isShowLocationTimeoutDialog = true});
LocationUtils(
{required this.isShowConfirmDialog,
required this.context,
this.isHuawei = false,
this.isShowLocationTimeoutDialog = true});
void getCurrentLocation(
{bool isShowConfirmDialog = false,
bool isShowLocationTimeoutDialog = false,
Function(LatLng)? callBack}) async {
this.isShowConfirmDialog = isShowConfirmDialog;
this.isShowLocationTimeoutDialog = isShowLocationTimeoutDialog;
void getCurrentLocation({Function(LatLng)? callBack}) async {
if (Platform.isAndroid && isHuawei) {
_getHMSCurrentLocation(callBack!);
} else {
Geolocator.isLocationServiceEnabled().then((value) async {
if (value) {
await Geolocator.checkPermission().then((permission) async {
if (permission == LocationPermission.always || permission == LocationPermission.whileInUse) {
Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.medium, timeLimit: Duration(seconds: 5)).then((value) {
if (permission == LocationPermission.always ||
permission == LocationPermission.whileInUse) {
Geolocator.getCurrentPosition(
desiredAccuracy: LocationAccuracy.medium,
timeLimit: Duration(seconds: 5))
.then((value) {
setLocation(value);
if (callBack != null) callBack(LatLng(value.latitude, value.longitude));
if (callBack != null)
callBack(LatLng(value.latitude, value.longitude));
}).catchError((err) {
print(err);
if (isShowConfirmDialog && isShowLocationTimeoutDialog) {
@ -45,17 +61,25 @@ class LocationUtils {
});
}
if (permission == LocationPermission.denied || permission == LocationPermission.deniedForever) {
if (permission == LocationPermission.denied ||
permission == LocationPermission.deniedForever) {
if (Platform.isAndroid) {
Utils.showPermissionConsentDialog(context, TranslationBase.of(context).locationPermissionDialog, () async {
Utils.showPermissionConsentDialog(context,
TranslationBase.of(context).locationPermissionDialog,
() async {
final hasPermission = await _handlePermission();
if (hasPermission) {
Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.medium, timeLimit: Duration(seconds: 10)).then((value) {
Geolocator.getCurrentPosition(
desiredAccuracy: LocationAccuracy.medium,
timeLimit: Duration(seconds: 10))
.then((value) {
setLocation(value);
if (callBack != null) callBack(LatLng(value.latitude, value.longitude));
if (callBack != null)
callBack(LatLng(value.latitude, value.longitude));
});
} else {
if (isShowConfirmDialog) showErrorLocationDialog(false, failureCallBack: () {});
if (isShowConfirmDialog)
showErrorLocationDialog(false, failureCallBack: () {});
}
});
} else {
@ -63,7 +87,8 @@ class LocationUtils {
getCurrentLocation(callBack: callBack);
} else {
setZeroLocation();
if (isShowConfirmDialog) showErrorLocationDialog(false, failureCallBack: () {});
if (isShowConfirmDialog)
showErrorLocationDialog(false, failureCallBack: () {});
}
}
}
@ -71,7 +96,8 @@ class LocationUtils {
print(err);
});
} else {
if (isShowConfirmDialog) showErrorLocationDialog(false, failureCallBack: () {});
if (isShowConfirmDialog)
showErrorLocationDialog(false, failureCallBack: () {});
}
}).catchError((err) {
print(err);
@ -134,14 +160,20 @@ class LocationUtils {
int _locationUpdateCbId = 0;
doIt() {
FusedLocationProviderClient locationService = FusedLocationProviderClient();
FusedLocationProviderClient locationService =
FusedLocationProviderClient();
LocationRequest locationRequest = LocationRequest();
locationRequest.priority = LocationRequest.PRIORITY_HIGH_ACCURACY;
locationRequest.interval = 1000;
List<LocationRequest> locationRequestList = <LocationRequest>[locationRequest];
LocationSettingsRequest locationSettingsRequest = LocationSettingsRequest(requests: locationRequestList);
List<LocationRequest> locationRequestList = <LocationRequest>[
locationRequest
];
LocationSettingsRequest locationSettingsRequest =
LocationSettingsRequest(requests: locationRequestList);
locationService.checkLocationSettings(locationSettingsRequest).then((settings) async {
locationService
.checkLocationSettings(locationSettingsRequest)
.then((settings) async {
_locationUpdateCbId = await locationService.requestLocationUpdatesCb(
locationRequest,
LocationCallback(onLocationResult: (locationResult) {
@ -208,7 +240,8 @@ class LocationUtils {
return dialog.showAlertDialog(context);
}
showErrorLocationDialog(bool isPermissionError, {Function()? failureCallBack}) {
showErrorLocationDialog(bool isPermissionError,
{Function()? failureCallBack}) {
setLocation(null);
ConfirmDialog dialog = new ConfirmDialog(
context: context,
@ -251,6 +284,7 @@ class LocationUtils {
var result = await [
Permission.location,
].request();
return (result[Permission.location]!.isGranted || result[Permission.locationAlways]!.isGranted);
return (result[Permission.location]!.isGranted ||
result[Permission.locationAlways]!.isGranted);
}
}

20
lib/uitl/utils.dart
Unescape Escape View File

@ -460,16 +460,16 @@ class Utils {
),
));
medical.add(InkWell(
onTap: () {
Navigator.push(context, FadePage(page: InsuranceUpdate()));
},
child: MedicalProfileItem(
title: TranslationBase.of(context).updateInsurance,
imagePath: 'insurance_card.svg',
subTitle: TranslationBase.of(context).updateInsuranceSubtitle,
),
));
// medical.add(InkWell(
// onTap: () {
// Navigator.push(context, FadePage(page: InsuranceUpdate()));
// },
// child: MedicalProfileItem(
// title: TranslationBase.of(context).updateInsurance,
// imagePath: 'insurance_card.svg',
// subTitle: TranslationBase.of(context).updateInsuranceSubtitle,
// ),
// ));
medical.add(InkWell(
onTap: () => projectViewModel.havePrivilege(18)

Write Preview
Loading…
Cancel
Save