haroon amjad
940ce5ff14
updates
9 months ago
haroon amjad
05e87bbb2e
Merge branch 'master' into haroon_dev
9 months ago
haroon amjad
ae3ed83dd0
contact us page changes
9 months ago
0c2fe81c99
Merge branch 'master' into dev_aamir
9 months ago
bb4719bd87
logout & family file fix & PMA-1047
9 months ago
Sikander Saleem
6e4d7519fb
Merge branch 'refs/heads/master' into dev_sikander
...
# Conflicts:
# lib/presentation/home/widgets/habib_wallet_card.dart
9 months ago
Sikander Saleem
2648f304f6
Merge branch 'refs/heads/master' into dev_sikander
...
# Conflicts:
# lib/core/app_assets.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/data/landing_page_data.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/widgets/habib_wallet_card.dart
# lib/presentation/home/widgets/small_service_card.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/widgets/appbar/collapsing_list_view.dart
9 months ago
haroon amjad
b0708d85d9
updates & fixes
9 months ago
haroon amjad
20216cd4ae
Merge branch 'master' into haroon_dev
9 months ago
2bbfe1f131
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/profile_settings/profile_settings.dart
9 months ago
8b701255ed
logout & family file fix
9 months ago
haroon amjad
7ead6d79e5
updates
9 months ago
haroon amjad
3e9a381ed7
Merge branch 'master' into haroon_dev
9 months ago
haroon amjad
e4b6360808
Services Page fix
9 months ago
haroon amjad
f46f978326
Clinic icons updated
9 months ago
14f3c6cb81
Added Arabic Support for symptoms checker
9 months ago
haroon amjad
10a5a6f558
Ask Doctor implemented
9 months ago
haroon amjad
d2deb974b1
symptoms merge
9 months ago
haroon amjad
f48eb631ab
Merge branch 'master' into haroon_dev
9 months ago
haroon amjad
f54ce71177
translation changes
9 months ago
07447e148b
Symptoms Checker flow is completed
9 months ago
haroon amjad
6faca94b89
updates
9 months ago
haroon amjad
99282f34e3
Added language change option in landing page
9 months ago
418297b6fb
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/api_consts.dart
9 months ago
4ceca016bb
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
# pubspec.lock
9 months ago
3bdc4e246f
refactor
9 months ago
haroon amjad
9ef70a250d
translation updates
9 months ago
Sikander Saleem
40ba1bd246
ui improvements
9 months ago
haroon amjad
3fc1302eaf
New Flutter App param added
9 months ago
Sikander Saleem
e38892ff2d
Merge branch 'refs/heads/master' into dev_sikander
...
# Conflicts:
# lib/presentation/habib_wallet/habib_wallet_page.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/widgets/habib_wallet_card.dart
# lib/presentation/insurance/insurance_home_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/profile_settings/profile_settings.dart
# lib/presentation/radiology/radiology_orders_page.dart
# lib/widgets/appbar/collapsing_list_view.dart
9 months ago
haroon amjad
5feacfaf27
Translation updates
9 months ago
haroon amjad
39af08ddc3
Translation updates
9 months ago
haroon amjad
e5f24b9c06
updates
9 months ago
haroon amjad
00475dc100
Merge branch 'master' into haroon_dev
9 months ago
haroon amjad
3ff9628cd3
Translation updates
9 months ago
bb72c7f7d6
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/hmg_services/services_page.dart
# pubspec.lock
9 months ago
0017c0601b
blood donation changes
9 months ago
7d8537fae6
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
9 months ago
1edeff439e
notifications page updates
9 months ago
haroon amjad
3e6ee8c10c
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/routes/app_routes.dart
9 months ago
haroon amjad
87422e8e05
translation updates
9 months ago
Sikander Saleem
0b9df1f22b
collapsing toolbar behaviour changed as like barq
9 months ago
9795276ef9
fixed errors
9 months ago
Sikander Saleem
45b013a048
UI/UX improvements - insurance update.
9 months ago
Sikander Saleem
1599cfed4e
UI/UX improvements-1.
9 months ago
haroon amjad
96ccb40f36
Merge branch 'master' into haroon_dev
9 months ago
haroon amjad
169215fd7b
translation changes
9 months ago
97a47ce4e8
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/routes/app_routes.dart
9 months ago
287e2b9562
fixed QR
9 months ago
Sikander Saleem
77a04e637e
UI/UX improvements.
9 months ago
8b5c4d7575
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# lib/core/dependencies.dart
# lib/routes/app_routes.dart
9 months ago
8c92df8648
contact us page fix
9 months ago
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
8f428297cb
Arabic translations added
9 months ago
haroon amjad
a0008c9104
Nearest Appointment sorting fixed
10 months ago
1d224702ac
Merge branch 'refs/heads/master' into fatima
10 months ago
69666a6f6c
fixed button
10 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
10 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
10 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
10 months ago
42222804fd
fix graph dot and bp graph.
10 months ago
bf210e664d
Merge branch 'master' into dev_aamir
10 months ago
6725ab028d
doctor search filter design update & switch user bug fix.
10 months ago
haroon amjad
609ae6ab83
updates
10 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
10 months ago
haroon amjad
44ce353dac
updates
10 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
10 months ago
haroon amjad
fc750174fe
Merge branch 'master' into haroon_dev
10 months ago
haroon amjad
d848291930
updates
10 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
10 months ago
16da0f4d0a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
10 months ago
8ee0e3b4ea
no message
10 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
10 months ago
haroon amjad
e454c9c991
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
10 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
10 months ago
0514716910
no message
10 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
10 months ago
ac0d72b3ff
vital sign finalized.
10 months ago
c11e859df1
search doctor by name filter.
10 months ago
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
10 months ago
001808488c
Added 'send report to email' feature
10 months ago
haroon amjad
91c16f13d1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/app_assets.dart
10 months ago
haroon amjad
1c0842ab95
updates
10 months ago
83f04bc0e6
search filter on select doctor page.
10 months ago
3f5bd0a759
Completed the health Tracker Module, Only the email part is left.
10 months ago
38d8341963
family file fix
10 months ago
c7e4018ddc
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
10 months ago
b815affe5c
blood group
10 months ago
haroon amjad
02930a901e
Indoor navigation implementation & Landing page swiper card updates
10 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
10 months ago
8ae81d2b24
fixed parking qr
10 months ago
34e8386ca1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
10 months ago
cc255e9c9a
vital sign detail page
10 months ago
haroon amjad
1656ca58c1
Merge branch 'ambulance_service' into haroon_dev
10 months ago
haroon amjad
685eec6a52
updates & fixes
10 months ago
haroon amjad
d6b1744176
updates
10 months ago
tahaalam
699ef2f672
Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
...
# Conflicts:
# android/settings.gradle.kts
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
haroon amjad
aamir-csol
Sikander Saleem
faizatflutter
Sultan khan
Fatimah.Alshammari
tahaalam