From 7b4b88b573e3934b3d4149a3c2586d2c1d1bcbba Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 14 Oct 2024 16:29:20 +0100
Subject: [PATCH] .

---
 ...ete_specialty_alter_formats_specialties.py | 22 +++++++++++++++++++
 oef/models.py                                 | 10 +++------
 oef/views.py                                  |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 oef/migrations/0006_delete_specialty_alter_formats_specialties.py

diff --git a/oef/migrations/0006_delete_specialty_alter_formats_specialties.py b/oef/migrations/0006_delete_specialty_alter_formats_specialties.py
new file mode 100644
index 00000000..ffff5293
--- /dev/null
+++ b/oef/migrations/0006_delete_specialty_alter_formats_specialties.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.0.2 on 2024-10-14 15:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('atlas', '0062_alter_casecollection_markers'),
+        ('oef', '0005_entry_inactive'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Specialty',
+        ),
+        migrations.AlterField(
+            model_name='formats',
+            name='specialties',
+            field=models.ManyToManyField(blank=True, to='atlas.subspecialty'),
+        ),
+    ]
diff --git a/oef/models.py b/oef/models.py
index 19a99116..889e5e24 100644
--- a/oef/models.py
+++ b/oef/models.py
@@ -1,6 +1,8 @@
 from django.db import models
 from django.urls import reverse
 
+from atlas.models import Subspecialty
+
 # Create your models here.
 class Entry(models.Model):
     modality = models.CharField(max_length=200)
@@ -39,7 +41,7 @@ class Formats(models.Model):
 
     inherits = models.ForeignKey('self', on_delete=models.CASCADE, null=True, blank=True)
 
-    specialties = models.ManyToManyField('Specialty', blank=True)
+    specialties = models.ManyToManyField(Subspecialty, blank=True)
 
     def __str__(self):
         return self.name
@@ -67,9 +69,3 @@ class Formats(models.Model):
 
     def get_entries(self):
         return Entry.objects.filter(questions__icontains=self.get_format(), inactive=False)
-
-class Specialty(models.Model):
-    name = models.CharField(max_length=200)
-
-    def __str__(self):
-        return self.name
\ No newline at end of file
diff --git a/oef/views.py b/oef/views.py
index d4f712ae..f2ce5e41 100644
--- a/oef/views.py
+++ b/oef/views.py
@@ -99,7 +99,7 @@ def format_search(request):
     if request.method == "POST":
         search = request.POST.get("search")
 
-        entries = Entry.objects.filter(questions__icontains=search)
+        entries = Entry.objects.filter(questions__icontains=search, inactive=False)