Commit Graph

674 Commits (e64d1088a6a8fc88872fe2a3b4d77413f7339fff)

Author SHA1 Message Date
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad aafdf3760d added sick leave status text & color 3 years ago
haroon amjad c8ec536267 Sickleave CR done 3 years ago
haroon amjad 25af2c23ef Sick leave CR, LiveCare support call, Appo calendar changes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad d75615a2eb Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 4 years ago
haroon amjad 106334c9cf updates & fixes 4 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 4 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 4 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 4 years ago
haroon amjad 833818e6e3 Rad & Lab email issues fixes 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad 4ba229c436 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
Zohaib Iqbal Kambrani 86363a15d6 Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
4 years ago
Zohaib Iqbal Kambrani 5c32e488d0 no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
haroon amjad bbb99667f8 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 27c6837f25 updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 643763764d family files fixes 4 years ago
haroon amjad 72e2707d4b updates 4 years ago
haroon amjad 60a44f9a42 OpenTok fixes 4 years ago
Zohaib Iqbal Kambrani ff508de9f7 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Updates & fixes

# Conflicts: resolved
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad aa36154764 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 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 4acdad0e99 fixes & updates 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad c175139a29 pharmacy fixes 4 years ago
Sikander Saleem c8b5602d8e flutter 2.8 improvements. 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 330f2d6c86 Fixes & updates 4 years ago
haroon amjad d5b58c07ca Smartwatch fixes 4 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad 75423e5501 Updates 4 years ago
haroon amjad 5f0985adaa Updates 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
haroon amjad 7ffc467552 Lakum fixes 4 years ago
haroon amjad 68294690a1 prescription reminders added 4 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 4 years ago
devmirza121 69b1dd6533 Medical Reminder 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
haroon amjad 0853ecdc27 Body added 4 years ago
haroon amjad 62974b7b72 Updates & fixes 4 years ago
Sikander Saleem 455f65a5e5 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem d2223da3c2 improvements. 4 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago
Sikander Saleem c1ce3a0489 blood sugar dialog improvement. 4 years ago
haroon amjad 924f685342 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
Sikander Saleem d8476df6dd Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
4 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 4 years ago
haroon amjad be91844868 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 30c6f1dedb Updates 4 years ago
Mirza.Shafique fe1a287070 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 5514753288 Zoom Avatar implementation 4 years ago
haroon amjad 1fff2dad25 Smartwatch updates 4 years ago
haroon amjad d409875741 Smartwatch updates 4 years ago
haroon amjad 1f077f71f8 no message 4 years ago
haroon amjad 2032053cb7 Working on Health data 4 years ago
haroon amjad 4b0382d7c4 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
Mirza.Shafique 792bb4df0b Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 8001c0140c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
4 years ago
Sikander Saleem 554b9558b1 add reminder & send mail button color change. 4 years ago
Sikander Saleem 14ccae993e my tracker tabs switching issue fixed. 4 years ago
Haroon Amjad 59dac89118 updates 4 years ago
haroon amjad 5d44fff28d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem ecb6315f9c blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 4 years ago
haroon amjad 2db050a228 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
haroon amjad 803f5a786b Blood pressure chart fix 4 years ago
haroon amjad 07a98d75c6 My tracker fixes 4 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 21863cfe06 improvements. 4 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
4 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
haroon amjad 4a2e01b8b1 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Sultan Khan 5c8b809e39 family file fixes 4 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 4 years ago
Mirza.Shafique 6261f01ab6 Merge branch 'development_new_design_2.0' into mirza_home_page 5 years ago
Mirza.Shafique 9c7e8e3637 Back Button on Landing Page 1 5 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
5 years ago
Sikander Saleem f509679173 Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 5 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
haroon amjad cb220031dd Updates & fixes 5 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 5 years ago
haroon amjad 6c4afaf114 Advance payment API updates 5 years ago
Mirza.Shafique 4d372bffb2 Merge branch 'development_new_design_2.0' into mirza_home_page 5 years ago
Mirza.Shafique e788f09ed9 Show Chart Widget 5 years ago
haroon amjad 2c4ff16f0c updates & fixes 5 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad 01ca8b8f84 updates & fixes 5 years ago
Mirza.Shafique cb230db0c5 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique a9773e81e7 Bug Fixes prescription 5 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 5 years ago
Sikander Saleem b4031e973e chevron icon to arrow forward 5 years ago
haroon amjad 503ab739ca prescription availability design revamped 5 years ago
haroon amjad 46a572674f Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
haroon amjad 69af6799c4 updates 5 years ago
Mirza.Shafique 3a40eb92be Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 5 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
5 years ago
haroon amjad 5163c826ad Updates & fixes 5 years ago
Sikander Saleem 6099738a5c improvements 5 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 5 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 5 years ago
haroon amjad 89e1aa70c0 updates 5 years ago
Sikander Saleem df32ae0142 lab order clinic/hospital name, prescription reminder ui, prescription availibility 5 years ago
Sikander Saleem 3403e07aba recall prescription order log when refill or cancel order. 5 years ago
Haroon Amjad 062ca5c11c EReferral fixes 5 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 5 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
haroon amjad a4a2389a78 updates & fixes 5 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 5 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 5 years ago
haroon amjad 184942e891 Covid Payment fixes 5 years ago
Mirza.Shafique 9b160958bb Covid New Design 3 5 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
haroon amjad fa8c739b2c updates & fixes 5 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
5 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 5 years ago
Sikander Saleem 9f8bcc63f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/prescriptions/prescriptions_history_details_page.dart
5 years ago
Sikander Saleem 4ce941e01e prescription order log detail view change on arabic 5 years ago
haroon amjad f55fbd1cc2 UI fixes 5 years ago
haroon amjad 4b1a2d4f3d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
5 years ago
haroon amjad a075d53dd5 UI updates & fixes 5 years ago
Sikander Saleem 7b8093b7ba Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem c1b23b7c2a improvements 5 years ago
Mirza.Shafique e24eaa791b Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 5b47aaac6f icon and find us distance 5 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 4a30c59f83 Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem e37781c3a6 insurance approval screen and detail screen ui changes. 5 years ago
haroon amjad ba7d0329c3 Dental Invoices UI 5 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
Sultan Khan 0e43ca173a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 5 years ago
Sultan Khan d535cb421d bug fixes 5 years ago
haroon amjad f9b57ce4aa Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
haroon amjad 4ac0845003 updates & fixes 5 years ago
Mirza.Shafique 719cdbd2e4 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 8a4cf9f23b Line Chart Fix in Vital Signs 5 years ago
Sikander Saleem baf4eab604 prescription order detail ui changes 5 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
5 years ago
Sikander Saleem d9405b2bd0 prescription order log ui changes 5 years ago
Sikander Saleem 8e27d8210a prescription detail ui changes. 5 years ago
haroon amjad ad3463bbfc active medication design revamped 5 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
5 years ago
Sikander Saleem 9d67704c67 prescription detail ui changes(cont). 5 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
Sikander Saleem 4e0197965c prescription ui changes(cont). 5 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 5 years ago
haroon amjad b1128be94f Updates & fixes 5 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Mirza.Shafique d7314f7555 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 5 years ago
haroon amjad f946a7be4d updates & fixes 5 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
Sultan Khan c6404a2a0b tracker services 5 years ago
haroon amjad f795ba24c5 updates & fixes 5 years ago
haroon amjad f33272f8d9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 5 years ago
Sultan Khan 2019e804f0 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 5 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 5 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
5 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 5 years ago
Mirza.Shafique afb08fcd0a Booking Filters Update 5 years ago
Mirza.Shafique 3af1676730 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/insurance/insurance_card_screen.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
5 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 5 years ago