From 6f2c783577f18b0319dbbf13f84d3d130e26d279 Mon Sep 17 00:00:00 2001
From: ismail <ismail.mosa.ibrahim@gmail.com>
Date: Thu, 15 Jan 2026 14:58:45 +0300
Subject: [PATCH] update on the complaint and fix merge conflict

---
 apps/accounts/migrations/0001_initial.py      |  4 ----
 apps/accounts/migrations/0002_initial.py      |  4 ----
 .../migrations/0005_merge_20260115_1447.py    | 14 ++++++++++++++
 apps/ai_engine/migrations/0001_initial.py     |  4 ----
 apps/analytics/migrations/0001_initial.py     |  4 ----
 apps/appreciation/migrations/0001_initial.py  |  4 ----
 apps/callcenter/migrations/0001_initial.py    |  4 ----
 apps/complaints/admin.py                      | 19 ++++++-------------
 apps/complaints/migrations/0001_initial.py    |  4 ----
 apps/complaints/migrations/0002_initial.py    |  4 ----
 apps/complaints/migrations/0003_initial.py    |  4 ----
 .../migrations/0006_merge_20260115_1447.py    | 14 ++++++++++++++
 apps/core/migrations/0001_initial.py          |  4 ----
 apps/feedback/migrations/0001_initial.py      |  4 ----
 apps/feedback/migrations/0002_initial.py      |  4 ----
 apps/feedback/migrations/0003_initial.py      |  4 ----
 apps/integrations/migrations/0001_initial.py  |  4 ----
 apps/journeys/migrations/0001_initial.py      |  4 ----
 apps/journeys/migrations/0002_initial.py      |  4 ----
 apps/notifications/migrations/0001_initial.py |  4 ----
 apps/observations/migrations/0001_initial.py  |  4 ----
 apps/organizations/migrations/0001_initial.py |  4 ----
 apps/physicians/migrations/0001_initial.py    |  4 ----
 apps/projects/migrations/0001_initial.py      |  4 ----
 apps/projects/migrations/0002_initial.py      |  4 ----
 .../migrations/0001_initial.py                |  4 ----
 apps/px_sources/migrations/0001_initial.py    |  4 ----
 apps/references/migrations/0001_initial.py    |  4 ----
 apps/social/migrations/0001_initial.py        |  4 ----
 apps/standards/migrations/0001_initial.py     |  4 ----
 apps/surveys/migrations/0001_initial.py       |  4 ----
 templates/complaints/complaint_detail.html    |  2 +-
 32 files changed, 35 insertions(+), 126 deletions(-)
 create mode 100644 apps/accounts/migrations/0005_merge_20260115_1447.py
 create mode 100644 apps/complaints/migrations/0006_merge_20260115_1447.py

diff --git a/apps/accounts/migrations/0001_initial.py b/apps/accounts/migrations/0001_initial.py
index 6d9a4ae..5bdb9a0 100644
--- a/apps/accounts/migrations/0001_initial.py
+++ b/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
diff --git a/apps/accounts/migrations/0002_initial.py b/apps/accounts/migrations/0002_initial.py
index 1c743f3..7467e3b 100644
--- a/apps/accounts/migrations/0002_initial.py
+++ b/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
diff --git a/apps/accounts/migrations/0005_merge_20260115_1447.py b/apps/accounts/migrations/0005_merge_20260115_1447.py
new file mode 100644
index 0000000..01e0f5a
--- /dev/null
+++ b/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 = [
+    ]
diff --git a/apps/ai_engine/migrations/0001_initial.py b/apps/ai_engine/migrations/0001_initial.py
index bcf1fa6..5b7fbd5 100644
--- a/apps/ai_engine/migrations/0001_initial.py
+++ b/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
diff --git a/apps/analytics/migrations/0001_initial.py b/apps/analytics/migrations/0001_initial.py
index 296208a..5dad3d1 100644
--- a/apps/analytics/migrations/0001_initial.py
+++ b/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
diff --git a/apps/appreciation/migrations/0001_initial.py b/apps/appreciation/migrations/0001_initial.py
index 41c2660..2816c46 100644
--- a/apps/appreciation/migrations/0001_initial.py
+++ b/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
diff --git a/apps/callcenter/migrations/0001_initial.py b/apps/callcenter/migrations/0001_initial.py
index 2f3d2a0..981d56b 100644
--- a/apps/callcenter/migrations/0001_initial.py
+++ b/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
diff --git a/apps/complaints/admin.py b/apps/complaints/admin.py
index 77c035c..df62c09 100644
--- a/apps/complaints/admin.py
+++ b/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',
-            'created_by'
+            'assigned_to', 'resolved_by', 'closed_by', 'resolution_survey'
         )
 
     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):
