Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page

 Conflicts:
	lib/pages/landing/landing_page.dart
merge-update-with-lab-changes
Mohammad Aljmma 5 years ago
commit d5afb50ed3

@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsLis
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -402,6 +403,7 @@ class _BookConfirmState extends State<BookConfirm> {
}
insertAppointment(context, DoctorList docObject) {
GifLoaderDialogUtils.showMyDialog(context);
AppoitmentAllHistoryResultList appo;
widget.service
.insertAppointment(
@ -445,8 +447,7 @@ class _BookConfirmState extends State<BookConfirm> {
}).catchError((err) {
AppToast.showErrorToast(message: err);
print(err);
}).showProgressBar(
text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
});
}
insertLiveCareScheduledAppointment(context, DoctorList docObject) {
@ -508,8 +509,7 @@ class _BookConfirmState extends State<BookConfirm> {
navigateToBookSuccess(context, docObject, widget.patientShareResponse);
}).catchError((err) {
print(err);
}).showProgressBar(
text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
});
}
getLiveCareAppointmentPatientShare(context, String appointmentNo,
@ -581,6 +581,7 @@ class _BookConfirmState extends State<BookConfirm> {
Future navigateToBookSuccess(context, DoctorList docObject,
PatientShareResponse patientShareResponse) async {
GifLoaderDialogUtils.hideDialog(context);
Navigator.push(
context,
MaterialPageRoute(

@ -31,6 +31,7 @@ class _BookingOptionsState extends State<BookingOptions> {
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: widget.isAppbar,
isShowDecPage: false,
appBarTitle: TranslationBase.of(context).bookAppo,
body: Container(
margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),

@ -235,7 +235,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
return children;
},
),
onDaySelected: (date, events,format) {
onDaySelected: (date, events) {
_onDaySelected(date, events);
_animationController.forward(from: 0.0);
},

@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.da
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
import 'package:flutter/material.dart';
@ -165,27 +166,21 @@ class _SearchByClinicState extends State<SearchByClinic> {
}
getClinicsList() {
GifLoaderDialogUtils.showMyDialog(context);
ClinicListService service = new ClinicListService();
service
.getClinicsList(context)
.then((res) {
if (res['MessageStatus'] == 1) {
setState(() {
isMobileAppDentalAllow = res['ISMobileAppDentalAllow'];
res['ListClinicCentralized'].forEach((v) {
clinicsList.add(new ListClinicCentralized.fromJson(v));
});
});
} else {}
})
.catchError((err) {
print(err);
})
.showProgressBar(
text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6))
.then((value) {
getProjectsList();
service.getClinicsList(context).then((res) {
if (res['MessageStatus'] == 1) {
setState(() {
isMobileAppDentalAllow = res['ISMobileAppDentalAllow'];
res['ListClinicCentralized'].forEach((v) {
clinicsList.add(new ListClinicCentralized.fromJson(v));
});
});
getProjectsList();
} else {}
}).catchError((err) {
print(err);
});
}
getProjectsList() {
@ -196,14 +191,13 @@ class _SearchByClinicState extends State<SearchByClinic> {
res['ListProject'].forEach((v) {
projectsList.add(new HospitalsModel.fromJson(v));
});
print(projectsList.length);
});
GifLoaderDialogUtils.hideDialog(context);
filterClinic();
} else {}
}).catchError((err) {
print(err);
}).showProgressBar(
text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
});
}
getDoctorsList(BuildContext context) {
@ -293,8 +287,6 @@ class _SearchByClinicState extends State<SearchByClinic> {
.where((i) => widget.clnicIds.indexOf(i.clinicID) > -1)
.toList();
isLoaded = true;
///print(clinicsList);
}
});
}

@ -348,7 +348,7 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
return children;
},
),
onDaySelected: (date, event,format) {
onDaySelected: (date, event) {
_onDaySelected(date, event,);
_animationController.forward(from: 0.0);
},

@ -45,7 +45,7 @@ class _SelectBeneficiaryDialogState extends State<SelectBeneficiaryDialog> {
leading: Radio(
value: BeneficiaryType.MyAccount,
groupValue: beneficiaryType,
activeColor: Colors.red[800],
activeColor: Color(0xFF40ACC9),
onChanged: (BeneficiaryType value) {
setState(() {
beneficiaryType = value;
@ -75,7 +75,7 @@ class _SelectBeneficiaryDialogState extends State<SelectBeneficiaryDialog> {
leading: Radio(
value: BeneficiaryType.MyFamilyFiles,
groupValue: beneficiaryType,
activeColor: Colors.red[800],
activeColor: Color(0xFF40ACC9),
onChanged: (BeneficiaryType value) {
setState(() {
beneficiaryType = value;
@ -105,7 +105,7 @@ class _SelectBeneficiaryDialogState extends State<SelectBeneficiaryDialog> {
leading: Radio(
value: BeneficiaryType.OtherAccount,
groupValue: beneficiaryType,
activeColor: Colors.red[800],
activeColor: Color(0xFF40ACC9),
onChanged: (BeneficiaryType value) {
setState(() {
beneficiaryType = value;

@ -54,7 +54,7 @@ class _SelectHospitalDialogState extends State<SelectHospitalDialog> {
leading: Radio(
value: widget.hospitals[index],
groupValue: widget.selectedHospital,
activeColor: Colors.red[800],
activeColor: Color(0xFF40ACC9),
onChanged: (value) {
setState(() {
widget.selectedHospital = value;

@ -100,7 +100,7 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
height: 4,
),
Texts(
model.appointmentDetails.clinicName,
model.appointmentDetails.clinicName != null ? model.appointmentDetails.clinicName : "",
bold: true,
),
SizedBox(

@ -79,13 +79,13 @@ class _AppDrawerState extends State<AppDrawer> {
right: 5),
child: Icon(
Icons.account_circle,
color: Colors.red,
color: Color(0xFF40ACC9),
)),
AppText(
user.firstName +
' ' +
user.lastName,
color: Colors.red,
color: Color(0xFF40ACC9),
)
],
),
@ -99,7 +99,7 @@ class _AppDrawerState extends State<AppDrawer> {
'File No:' +
user.patientID
.toString(),
color: Colors.red,
color: Color(0xFF40ACC9),
fontSize: SizeConfig
.textMultiplier *
1.5,
@ -149,8 +149,8 @@ class _AppDrawerState extends State<AppDrawer> {
child: DrawerItem(
TranslationBase.of(context).family,
Icons.group,
textColor: Colors.red,
iconColor: Colors.red,
textColor: Color(0xFF40ACC9),
iconColor: Color(0xFF40ACC9),
bottomLine: false,
sideArrow: true,
),

@ -86,6 +86,7 @@ dependencies:
# Calendar
table_calendar: ^2.2.3
# SVG Images
flutter_svg: ^0.18.0

Loading…
Cancel
Save