 haroon amjad
|
9413e54d3a
|
NPHIES Eligibility checks implemented
|
8 months ago |
Haroon Amjad
|
105ab2326a
|
updates
|
8 months ago |
|
haroon amjad
|
530b87282f
|
updates & fixes
|
8 months ago |
aamir-csol
|
7296bfb6fc
|
family fil fixes
|
8 months ago |
|
haroon amjad
|
01c21377aa
|
Updates & fixes
|
8 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
|
8 months ago |
|
tahaalam
|
d137e1166d
|
watch integration ui added.
|
8 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
|
8 months ago |
|
aamir-csol
|
2c7f4ddc48
|
Ai Analysis & PMA-(1078,1079)
|
8 months ago |
|
Haroon Amjad
|
a4573c8710
|
arabic fixes
|
8 months ago |
|
Haroon Amjad
|
4ce1e912ce
|
Vital sign data connected to Symptom checker
|
8 months ago |
|
haroon amjad
|
9ed016ad8b
|
updates & fixes
|
8 months ago |
 Sikander Saleem
|
b9350afead
|
ui improvements
|
8 months ago |
faizatflutter
|
9c7cfde5f4
|
ui improvements
|
8 months ago |
|
Sikander Saleem
|
6e1eb0d0bb
|
ui improvements
|
8 months ago |
|
Sikander Saleem
|
6e4d7519fb
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/home/widgets/habib_wallet_card.dart
|
9 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
|
9 months ago |
|
haroon amjad
|
b0708d85d9
|
updates & fixes
|
9 months ago |
|
haroon amjad
|
3e9a381ed7
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
faizatflutter
|
14f3c6cb81
|
Added Arabic Support for symptoms checker
|
9 months ago |
|
haroon amjad
|
10a5a6f558
|
Ask Doctor implemented
|
9 months ago |
|
haroon amjad
|
f48eb631ab
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
haroon amjad
|
f54ce71177
|
translation changes
|
9 months ago |
|
faizatflutter
|
07447e148b
|
Symptoms Checker flow is completed
|
9 months ago |
|
haroon amjad
|
6faca94b89
|
updates
|
9 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
|
9 months ago |
|
haroon amjad
|
5feacfaf27
|
Translation updates
|
9 months ago |
|
haroon amjad
|
39af08ddc3
|
Translation updates
|
9 months ago |
|
Sikander Saleem
|
0b9df1f22b
|
collapsing toolbar behaviour changed as like barq
|
9 months ago |
|
Sikander Saleem
|
45b013a048
|
UI/UX improvements - insurance update.
|
9 months ago |
|
Sikander Saleem
|
1599cfed4e
|
UI/UX improvements-1.
|
9 months ago |
|
Sikander Saleem
|
77a04e637e
|
UI/UX improvements.
|
9 months ago |
|
haroon amjad
|
475a9b9acb
|
Merge branch 'master' into haroon_dev
|
9 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
|
9 months ago |
|
Sultan khan
|
42222804fd
|
fix graph dot and bp graph.
|
9 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
|
9 months ago |
|
haroon amjad
|
44ce353dac
|
updates
|
9 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
|
9 months ago |
|
haroon amjad
|
e454c9c991
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
|
9 months ago |
|
faizatflutter
|
ff2bcbae3f
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
|
9 months ago |
|
faizatflutter
|
3f5bd0a759
|
Completed the health Tracker Module, Only the email part is left.
|
9 months ago |
|
haroon amjad
|
02930a901e
|
Indoor navigation implementation & Landing page swiper card updates
|
9 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
|
9 months ago |
|
haroon amjad
|
ede8844f19
|
Monthly Reports implemented
|
9 months ago |
|
haroon amjad
|
255353dd21
|
Bottom nav updates
|
9 months ago |
|
haroon amjad
|
b10d715d55
|
App updates
|
9 months ago |
|
haroon amjad
|
05e5b41dc6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
9 months ago |
|
haroon amjad
|
6f067d92d6
|
My invoices implemented
|
9 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)
|
9 months ago |
|
Sultan khan
|
f7021f685a
|
no message
|
9 months ago |
|
faizatflutter
|
a29c0dd6bc
|
fixed the suggested design changes. (Not reminder ones)
|
9 months ago |
|
faizatflutter
|
f8fdd7570e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
9 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
|
9 months ago |
|
faizatflutter
|
d4dd475e0b
|
Added Graph
|
9 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
|
9 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
|
9 months ago |
|
Sultan khan
|
873b2a1591
|
sorting done, covid inprogress
|
9 months ago |
|
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
9 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
|
9 months ago |
|
aamir-csol
|
135b05e561
|
Health calculators & converters
|
9 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
|
10 months ago |
|
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
10 months ago |
|
haroon amjad
|
5581346a2d
|
updates
|
10 months ago |
|
Sikander Saleem
|
edcab9d26d
|
collapsing_list_view improvement
|
10 months ago |
|
Sikander Saleem
|
5191ffeb2c
|
Merge branch 'refs/heads/master' into dev_sikander
|
10 months ago |
|
Sikander Saleem
|
a78769df67
|
collapsing_list_view improvement
|
10 months ago |
|
faizatflutter
|
94668997aa
|
Updated design for HHC
|
10 months ago |
|
haroon amjad
|
450f07d39d
|
updates & fixes
|
10 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
|
10 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
|
10 months ago |
|
aamir-csol
|
335e6a6649
|
Health Calculators
|
10 months ago |
|
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
10 months ago |
|
faizatflutter
|
cf26e71645
|
Complete USerInfo Selectoiun
|
10 months ago |
|
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
10 months ago |
|
tahaalam
|
2125e30c23
|
Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
10 months ago |
|
tahaalam
|
95243c250f
|
graph shaded region added from horizontal spaces
|
10 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
|
10 months ago |
|
haroon amjad
|
634a138c7f
|
Queueing system screen implementation contd.
|
10 months ago |
|
aamir-csol
|
f91f8e63d7
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/medical_file/widgets/lab_rad_card.dart
|
10 months ago |
|
aamir-csol
|
d256eec392
|
medical file changes
|
10 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
|
10 months ago |
|
faizatflutter
|
2173d091ed
|
Added symptoms selector
|
10 months ago |
|
aamir-csol
|
19365375f6
|
medical file changes
|
10 months ago |
|
tahaalam
|
ac15ab26f5
|
graph changes for high and low
|
10 months ago |
|
haroon amjad
|
b37804d012
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/prescriptions/prescriptions_view_model.dart
# lib/presentation/appointments/appointment_details_page.dart
|
10 months ago |
|
Haroon6138
|
88039534e2
|
Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105) from calender_reminder into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105
|
10 months ago |
|
aamir-csol
|
0f17a655ed
|
Merge branch 'master' into dev_aamir
# Conflicts:
# ios/Runner/AppDelegate.swift
# lib/core/dependencies.dart
# lib/core/utils/utils.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/authentication/quick_login.dart
# lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/appbar/collapsing_list_view.dart
# lib/widgets/common_bottom_sheet.dart
|
10 months ago |
|
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
10 months ago |
|
faizatflutter
|
ac84d268e9
|
triage design
|
10 months ago |
|
tahaalam
|
e200479332
|
old calender util deleted
|
10 months ago |
|
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
10 months ago |
|
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
11 months ago |
|
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
11 months ago |
|
Sultan khan
|
a4d3bb3533
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
11 months ago |
|
Sultan khan
|
fb69723a65
|
e-referral done.
|
11 months ago |
|
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
11 months ago |
|
faizatflutter
|
8068de70cb
|
Completed the HHC and CMC
|
11 months ago |
|
haroon amjad
|
b90883a596
|
prescription order implementation contd.
|
11 months ago |
|
tahaalam
|
cbaea9d5e6
|
screen documentation added.
|
11 months ago |