Commit Graph

195 Commits (d865bd9c3b514ae81e063aedbc56cfe8a9f7e1cc)

Author SHA1 Message Date
haroon amjad c2785c5f68 Updates & fixes 11 months ago
haroon amjad 889828d4d4 Lab report download VIDA Plus implementation 11 months ago
sultan khan e66e42edda next day appointment updates 11 months ago
sultan khan b93d373c6f next appointment updated. 11 months ago
sultan khan 2c746bf783 next day appointments change. 11 months ago
haroon amjad 291cf16d22 Changes for Laser clinic full body part 1 year ago
haroon amjad 849164be2c Laser appointment booking changes 1 year ago
haroon amjad 20bfdc3652 Project Name Top & Bottom changes implemented 1 year ago
haroon amjad 3d44aa2e64 Sickleave updates 1 year ago
haroon amjad c6ee01c652 Waiting appointment bug fix 1 year ago
haroon amjad cee903dd6b changes for the hospital gesture clicked area and nearest check not showing the hospital dropdown area 1 year ago
haroon amjad 7ddd932c51 no message 1 year ago
haroon amjad a6ee6869cc Merge commit '81b94814ce4f0a1e4626fe07a9b7933246d71336' into dev_v3.13.6 1 year ago
taha.alam 81b94814ce WD: hospital top and bottom name added 1 year ago
taha.alam fe9d259cbd build context handled 1 year ago
taha.alam 936682ff95 WD: clinic by hospital 1 year ago
haroon amjad ef36e8bd30 fixes 1 year ago
haroon amjad b64cf0bf6c SFCalendar issue fixed & update to stores 16.4 1 year ago
haroon amjad 6c98f9f94f updates & fixes 1 year ago
haroon amjad 536c95c825 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/drawer/app_drawer_widget.dart
1 year ago
haroon amjad d3d8d1f121 Update to stores 16.0 1 year ago
haroon amjad 50ba0372db language updates 1 year ago
haroon amjad baaacdb2f8 updates 1 year ago
haroon amjad 0eaeb75207 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750 1 year ago
Aamir.Muhammad 4c5ba6048f CR Fixes Search By Clinic & Search By Doctor List Reload Issue 1 year ago
haroon amjad ca8533190a Walkin appointment booking implementation contd 1 year ago
haroon amjad 984459d314 Walkin appointment implementation contd 2 years ago
haroon amjad b3f2904e9a Waiting appointment implementation contd. 2 years ago
haroon amjad 8edf65daf1 Updates & Fixes 2 years ago
haroon amjad c948a1780c Update to stores VersionID 15.8 2 years ago
haroon amjad 5b7b40c732 Updates & fixes 2 years ago
Sultan khan 735582e3ab updated code. 2 years ago
Sultan khan 6983e309e0 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	android/build.gradle
#	android/gradle.properties
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/model/prescriptions/prescription_report_inp.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	pubspec.yaml
2 years ago
haroon amjad 7850748ea2 Dental updates 2 years ago
Sultan khan 30c14c2167 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	lib/core/model/reports/Reports.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/medical/ask_doctor_view_model.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/PrescriptionReport.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/medical/eye/EyeHomePage.dart
#	lib/pages/medical/reports/report_list_widget.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/location_util.dart
#	lib/uitl/utils.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad e5d8505c2d Updates & fixes 2 years ago
Sultan khan 86f5e81fea merge with 3.3 2 years ago
Sultan khan d0c7b08eac Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/viewModels/er/EdOnlineViewModel.dart
	lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
	lib/pages/BookAppointment/DentalComplaints.dart
	lib/pages/BookAppointment/components/SearchByClinic.dart
	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/landing/landing_page.dart
	lib/pages/livecare/widgets/clinic_card.dart
	lib/pages/login/login.dart
	lib/pages/rateAppointment/rate_appointment_clinic.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/services/clinic_services/get_clinic_service.dart
	lib/uitl/push-notification-handler.dart
	lib/widgets/others/bottom_bar.dart
	pubspec.yaml
2 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 2 years ago
Sultan khan 4338da513d Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/model/rate/appoitment_rated.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/models/Authentication/check_activation_code_request.dart
#	lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/splashPage.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 512db615be Language ID fixes & app update to stores, VersionID 11.5 2 years ago
devamirsaleemahmad 8f591654a5 changes 2 years ago
devamirsaleemahmad cbc38940ea changes 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
2 years ago
haroon amjad fb9a4d5297 Laser clinic changes 2 years ago
haroon amjad 6b121e7f39 Store build version 4.5.026 2 years ago