aamir-csol
bb4719bd87
logout & family file fix & PMA-1047
2 weeks ago
haroon amjad
f54ce71177
translation changes
2 weeks ago
haroon amjad
6faca94b89
updates
3 weeks ago
haroon amjad
3ff9628cd3
Translation updates
3 weeks 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 weeks ago
Sultan khan
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
4 weeks ago
Sultan khan
ac0d72b3ff
vital sign finalized.
4 weeks ago
faizatflutter
ff2bcbae3f
Merge branch 'master' into faiz_dev
...
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
4 weeks ago
faizatflutter
001808488c
Added 'send report to email' feature
4 weeks 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 weeks ago
Fatimah.Alshammari
8ae81d2b24
fixed parking qr
4 weeks ago
haroon amjad
ede8844f19
Monthly Reports implemented
1 month ago
haroon amjad
b10d715d55
App updates
1 month ago
haroon amjad
05e5b41dc6
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
1 month ago
haroon amjad
6f067d92d6
My invoices implemented
1 month 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)
1 month ago
Sultan khan
f7021f685a
no message
1 month ago
haroon amjad
213662e718
updates
1 month 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
1 month 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
1 month ago
haroon amjad
dcdd17f0e9
sickleave fix
1 month ago
aamir-csol
54f8391066
Merge branch 'master' into dev_aamir
...
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
1 month ago
aamir-csol
135b05e561
Health calculators & converters
1 month 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
1 month 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
1 month ago
haroon amjad
450f07d39d
updates & fixes
2 months ago
haroon amjad
d8c7503c56
QLine API implementation enhancements
2 months ago
Fatimah.Alshammari
190492a191
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/routes/app_routes.dart
2 months ago
haroon amjad
3060c57201
updates
2 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
2 months ago
haroon amjad
ff98262cf7
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/home/landing_page.dart
2 months ago
haroon amjad
796aeb03d3
Ancillary order fixes, QLine API integrated & other enhancements
2 months ago
haroon amjad
c97a492244
Medical File page updates
2 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
2 months ago
haroon amjad
634a138c7f
Queueing system screen implementation contd.
2 months ago
haroon amjad
ca47315b2c
Merge branch 'master' into haroon_dev
2 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
2 months ago
aamir-csol
d256eec392
medical file changes
2 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
2 months ago
aamir-csol
19365375f6
medical file changes
2 months ago
haroon amjad
3185d1e9e7
Allergies list implemented
2 months ago
haroon amjad
36bf63dcde
Incoming call updates
2 months ago
haroon amjad
1e5744cf44
Updates & enhancements
2 months ago
Fatimah.Alshammari
86a91ab383
Merge branch 'refs/heads/master' into fatima
2 months ago
faizatflutter
757ace2ba1
Added Organ Selector
2 months ago
haroon amjad
f142ff90be
updates
2 months ago
haroon amjad
07a3052b8e
appointment prescription implemented
3 months ago
Fatimah.Alshammari
89ff10f506
Merge branch 'refs/heads/master' into fatima
...
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
3 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
3 months ago
haroon amjad
c03c84287c
Appointment details Lab & radiology integration implemented
3 months ago