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
0c68ca4438
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 :
Added 'send report to email' feature
Completed the health Tracker Module, Only the email part is left.
only explain api left.
Triage Completed. Explain API left
Till Triage Completed
refactoring
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
9 months ago
ac0d72b3ff
vital sign finalized.
9 months ago
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
9 months ago
001808488c
Added 'send report to email' feature
9 months ago
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
8ae81d2b24
fixed parking qr
9 months ago
haroon amjad
ede8844f19
Monthly Reports implemented
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
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)
10 months ago
f7021f685a
no message
10 months ago
haroon amjad
213662e718
updates
10 months ago
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
10 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
10 months ago
haroon amjad
dcdd17f0e9
sickleave fix
10 months ago
54f8391066
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
10 months ago
135b05e561
Health calculators & converters
10 months ago
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
10 months ago
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
haroon amjad
450f07d39d
updates & fixes
10 months ago
haroon amjad
d8c7503c56
QLine API implementation enhancements
10 months ago
190492a191
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/routes/app_routes.dart
10 months ago
haroon amjad
3060c57201
updates
10 months ago
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
haroon amjad
ff98262cf7
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/home/landing_page.dart
10 months ago
haroon amjad
796aeb03d3
Ancillary order fixes, QLine API integrated & other enhancements
10 months ago
haroon amjad
c97a492244
Medical File page updates
10 months ago
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
haroon amjad
ca47315b2c
Merge branch 'master' into haroon_dev
10 months ago
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
d256eec392
medical file changes
10 months ago
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
19365375f6
medical file changes
10 months ago
haroon amjad
3185d1e9e7
Allergies list implemented
10 months ago
haroon amjad
36bf63dcde
Incoming call updates
11 months ago
haroon amjad
1e5744cf44
Updates & enhancements
11 months ago
86a91ab383
Merge branch 'refs/heads/master' into fatima
11 months ago
757ace2ba1
Added Organ Selector
11 months ago
haroon amjad
f142ff90be
updates
11 months ago
haroon amjad
07a3052b8e
appointment prescription implemented
11 months ago
89ff10f506
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
11 months ago
haroon amjad
63d844a5e9
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/features/radiology/radiology_view_model.dart
# lib/presentation/appointments/appointment_details_page.dart
# lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
# lib/presentation/emergency_services/history/widget/rrt_item.dart
11 months ago
haroon amjad
c03c84287c
Appointment details Lab & radiology integration implemented
11 months ago
haroon amjad
ffca4317aa
updates
11 months ago
721bf95c1b
Comprehensive checkup in progress
11 months ago
8191852f4d
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
11 months ago
haroon amjad
f9f17f3a76
LiveChat implemented
11 months ago
Fatimah.Alshammari
Sultan khan
faizatflutter
haroon amjad
aamir-csol