merge-requests/405/head
haroon amjad 3 years ago
parent 879ce4ee06
commit dfafb6b664

@ -23,9 +23,9 @@ class BaseService {
} }
getUser() async { getUser() async {
if (user==null) { // if (user==null) {
var userData = await sharedPref.getObject(USER_PROFILE); var userData = await sharedPref.getObject(USER_PROFILE);
if (userData != null) user = AuthenticatedUser.fromJson(userData); if (userData != null) user = AuthenticatedUser.fromJson(userData);
} // }
} }
} }

@ -177,9 +177,9 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList]; widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList];
await widget.model.getCustomerInfo(); await widget.model.getCustomerInfo();
if (widget.model.state == ViewState.ErrorLocal) { // if (widget.model.state == ViewState.ErrorLocal) {
Utils.showErrorToast(); // Utils.showErrorToast();
} else { // } else {
navigateTo( navigateTo(
context, context,
NewCMCStepTowPage( NewCMCStepTowPage(
@ -189,7 +189,7 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
model: widget.model, model: widget.model,
), ),
); );
} // }
} }
}, },
), ),

@ -111,10 +111,14 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) { void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) {
print('CALLBACK: _onVisibleDaysChanged'); print('CALLBACK: _onVisibleDaysChanged');
print(first);
print(last);
} }
void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) { void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) {
print('CALLBACK: _onCalendarCreated'); print('CALLBACK: _onCalendarCreated');
print(first);
print(last);
} }
@override @override
@ -274,8 +278,6 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
selectedButtonIndex = 0; selectedButtonIndex = 0;
DocAvailableAppointments.selectedTime = dayEvents[selectedButtonIndex].isoTime; DocAvailableAppointments.selectedTime = dayEvents[selectedButtonIndex].isoTime;
// _scrollController.animateTo(0.0, duration: new Duration(seconds: 1), curve: Curves.ease);
}); });
} }

@ -59,7 +59,7 @@ class AppMapState extends State<AppMap> {
Widget googleMap() { Widget googleMap() {
return GoogleMap( return GoogleMap(
mapType: MapType.normal, mapType: MapType.normal,
zoomControlsEnabled: false, zoomControlsEnabled: true,
myLocationButtonEnabled: true, myLocationButtonEnabled: true,
myLocationEnabled: true, myLocationEnabled: true,
initialCameraPosition: CameraPosition.fromMap(widget.initialCamera), initialCameraPosition: CameraPosition.fromMap(widget.initialCamera),

Loading…
Cancel
Save