Commit Graph

45 Commits (f52aed49fd124e185ffdfd58bb9bc4d37b52bc31)

Author SHA1 Message Date
Sultan khan 21e4bb5138 error code 699 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 aa04e943ef updates & fixes 2 years ago
Sultan khan f2a57255fc no message 2 years ago
Sultan khan 8c46d2577d updated with assets 2 years ago
Sultan khan ec13edc28b updates. 2 years ago
devamirsaleemahmad 23b7d85911 changes 2 years ago
devamirsaleemahmad 4231c85055 Merge branch 'development_v3.3' 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/privilege/VidaPlusProjectListModel.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.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/service/privilege_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/models/anicllary-orders/ancillary_order_list_model.dart
#	lib/models/anicllary-orders/ancillary_orders_proc_list.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/confirm_payment_page.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/insurance/insurance_update_screen.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/ask_doctor/doctor_response.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/pages/medical/balance/my_balance_page.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/pages/medical/radiology/radiology_home_page.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	pubspec.yaml
2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad 3f6c05825d updates 2 years ago
haroon amjad 98abc5a069 updates 3 years ago
haroon amjad 6bdb7a3305 Updates & fixes 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 3 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad 94aab4a737 Speech to text fix in iOS 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 4 years ago
Sikander Saleem ecb6315f9c blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 4 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
haroon amjad 69af6799c4 updates 4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Sikander Saleem cd85ad4f8a feedback ui redesigned. 4 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 4 years ago
Sultan Khan 9610ff640e feedback changes 4 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 5 years ago
Sultan Khan 3a8b889b74 bug fixes 5 years ago
Elham Rababah 96117fd191 PAP-625: add option “not classified”. 5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Mohammad Aljammal b6d2878cf1 add Radiology translations and colors 5 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 5 years ago
Mohammad Aljmma 97a8fe4f9b fix issue #14 5 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 5 years ago
Mohammad Aljammal 32e2732c43 feedback service 6 years ago
Mohammad Aljammal 7d230ea14c fix issues 6 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 6 years ago