haroon amjad
|
609ae6ab83
|
updates
|
4 days ago |
haroon amjad
|
344adf23c0
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
|
4 days ago |
Fatimah.Alshammari
|
250af1506c
|
Merge branch 'master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/services/dialog_service.dart
# lib/theme/colors.dart
|
4 days ago |
haroon amjad
|
e454c9c991
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
|
4 days ago |
faizatflutter
|
ff2bcbae3f
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
|
4 days ago |
haroon amjad
|
1c0842ab95
|
updates
|
4 days ago |
faizatflutter
|
3f5bd0a759
|
Completed the health Tracker Module, Only the email part is left.
|
5 days ago |
haroon amjad
|
02930a901e
|
Indoor navigation implementation & Landing page swiper card updates
|
1 week 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
|
1 week 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
|
2 weeks ago |
haroon amjad
|
b10d715d55
|
App updates
|
2 weeks ago |
Fatimah.Alshammari
|
11de01e079
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
2 weeks 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 |
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
|
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 |
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
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 |
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
|
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 |
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
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 |