Commit Graph

337 Commits (b60bfde04fd782ef0ee8b033690ea8961ca85b98)

Author SHA1 Message Date
Aamir Muhammad b60bfde04f saved login fixes & design changes. 10 months ago
Aamir Muhammad e306bfd69b saved login fixes & design changes. 10 months ago
Aamir Muhammad 23fc89b40a font changes 10 months ago
Aamir Muhammad 6b96b6fc9e ui fixes 10 months ago
Aamir Muhammad 2dd823667c register Design. 10 months ago
Aamir Muhammad 16b37b847d translation & register Design changes. 10 months ago
Aamir Muhammad 801a2578ab lottie & bottom sheet 10 months ago
Aamir Muhammad 5fd4aee7ea consumer on welcome & language & font 10 months ago
Aamir Muhammad dbfa3c7cee consumer on welcome & language & font 10 months ago
Aamir Muhammad 1282b5a415 consumer on welcome & language & font 10 months ago
Aamir Muhammad 6578baaf34 login using sms done 10 months ago
haroon amjad e748712954 Initial Commit 10 months ago
taha.alam 4b40d5d5a0 WD: Color of hospital name will be as of the type of it. 1 year ago
taha.alam 11b83d1276 WD: Grouped by region ui changed and added to other two tabs of Search 1 year ago
taha.alam 615f3bfa8e WD: region filter is added. 1 year ago
taha.alam cd460ee31b WIP: doctor list by region 1 year ago
haroon amjad 20bfdc3652 Project Name Top & Bottom changes implemented 2 years ago
haroon amjad dc17576c26 Flutter version upgraded to 3.22.0 2 years ago
Aamir.Muhammad 4c5ba6048f CR Fixes Search By Clinic & Search By Doctor List Reload Issue 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 3 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
3 years ago
Aamir Muhammad 6f99aca8a5 Inpatient Cr Merge 3 years ago
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
3 years ago
Sultan khan 62dc3c162a updated 3.13.6 3 years ago
Sultan khan 8c46d2577d updated with assets 3 years ago
Sultan khan c96c151f44 null safety issue fixed. 3 years ago
Sultan khan ec13edc28b updates. 3 years ago
devamirsaleemahmad ed748a626b changes 3 years ago
devamirsaleemahmad 23b7d85911 changes 3 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 3 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 3 years ago
Sultan khan 4d52f639aa Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/livecare/live_care_payment_page.dart
#	lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
#	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
3 years ago
Sultan khan 0c534cffae code update in progress 3 years ago
devamirsaleemahmad 2c9e51aef0 changes 3 years ago
devamirsaleemahmad 49d3df8c87 changes 3 years ago
devamirsaleemahmad 47801ecb36 changes 3 years ago
devamirsaleemahmad d8836d5e89 Merge branch 'dev_v3.13.6_automigrate' into dev_v3.13.6
# Conflicts:
#	lib/main.dart
#	lib/uitl/CalendarUtils.dart
#	lib/uitl/app_shared_preferences.dart
3 years ago
devamirsaleemahmad c1fd6313b1 changes 3 years ago
Sultan khan c63a1fadf5 code updated in-progress 3 years ago
Sultan khan 8a42bf8b2f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/widgets/buttons/custom_text_button.dart
3 years ago
Sultan khan 391331f508 code update in progress 3 years ago
Sultan khan 04244675e1 code updated. 3 years ago
Sultan khan b45cbbcf29 updates 3 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
3 years ago
haroon amjad df610690d5 updates 3 years ago
haroon amjad d8e9f36844 updates 3 years ago
haroon amjad c0595a8dc6 updates 3 years ago
haroon amjad f624c70cee Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago