a816afadea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
9 months ago
d76ff5828f
fixes
9 months ago
haroon amjad
a0008c9104
Nearest Appointment sorting fixed
9 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
9 months ago
Haroon6138
06c67a0409
Merge pull request 'dev_aamir' ( #153 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/153
9 months ago
0ddaa6899d
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 :
fixed parking qr
added parking part
added monthly report
added monthly report
added monthly report
fix error
monthly report
fix toggle
fix toggle
active medication
active medication
active medication
9 months ago
42222804fd
fix graph dot and bp graph.
9 months ago
bf210e664d
Merge branch 'master' into dev_aamir
9 months ago
6725ab028d
doctor search filter design update & switch user bug fix.
9 months ago
haroon amjad
609ae6ab83
updates
9 months 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
9 months ago
haroon amjad
44ce353dac
updates
9 months ago
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
9 months ago
haroon amjad
fc750174fe
Merge branch 'master' into haroon_dev
9 months ago
Haroon6138
aee496b7c3
Merge pull request 'dev_sultan' ( #151 ) from dev_sultan into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/151
9 months ago
16da0f4d0a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
9 months ago
0c68ca4438
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 :
Added 'send report to email' feature
Completed the health Tracker Module, Only the email part is left.
only explain api left.
Triage Completed. Explain API left
Till Triage Completed
refactoring
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad
e454c9c991
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
9 months ago
Haroon6138
96ebc3c7e9
Merge pull request 'dev_aamir' ( #149 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/149
9 months ago
0514716910
no message
9 months ago
e903f9c418
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 :
search filter on select doctor page.
family file fix
blood group
9 months ago
ac0d72b3ff
vital sign finalized.
9 months ago
c11e859df1
search doctor by name filter.
9 months ago
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
9 months ago
001808488c
Added 'send report to email' feature
9 months ago
haroon amjad
91c16f13d1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/app_assets.dart
9 months ago
haroon amjad
1c0842ab95
updates
9 months ago
83f04bc0e6
search filter on select doctor page.
9 months ago
3f5bd0a759
Completed the health Tracker Module, Only the email part is left.
9 months ago
c7e4018ddc
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
9 months ago
b815affe5c
blood group
9 months ago
haroon amjad
02930a901e
Indoor navigation implementation & Landing page swiper card updates
9 months ago
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
9 months ago
8ae81d2b24
fixed parking qr
9 months ago
34e8386ca1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
9 months ago
cc255e9c9a
vital sign detail page
9 months ago
haroon amjad
1656ca58c1
Merge branch 'ambulance_service' into haroon_dev
10 months ago
haroon amjad
d6b1744176
updates
10 months 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
10 months ago
haroon amjad
ede8844f19
Monthly Reports implemented
10 months ago
17f32e34d3
Merge branch 'refs/heads/master' into faiz_dev
...
# Conflicts:
# lib/presentation/symptoms_checker/user_info_selection.dart
10 months ago
4ee0d1d3c8
only explain api left.
10 months ago
8c91b6830a
Triage Completed. Explain API left
10 months ago
haroon amjad
e9dd2f0648
updates
10 months ago
haroon amjad
210da3404c
updates
10 months ago
haroon amjad
32ee47ca66
Merge branch 'master' into haroon_dev
10 months 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
10 months ago
haroon amjad
b10d715d55
App updates
10 months ago
tahaalam
f19d06512a
filters changed in region selection bottom sheet
10 months ago
49d091547a
Till Triage Completed
10 months ago
aamir-csol
haroon amjad
Sultan khan
Fatimah.Alshammari
faizatflutter
tahaalam