Sultan khan
0d4563542a
WD:map issues resolved:
...
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
3 weeks ago
haroon amjad
89a1da4407
Updates
3 weeks ago
haroon amjad
56f5151c0c
Font changes, Updates & fixes
3 weeks ago
tahaalam
c716490b0e
map type is added to the maps already present
3 weeks ago
haroon amjad
453cfc07e1
Updates
3 weeks ago
haroon amjad
3d39190c62
updates & fixes
3 weeks ago
haroon amjad
3703afe8bd
updates
3 weeks ago
haroon amjad
edeae70aa0
Updates
3 weeks ago
haroon amjad
1f290c5bfe
updates
3 weeks ago
haroon amjad
deca29b423
updates & fixes
3 weeks ago
haroon amjad
93af246700
updates
3 weeks ago
haroon amjad
db89408185
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/generated/locale_keys.g.dart
4 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
4 weeks ago
haroon amjad
841fca027c
updates
4 weeks ago
tahaalam
a8138ba231
Merge remote-tracking branch 'origin/master' into reminer
4 weeks ago
tahaalam
8b829b9101
reminder start time added to the prescription
4 weeks ago
tahaalam
2babda2d63
Merge remote-tracking branch 'origin/master' into labs_graph_pdf
4 weeks ago
tahaalam
1d1c756412
graph values fix and comparision with the pdf
4 weeks ago
haroon amjad
1709b80e84
Updates
4 weeks ago
haroon amjad
d053f58b7d
Updates
1 month ago
haroon amjad
3d877ed28d
Updates
1 month ago
Haroon Amjad
55b8bc162c
Updates
1 month ago
tahaalam
f84d5c6769
Merge remote-tracking branch 'origin/master' into watch_integration
...
# Conflicts:
# lib/splashPage.dart
1 month ago
tahaalam
dda4dbeba9
merge issue resolution some import were missing from master.
2 months 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
2 months ago
Sultan khan
4f303d8496
other country login done.
2 months 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
2 months ago
haroon amjad
47b50e35a1
updates
2 months ago
haroon amjad
29447cc9fa
updates
2 months ago
haroon amjad
6e71aa7f13
updates & fixes
2 months ago
Haroon Amjad
8de8039096
updates
2 months ago
Haroon Amjad
040ff6a80d
Dark mode persistence added in the app
2 months ago
haroon amjad
f46b3f745f
Dark mode enabled
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
bfeb3dce4e
data integration along with the data representation
2 months ago
haroon amjad
9413e54d3a
NPHIES Eligibility checks implemented
2 months ago
Haroon Amjad
105ab2326a
updates
2 months ago
haroon amjad
530b87282f
updates & fixes
3 months ago
aamir-csol
7296bfb6fc
family fil fixes
3 months ago
haroon amjad
01c21377aa
Updates & fixes
3 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
3 months ago
tahaalam
d137e1166d
watch integration ui added.
3 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
3 months ago
aamir-csol
2c7f4ddc48
Ai Analysis & PMA-(1078,1079)
3 months ago
Haroon Amjad
a4573c8710
arabic fixes
3 months ago
Haroon Amjad
4ce1e912ce
Vital sign data connected to Symptom checker
3 months ago
haroon amjad
9ed016ad8b
updates & fixes
3 months ago
Sikander Saleem
b9350afead
ui improvements
3 months ago
faizatflutter
9c7cfde5f4
ui improvements
3 months ago
Sikander Saleem
6e1eb0d0bb
ui improvements
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
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
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
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
Sikander Saleem
0b9df1f22b
collapsing toolbar behaviour changed as like barq
3 months ago
Sikander Saleem
45b013a048
UI/UX improvements - insurance update.
3 months ago
Sikander Saleem
1599cfed4e
UI/UX improvements-1.
3 months ago
Sikander Saleem
77a04e637e
UI/UX improvements.
3 months ago
haroon amjad
475a9b9acb
Merge branch 'master' into haroon_dev
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
4 months ago
Sultan khan
42222804fd
fix graph dot and bp graph.
4 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
4 months ago
haroon amjad
44ce353dac
updates
4 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
4 months ago
haroon amjad
e454c9c991
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
4 months ago
faizatflutter
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
4 months ago
faizatflutter
3f5bd0a759
Completed the health Tracker Module, Only the email part is left.
4 months ago
haroon amjad
02930a901e
Indoor navigation implementation & Landing page swiper card updates
4 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
4 months ago
haroon amjad
ede8844f19
Monthly Reports implemented
4 months ago
haroon amjad
255353dd21
Bottom nav updates
4 months ago
haroon amjad
b10d715d55
App updates
4 months ago
haroon amjad
05e5b41dc6
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
4 months ago
haroon amjad
6f067d92d6
My invoices implemented
4 months ago
Sultan khan
dc8031bb41
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
fixed the suggested design changes. (Not reminder ones)
fixed the suggested design changes. (Not reminder ones)
4 months ago
Sultan khan
f7021f685a
no message
4 months ago
faizatflutter
a29c0dd6bc
fixed the suggested design changes. (Not reminder ones)
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
d4dd475e0b
Added Graph
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
6ceee6973f
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 :
sickleave fix
Health calculators & converters
updates
updates
updates
updates
Nearest Appointment selected
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
4 months ago
Sultan khan
873b2a1591
sorting done, covid inprogress
4 months ago
faizatflutter
a1aaa041d1
Water Intake Final Touches
4 months ago
haroon amjad
b353de3cf8
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/book_appointment/select_doctor_page.dart
# lib/presentation/book_appointment/widgets/doctor_card.dart
4 months ago
aamir-csol
135b05e561
Health calculators & converters
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
faizatflutter
fd2abbbc7b
Water Intake Design completed
4 months ago
haroon amjad
5581346a2d
updates
4 months ago
Sikander Saleem
edcab9d26d
collapsing_list_view improvement
4 months ago
Sikander Saleem
5191ffeb2c
Merge branch 'refs/heads/master' into dev_sikander
4 months ago