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

Dental updates

Browse Source
dev_3.3_AmbulanceRequestCR^2
haroon amjad 2 years ago
parent 0168f06bb9
commit 7850748ea2
8 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File

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

@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:4422/';
var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://uat.hmgwebservices.com/';
var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'http://10.20.200.111:1010/';
// var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/';

8
lib/pages/BookAppointment/DentalComplaints.dart
Unescape Escape View File

@ -118,6 +118,7 @@ class _DentalComplaintsState extends State<DentalComplaints> {
return DoctorView(
doctor: doctor,
isLiveCareAppointment: false,
isContinueDentalPlan: hasDentalPlan,
);
}).toList(),
)),
@ -146,8 +147,8 @@ class _DentalComplaintsState extends State<DentalComplaints> {
confirmMessage: TranslationBase.of(context).continuePlan,
okText: TranslationBase.of(context).yes,
cancelText: TranslationBase.of(context).no,
okFunction: () => {Navigator.of(context).pop(), continueDentalPlan()},
cancelFunction: () => {getChiefComplaintsList()});
okFunction: () => {Navigator.of(context).pop(), continueDentalPlan(), hasDentalPlan = true},
cancelFunction: () => {getChiefComplaintsList(), hasDentalPlan = false});
dialog.showAlertDialog(context);
} else {
getChiefComplaintsList();
@ -260,8 +261,9 @@ class _DentalComplaintsState extends State<DentalComplaints> {
int languageID = projectViewModel.isArabic ? 1 : 2;
GifLoaderDialogUtils.showMyDialog(context);
getLanguageID();
hasDentalPlan = false;
ClinicListService service = new ClinicListService();
service.getChiefComplaintsList(widget.searchInfo.ClinicID, widget.searchInfo.ProjectID, languageID, context).then((res) {
service.getChiefComplaintsList(widget.searchInfo.ClinicID, widget.searchInfo.ProjectID, languageID, false, context).then((res) {
GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
setState(() {

4
lib/pages/BookAppointment/DoctorProfile.dart
Unescape Escape View File

@ -39,8 +39,9 @@ class DoctorProfile extends StatefulWidget {
final bool isOpenAppt;
bool isLiveCareAppointment;
bool isDoctorNameSearch;
bool isContinueDentalPlan;
DoctorProfile({@required this.doctor, @required this.docProfileList, @required this.isLiveCareAppointment, this.isOpenAppt = false, this.isDoctorNameSearch = false});
DoctorProfile({@required this.doctor, @required this.docProfileList, @required this.isLiveCareAppointment, this.isOpenAppt = false, this.isDoctorNameSearch = false, this.isContinueDentalPlan = false});
AuthenticatedUser authUser;
@ -203,6 +204,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
doctor: widget.doctor,
isLiveCareAppointment: widget.isLiveCareAppointment,
doctorSchedule: doctorSchedule,
isContinueDentalPlan: widget.isContinueDentalPlan,
),
],
controller: _tabController,

5
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
Unescape Escape View File

@ -27,10 +27,11 @@ class DocAvailableAppointments extends StatefulWidget {
static String selectedDate;
static String selectedTime;
bool isLiveCareAppointment;
bool isContinueDentalPlan;
final dynamic doctorSchedule;
static int initialSlotDuration;
DocAvailableAppointments({@required this.doctor, this.doctorSchedule, @required this.isLiveCareAppointment});
DocAvailableAppointments({@required this.doctor, this.doctorSchedule, @required this.isLiveCareAppointment, this.isContinueDentalPlan = false});
@override
_DocAvailableAppointmentsState createState() => _DocAvailableAppointmentsState();
@ -320,7 +321,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
print(DocAvailableAppointments.initialSlotDuration);
GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService();
service.getDoctorFreeSlots(docObject.doctorID, docObject.clinicID, docObject.projectID, context, projectViewModel).then((res) {
service.getDoctorFreeSlots(docObject.doctorID, docObject.clinicID, docObject.projectID, widget.isContinueDentalPlan, context, projectViewModel).then((res) {
GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
if (res['FreeTimeSlots'].length != 0) {

11
lib/pages/BookAppointment/widgets/DoctorView.dart
Unescape Escape View File

@ -28,6 +28,7 @@ class DoctorView extends StatelessWidget {
bool isObGyneAppointment;
bool isShowFlag;
bool isDoctorNameSearch;
bool isContinueDentalPlan;
OBGyneProcedureListResponse obGyneProcedureListResponse;
final VoidCallback onTap;
@ -36,6 +37,7 @@ class DoctorView extends StatelessWidget {
@required this.isLiveCareAppointment,
this.isObGyneAppointment = false,
this.isDoctorNameSearch = false,
this.isContinueDentalPlan = false,
this.isShowFlag = true,
this.onTap,
this.obGyneProcedureListResponse});
@ -54,7 +56,7 @@ class DoctorView extends StatelessWidget {
// showDentalChiefComplaintsList(context);
// } else
if (isShowFlag) {
getDoctorsProfile(context, doctor, isAppo: true);
getDoctorsProfile(context, doctor, isAppo: true, isContinueDentalPlan: isContinueDentalPlan);
}
(onTap ?? () {})(); // For log analytics of doctor click from book appointment
}
@ -182,7 +184,7 @@ class DoctorView extends StatelessWidget {
return docSpeciality;
}
getDoctorsProfile(context, DoctorList docObject, {isAppo}) {
getDoctorsProfile(context, DoctorList docObject, {isAppo, bool isContinueDentalPlan = false}) {
int languageID = projectViewModel.isArabic ? 1 : 2;
GifLoaderDialogUtils.showMyDialog(context);
List<DoctorProfileList> docProfileList = [];
@ -195,7 +197,7 @@ class DoctorView extends StatelessWidget {
docProfileList.add(new DoctorProfileList.fromJson(v));
});
} else {}
navigateToDoctorProfile(context, docObject, docProfileList[0], isAppo: isAppo);
navigateToDoctorProfile(context, docObject, docProfileList[0], isAppo: isAppo, isContinueDentalPlan: isContinueDentalPlan);
} else {
AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
}
@ -234,7 +236,7 @@ class DoctorView extends StatelessWidget {
FadePage(page: ObGyneTimeSlots(projectID: doctor.projectID, selectedClinicID: doctor.clinicID, selectedDoctorID: doctor.doctorID, obGyneProcedureListResponse: obGyneProcedureListResponse)));
}
Future navigateToDoctorProfile(context, docObject, docProfile, {isAppo}) async {
Future navigateToDoctorProfile(context, docObject, docProfile, {isAppo, bool isContinueDentalPlan = false}) async {
Navigator.push(
context,
FadePage(
@ -244,6 +246,7 @@ class DoctorView extends StatelessWidget {
docProfileList: docProfile,
isOpenAppt: isAppo,
isDoctorNameSearch: isDoctorNameSearch,
isContinueDentalPlan: isContinueDentalPlan,
),
),
);

2
lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
Unescape Escape View File

@ -466,7 +466,7 @@ class _CovidTimeSlotsState extends State<ObGyneTimeSlots> with TickerProviderSta
getCovidFreeSlots(BuildContext context, int projectID) {
DoctorsListService service = new DoctorsListService();
GifLoaderDialogUtils.showMyDialog(context);
service.getDoctorFreeSlots(widget.selectedDoctorID, widget.selectedClinicID, widget.projectID, context).then((res) {
service.getDoctorFreeSlots(widget.selectedDoctorID, widget.selectedClinicID, widget.projectID, false, context).then((res) {
GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
if (res['FreeTimeSlots'].length != 0) {

5
lib/services/appointment_services/GetDoctorsList.dart
Unescape Escape View File

@ -257,7 +257,7 @@ class DoctorsListService extends BaseService {
return Future.value(localRes);
}
Future<Map> getDoctorFreeSlots(int docID, int clinicID, int projectID, BuildContext context, [ProjectViewModel projectViewModel]) async {
Future<Map> getDoctorFreeSlots(int docID, int clinicID, int projectID, bool isContinueDentalPlan, BuildContext context, [ProjectViewModel projectViewModel]) async {
Map<String, dynamic> request;
Request req = appGlobal.getPublicRequest();
@ -277,7 +277,8 @@ class DoctorsListService extends BaseService {
"SessionID": null,
"isDentalAllowedBackend": false,
"LanguageID": 1,
"DeviceTypeID": 1
"DeviceTypeID": 1,
"ContinueDentalPlan": isContinueDentalPlan,
};
if (clinicID == 253) {

6
lib/services/clinic_services/get_clinic_service.dart
Unescape Escape View File

@ -61,7 +61,7 @@ class ClinicListService extends BaseService {
return Future.value(localRes);
}
Future<Map> getChiefComplaintsList(int clinicID, int projectID, int languageID, BuildContext context, {doctorId}) async {
Future<Map> getChiefComplaintsList(int clinicID, int projectID, int languageID, bool isContinueDentalPlan, BuildContext context, {doctorId}) async {
//Utils.showProgressDialog(context);
Map<String, dynamic> request;
@ -86,8 +86,8 @@ class ClinicListService extends BaseService {
"SessionID": null,
"isDentalAllowedBackend": true,
"DeviceTypeID": 1,
"PatientID": 1,
"ContinueDentalPlan": true,
// "PatientID": 1,
"ContinueDentalPlan": isContinueDentalPlan,
"IsSearchAppointmnetByClinicID": false,
"DateofBirth": authUser.dateofBirth
};

Write Preview
Loading…
Cancel
Save