haroon amjad
bd65d05e9e
Merge branch 'master' into haroon_dev
2 weeks ago
haroon amjad
a13d0cf0e4
updates
2 weeks ago
Sultan khan
c970a3f697
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
family file switch back issue fixed
Vital sign updates
updates
Updates
Added location option in region selection bottom sheet
Updates
Profile settings update
2 weeks ago
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
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
841fca027c
updates
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
haroon amjad
e29aba81da
Updates
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
aamir-csol
f1555c76a3
Invoices Filter
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
tahaalam
f84d5c6769
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# lib/splashPage.dart
1 month ago
haroon amjad
1a68ffd500
Updates
1 month ago
tahaalam
50d78551c2
warning dialog displayed to user if the watch intented is not currently implemented
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
f46b3f745f
Dark mode enabled
1 month 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
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
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
9413e54d3a
NPHIES Eligibility checks implemented
2 months ago
haroon amjad
05b6d02e4c
Updates & fixes
2 months ago
haroon amjad
8309f311e6
App update page implemented
2 months ago
haroon amjad
4b710523e8
Feedback status implemented
2 months ago
haroon amjad
2be65cba51
Inactive Insurance case handled
2 months ago
haroon amjad
530b87282f
updates & fixes
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
aamir-csol
2c7f4ddc48
Ai Analysis & PMA-(1078,1079)
2 months ago
haroon amjad
c9279e2272
updates
2 months ago
haroon amjad
3c9c3032a5
Services price list implemented
2 months ago
haroon amjad
2ab3e178a2
Indoor navigation 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
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
tahaalam
f78eb5da67
Wd: Unware clinic bottom sheet shown on appointment page.
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
faizatflutter
14f3c6cb81
Added Arabic Support for symptoms checker
3 months ago
haroon amjad
6faca94b89
updates
3 months ago
Fatimah.Alshammari
d027415302
fixed errors
3 months ago
haroon amjad
9ef70a250d
translation updates
3 months ago
haroon amjad
5feacfaf27
Translation updates
3 months ago
haroon amjad
39af08ddc3
Translation updates
3 months ago
haroon amjad
3ff9628cd3
Translation updates
3 months ago
haroon amjad
87422e8e05
translation updates
3 months ago
haroon amjad
169215fd7b
translation changes
3 months ago
haroon amjad
8f428297cb
Arabic translations added
3 months 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
4 months ago
Sultan khan
873b2a1591
sorting done, covid inprogress
4 months ago
Fatimah.Alshammari
7a03242396
added monthly report
4 months ago
haroon amjad
a83a35a284
Services Page Revamp
4 months ago
faizatflutter
eabfaf8182
Design Updates
6 months ago
tahaalam
ea92a0c75c
laser appointment screen added
6 months ago
tahaalam
483a1571d9
Merge remote-tracking branch 'origin/master' into appointment_filter
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/presentation/lab/lab_results/lab_result_details.dart
6 months ago
tahaalam
6cf08c04d2
appointment filters added.
6 months ago
tahaalam
641df8b51b
logs removed
6 months ago
tahaalam
6ef9ae813d
doctors search filter added
7 months ago
tahaalam
da89c41925
lab result by hospital and translations are added
7 months ago
taha.alam
7093a26cb8
selection region arabic handling
7 months ago
aamir-csol
17c47d093c
otp screen & register Uae & resend Activation Code.
7 months ago
aamir-csol
2b7656d83a
otp screen & register Uae & resend Activation Code.
7 months ago
aamir-csol
5de8314f3f
otp screen & register Uae & resend Activation Code.
7 months ago
aamir-csol
b9b0dfd1fa
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
7 months ago
aamir-csol
15c07cb4e2
otp screen & register Uae & resend Activation Code.
7 months ago
taha.alam
788887a7f1
Merge remote-tracking branch 'origin/master' into feature/search_by_region
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/book_appointment_page.dart
# lib/presentation/home/navigation_screen.dart
7 months ago
taha.alam
2174e0e292
viewmodel and repo updated for the appointment by region selection.
7 months ago
Sultan khan
6b766e558d
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/navigation_screen.dart
7 months ago
aamir-csol
4e17ff9c82
otp screen & register Uae & resend Activation Code.
7 months ago
Sultan khan
fdd5d4cf6d
fixes
7 months ago
Haroon Amjad
de717edfe8
Sickleave implementation done.
7 months ago
Sultan khan
ba2c8327fe
login flow inprogress
7 months ago
aamir-csol
da035650c0
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
7 months ago
haroon amjad
cce7c7166d
Merge branch 'dev_sultan'
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
7 months ago
Sultan khan
2f2a8f3f8f
search lab result screen added
7 months ago
haroon amjad
efb22aec4e
prescription details page implemented
7 months ago
aamir-csol
0309299f44
changes
7 months ago
aamir-csol
cf1908b44a
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
7 months ago
aamir-csol
85fac13314
changes
7 months ago
haroon amjad
8bc49929d4
prescription orders list page implemented
7 months ago
haroon amjad
6f07bc7c2c
Radiology Orders implemented
7 months ago
haroon amjad
4c241b0dac
Lab orders implemented
7 months ago
Sultan khan
f55d82ddb3
bottom navigation
7 months ago
Haroon Amjad
36c6f0d541
Landing page updates
7 months ago
aamir-csol
7321da67e3
register step 2 & fixes
7 months ago
aamir-csol
67e580447e
changes
8 months ago
aamir-csol
8f1e4500cc
register & Exception bottom sheet, country dropdown.
8 months ago
aamir-csol
6f98690929
register & changes
8 months ago
aamir-csol
9c52a6122f
Merge branch 'master' into dev_aamir
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/authantication/login.dart
8 months ago
Haroon Amjad
0a39a00df5
Landing page updates
8 months ago