Sultan khan
6178062ed0
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 : (33 commits)
reminder start time added to the prescription
Invoices Filter
Updates
updates
Revert "graph values fix and comparision with the pdf"
graph values fix and comparision with the pdf
graph values fix and comparision with the pdf
Updates
Updates
updates
Updates
Updates
Updates
Updates
Habib Wallet updates
Changes for AI Lab analysis
App update page updates
updates
Updates
warning dialog displayed to user if the watch intented is not currently implemented
...
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
2 weeks ago
haroon amjad
6108a629a2
Merge branch 'master' into haroon_dev
2 weeks ago
Haroon6138
c324007e61
Merge pull request 'family file switch back issue fixed' ( #203 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/203
2 weeks ago
aamir-csol
38471a773c
family file switch back issue fixed
2 weeks ago
Sultan khan
d3dfb2e2a5
doctor favorite in progress.
2 weeks ago
haroon amjad
fbb2570d8e
Vital sign updates
2 weeks ago
haroon amjad
db89408185
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad
78a6d55b35
Merge branch 'master' into watch_integration
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
2 weeks ago
haroon amjad
078b236b67
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
2 weeks ago
tahaalam
a8138ba231
Merge remote-tracking branch 'origin/master' into reminer
2 weeks ago
tahaalam
8b829b9101
reminder start time added to the prescription
2 weeks ago
haroon amjad
a45980162d
Added location option in region selection bottom sheet
2 weeks ago
haroon amjad
444e7b562f
Merge branch 'master' into haroon_dev
2 weeks ago
Haroon6138
88da9af44b
Merge pull request 'Invoices Filter' ( #200 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/200
2 weeks ago
haroon amjad
7611c1d58c
Updates
2 weeks ago
aamir-csol
f1555c76a3
Invoices Filter
2 weeks ago
haroon amjad
dfc666673d
Profile settings update
2 weeks ago
tahaalam
2babda2d63
Merge remote-tracking branch 'origin/master' into labs_graph_pdf
2 weeks ago
haroon amjad
d4ed2b47bc
updates
2 weeks ago
tahaalam
1d1c756412
graph values fix and comparision with the pdf
2 weeks ago
haroon amjad
1709b80e84
Updates
2 weeks ago
haroon amjad
4a3d66f01a
Updates
2 weeks ago
haroon amjad
d053f58b7d
Updates
3 weeks ago
haroon amjad
d703c382e5
Updates
3 weeks ago
haroon amjad
3d877ed28d
Updates
3 weeks ago
Haroon Amjad
55b8bc162c
Updates
4 weeks ago
haroon amjad
08928ddd28
Habib Wallet updates
1 month ago
tahaalam
f84d5c6769
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# lib/splashPage.dart
1 month ago
Haroon Amjad
657f886391
Changes for AI Lab analysis
1 month ago
Haroon Amjad
d194b5a45b
updates
1 month ago
tahaalam
dda4dbeba9
merge issue resolution some import were missing from master.
1 month ago
Sultan khan
f51e37db55
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
lab test description update
# Conflicts:
# lib/core/api/api_client.dart
# lib/presentation/authentication/login.dart
1 month ago
Sultan khan
4f303d8496
other country login done.
1 month ago
tahaalam
151fcf23d1
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# android/app/build.gradle.kts
# android/app/src/main/res/mipmap-hdpi/ic_launcher.png
# android/app/src/main/res/mipmap-mdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
# android/build/reports/problems/problems-report.html
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# pubspec.yaml
1 month ago
haroon amjad
47b50e35a1
updates
1 month ago
Sultan khan
80adf1bd2f
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 & fixes
updates
updates
Dark mode persistence added in the app
Dark mode enabled
Updates & fixes
updates
updates
updates
1 month ago
haroon amjad
29447cc9fa
updates
1 month ago
haroon amjad
6e71aa7f13
updates & fixes
1 month ago
haroon amjad
fdeeed10d6
updates
1 month ago
Haroon Amjad
8de8039096
updates
1 month ago
Haroon Amjad
040ff6a80d
Dark mode persistence added in the app
1 month ago
haroon amjad
f46b3f745f
Dark mode enabled
1 month ago
haroon amjad
074c060e36
Updates & fixes
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
631fabad23
updates
1 month ago
haroon amjad
b75f0c7ee4
updates
2 months ago
haroon amjad
79b23584db
updates
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
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
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
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
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
aamir-csol
c48cb78cd9
PMA-1100
2 months ago
tahaalam
4912f686f9
platform channel added.
2 months ago
haroon amjad
01c21377aa
Updates & fixes
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
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
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
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
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
haroon amjad
bafe835ebd
Scheduled livecare appointment booking fixes
3 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
3 months ago
aamir-csol
8c7f4afe76
family file button fix
3 months ago
haroon amjad
4e6d3d3178
SmartWatch implementation contd.
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
3e9a381ed7
Merge branch 'master' into haroon_dev
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
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
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
haroon amjad
87422e8e05
translation updates
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
a0008c9104
Nearest Appointment sorting fixed
3 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
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
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
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
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
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
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
3 months ago
haroon amjad
ede8844f19
Monthly Reports implemented
3 months ago
faizatflutter
17f32e34d3
Merge branch 'refs/heads/master' into faiz_dev
...
# Conflicts:
# lib/presentation/symptoms_checker/user_info_selection.dart
3 months ago
faizatflutter
8c91b6830a
Triage Completed. Explain API left
3 months ago