Commit Graph

353 Commits (a9bd9f1fdf771e0d57ea381f99f4e0b946916250)

Author SHA1 Message Date
devmirza121 6575456d3b Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
devmirza121 dc3d3bc772 Health Calculator 5.0 3 years ago
haroon amjad 338c646a43 updates 3 years ago
devmirza121 a131f24952 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
devmirza121 1d1708bdcc Health Calculator 4.0 3 years ago
haroon amjad 75989bdc01 Health Calculators translations 3 years ago
haroon amjad d2834bb3dd Health calculator fixes 3 years ago
devmirza121 6225f2468d Health Calculator 3.0 3 years ago
devmirza121 d4eab13982 Health Calculator 2.0 3 years ago
devmirza121 e13d64dbf7 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
devmirza121 0b8600605b Health Calculator 1.0 3 years ago
haroon amjad 894cc0e336 Updates & fixes 3 years ago
haroon amjad 72784f68b9 Fixes & updates 3 years ago
haroon amjad e7f5fc8434 Blood donation fixes 3 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 3 years ago
haroon amjad 62974b7b72 Updates & fixes 3 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 3 years ago
haroon amjad 2a212149ed Health converters UI done 3 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 3 years ago
haroon amjad 924f685342 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
3 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 3 years ago
Sikander Saleem ebb4c026c6 improvements 3 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
3 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 3 years ago
haroon amjad e913316c54 Updates 3 years ago
haroon amjad 30c6f1dedb Updates 3 years ago
Mirza.Shafique 957ff9039b Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 1a6802ce24 Child Vaccine 3 3 years ago
haroon amjad 2062b96652 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 3 years ago
Mirza.Shafique a766c2522e Child Vaccine 1.0 3 years ago
Mirza.Shafique 41db218e9a oder log merge fix 3 years ago
Mirza.Shafique d3698a0e74 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
3 years ago
Mirza.Shafique 3d480bac5c design fixes 3 3 years ago
haroon amjad 4b0382d7c4 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sikander Saleem 4dca22bec1 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem afad83182d h20 dialog ui changes 3 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
3 years ago
haroon amjad 494b1f221d Updates & fixes 3 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 3 years ago
haroon amjad 43a672cc68 Updates & fixes 3 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
3 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 3 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 3 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 3 years ago
haroon amjad 03882c166c Translation & UI updates 3 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
3 years ago
haroon amjad 6d3ead24e1 localisation update 3 years ago