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
3 weeks ago
haroon amjad
837a934d0d
updates
3 weeks ago
haroon amjad
db89408185
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/generated/locale_keys.g.dart
3 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
3 weeks ago
haroon amjad
841fca027c
updates
3 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
3 weeks ago
haroon amjad
e29aba81da
Updates
3 weeks ago
tahaalam
a8138ba231
Merge remote-tracking branch 'origin/master' into reminer
3 weeks ago
tahaalam
8b829b9101
reminder start time added to the prescription
3 weeks ago
haroon amjad
a45980162d
Added location option in region selection bottom sheet
3 weeks ago
haroon amjad
444e7b562f
Merge branch 'master' into haroon_dev
3 weeks ago
haroon amjad
7611c1d58c
Updates
3 weeks ago
aamir-csol
f1555c76a3
Invoices Filter
3 weeks ago
haroon amjad
1709b80e84
Updates
3 weeks ago
haroon amjad
4a3d66f01a
Updates
3 weeks ago
haroon amjad
d053f58b7d
Updates
4 weeks ago
haroon amjad
d703c382e5
Updates
4 weeks ago
haroon amjad
3d877ed28d
Updates
4 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
1a68ffd500
Updates
1 month ago
tahaalam
50d78551c2
warning dialog displayed to user if the watch intented is not currently implemented
1 month ago
haroon amjad
abbf016694
Merge branch 'master' into haroon_dev
1 month ago
haroon amjad
2c0d010bac
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
haroon amjad
f46b3f745f
Dark mode enabled
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
Fatimah.Alshammari
8368dbd4d9
fixed Ar and En files
2 months ago
haroon amjad
dffed5df6b
Insurance approvals page fixes
2 months ago
Fatimah.Alshammari
cf3c14281c
fixed Ar En files
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
ec506869cc
Android package name updated to new package details
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
e1788f1187
Merge branch 'master' into haroon_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
5015747580
LiveCare changes
2 months ago
haroon amjad
01c21377aa
Updates & fixes
2 months ago
tahaalam
183bcce003
merge issue resolution
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
Fatimah.Alshammari
47ec43850d
Merge branch 'master' into fatima
2 months ago
haroon amjad
3c9c3032a5
Services price list implemented
2 months ago
haroon amjad
2ab3e178a2
Indoor navigation implemented
2 months ago
haroon amjad
3af43dc676
JIRA bug fixes & updates
2 months ago
Fatimah.Alshammari
0d6d23dbbc
Merge branch 'master' into fatima
3 months ago
haroon amjad
5c684a6a0d
Doctor Rating details implemented
3 months ago
Fatimah.Alshammari
f340f4fb8f
Merge branch 'master' into fatima
...
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
3 months ago
haroon amjad
70a6d90ce3
updates & 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
Sikander Saleem
f376f430c6
Merge branch 'refs/heads/master' into dev_sikander
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
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
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
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
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
f48eb631ab
Merge branch 'master' into haroon_dev
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
haroon amjad
9ef70a250d
translation updates
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
3ff9628cd3
Translation updates
3 months ago
haroon amjad
87422e8e05
translation updates
3 months ago
Sikander Saleem
45b013a048
UI/UX improvements - insurance update.
3 months ago
haroon amjad
169215fd7b
translation changes
3 months ago
Sikander Saleem
77a04e637e
UI/UX improvements.
3 months ago
haroon amjad
8f428297cb
Arabic translations added
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
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
faizatflutter
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
3 months ago
haroon amjad
91c16f13d1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/app_assets.dart
3 months ago
faizatflutter
3f5bd0a759
Completed the health Tracker Module, Only the email part is left.
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
haroon amjad
ede8844f19
Monthly Reports implemented
3 months ago
haroon amjad
255353dd21
Bottom nav updates
3 months ago
haroon amjad
b10d715d55
App updates
4 months ago
Sultan khan
5a1fe2b5ca
vital sign page added
4 months ago
Sultan khan
f7021f685a
no message
4 months ago
faizatflutter
f8fdd7570e
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
4 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
faizatflutter
333046951c
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/main.dart
# lib/routes/app_routes.dart
4 months ago
Sultan khan
68a34369ee
no message
4 months ago
Sultan khan
873b2a1591
sorting done, covid inprogress
4 months ago
faizatflutter
a1aaa041d1
Water Intake Final Touches
4 months ago
Sultan khan
366429f083
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 :
Health calculators & converters
Health calculators & converters
collapsing_list_view improvement
# Conflicts:
# lib/widgets/appbar/collapsing_list_view.dart
4 months ago
Fatimah.Alshammari
f3674ba06f
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
4 months ago
Sultan khan
40638cfec4
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 :
collapsing_list_view improvement
Updated design for HHC
updates & fixes
QLine API implementation enhancements
LiveCare flow from clinic selection implemented
# Conflicts:
# lib/presentation/home/landing_page.dart
4 months ago
faizatflutter
fd2abbbc7b
Water Intake Design completed
4 months ago
aamir-csol
c921228ad9
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
# lib/presentation/health_calculators/health_calculator_result.dart
4 months ago
aamir-csol
f509a09b34
Health calculators & converters
4 months ago
haroon amjad
450f07d39d
updates & fixes
4 months ago
Sultan khan
68e1b116f9
last rated updated.
4 months ago
Fatimah.Alshammari
3d8daeb58d
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/core/utils/calendar_utils.dart
# lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/hmg_services/services_view.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
# pubspec.yaml
4 months ago
Fatimah.Alshammari
0b3fea230f
monthly report
4 months ago
aamir-csol
7d71d994ea
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/core/app_assets.dart
# lib/core/enums.dart
# lib/core/utils/calender_utils_new.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/hmg_services/services_view.dart
# lib/routes/app_routes.dart
4 months ago
aamir-csol
335e6a6649
Health Calculators
4 months ago
haroon amjad
d202aa8423
Smartwatch integration started
4 months ago
haroon amjad
ff98262cf7
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/home/landing_page.dart
4 months ago
faizatflutter
6f72c99975
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
4 months ago
haroon amjad
796aeb03d3
Ancillary order fixes, QLine API integrated & other enhancements
4 months ago
faizatflutter
c7c0a0ac09
Added user_info module IAP
4 months ago
haroon amjad
c97a492244
Medical File page updates
4 months ago
haroon amjad
a83a35a284
Services Page Revamp
4 months ago
faizatflutter
34f4cd4f91
Merge branch 'refs/heads/master' into faiz_dev
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/widgets/appbar/collapsing_list_view.dart
4 months ago
haroon amjad
e72e67d9bf
Appointment Queue implemented, Blood Donation implementation contd.
4 months ago
faizatflutter
2ffd4cc1ae
Integrated the API for Symptoms Checker
4 months ago
haroon amjad
634a138c7f
Queueing system screen implementation contd.
4 months ago
faizatflutter
e35fe9ac05
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/routes/app_routes.dart
# lib/widgets/appbar/collapsing_list_view.dart
4 months ago
haroon amjad
2b7379c1c3
Waiting appointment implementation in progress
4 months ago
haroon amjad
36bf63dcde
Incoming call updates
5 months ago
faizatflutter
acb6d31ff3
Added possible conditions screen
5 months ago
faizatflutter
757ace2ba1
Added Organ Selector
5 months ago
faizatflutter
8ddfdeeac4
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/app_assets.dart
# lib/core/utils/date_util.dart
# lib/features/emergency_services/emergency_services_repo.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/widgets/common_bottom_sheet.dart
5 months ago
tahaalam
31261092a8
rrt request creation and history listing
5 months ago
faizatflutter
721bf95c1b
Comprehensive checkup in progress
5 months ago
tahaalam
5b0a8ad898
cancel and listing request added
5 months ago
tahaalam
1ca39e1332
Ambulance order screens and geocoding request added
5 months ago
tahaalam
90128a812b
call ambulance module design added.
6 months ago
haroon amjad
1c3ed8f2e1
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/dependencies.dart
# lib/features/emergency_services/emergency_services_repo.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/emergency_services/emergency_services_page.dart
6 months ago