edit card_position.dart

merge-update-with-lab-changes
Amjad amireh 6 years ago
parent e638464657
commit 62d96a3f1c

@ -20,8 +20,8 @@ class ErService extends BaseService {
} }
var lat = await sharedPref.getDouble(USER_LAT); var lat = await sharedPref.getDouble(USER_LAT);
var long = await sharedPref.getDouble(USER_LONG); var long = await sharedPref.getDouble(USER_LONG);
body['Latitude'] = lat; body['Latitude'] = lat ?? 0;
body['Longitude'] = long; body['Longitude'] = long ?? 0;
await baseAppClient.post(GET_NEAREST_HOSPITAL, await baseAppClient.post(GET_NEAREST_HOSPITAL,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {

@ -8,9 +8,8 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.da
import '../../../locator.dart'; import '../../../locator.dart';
class NearHospitalViewModel extends BaseViewModel { class NearHospitalViewModel extends BaseViewModel {
ErService _erService = locator<ErService>(); ErService _erService = locator<ErService>();
List<ProjectAvgERWaitingTime> get ProjectAvgERWaitingTimeModeList => List<ProjectAvgERWaitingTime> get ProjectAvgERWaitingTimeModeList =>
_erService.projectAvgERWaitingTimeModelList; _erService.projectAvgERWaitingTimeModelList;
@ -18,8 +17,8 @@ class NearHospitalViewModel extends BaseViewModel {
setState(ViewState.Busy); setState(ViewState.Busy);
if (id != null && projectID != null) { if (id != null && projectID != null) {
await _erService.getProjectAvgERWaitingTimeOrders(
await _erService.getProjectAvgERWaitingTimeOrders(id: id,projectID: projectID); id: id, projectID: projectID);
} else { } else {
await _erService.getProjectAvgERWaitingTimeOrders(); await _erService.getProjectAvgERWaitingTimeOrders();
} }
@ -29,6 +28,4 @@ class NearHospitalViewModel extends BaseViewModel {
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }

@ -10,14 +10,14 @@ import '../../uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart';
import 'widgets/card_position.dart'; import 'widgets/card_position.dart';
class NearestEr extends StatelessWidget { class NearestEr extends StatelessWidget {
static const String _url = "assets/images/";
static const String url = "assets/images/";
int appointmentNo; int appointmentNo;
int projectID; int projectID;
NearestEr({this.appointmentNo, this.projectID}); NearestEr({this.appointmentNo, this.projectID});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<NearHospitalViewModel>( return BaseView<NearHospitalViewModel>(
@ -29,22 +29,20 @@ class NearestEr extends StatelessWidget {
isShowAppBar: true, isShowAppBar: true,
appBarTitle: 'Nearest ER', appBarTitle: 'Nearest ER',
baseViewModel: mode, baseViewModel: mode,
body: mode.ProjectAvgERWaitingTimeModeList.length > 0 body: mode.ProjectAvgERWaitingTimeModeList.length > 0
? Container( ? Container(
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Text("\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location",textAlign: TextAlign.center, Text(
"\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location",
textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 18.0, fontSize: 18.0,
letterSpacing: 1.0, letterSpacing: 1.0,
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
color: new Color(0xFF60686b))), color: new Color(0xFF60686b))),
Container( Container(
margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
@ -54,39 +52,73 @@ class NearestEr extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[0]
text: mode.ProjectAvgERWaitingTimeModeList[0].projectName.toString(), .projectName
image: 'assets/images/new-design/find_us_icon.png', .toString(),
image:
subText: mode.ProjectAvgERWaitingTimeModeList[0].distanceInKilometers.toString(), 'assets/images/new-design/find_us_icon.png',
type: mode.ProjectAvgERWaitingTimeModeList[0].iD.toString(), subText: mode
telephone: mode.ProjectAvgERWaitingTimeModeList[0].phoneNumber.toString(), .ProjectAvgERWaitingTimeModeList[0]
networkImage: mode.ProjectAvgERWaitingTimeModeList[0].projectImageURL.toString(), .distanceInKilometers
latitude:mode.ProjectAvgERWaitingTimeModeList[0].latitude , .toString(),
longitude:mode.ProjectAvgERWaitingTimeModeList[0].longitude , type: mode
projectname:mode.ProjectAvgERWaitingTimeModeList[0].projectName , .ProjectAvgERWaitingTimeModeList[0].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[0]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[0]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[0]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[0]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[0]
.projectName,
), ),
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[1]
text: mode.ProjectAvgERWaitingTimeModeList[1].projectName.toString(), .projectName
image: 'assets/images/new-design/find_us_icon.png', .toString(),
image:
subText: mode.ProjectAvgERWaitingTimeModeList[1].distanceInKilometers.toString(), 'assets/images/new-design/find_us_icon.png',
type: mode.ProjectAvgERWaitingTimeModeList[1].iD.toString(), subText: mode
telephone: mode.ProjectAvgERWaitingTimeModeList[1].phoneNumber.toString(), .ProjectAvgERWaitingTimeModeList[1]
networkImage: mode.ProjectAvgERWaitingTimeModeList[1].projectImageURL.toString(), .distanceInKilometers
latitude:mode.ProjectAvgERWaitingTimeModeList[1].latitude , .toString(),
longitude:mode.ProjectAvgERWaitingTimeModeList[1].longitude , type: mode
projectname:mode.ProjectAvgERWaitingTimeModeList[1].projectName , .ProjectAvgERWaitingTimeModeList[1].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[1]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[1]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[1]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[1]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[1]
.projectName,
), ),
flex: 0, flex: 0,
) )
], ],
), ),
@ -96,44 +128,83 @@ class NearestEr extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: CardPosition(
// mode // mode
// .vitalSignResModelList[ // .vitalSignResModelList[
// mode.vitalSignResModelList.length - 1] // mode.vitalSignResModelList.length - 1]
// .heightCm // .heightCm
// .toString() // .toString()
text: mode.ProjectAvgERWaitingTimeModeList[2].projectName.toString(), text: mode
image: 'assets/images/new-design/find_us_icon.png', .ProjectAvgERWaitingTimeModeList[2]
.projectName
subText: mode.ProjectAvgERWaitingTimeModeList[2].distanceInKilometers.toString(), .toString(),
type: mode.ProjectAvgERWaitingTimeModeList[2].iD.toString(), image:
telephone: mode.ProjectAvgERWaitingTimeModeList[2].phoneNumber.toString(), 'assets/images/new-design/find_us_icon.png',
networkImage: mode.ProjectAvgERWaitingTimeModeList[2].projectImageURL.toString(),
latitude:mode.ProjectAvgERWaitingTimeModeList[2].latitude , subText: mode
longitude:mode.ProjectAvgERWaitingTimeModeList[2].longitude , .ProjectAvgERWaitingTimeModeList[2]
projectname:mode.ProjectAvgERWaitingTimeModeList[2].projectName , .distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[2].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[2]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[2]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[2]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[2]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[2]
.projectName,
), ),
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( child: CardPosition(
// mode // mode
// .vitalSignResModelList[ // .vitalSignResModelList[
// mode.vitalSignResModelList.length - 1] // mode.vitalSignResModelList.length - 1]
// .heightCm // .heightCm
// .toString() // .toString()
text: mode.ProjectAvgERWaitingTimeModeList[3].projectName.toString(), text: mode
image: 'assets/images/new-design/find_us_icon.png', .ProjectAvgERWaitingTimeModeList[3]
.projectName
subText: mode.ProjectAvgERWaitingTimeModeList[3].distanceInKilometers.toString(), .toString(),
type: mode.ProjectAvgERWaitingTimeModeList[3].iD.toString(), image:
telephone: mode.ProjectAvgERWaitingTimeModeList[3].phoneNumber.toString(), 'assets/images/new-design/find_us_icon.png',
networkImage: mode.ProjectAvgERWaitingTimeModeList[3].projectImageURL.toString(),
latitude:mode.ProjectAvgERWaitingTimeModeList[3].latitude , subText: mode
longitude:mode.ProjectAvgERWaitingTimeModeList[3].longitude , .ProjectAvgERWaitingTimeModeList[3]
projectname:mode.ProjectAvgERWaitingTimeModeList[3].projectName , .distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[3].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[3]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[3]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[3]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[3]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[3]
.projectName,
), ),
flex: 0, flex: 0,
) )
@ -145,41 +216,79 @@ class NearestEr extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: CardPosition(
// mode // mode
// .vitalSignResModelList[ // .vitalSignResModelList[
// mode.vitalSignResModelList.length - 1] // mode.vitalSignResModelList.length - 1]
// .heightCm // .heightCm
// .toString() // .toString()
text: mode.ProjectAvgERWaitingTimeModeList[4].projectName.toString(), text: mode
image: 'assets/images/new-design/find_us_icon.png', .ProjectAvgERWaitingTimeModeList[4]
.projectName
subText: mode.ProjectAvgERWaitingTimeModeList[4].distanceInKilometers.toString(), .toString(),
type: mode.ProjectAvgERWaitingTimeModeList[4].iD.toString(), image:
telephone: mode.ProjectAvgERWaitingTimeModeList[4].phoneNumber.toString(), 'assets/images/new-design/find_us_icon.png',
networkImage: mode.ProjectAvgERWaitingTimeModeList[4].projectImageURL.toString(),
latitude:mode.ProjectAvgERWaitingTimeModeList[4].latitude , subText: mode
longitude:mode.ProjectAvgERWaitingTimeModeList[4].longitude , .ProjectAvgERWaitingTimeModeList[4]
projectname:mode.ProjectAvgERWaitingTimeModeList[4].projectName , .distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[4].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[4]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[4]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[4]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[4]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[4]
.projectName,
), ),
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( child: CardPosition(
text: mode
text: mode.ProjectAvgERWaitingTimeModeList[5].projectName.toString(), .ProjectAvgERWaitingTimeModeList[5]
image: 'assets/images/new-design/find_us_icon.png', .projectName
.toString(),
subText: mode.ProjectAvgERWaitingTimeModeList[5].distanceInKilometers.toString(), image:
type: mode.ProjectAvgERWaitingTimeModeList[5].iD.toString(), 'assets/images/new-design/find_us_icon.png',
telephone: mode.ProjectAvgERWaitingTimeModeList[5].phoneNumber.toString(), subText: mode
networkImage: mode.ProjectAvgERWaitingTimeModeList[5].projectImageURL.toString(), .ProjectAvgERWaitingTimeModeList[5]
latitude:mode.ProjectAvgERWaitingTimeModeList[5].latitude , .distanceInKilometers
longitude:mode.ProjectAvgERWaitingTimeModeList[5].longitude , .toString(),
projectname:mode.ProjectAvgERWaitingTimeModeList[5].projectName , type: mode
.ProjectAvgERWaitingTimeModeList[5].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[5]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[5]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[5]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[5]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[5]
.projectName,
), ),
flex: 0, flex: 0,
) )
], ],
), ),
@ -189,27 +298,43 @@ class NearestEr extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[6]
text: mode.ProjectAvgERWaitingTimeModeList[6].projectName.toString(), .projectName
image: 'assets/images/new-design/find_us_icon.png', .toString(),
image:
subText: mode.ProjectAvgERWaitingTimeModeList[6].distanceInKilometers.toString(), 'assets/images/new-design/find_us_icon.png',
type: mode.ProjectAvgERWaitingTimeModeList[6].iD.toString(), subText: mode
telephone: mode.ProjectAvgERWaitingTimeModeList[6].phoneNumber.toString(), .ProjectAvgERWaitingTimeModeList[6]
networkImage: mode.ProjectAvgERWaitingTimeModeList[6].projectImageURL.toString(), .distanceInKilometers
latitude:mode.ProjectAvgERWaitingTimeModeList[6].latitude , .toString(),
longitude:mode.ProjectAvgERWaitingTimeModeList[6].longitude , type: mode
projectname:mode.ProjectAvgERWaitingTimeModeList[6].projectName , .ProjectAvgERWaitingTimeModeList[6].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[6]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[6]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[6]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[6]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[6]
.projectName,
), ),
flex: 0, flex: 0,
), ),
], ],
), ),
], ],
) )),
),
], ],
), ),
) )
@ -221,147 +346,3 @@ class NearestEr extends StatelessWidget {
} }
} }
//class NearestEr extends StatefulWidget {
// static const String url = "assets/images/";
// final bool isAppbar;
//
//
// const NearestEr({Key key, this.isAppbar}) : super(key: key);
// @override
// _NearestErState createState() => _NearestErState();
//}
//
//class _NearestErState extends State<NearestEr> {
// LocationUtils locationUtils;
// @override
// void initState() {
// locationUtils =
// new LocationUtils(isShowConfirmDialog: true, context: context);
// WidgetsBinding.instance
// .addPostFrameCallback((_) => locationUtils.getCurrentLocation());
//
// super.initState();
// }
// @override
// Widget build(BuildContext context) {
// return AppScaffold(
// isShowAppBar: widget.isAppbar,
// appBarTitle: TranslationBase.of(context).bookAppo,
// body: Container(
// margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),
// child: ListView(
//
// children: <Widget>[
// Text(TranslationBase.of(context).searchBy,
// style: TextStyle(
// fontSize: 24.0,
// letterSpacing: 1.0,
// fontWeight: FontWeight.bold,
// color: new Color(0xFF60686b))),
// Container(
// margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
//
// child: Column(
// mainAxisAlignment: MainAxisAlignment.center,
// children: <Widget>[
// Row(
// mainAxisSize: MainAxisSize.min,
// mainAxisAlignment: MainAxisAlignment.center,
// children: <Widget>[
// Expanded(
// child: CardPosition(
// text: "Olaya Hospital",
// image: 'assets/images/new-design/find_us_icon.png',
//
// subText: TranslationBase.of(context).requestA,
// type: 3,
// ),
// flex: 0,
//
// ),
// Expanded(
// child: CardPosition(
// image: 'assets/images/new-design/find_us_icon.png',
// text: "Takhassusi Hospital",
// subText: TranslationBase.of(context).locationa,
// type: 5),
// flex: 0,
//
// )
// ],
// ),
// Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.center,
// children: <Widget>[
// Expanded(
// child: CardPosition(
// image: 'assets/images/new-design/find_us_icon.png',
// text: "Arryan Hospital",
// subText: TranslationBase.of(context).requestA,
// type: 4,
// ),
// flex: 0,
// ),
// Expanded(
// child: CardPosition(
// image: 'assets/images/new-design/find_us_icon.png',
// text: "Suwaidi Hospital",
// subText: TranslationBase.of(context).locationa,
// type: 6),
// flex: 0,
// )
// ],
// ),
// Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.center,
// children: <Widget>[
// Expanded(
// child: CardPosition(
// image: 'assets/images/new-design/find_us_icon.png',
// text: "Al Qassim Hospital",
// subText: TranslationBase.of(context).requestA,
// type: 7,
// ),
// flex: 0,
// ),
// Expanded(
// child: CardPosition(
// image: 'assets/images/new-design/find_us_icon.png',
// text: "Khobar Hospital",
// subText: TranslationBase.of(context).locationa,
// type: 8),
// flex: 0,
//
// )
// ],
// ),
// Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.center,
// children: <Widget>[
// Expanded(
// child: CardPosition(
// image: 'assets/images/new-design/find_us_icon.png',
// text: "Dubai Hospital",
// subText: TranslationBase.of(context).requestA,
// type: 1,
//
// ),
// flex: 0,
// ),
//
// ],
// ),
// ],
// )
// ),
// ],
// ),
// ),
// );
// }
//}

Loading…
Cancel
Save