haroon amjad
f46b3f745f
Dark mode enabled
1 month ago
Sultan khan
acfab432cc
multiple submit button commented
1 month ago
haroon amjad
074c060e36
Updates & fixes
1 month ago
haroon amjad
b4a7508f7c
updates
1 month ago
Sultan khan
d6eb6970af
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 : (29 commits)
calender package added
Android zoom fixes
updates
updates
wallet page fix
updates
fixed Ar and En files
Insurance approvals page fixes
fixed Ar En files
Added immediate patient insurance update API
updates
sickleave & medical report fixes
test description issue in lab results fixed
Updates & fixes, Filter issues fixed for lab & rad
Ancillary order fixes
NPHIES Eligibility checks implemented
updates
Android package name updated to new package details
Updates & fixes
App update page implemented
...
1 month ago
haroon amjad
961a1f5b03
updates
1 month ago
haroon amjad
68ff91561f
Merge branch 'master' into haroon_dev
1 month ago
haroon amjad
631fabad23
updates
1 month ago
tahaalam
71ac91a076
calender package added
1 month ago
haroon amjad
b75f0c7ee4
updates
1 month ago
haroon amjad
79b23584db
updates
2 months ago
haroon amjad
295709cbc2
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
1286455f8c
wallet page fix
2 months ago
haroon amjad
5e16169867
updates
2 months ago
Fatimah.Alshammari
ee358259f5
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
2 months ago
haroon amjad
dffed5df6b
Insurance approvals page fixes
2 months ago
Haroon Amjad
d9013a1dc2
Added immediate patient insurance update API
2 months ago
haroon amjad
a25df34f42
updates
2 months ago
haroon amjad
6cc058e86d
updates
2 months ago
tahaalam
fbe9cd9dff
package change activity
2 months ago
haroon amjad
84224ae61b
sickleave & medical report fixes
2 months ago
tahaalam
3f9046f1e4
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# ios/Runner.xcodeproj/project.pbxproj
# lib/core/api_consts.dart
# lib/generated/locale_keys.g.dart
2 months ago
tahaalam
a395d9b93a
ios health connect added
2 months ago
Haroon Amjad
c2028841c5
test description issue in lab results fixed
2 months ago
tahaalam
bfeb3dce4e
data integration along with the data representation
2 months ago
haroon amjad
dc0e4e5eb6
Updates & fixes, Filter issues fixed for lab & rad
2 months ago
Fatimah.Alshammari
46c8fbf0f6
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
2 months ago
haroon amjad
2a819a2d97
Ancillary order fixes
2 months ago
haroon amjad
9413e54d3a
NPHIES Eligibility checks implemented
2 months ago
Sultan khan
b91850d388
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 : (67 commits)
added women support in symptoms checker module.
family fil fixes
PMA-1100
updates
updates
Updates & fixes
updates
Ai Analysis & PMA-(1078,1079)
update
updates
arabic fixes
arabic fixes
Vital sign data connected to Symptom checker
Date format changed to en-US
confirm button added
iOS BundleID changes
Services price list implemented
Indoor navigation implemented
updates & fixes
JIRA bug fixes & updates
...
# Conflicts:
# lib/presentation/authentication/register_step2.dart
# lib/presentation/vital_sign/vital_sign_page.dart
2 months ago
Haroon Amjad
105ab2326a
updates
2 months ago
haroon amjad
ec506869cc
Android package name updated to new package details
2 months ago
haroon amjad
05b6d02e4c
Updates & fixes
2 months ago
tahaalam
5ea70397e2
samsung integration addded
2 months ago
Sultan khan
c416d84a3a
register insurance in progress.
2 months ago
haroon amjad
8309f311e6
App update page implemented
2 months ago
haroon amjad
c6ee3c453f
contact us bottom sheet icons changed
2 months ago
haroon amjad
4b710523e8
Feedback status implemented
2 months ago
haroon amjad
e1788f1187
Merge branch 'master' into haroon_dev
2 months ago
faizatflutter
afae41c410
Merge branch 'master' into faiz_dev
2 months ago
faizatflutter
b44ae1e838
added women support in symptoms checker module.
2 months ago
haroon amjad
2be65cba51
Inactive Insurance case handled
2 months ago
haroon amjad
530b87282f
updates & fixes
2 months ago
haroon amjad
2e1f4e87e0
AI Lab Analysis updates
2 months ago
haroon amjad
87e0c5b6eb
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
1575a8e308
Feedback status implementation contd.
2 months ago
aamir-csol
7296bfb6fc
family fil fixes
2 months ago
tahaalam
df0b926e59
heart rate sleep data and steps count obtained
2 months ago
haroon amjad
0da4b63d74
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
305b3274c0
Symptoms checker doctor selection implemented
2 months ago
haroon amjad
5015747580
LiveCare changes
2 months ago
aamir-csol
c48cb78cd9
PMA-1100
2 months ago
tahaalam
4912f686f9
platform channel added.
2 months ago
Haroon Amjad
cb44e902a3
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
2 months ago
Haroon Amjad
9b3c172dd1
updates
2 months ago
haroon amjad
20ed54243b
updates
2 months ago
haroon amjad
01c21377aa
Updates & fixes
2 months ago
tahaalam
02398d3bb4
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# ios/Runner.xcodeproj/project.pbxproj
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
2 months ago
tahaalam
d137e1166d
watch integration ui added.
2 months ago
aamir-csol
a105d87241
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/features/authentication/authentication_view_model.dart
# lib/generated/locale_keys.g.dart
2 months ago
haroon amjad
68f5e64557
updates
2 months ago
aamir-csol
2c7f4ddc48
Ai Analysis & PMA-(1078,1079)
2 months ago
haroon amjad
95b65ed8a5
Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
...
# Conflicts:
# lib/features/book_appointments/book_appointments_view_model.dart
2 months ago
haroon amjad
c9279e2272
updates
2 months ago
Haroon Amjad
23abbebf9e
arabic fixes
2 months ago
Haroon Amjad
a4573c8710
arabic fixes
2 months ago
Haroon Amjad
4ce1e912ce
Vital sign data connected to Symptom checker
2 months ago
Haroon Amjad
eeaa22357f
Date format changed to en-US
2 months ago
haroon amjad
000c403f6b
confirm button added
2 months ago
Fatimah.Alshammari
47ec43850d
Merge branch 'master' into fatima
2 months ago
haroon amjad
f09d478a03
iOS BundleID changes
2 months ago
haroon amjad
3c9c3032a5
Services price list implemented
2 months ago
haroon amjad
2ab3e178a2
Indoor navigation implemented
2 months ago
haroon amjad
9ed016ad8b
updates & fixes
2 months ago
haroon amjad
3af43dc676
JIRA bug fixes & updates
2 months ago
Fatimah.Alshammari
0d6d23dbbc
Merge branch 'master' into fatima
2 months ago
haroon amjad
66ff6ed8b6
Prescription download changes
2 months ago
haroon amjad
85ccf41d04
Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare
2 months ago
haroon amjad
b309342cdc
lab fixes
2 months ago
haroon amjad
5c684a6a0d
Doctor Rating details implemented
2 months ago
Fatimah.Alshammari
f340f4fb8f
Merge branch 'master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
2 months ago
haroon amjad
bafe835ebd
Scheduled livecare appointment booking fixes
2 months ago
haroon amjad
8472a45530
updates
2 months ago
haroon amjad
70a6d90ce3
updates & fixes
2 months ago
haroon amjad
8740178f8c
Merge branch 'master' into haroon_dev
2 months ago
haroon amjad
cfd0c16738
updates & fixes
2 months ago
aamir-csol
7014ac397e
Merge remote-tracking branch 'origin/master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
2 months ago
Haroon Amjad
49542a9112
updates & fixes
2 months ago
Haroon Amjad
1ae1212733
Merge branch 'master' into haroon_dev
2 months ago
Haroon Amjad
537d93915e
Zoom SDK fixes
2 months ago
Sikander Saleem
f376f430c6
Merge branch 'refs/heads/master' into dev_sikander
3 months ago
Sikander Saleem
b9350afead
ui improvements
3 months ago
aamir-csol
2c2cb8bb99
family file button fix
3 months ago
aamir-csol
8c7f4afe76
family file button fix
3 months ago
Haroon6138
c50f8d63ef
Merge pull request 'haroon_dev' ( #171 ) from haroon_dev into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/171
3 months ago
haroon amjad
4e6d3d3178
SmartWatch implementation contd.
3 months ago
faizatflutter
9c7cfde5f4
ui improvements
3 months ago
tahaalam
f78eb5da67
Wd: Unware clinic bottom sheet shown on appointment page.
3 months ago
Sikander Saleem
6e1eb0d0bb
ui improvements
3 months ago
Sikander Saleem
41a4005d41
Merge branch 'refs/heads/master' into dev_sikander
3 months ago
haroon amjad
940ce5ff14
updates
3 months ago
haroon amjad
05e87bbb2e
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
ae3ed83dd0
contact us page changes
3 months ago
aamir-csol
0c2fe81c99
Merge branch 'master' into dev_aamir
3 months ago
aamir-csol
bb4719bd87
logout & family file fix & PMA-1047
3 months ago
Fatimah.Alshammari
931e3fa968
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
3 months ago
Sikander Saleem
6e4d7519fb
Merge branch 'refs/heads/master' into dev_sikander
...
# Conflicts:
# lib/presentation/home/widgets/habib_wallet_card.dart
3 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
3 months ago
haroon amjad
b0708d85d9
updates & fixes
3 months ago
haroon amjad
20216cd4ae
Merge branch 'master' into haroon_dev
3 months ago
aamir-csol
2bbfe1f131
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/profile_settings/profile_settings.dart
3 months ago
aamir-csol
8b701255ed
logout & family file fix
3 months ago
haroon amjad
7ead6d79e5
updates
3 months ago
haroon amjad
3e9a381ed7
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
e4b6360808
Services Page fix
3 months ago
haroon amjad
f46f978326
Clinic icons updated
3 months ago
faizatflutter
14f3c6cb81
Added Arabic Support for symptoms checker
3 months ago
haroon amjad
10a5a6f558
Ask Doctor implemented
3 months ago
haroon amjad
d2deb974b1
symptoms merge
3 months ago
haroon amjad
f48eb631ab
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
f54ce71177
translation changes
3 months ago
faizatflutter
07447e148b
Symptoms Checker flow is completed
3 months ago
haroon amjad
6faca94b89
updates
3 months ago
Fatimah.Alshammari
d027415302
fixed errors
3 months ago
haroon amjad
99282f34e3
Added language change option in landing page
3 months ago
aamir-csol
418297b6fb
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/api_consts.dart
3 months ago
faizatflutter
4ceca016bb
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/presentation/hmg_services/services_page.dart
# pubspec.lock
3 months ago
faizatflutter
3bdc4e246f
refactor
3 months ago
haroon amjad
9ef70a250d
translation updates
3 months ago
Sikander Saleem
40ba1bd246
ui improvements
3 months ago
haroon amjad
3fc1302eaf
New Flutter App param added
3 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
3 months ago
haroon amjad
5feacfaf27
Translation updates
3 months ago
haroon amjad
39af08ddc3
Translation updates
3 months ago
haroon amjad
e5f24b9c06
updates
3 months ago
haroon amjad
00475dc100
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
3ff9628cd3
Translation updates
3 months ago
aamir-csol
bb72c7f7d6
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/hmg_services/services_page.dart
# pubspec.lock
3 months ago
aamir-csol
0017c0601b
blood donation changes
3 months ago
Sultan khan
7d8537fae6
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
Sultan khan
1edeff439e
notifications page updates
3 months ago
haroon amjad
3e6ee8c10c
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/routes/app_routes.dart
3 months ago
haroon amjad
87422e8e05
translation updates
3 months ago
Sikander Saleem
0b9df1f22b
collapsing toolbar behaviour changed as like barq
3 months ago
Fatimah.Alshammari
9795276ef9
fixed errors
3 months ago
Sikander Saleem
45b013a048
UI/UX improvements - insurance update.
3 months ago
Sikander Saleem
1599cfed4e
UI/UX improvements-1.
3 months ago
haroon amjad
96ccb40f36
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
169215fd7b
translation changes
3 months ago
Fatimah.Alshammari
97a47ce4e8
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/routes/app_routes.dart
3 months ago
Fatimah.Alshammari
287e2b9562
fixed QR
3 months ago
Sikander Saleem
77a04e637e
UI/UX improvements.
3 months ago
Sultan khan
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
3 months ago
Sultan khan
8c92df8648
contact us page fix
3 months ago
aamir-csol
a816afadea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
3 months ago
aamir-csol
d76ff5828f
fixes
3 months ago
haroon amjad
8f428297cb
Arabic translations added
3 months ago
haroon amjad
a0008c9104
Nearest Appointment sorting fixed
3 months ago
Fatimah.Alshammari
1d224702ac
Merge branch 'refs/heads/master' into fatima
3 months ago
Fatimah.Alshammari
69666a6f6c
fixed button
3 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
3 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
3 months ago
Sultan khan
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
3 months ago
Sultan khan
42222804fd
fix graph dot and bp graph.
3 months ago
aamir-csol
bf210e664d
Merge branch 'master' into dev_aamir
3 months ago
aamir-csol
6725ab028d
doctor search filter design update & switch user bug fix.
3 months ago
haroon amjad
609ae6ab83
updates
3 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
3 months ago
haroon amjad
44ce353dac
updates
3 months 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
3 months ago
haroon amjad
fc750174fe
Merge branch 'master' into haroon_dev
3 months ago
haroon amjad
d848291930
updates
3 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
3 months ago
Sultan khan
16da0f4d0a
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
Sultan khan
8ee0e3b4ea
no message
3 months ago
Sultan khan
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
3 months ago
haroon amjad
e454c9c991
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
3 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
3 months ago
Sultan khan
0514716910
no message
3 months ago
Sultan khan
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
3 months ago
Sultan khan
ac0d72b3ff
vital sign finalized.
3 months ago
aamir-csol
c11e859df1
search doctor by name filter.
3 months ago
faizatflutter
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
3 months ago
faizatflutter
001808488c
Added 'send report to email' feature
3 months ago
haroon amjad
91c16f13d1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/app_assets.dart
3 months ago
haroon amjad
1c0842ab95
updates
3 months ago
aamir-csol
83f04bc0e6
search filter on select doctor page.
3 months ago
faizatflutter
3f5bd0a759
Completed the health Tracker Module, Only the email part is left.
3 months ago
aamir-csol
38d8341963
family file fix
3 months ago
aamir-csol
c7e4018ddc
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
3 months ago
aamir-csol
b815affe5c
blood group
3 months ago
haroon amjad
02930a901e
Indoor navigation implementation & Landing page swiper card updates
3 months 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
3 months ago
Fatimah.Alshammari
8ae81d2b24
fixed parking qr
3 months ago
Sultan khan
34e8386ca1
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
3 months ago
Sultan khan
cc255e9c9a
vital sign detail page
3 months ago
haroon amjad
1656ca58c1
Merge branch 'ambulance_service' into haroon_dev
3 months ago
haroon amjad
685eec6a52
updates & fixes
3 months ago
haroon amjad
d6b1744176
updates
3 months ago
tahaalam
699ef2f672
Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
...
# Conflicts:
# android/settings.gradle.kts
3 months ago