Commit Graph

153 Commits (ff2bcbae3f5e54623c74e5da80a0da25c0146a6c)

Author SHA1 Message Date
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
3 days ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 4 days ago
haroon amjad 1656ca58c1 Merge branch 'ambulance_service' into haroon_dev 1 week ago
haroon amjad d6b1744176 updates 1 week ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
1 week ago
haroon amjad 210da3404c updates 1 week ago
haroon amjad b10d715d55 App updates 1 week ago
haroon amjad b353de3cf8 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_doctor_page.dart
#	lib/presentation/book_appointment/widgets/doctor_card.dart
3 weeks ago
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
3 weeks ago
aamir-csol 135b05e561 Health calculators & converters 3 weeks ago
haroon amjad 510d82b592 Merge branch 'master' into haroon_dev 3 weeks ago
Sultan khan 366429f083 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:
  Health calculators & converters
  Health calculators & converters
  collapsing_list_view improvement

# Conflicts:
#	lib/widgets/appbar/collapsing_list_view.dart
3 weeks ago
haroon amjad f886357bcd updates 3 weeks ago
Sultan khan 40638cfec4 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:
  collapsing_list_view improvement
  Updated design for HHC
  updates & fixes
  QLine API implementation enhancements
  LiveCare flow from clinic selection implemented

# Conflicts:
#	lib/presentation/home/landing_page.dart
3 weeks ago
aamir-csol c921228ad9 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/health_calculators/health_calculator_result.dart
4 weeks ago
aamir-csol f509a09b34 Health calculators & converters 4 weeks ago
haroon amjad 450f07d39d updates & fixes 1 month ago
haroon amjad d8c7503c56 QLine API implementation enhancements 1 month ago
Sultan khan d28c94606b 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:
  updates
  updates
  updates & fixes
1 month ago
Sultan khan 68e1b116f9 last rated updated. 1 month ago
haroon amjad bee4aafc44 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 3060c57201 updates 1 month 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
1 month ago
haroon amjad eff6cbbaad updates & fixes 1 month ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
1 month ago
Sultan khan f28762a5c5 last appointment rated done. 1 month ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 1 month ago
faizatflutter c7c0a0ac09 Added user_info module IAP 1 month ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 1 month ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 1 month ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
1 month ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 1 month ago
haroon amjad 36bf63dcde Incoming call updates 1 month ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 1e5744cf44 Updates & enhancements 2 months ago
Sultan khan 9e0336687c virtual tour. 2 months ago
faizatflutter 757ace2ba1 Added Organ Selector 2 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 2 months ago
haroon amjad b13adde9d2 send feedback implementation done 2 months ago
haroon amjad 938463aabc Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/date_util.dart
2 months ago
haroon amjad 9f845f1de8 Feedback page implementation contd. 2 months ago
tahaalam 31261092a8 rrt request creation and history listing 2 months ago
Haroon Amjad 37a0692be4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 2 months ago
haroon amjad f9f17f3a76 LiveChat implemented 2 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
2 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
2 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
2 months ago
tahaalam 1f852f63cf penguin sdk added 2 months ago
haroon amjad 2a6c7fc0a1 Find us implemented 2 months ago
tahaalam 5b0a8ad898 cancel and listing request added 2 months ago