update on the complaint sla and staff hierarchy
This commit is contained in:
parent
65490078bb
commit
9d586a4ed3
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.utils.timezone
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -318,18 +318,16 @@ class ComplaintForm(forms.ModelForm):
|
||||
user = kwargs.pop('user', None)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
# Filter hospital and patient by user permissions
|
||||
# Filter hospitals and patients based on user permissions
|
||||
if user and not user.is_px_admin() and user.hospital:
|
||||
self.fields['hospital'].queryset = Hospital.objects.filter(
|
||||
id=user.hospital.id
|
||||
)
|
||||
self.fields['hospital'].queryset = Hospital.objects.filter(id=user.hospital.id)
|
||||
self.fields['hospital'].initial = user.hospital
|
||||
self.fields['patient'].queryset = Patient.objects.filter(
|
||||
primary_hospital=user.hospital,
|
||||
status='active'
|
||||
)
|
||||
|
||||
# Check for hospital selection in both initial data and POST data
|
||||
# This is needed for validation to work correctly
|
||||
hospital_id = None
|
||||
if 'hospital' in self.data:
|
||||
hospital_id = self.data.get('hospital')
|
||||
@ -425,11 +423,11 @@ class InquiryForm(forms.ModelForm):
|
||||
user = kwargs.pop('user', None)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
# Filter hospital by user permissions
|
||||
# Filter hospitals based on user role
|
||||
if user and not user.is_px_admin() and user.hospital:
|
||||
self.fields['hospital'].queryset = Hospital.objects.filter(
|
||||
id=user.hospital.id
|
||||
)
|
||||
self.fields['hospital'].queryset = Hospital.objects.filter(id=user.hospital.id)
|
||||
self.fields['hospital'].initial = user.hospital
|
||||
self.fields['hospital'].widget.attrs['readonly'] = True
|
||||
|
||||
# Check for hospital selection in both initial data and POST data
|
||||
hospital_id = None
|
||||
@ -446,9 +444,6 @@ class InquiryForm(forms.ModelForm):
|
||||
).order_by('name')
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class SLAConfigForm(forms.ModelForm):
|
||||
"""Form for creating and editing SLA configurations"""
|
||||
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
"""
|
||||
Complaints UI views - Server-rendered templates for complaints console
|
||||
"""
|
||||
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.core.paginator import Paginator
|
||||
@ -241,6 +242,16 @@ def complaint_detail(request, pk):
|
||||
explanation_attachments = explanation.attachments.all()
|
||||
|
||||
context = {
|
||||
'complaint': complaint,
|
||||
'timeline': timeline,
|
||||
'attachments': attachments,
|
||||
'px_actions': px_actions,
|
||||
'assignable_users': assignable_users,
|
||||
'status_choices': ComplaintStatus.choices,
|
||||
'can_edit': user.is_px_admin() or user.is_hospital_admin(),
|
||||
'hospital_departments': hospital_departments,
|
||||
'base_layout': base_layout,
|
||||
'source_user': source_user,
|
||||
"complaint": complaint,
|
||||
"timeline": timeline,
|
||||
"attachments": attachments,
|
||||
@ -249,8 +260,6 @@ def complaint_detail(request, pk):
|
||||
"status_choices": ComplaintStatus.choices,
|
||||
"can_edit": user.is_px_admin() or user.is_hospital_admin(),
|
||||
"hospital_departments": hospital_departments,
|
||||
'base_layout': base_layout,
|
||||
'source_user': source_user,
|
||||
"explanation": explanation,
|
||||
"explanations": explanations,
|
||||
"explanation_attachments": explanation_attachments,
|
||||
@ -390,7 +399,8 @@ def complaint_create(request):
|
||||
user=request.user,
|
||||
content_object=complaint,
|
||||
metadata={
|
||||
# "category": category.name_en,
|
||||
'severity': complaint.severity,
|
||||
"category": category.name_en,
|
||||
"severity": complaint.severity,
|
||||
"patient_mrn": complaint.patient.mrn if complaint.patient else None,
|
||||
"ai_analysis_pending": True,
|
||||
@ -406,9 +416,6 @@ def complaint_create(request):
|
||||
except ComplaintCategory.DoesNotExist:
|
||||
messages.error(request, "Selected category not found.")
|
||||
return redirect("complaints:complaint_create")
|
||||
except Exception as e:
|
||||
messages.error(request, f"Error creating complaint: {str(e)}")
|
||||
return redirect("complaints:complaint_create")
|
||||
|
||||
# GET request - show form
|
||||
# Check for hospital parameter from URL (for pre-selection)
|
||||
@ -1035,36 +1042,40 @@ def inquiry_create(request):
|
||||
from .models import Inquiry
|
||||
from .forms import InquiryForm
|
||||
from apps.organizations.models import Patient
|
||||
from apps.px_sources.models import SourceUser, PXSource
|
||||
|
||||
# Determine base layout based on user type
|
||||
source_user = SourceUser.objects.filter(user=request.user).first()
|
||||
base_layout = 'layouts/source_user_base.html' if source_user else 'layouts/base.html'
|
||||
|
||||
if request.method == 'POST':
|
||||
# Handle form submission
|
||||
form = InquiryForm(request.POST, user=request.user)
|
||||
|
||||
if not form.is_valid():
|
||||
messages.error(request, f"Please correct the errors: {form.errors}")
|
||||
context = {
|
||||
'form': form,
|
||||
'base_layout': base_layout,
|
||||
'source_user': source_user,
|
||||
}
|
||||
return render(request, 'complaints/inquiry_form.html', context)
|
||||
|
||||
|
||||
if request.method == "POST":
|
||||
try:
|
||||
# Save inquiry
|
||||
inquiry = form.save(commit=False)
|
||||
|
||||
# Set source for source users
|
||||
source_user = SourceUser.objects.filter(user=request.user).first()
|
||||
if source_user:
|
||||
inquiry.source = source_user.source
|
||||
inquiry.created_by = request.user
|
||||
|
||||
inquiry.save()
|
||||
# Get form data
|
||||
patient_id = request.POST.get("patient_id", None)
|
||||
hospital_id = request.POST.get("hospital_id")
|
||||
department_id = request.POST.get("department_id", None)
|
||||
|
||||
subject = request.POST.get("subject")
|
||||
message = request.POST.get("message")
|
||||
category = request.POST.get("category")
|
||||
|
||||
# Contact info (if no patient)
|
||||
contact_name = request.POST.get("contact_name", "")
|
||||
contact_phone = request.POST.get("contact_phone", "")
|
||||
contact_email = request.POST.get("contact_email", "")
|
||||
|
||||
# Validate required fields
|
||||
if not all([hospital_id, subject, message, category]):
|
||||
messages.error(request, "Please fill in all required fields.")
|
||||
return redirect("complaints:inquiry_create")
|
||||
|
||||
# Create inquiry
|
||||
inquiry = Inquiry.objects.create(
|
||||
patient_id=patient_id if patient_id else None,
|
||||
hospital_id=hospital_id,
|
||||
department_id=department_id if department_id else None,
|
||||
subject=subject,
|
||||
message=message,
|
||||
category=category,
|
||||
contact_name=contact_name,
|
||||
contact_phone=contact_phone,
|
||||
contact_email=contact_email,
|
||||
)
|
||||
|
||||
# Log audit
|
||||
AuditService.log_event(
|
||||
@ -1083,15 +1094,12 @@ def inquiry_create(request):
|
||||
return redirect("complaints:inquiry_create")
|
||||
|
||||
# GET request - show form
|
||||
form = InquiryForm(user=request.user)
|
||||
hospitals = Hospital.objects.filter(status='active')
|
||||
hospitals = Hospital.objects.filter(status="active")
|
||||
if not request.user.is_px_admin() and request.user.hospital:
|
||||
hospitals = hospitals.filter(id=request.user.hospital.id)
|
||||
|
||||
context = {
|
||||
'form': form,
|
||||
'base_layout': base_layout,
|
||||
'source_user': source_user,
|
||||
"hospitals": hospitals,
|
||||
}
|
||||
|
||||
return render(request, "complaints/inquiry_form.html", context)
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import apps.observations.models
|
||||
import django.db.models.deletion
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import apps.references.models
|
||||
import django.db.models.deletion
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.core.validators
|
||||
import django.db.models.deletion
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 6.0 on 2026-01-12 09:50
|
||||
=======
|
||||
# Generated by Django 6.0.1 on 2026-01-12 09:50
|
||||
>>>>>>> 1f9d8a7 (update on the complaint sla and staff hierarchy)
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user