Commit Graph

350 Commits (7fc47ebf341f6aaa6b8f61ba8c676799e09fa7d6)

Author SHA1 Message Date
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad b15bd2362b 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 4c2410cfd5 Health plugin updated 4 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
haroon amjad 3b9c1eb9ed Appointment booking fix 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad fe7baeab3c LiveCare permissions 4 years ago
Sikander Saleem 4518a26ff1 video call improvement. 4 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 4 years ago
haroon amjad 6d970800f9 Book Appo fix 4 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 4 years ago
haroon amjad 47b7b0db58 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 014074c414 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 4 years ago
haroon amjad 289e74fd0a fixes 4 years ago
haroon amjad 70304427f9 Doc specialty fix 4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
haroon amjad 5692bc66a9 Removing anatomy pub from project 4 years ago
haroon amjad 668d725b25 Laser booking 4 years ago
haroon amjad 0853ecdc27 Body added 4 years ago
haroon amjad 2a212149ed Health converters UI done 4 years ago
haroon amjad b53d912996 Fixes & updates 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
haroon amjad f60684ad08 Notifications UI redesigned 4 years ago
haroon amjad 58c78656bf Rating dialog updates 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Sikander Saleem f6b96dcb7b Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByDoctor.dart
4 years ago
Sikander Saleem c9662c7451 schedule appointment navigation fix. 4 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
haroon amjad 587210ee58 UI fixes 4 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 4 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
haroon amjad 503ab739ca prescription availability design revamped 4 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
Sikander Saleem 6099738a5c improvements 4 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 4 years ago
haroon amjad 89e1aa70c0 updates 4 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad dfafb6b664 fixes 4 years ago
Sikander Saleem df32ae0142 lab order clinic/hospital name, prescription reminder ui, prescription availibility 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
haroon amjad fa8c739b2c updates & fixes 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
haroon amjad 19e6954bc8 updates 4 years ago
haroon amjad 92bfe27a6e updates & fixes 4 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
haroon amjad 0fe4a21388 updates & fixes 4 years ago
haroon amjad f946a7be4d updates & fixes 4 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 4 years ago
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
Sikander Saleem aa047afef7 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Mirza.Shafique afb08fcd0a Booking Filters Update 4 years ago
Sikander Saleem 1db8c96ed7 title improvement for book appointment clinic search. 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 4 years ago
haroon amjad 45272d251c Updates & fixes 4 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
Sikander Saleem 62ca009404 improvement. 4 years ago
Sultan Khan ad7527ee65 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 233a273316 shcedule page 4 years ago
Mirza.Shafique 3f0d8626e7 Marge issue 4 years ago
Mirza.Shafique 590ea48ea9 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Mirza.Shafique e1e3741abf Event Reminder 4 years ago
haroon amjad 3abd7227ec fixes 4 years ago
haroon amjad 9cf9e297cf Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
4 years ago
haroon amjad 4560037f97 updates 4 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan d1fc4751ad BUG FIXES 4 years ago
Mirza.Shafique ebf293736d Booking appointment Marge 4 years ago
Sikander Saleem 363cf78884 improvement. 4 years ago
Sikander Saleem b78f8f76db improvement. 4 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
4 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 4 years ago
haroon amjad e9c26ee85f Dental procedures implemented 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Sultan Khan 1a501a3b2a calendar events changes 4 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 4 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 4 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 4 years ago
Mirza.Shafique bd1cf9bcc7 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 4 years ago
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 94ff5cff40 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 970887b0c5 changes 4 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
haroon amjad 5f521556dc Dental flow fixes 4 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 11ffed2ae3 bug fixes 4 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 5 years ago
Sikander Saleem 350ff20a1a my doctor screen. 5 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 5 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
haroon amjad eadba3f767 Working on livecare appointment booking page 5 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 5 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 5 years ago
haroon amjad a32501f3dc My invoices implementation continued 5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
haroon amjad 5007064105 Jira fixes 5 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
Mirza.Shafique b31813770e Check-In NFC done 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
5 years ago
Sultan Khan b891c1bd80 theme issue 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
haroon amjad deb0b40cfe fixes 5 years ago
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
5 years ago
haroon amjad 9ecf745747 fixes 5 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 5 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 5 years ago
haroon amjad dde10cd27b working in LiveCare Scheduling 5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
5 years ago
Haroon Amjad b0ea1fc262 updates & fixes 5 years ago
haroon amjad 8c9762c24f Fixes 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
haroon amjad 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Haroon Amjad 3308aa47e1 fixes 5 years ago