Commit Graph

133 Commits (d2e0eaf0ef2db98d85c7c23bffe3c824e76fc080)

Author SHA1 Message Date
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
10 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
10 months ago
faizatflutter 001808488c Added 'send report to email' feature 10 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 10 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 10 months ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
10 months ago
haroon amjad ede8844f19 Monthly Reports implemented 10 months ago
haroon amjad 6f067d92d6 My invoices implemented 10 months ago
faizatflutter d4dd475e0b Added Graph 10 months ago
faizatflutter 333046951c Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/routes/app_routes.dart
10 months ago
Fatimah.Alshammari f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
10 months ago
Fatimah.Alshammari 68f044de52 added monthly report 10 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 10 months ago
aamir-csol f509a09b34 Health calculators & converters 10 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
11 months ago
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
11 months ago
Sultan khan 70d5b06987 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (45 commits)
  Health Calculators
  Smartwatch integration started
  refactor
  Complete UserInfo Selection Module
  Complete UserInfo Selection Module
  update
  Complete USerInfo Selectoiun
  Ancillary order fixes, QLine API integrated & other enhancements
  Added user_info module IAP
  Medical File page updates
  Master merged
  Services Page Revamp
  loading view added
  graph shaded region added from horizontal spaces
  Refactoring
  Appointment Queue implemented, Blood Donation implementation contd.
  Integrated the API for Symptoms Checker
  Queueing system screen implementation contd.
  medical file changes
  Added symptoms selector
  ...

# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/my_appointments/my_appointments_repo.dart
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/home/landing_page.dart
11 months ago
Fatimah.Alshammari 0b3fea230f monthly report 11 months ago
aamir-csol 7d71d994ea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/enums.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/routes/app_routes.dart
11 months ago
aamir-csol 335e6a6649 Health Calculators 11 months ago
haroon amjad d202aa8423 Smartwatch integration started 11 months ago
Sultan khan f28762a5c5 last appointment rated done. 11 months ago
faizatflutter 34f4cd4f91 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
11 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 11 months ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 11 months ago
faizatflutter 757ace2ba1 Added Organ Selector 11 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
11 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 11 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
11 months ago
Fatimah.Alshammari eae16eec44 active medication 11 months ago
tahaalam 53be50b40c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/appointments/widgets/appointment_doctor_card.dart
#	lib/widgets/common_bottom_sheet.dart
11 months ago
faizatflutter 617b68021a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/appointments/appointment_payment_page.dart
11 months ago
tahaalam a669265076 Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
#	lib/main.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/input_widget.dart
11 months ago
haroon amjad 2a6c7fc0a1 Find us implemented 12 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 12 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 12 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
1 year ago
faizatflutter eabfaf8182 Design Updates 1 year ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 1 year ago
haroon amjad f1a60a9dfb updates 1 year ago
tahaalam 6cf08c04d2 appointment filters added. 1 year ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
1 year ago
tahaalam 6ef9ae813d doctors search filter added 1 year ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 1 year ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 1 year ago
taha.alam 7093a26cb8 selection region arabic handling 1 year ago
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 1 year ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 1 year ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
1 year ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 1 year ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
1 year ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 1 year ago
haroon amjad 9f95150a94 book appointment implementation completed. 1 year ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
1 year ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 1 year ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 1 year ago
Haroon Amjad b240293064 medical file implementation contd. 1 year ago
haroon amjad ccd29f0cf9 updates 1 year ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
1 year ago
Sultan khan ba2c8327fe login flow inprogress 1 year ago
haroon amjad 2c45356b07 Payment module implementation contd. 1 year ago
haroon amjad a0bdc34685 My appointments implementation contd. 1 year ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
1 year ago
faizatflutter 84804a59a7 completed till otp receiving 1 year ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 1 year ago
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
1 year ago
faizatflutter 32fadb8ad9 completed login function 1 year ago
haroon amjad 8bc49929d4 prescription orders list page implemented 1 year ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 1 year ago
Haroon Amjad a77fc49c68 lab result changes 1 year ago
haroon amjad e044fc8c5e lab implementation contd. 1 year ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 1 year ago
faizatflutter 89e9323d9e merged master and updated structure 1 year ago
faizatflutter e2b0930dd1 Merge branch 'master' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml
1 year ago
Haroon Amjad 0a39a00df5 Landing page updates 1 year ago
Sultan khan d3aff9f93d updating structure 1 year ago
Sultan khan cbfb381615 Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock
1 year ago
Faiz Hashmi 357cf4392e Updated architecture 1 year ago
aamir-csol 4e3ba99280 widgets & fixes 1 year ago
Faiz Hashmi d65dc4ea89 initial commit 1 year ago
Haroon Amjad c65d44ae4d updates 1 year ago
Haroon Amjad 2293db00ea updates 1 year ago
Haroon Amjad b6766654e0 initial commit 1 year ago