Commit Graph

488 Commits (e64d1088a6a8fc88872fe2a3b4d77413f7339fff)

Author SHA1 Message Date
haroon amjad c7ee76d816 updates 2 years ago
devamirsaleemahmad cbc38940ea changes 2 years ago
devamirsaleemahmad ed748a626b changes 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
haroon amjad d5dd8757e9 Privileges added for QR & NFC CheckIn options 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
haroon amjad 0a478e077a QR Code checkin implemented 2 years ago
haroon amjad 542501f5c5 updates 2 years ago
devamirsaleemahmad c1fd6313b1 changes 2 years ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
devamirsaleemahmad b26f535749 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 2 years ago
Sultan khan 391331f508 code update in progress 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 9ed454f67a Cash patient check implemented 2 years ago
haroon amjad 49963911ba Patient eligibility change 2 years ago
haroon amjad 72ee34f9a7 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/uitl/translations_delegate_base.dart
2 years ago
haroon amjad 275c99a4ce updates 2 years ago
haroon amjad fb9a4d5297 Laser clinic changes 2 years ago
haroon amjad 6b121e7f39 Store build version 4.5.026 2 years ago
haroon amjad 75685b1f61 Project selection added in Laser & advance payment 2 years ago
haroon amjad c58e180c91 Updates 2 years ago
haroon amjad 7c68779324 Nphies integration 3 years ago
haroon amjad da0a164b0e updates 3 years ago
haroon amjad e4fe4baa27 nearest appo crash fixed 3 years ago
haroon amjad f28fcbd006 AdvanceNumber_VP added 3 years ago
haroon amjad 15c4f016df update to stores for version 10.5 3 years ago
haroon amjad f45c5de526 Merge branch 'sultan_v3.3' into development_v3.3 3 years ago
Sultan khan 47702b5c01 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_v3.3
# Conflicts:
#	lib/config/config.dart
3 years ago
Sultan khan ea82219e9e Appointment logs 3 years ago
haroon amjad 6e9cc39269 Dental fixes 3 years ago
haroon amjad 63426a691d Ancillary orders family members issue resolved 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad 4f50c3ff8e Pharmacy LiveCare revamped 3 years ago
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad c8ec536267 Sickleave CR done 3 years ago
haroon amjad e5e5bb5352 Dental book appointment changes 3 years ago
haroon amjad 25af2c23ef Sick leave CR, LiveCare support call, Appo calendar changes 3 years ago
haroon amjad 22274ebbb0 updates & fixes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 442a94ac08 Updates & fixes 3 years ago
haroon amjad f6191d9bf7 updates & fixes 3 years ago
haroon amjad 7ae4e7d616 updates & fixes 3 years ago
haroon amjad d75615a2eb Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 106334c9cf updates & fixes 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 3 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
haroon amjad f50bfda330 updates 4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad 842e099953 DateTime Fixes 4 years ago
haroon amjad a9e48e487f HHC Fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad be2a9380df Analytics change 4 years ago
haroon amjad 9464d543fc updates 4 years ago
haroon amjad d344169399 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookSuccess.dart
4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
Zohaib Iqbal Kambrani aac15c5a4a partial analytics fixes and updates 4 years ago
Zohaib Iqbal Kambrani 936b7c28f9 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Covid updates & other fixes

# Conflicts: Resolved
#	lib/config/config.dart
#	lib/pages/webRTC/signaling.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
Zohaib Iqbal Kambrani a398220033 no message 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 3eb7a4325b updates & fixes 4 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani 81a3d1ce87 no message 4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad 693f8cb090 Updates & fixes 4 years ago
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
5 years ago
Sultan Khan 1a501a3b2a calendar events changes 5 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 5 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 5 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 5 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
5 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 5 years ago
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 5 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
5 years ago
Sikander Saleem 970887b0c5 changes 5 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 5 years ago