Marwan Alwali
|
3c2593de78
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# data.json
|
2026-03-16 02:12:48 +03:00 |
|
|
|
0fc06151eb
|
data
|
2026-03-15 23:48:45 +03:00 |
|
Marwan Alwali
|
a63a25da92
|
update
|
2026-03-13 18:43:51 +03:00 |
|
|
|
1091dcdfde
|
Fix remaining syntax errors in physicians/ui_views.py - remove orphaned lines
|
2026-03-11 01:37:32 +03:00 |
|
|
|
ba63f8f1c6
|
Fix orphaned lines and undefined variables in physicians ui_views.py
|
2026-03-11 01:33:11 +03:00 |
|
|
|
3b9468748c
|
Fix syntax errors in forms.py files
|
2026-03-11 01:26:19 +03:00 |
|
|
|
da0ca4ee19
|
Fix hospital fields in forms - Add HospitalFieldMixin and update templates
PHASE 1: Add HospitalFieldMixin to forms without it
- apps/complaints/forms.py: SLAConfigForm, EscalationRuleForm
- apps/feedback/forms.py: FeedbackForm
- apps/rca/forms.py: RootCauseAnalysisForm
PHASE 2: Update templates to conditionally hide hospital field labels
- templates/complaints/complaint_form.html
- templates/complaints/inquiry_form.html
- templates/complaints/complaint_threshold_form.html
- templates/complaints/escalation_rule_form.html
- templates/feedback/feedback_form.html
PHASE 3: Remove redundant manual hospital filtering code
- Removed manual __init__ hospital logic from forms now using mixin
Behavior:
- PX Admin: Sees hospital dropdown (can select any hospital)
- Hospital Admin/Staff: Hospital field hidden, auto-set to their hospital
- Cleaner code: Mixin handles all role-based filtering automatically
|
2026-03-11 01:19:41 +03:00 |
|
|
|
b57ce661bb
|
Clean up redundant hospital filtering in views
Removed ~300 lines of redundant hospital filtering code from views.
Templates no longer use hospital dropdowns, so views don't need to:
- Query Hospital.objects.filter()
- Apply RBAC filtering to hospitals queryset
- Pass hospitals to context
The middleware (TenantMiddleware) already handles hospital filtering
via request.tenant_hospital for all users.
Files cleaned:
- apps/surveys/ui_views.py
- apps/callcenter/ui_views.py
- apps/complaints/ui_views.py
- apps/analytics/ui_views.py
- apps/physicians/ui_views.py
- apps/projects/ui_views.py
- apps/feedback/views.py
- apps/dashboard/views.py
- apps/journeys/ui_views.py
- apps/appreciation/ui_views.py
|
2026-03-11 00:49:42 +03:00 |
|
|
|
c16e410fdd
|
Remove hospital dropdowns from templates and fix JavaScript dependencies
|
2026-03-11 00:17:53 +03:00 |
|
Marwan Alwali
|
b383991053
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# apps/dashboard/views.py
# config/celery.py
|
2026-03-10 19:42:39 +03:00 |
|
|
|
01fa26c59a
|
updates
|
2026-03-09 16:10:24 +03:00 |
|
Marwan Alwali
|
bda6af64a5
|
update-language-button
|
2026-02-25 21:52:18 +03:00 |
|
Marwan Alwali
|
fa966a3574
|
Merge remote-tracking branch 'origin/main'
|
2026-02-25 21:20:10 +03:00 |
|
|
|
60839790e8
|
update
|
2026-02-25 08:27:21 +03:00 |
|
|
|
ceae6c5009
|
update
|
2026-02-25 08:24:43 +03:00 |
|
|
|
d787d41bc9
|
export
|
2026-02-25 08:15:25 +03:00 |
|
|
|
b3d9bd17cb
|
more changes
|
2026-02-25 04:47:05 +03:00 |
|
Marwan Alwali
|
cce11c0f62
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# PX360/settings.py
# config/settings/base.py
# templates/layouts/partials/sidebar.html
|
2026-02-22 10:14:03 +03:00 |
|
|
|
bdba45fa47
|
Upload files to "/"
|
2026-02-22 09:18:20 +03:00 |
|
|
|
d07cb052f3
|
update
|
2026-02-22 09:09:49 +03:00 |
|
|
|
39b1dcb8c0
|
lots of updates
|
2026-02-22 08:35:53 +03:00 |
|
Marwan Alwali
|
b23526b353
|
update-translation
|
2026-02-17 10:59:57 +03:00 |
|
Marwan Alwali
|
35c076a030
|
Merge remote-tracking branch 'origin/main'
|
2026-02-12 21:40:22 +03:00 |
|
|
|
8fb4fbe3af
|
Merge pull request 'social modified' (#4) from social into main
Reviewed-on: #4
|
2026-02-12 15:13:50 +03:00 |
|
|
|
4f2c8e2dbb
|
changes to tik tok
|
2026-02-12 15:09:48 +03:00 |
|
Marwan Alwali
|
4ceb533fad
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# appreciation/admin.py
# appreciation/models.py
|
2026-02-12 08:27:48 +03:00 |
|
|
|
72dd1e8e3c
|
more updates in complaint and survey
|
2026-02-10 12:33:31 +03:00 |
|
Marwan Alwali
|
7bddee1647
|
update
|
2026-02-02 16:50:42 +03:00 |
|
|
|
3c44f28d33
|
survey charts and analytics
|
2026-01-25 10:39:37 +03:00 |
|
|
|
42cf7bf8f1
|
update on the surevey
|
2026-01-24 15:27:30 +03:00 |
|
|
|
3ce62d80e1
|
small changes
|
2026-01-24 15:27:27 +03:00 |
|
|
|
9d586a4ed3
|
update on the complaint sla and staff hierarchy
|
2026-01-24 15:26:30 +03:00 |
|
|
|
65490078bb
|
update the complaint and inquiry creation for the source user
|
2026-01-24 15:25:53 +03:00 |
|
|
|
d0a2d5db7b
|
standards app done
|
2026-01-24 15:24:58 +03:00 |
|
|
|
aac8698df4
|
update on the complaint sla and staff hierarchy
|
2026-01-24 15:24:39 +03:00 |
|
|
|
dcb6455819
|
update the complaint and inquiry creation for the source user
|
2026-01-24 15:13:14 +03:00 |
|
|
|
4dd3c3e505
|
standards app done
|
2026-01-24 15:07:27 +03:00 |
|
Marwan Alwali
|
7d6d75b10b
|
update-admin-stuff
|
2026-01-21 14:27:29 +03:00 |
|
Marwan Alwali
|
9d694c7ab3
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# apps/accounts/admin.py
|
2026-01-18 14:05:58 +03:00 |
|
Marwan Alwali
|
524efbead9
|
update-po-file
|
2026-01-18 14:04:23 +03:00 |
|
|
|
6f2c783577
|
update on the complaint and fix merge conflict
|
2026-01-15 15:25:09 +03:00 |
|
|
|
e3b3490bc9
|
update on the complaint sla and staff hierarchy
|
2026-01-15 15:22:57 +03:00 |
|
|
|
8b65f9a52e
|
update the complaint and inquiry creation for the source user
|
2026-01-15 15:07:32 +03:00 |
|
|
|
90dd2a66af
|
standards app done
|
2026-01-15 15:02:42 +03:00 |
|
|
|
1f9d8a7198
|
update on the complaint sla and staff hierarchy
|
2026-01-15 14:32:49 +03:00 |
|
|
|
5185849c6d
|
requirements.txt updated
|
2026-01-15 14:31:58 +03:00 |
|
|
|
ec675dbc4e
|
social and source app
|
2026-01-15 14:31:58 +03:00 |
|
Marwan Alwali
|
02984811ab
|
update
|
2026-01-13 17:01:46 +03:00 |
|
Marwan Alwali
|
d7847da450
|
update
|
2026-01-12 13:20:34 +03:00 |
|
|
|
350607d0cc
|
update on the staff model
|
2026-01-12 12:19:19 +03:00 |
|