diff --git a/apps/complaints/migrations/0001_initial.py b/apps/complaints/migrations/0001_initial.py
index a420799..70769e7 100644
--- a/apps/complaints/migrations/0001_initial.py
+++ b/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
diff --git a/apps/complaints/migrations/0002_initial.py b/apps/complaints/migrations/0002_initial.py
index 6cb6bdb..2f57c66 100644
--- a/apps/complaints/migrations/0002_initial.py
+++ b/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
diff --git a/apps/complaints/migrations/0003_initial.py b/apps/complaints/migrations/0003_initial.py
index 40caf5f..8f9537a 100644
--- a/apps/complaints/migrations/0003_initial.py
+++ b/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
diff --git a/apps/complaints/migrations/0006_merge_20260115_1447.py b/apps/complaints/migrations/0006_merge_20260115_1447.py
new file mode 100644
index 0000000..6c28eb8
--- /dev/null
+++ b/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 = [
+    ]
diff --git a/apps/core/migrations/0001_initial.py b/apps/core/migrations/0001_initial.py
index d4b7acc..b049ae3 100644
--- a/apps/core/migrations/0001_initial.py
+++ b/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
diff --git a/apps/feedback/migrations/0001_initial.py b/apps/feedback/migrations/0001_initial.py
index 5d70bc5..f05b8c7 100644
--- a/apps/feedback/migrations/0001_initial.py
+++ b/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
diff --git a/apps/feedback/migrations/0002_initial.py b/apps/feedback/migrations/0002_initial.py
index 73a5436..2dd8502 100644
--- a/apps/feedback/migrations/0002_initial.py
+++ b/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
diff --git a/apps/feedback/migrations/0003_initial.py b/apps/feedback/migrations/0003_initial.py
index b4ca1c2..44d2190 100644
--- a/apps/feedback/migrations/0003_initial.py
+++ b/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
diff --git a/apps/integrations/migrations/0001_initial.py b/apps/integrations/migrations/0001_initial.py
index fbeda59..3175c56 100644
--- a/apps/integrations/migrations/0001_initial.py
+++ b/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
diff --git a/apps/journeys/migrations/0001_initial.py b/apps/journeys/migrations/0001_initial.py
index 10327e9..bcddf72 100644
--- a/apps/journeys/migrations/0001_initial.py
+++ b/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
diff --git a/apps/journeys/migrations/0002_initial.py b/apps/journeys/migrations/0002_initial.py
index 132216f..1df1564 100644
--- a/apps/journeys/migrations/0002_initial.py
+++ b/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
diff --git a/apps/notifications/migrations/0001_initial.py b/apps/notifications/migrations/0001_initial.py
index 7e3295c..cf6b30a 100644
--- a/apps/notifications/migrations/0001_initial.py
+++ b/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
diff --git a/apps/observations/migrations/0001_initial.py b/apps/observations/migrations/0001_initial.py
index 5ffafdd..a059f26 100644
--- a/apps/observations/migrations/0001_initial.py
+++ b/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
diff --git a/apps/organizations/migrations/0001_initial.py b/apps/organizations/migrations/0001_initial.py
index dd1c4a7..5c52d45 100644
--- a/apps/organizations/migrations/0001_initial.py
+++ b/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
diff --git a/apps/physicians/migrations/0001_initial.py b/apps/physicians/migrations/0001_initial.py
index 79210e7..211d14c 100644
--- a/apps/physicians/migrations/0001_initial.py
+++ b/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
diff --git a/apps/projects/migrations/0001_initial.py b/apps/projects/migrations/0001_initial.py
index 9360298..f547dca 100644
--- a/apps/projects/migrations/0001_initial.py
+++ b/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
diff --git a/apps/projects/migrations/0002_initial.py b/apps/projects/migrations/0002_initial.py
index 46a13cb..4ae6ee6 100644
--- a/apps/projects/migrations/0002_initial.py
+++ b/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
diff --git a/apps/px_action_center/migrations/0001_initial.py b/apps/px_action_center/migrations/0001_initial.py
index 6d7ab9b..6161572 100644
--- a/apps/px_action_center/migrations/0001_initial.py
+++ b/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
diff --git a/apps/px_sources/migrations/0001_initial.py b/apps/px_sources/migrations/0001_initial.py
index d26085a..2195c2c 100644
--- a/apps/px_sources/migrations/0001_initial.py
+++ b/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
diff --git a/apps/references/migrations/0001_initial.py b/apps/references/migrations/0001_initial.py
index 4fde651..11daddc 100644
--- a/apps/references/migrations/0001_initial.py
+++ b/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
diff --git a/apps/social/migrations/0001_initial.py b/apps/social/migrations/0001_initial.py
index 4f9628f..f0204af 100644
--- a/apps/social/migrations/0001_initial.py
+++ b/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
 
diff --git a/apps/standards/migrations/0001_initial.py b/apps/standards/migrations/0001_initial.py
index 02f5065..62877fe 100644
--- a/apps/standards/migrations/0001_initial.py
+++ b/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
diff --git a/apps/surveys/migrations/0001_initial.py b/apps/surveys/migrations/0001_initial.py
index de07dd1..616d233 100644
--- a/apps/surveys/migrations/0001_initial.py
+++ b/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
diff --git a/templates/complaints/complaint_detail.html b/templates/complaints/complaint_detail.html
index 567c317..46aee2f 100644
--- a/templates/complaints/complaint_detail.html
+++ b/templates/complaints/complaint_detail.html
@@ -1,4 +1,4 @@
-{% extends base_layout %}
+{% extends "layouts/base.html" %}
 {% load i18n %}
 {% load static %}
 {% load math %}