faizatflutter
|
3f5bd0a759
|
Completed the health Tracker Module, Only the email part is left.
|
4 weeks ago |
aamir-csol
|
38d8341963
|
family file fix
|
4 weeks ago |
aamir-csol
|
c7e4018ddc
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
|
4 weeks ago |
aamir-csol
|
b815affe5c
|
blood group
|
4 weeks ago |
haroon amjad
|
02930a901e
|
Indoor navigation implementation & Landing page swiper card updates
|
1 month 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 month ago |
Fatimah.Alshammari
|
8ae81d2b24
|
fixed parking qr
|
1 month 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 month ago |
haroon amjad
|
ede8844f19
|
Monthly Reports implemented
|
1 month ago |
faizatflutter
|
17f32e34d3
|
Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
# lib/presentation/symptoms_checker/user_info_selection.dart
|
1 month ago |
faizatflutter
|
8c91b6830a
|
Triage Completed. Explain API left
|
1 month ago |
haroon amjad
|
32ee47ca66
|
Merge branch 'master' into haroon_dev
|
1 month ago |
Haroon6138
|
ba211ea4c2
|
Merge pull request 'hospital_filter' (#141) from hospital_filter into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/141
|
1 month ago |
haroon amjad
|
b10d715d55
|
App updates
|
1 month ago |
tahaalam
|
f19d06512a
|
filters changed in region selection bottom sheet
|
1 month ago |
faizatflutter
|
49d091547a
|
Till Triage Completed
|
1 month ago |
haroon amjad
|
05e5b41dc6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
haroon amjad
|
6f067d92d6
|
My invoices implemented
|
1 month ago |
Sultan khan
|
d62324044a
|
default appointment load fix
|
1 month ago |
Sultan khan
|
dc8031bb41
|
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
fixed the suggested design changes. (Not reminder ones)
fixed the suggested design changes. (Not reminder ones)
|
1 month ago |
Sultan khan
|
f7021f685a
|
no message
|
1 month ago |
faizatflutter
|
597579e677
|
refactoring
|
1 month ago |
haroon amjad
|
93979707e4
|
Merge branch 'master' into haroon_dev
|
1 month ago |
haroon amjad
|
213662e718
|
updates
|
1 month ago |
faizatflutter
|
460e32d25a
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
|
1 month ago |
faizatflutter
|
a29c0dd6bc
|
fixed the suggested design changes. (Not reminder ones)
|
1 month ago |
Haroon6138
|
06f6cb1514
|
Merge pull request 'dev_sultan' (#137) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/137
|
1 month ago |
Sultan khan
|
0895d94df2
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
Sultan khan
|
afe169d2d9
|
silent login fix
|
1 month ago |
faizatflutter
|
40f6cafb48
|
fixed routing again and again.
|
1 month ago |
Sultan khan
|
449c693fdb
|
Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
# lib/presentation/book_appointment/laser/laser_appointment.dart
|
1 month ago |
faizatflutter
|
f8fdd7570e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
1 month ago |
faizatflutter
|
0e2de5a55d
|
Completed Graph
|
1 month ago |
haroon amjad
|
162337b317
|
Added appointment nearest gate & floor
|
1 month 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
|
1 month ago |
faizatflutter
|
d4dd475e0b
|
Added Graph
|
1 month ago |
Sultan khan
|
d55fe5e527
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
Sultan khan
|
0e26505692
|
covid page inprogress
|
1 month ago |
aamir-csol
|
6c1707128b
|
Merge branch 'master' into dev_aamir
|
1 month ago |
aamir-csol
|
3601e39a29
|
Health calculators & converters
|
1 month 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
|
1 month ago |
Sultan khan
|
6ceee6973f
|
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:
sickleave fix
Health calculators & converters
updates
updates
updates
updates
Nearest Appointment selected
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
1 month ago |
Sultan khan
|
873b2a1591
|
sorting done, covid inprogress
|
1 month ago |
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
1 month 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
|
1 month ago |
aamir-csol
|
54f8391066
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
1 month ago |
aamir-csol
|
135b05e561
|
Health calculators & converters
|
1 month ago |
haroon amjad
|
510d82b592
|
Merge branch 'master' into haroon_dev
|
1 month 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
|
1 month ago |
haroon amjad
|
3cc2610d30
|
updates
|
1 month ago |
haroon amjad
|
f886357bcd
|
updates
|
2 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
|
2 months 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
|
2 months ago |
Fatimah.Alshammari
|
68f044de52
|
added monthly report
|
2 months ago |
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
2 months ago |
haroon amjad
|
87fd9a42b7
|
Nearest Appointment selected
|
2 months ago |
faizatflutter
|
94668997aa
|
Updated design for HHC
|
2 months ago |
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
2 months ago |
Fatimah.Alshammari
|
c9de23347a
|
fix error
|
2 months ago |
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
2 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
|
2 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
|
2 months ago |
Fatimah.Alshammari
|
0b3fea230f
|
monthly report
|
2 months ago |
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
2 months ago |
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
2 months ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
2 months ago |
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
2 months ago |
faizatflutter
|
fbe124f6ee
|
Complete UserInfo Selection Module
|
2 months ago |
haroon amjad
|
2f26e12fd3
|
update
|
2 months ago |
faizatflutter
|
cf26e71645
|
Complete USerInfo Selectoiun
|
2 months ago |
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
2 months ago |
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
2 months ago |
haroon amjad
|
7cdb30a364
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
a83a35a284
|
Services Page Revamp
|
2 months ago |
tahaalam
|
2125e30c23
|
Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
2 months ago |
tahaalam
|
95243c250f
|
graph shaded region added from horizontal spaces
|
2 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
|
2 months ago |
faizatflutter
|
9410ad9b60
|
Refactoring
|
2 months ago |
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
2 months ago |
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
2 months ago |
haroon amjad
|
ca47315b2c
|
Merge branch 'master' into haroon_dev
|
2 months ago |
aamir-csol
|
f91f8e63d7
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/medical_file/widgets/lab_rad_card.dart
|
2 months 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
|
2 months ago |
faizatflutter
|
2173d091ed
|
Added symptoms selector
|
2 months ago |
tahaalam
|
ac15ab26f5
|
graph changes for high and low
|
2 months ago |
haroon amjad
|
3185d1e9e7
|
Allergies list implemented
|
2 months ago |
haroon amjad
|
b37804d012
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/prescriptions/prescriptions_view_model.dart
# lib/presentation/appointments/appointment_details_page.dart
|
2 months ago |
Haroon6138
|
88039534e2
|
Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105) from calender_reminder into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105
|
2 months ago |
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
2 months ago |
aamir-csol
|
0f17a655ed
|
Merge branch 'master' into dev_aamir
# Conflicts:
# ios/Runner/AppDelegate.swift
# lib/core/dependencies.dart
# lib/core/utils/utils.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/authentication/quick_login.dart
# lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/appbar/collapsing_list_view.dart
# lib/widgets/common_bottom_sheet.dart
|
2 months ago |
haroon amjad
|
2b7379c1c3
|
Waiting appointment implementation in progress
|
2 months ago |
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
2 months ago |
faizatflutter
|
ac84d268e9
|
triage design
|
2 months ago |
Sultan khan
|
ddac155a6a
|
silent login case handled.
|
2 months ago |
tahaalam
|
e0e41d1900
|
calender reminder added on appointment and pescription
|
2 months ago |
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
2 months ago |
faizatflutter
|
acb6d31ff3
|
Added possible conditions screen
|
2 months ago |
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
3 months ago |
Sultan khan
|
9e0336687c
|
virtual tour.
|
3 months ago |