update on the complaint and fix merge conflict

apps/accounts/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/accounts/migrations/0002_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/accounts/migrations/0005_merge_20260115_1447.py

@@ -0,0 +1,14 @@
+# Generated by Django 6.0.1 on 2026-01-15 11:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_user_explanation_notification_channel_and_more'),
+        ('accounts', '0004_username_default'),
+    ]
+
+    operations = [
+    ]

apps/ai_engine/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/analytics/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/appreciation/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/callcenter/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/complaints/admin.py

@@ -39,11 +39,11 @@ class ComplaintAdmin(admin.ModelAdmin):
     list_display = [
         'title_preview', 'patient', 'hospital', 'category',
         'severity_badge', 'status_badge', 'sla_indicator',
-        'created_by', 'assigned_to', 'created_at'
+        'assigned_to', 'created_at'
     ]
     list_filter = [
         'status', 'severity', 'priority', 'category', 'source',
-        'is_overdue', 'hospital', 'created_by', 'created_at'
+        'is_overdue', 'hospital', 'created_at'
     ]
     search_fields = [
         'title', 'description', 'patient__mrn',
@@ -66,9 +66,6 @@ class ComplaintAdmin(admin.ModelAdmin):
         ('Classification', {
             'fields': ('priority', 'severity', 'source')
         }),
-        ('Creator Tracking', {
-            'fields': ('created_by',)
-        }),
         ('Status & Assignment', {
             'fields': ('status', 'assigned_to', 'assigned_at')
         }),
@@ -97,8 +94,7 @@ class ComplaintAdmin(admin.ModelAdmin):
         qs = super().get_queryset(request)
         return qs.select_related(
             'patient', 'hospital', 'department', 'staff',
-            'assigned_to', 'resolved_by', 'closed_by', 'resolution_survey',
+            'assigned_to', 'resolved_by', 'closed_by', 'resolution_survey'
-            'created_by'
         )
 
     def title_preview(self, obj):
@@ -223,9 +219,9 @@ class InquiryAdmin(admin.ModelAdmin):
     """Inquiry admin"""
     list_display = [
         'subject_preview', 'patient', 'contact_name',
-        'hospital', 'category', 'status', 'created_by', 'assigned_to', 'created_at'
+        'hospital', 'category', 'status', 'assigned_to', 'created_at'
     ]
-    list_filter = ['status', 'category', 'source', 'hospital', 'created_by', 'created_at']
+    list_filter = ['status', 'category', 'source', 'hospital', 'created_at']
     search_fields = [
         'subject', 'message', 'contact_name', 'contact_phone',
         'patient__mrn', 'patient__first_name', 'patient__last_name'
@@ -246,9 +242,6 @@ class InquiryAdmin(admin.ModelAdmin):
         ('Inquiry Details', {
             'fields': ('subject', 'message', 'category', 'source')
         }),
-        ('Creator Tracking', {
-            'fields': ('created_by',)
-        }),
         ('Status & Assignment', {
             'fields': ('status', 'assigned_to')
         }),
@@ -266,7 +259,7 @@ class InquiryAdmin(admin.ModelAdmin):
         qs = super().get_queryset(request)
         return qs.select_related(
             'patient', 'hospital', 'department',
-            'assigned_to', 'responded_by', 'created_by'
+            'assigned_to', 'responded_by'
         )
 
     def subject_preview(self, obj):

apps/complaints/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/complaints/migrations/0002_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/complaints/migrations/0003_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/complaints/migrations/0006_merge_20260115_1447.py

@@ -0,0 +1,14 @@
+# Generated by Django 6.0.1 on 2026-01-15 11:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('complaints', '0004_complaint_created_by_inquiry_created_by_and_more'),
+        ('complaints', '0005_complaintexplanation_escalated_at_and_more'),
+    ]
+
+    operations = [
+    ]

apps/core/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/feedback/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/feedback/migrations/0002_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/feedback/migrations/0003_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/integrations/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/journeys/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/journeys/migrations/0002_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/notifications/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/observations/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/organizations/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/physicians/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/projects/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/projects/migrations/0002_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/px_action_center/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/px_sources/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/references/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/social/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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
 

apps/standards/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

apps/surveys/migrations/0001_initial.py

@@ -1,8 +1,4 @@
-<<<<<<< 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

templates/complaints/complaint_detail.html

@@ -1,4 +1,4 @@
-{% extends base_layout %}
+{% extends "layouts/base.html" %}
 {% load i18n %}
 {% load static %}
 {% load math %}