major rcr update

rcr/models.py

@@ -2,9 +2,11 @@ from django.conf import settings
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+import reversion
 
 # Create your models here.
 
+@reversion.register()
 class Item(models.Model):
     class LevelChoices(models.TextChoices):
         NONE = "", _("None")
@@ -13,20 +15,29 @@ class Item(models.Model):
         POST_GEN = "GEN", _("Post FRCR Generalist")
         POST_SPEC = "SPEC", _("Post FRCR Specialist")
 
+    SPECIALTY_CHOICES = (
+        ("Radiology", "Radiology"),
+        ("Oncology", "Oncology"),
+        ("Cross-faculty", "Cross-faculty"),
+    )
+
 
     name = models.CharField(max_length=200, blank=True, default="")
     description = models.TextField(blank=True, default="")
     content_type = models.CharField(max_length=200, blank=True, default="")
     created_on = models.DateTimeField(null=True, blank=True)
-    number_of_items = models.IntegerField(default=1)
+    number_of_items = models.IntegerField(null=True, blank=True)
     specialty = models.CharField(max_length=50,blank=True, default="")
-    unique_views_2023 = models.IntegerField(null=True)
-    targeted_to_group = models.CharField(max_length=255, default="Targeted")
+    access_count = models.IntegerField(null=True, blank=True)
+    targeted_to_group = models.CharField(max_length=255, default="Targeted", blank=True)
+    review_link = models.CharField(max_length=255, blank=True, default="")
+    review_link_password = models.CharField(max_length=255, blank=True, default="")
 
 
     rcr_platform_id = models.CharField(max_length=255, unique=True)
 
-    category = models.ForeignKey("Category", on_delete=models.SET_NULL, null=True, blank=True)
+    radiology_category = models.ForeignKey("RadiologyCategory", on_delete=models.SET_NULL, null=True, blank=True, related_name="item_radiology")
+    oncology_category = models.ForeignKey("OncologyCategory", on_delete=models.SET_NULL, null=True, blank=True, related_name="item_oncology")
 
     level = models.ManyToManyField("Level", blank=True)
 
@@ -34,26 +45,44 @@ class Item(models.Model):
 
     assessed_by = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=True, related_name="assessed_items")
 
-    assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, on_delete=models.SET_NULL, related_name="assigned_items")
+    assigned_to_radiology = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, on_delete=models.SET_NULL, related_name="assigned_items_radiology")
+    assigned_to_oncology = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, on_delete=models.SET_NULL, related_name="assigned_items_oncology")
 
     outcome = models.ForeignKey("Outcome", on_delete=models.SET_NULL, blank=True, null=True)
     outcome_reason = models.ForeignKey("OutcomeReason", on_delete=models.SET_NULL, blank=True, null=True)
     outcome_free_text = models.CharField(max_length=255, help_text="Reason for outcome (if not available above)", default="", blank=True)
 
-    completed = models.BooleanField(default=False)
+
+    comments = models.TextField(blank=True)
+    needs_review = models.BooleanField(default=False, help_text="Check if this item needs review.")
+
+    completed_radiology = models.BooleanField(default=False)
+    completed_oncology = models.BooleanField(default=False)
 
     class Meta:
         ordering = ("pk",)
 
     def __str__(self):
-        return self.name
+        completed = ""
+        if self.completed_oncology:
+            completed = " [Completed ONC]"
+        if self.completed_radiology:
+            completed = completed + " [Completed RAD]"
+
+        return f"{self.specialty} / {self.content_type} / {self.name}{completed}"
 
     def get_absolute_url(self):
         return reverse("rcr:radiology_detail_view", kwargs={"pk": self.pk})
     
 
 
-class Category(models.Model):
+class RadiologyCategory(models.Model):
+    name = models.CharField(max_length=255)
+
+    def __str__(self):
+        return self.name
+
+class OncologyCategory(models.Model):
     name = models.CharField(max_length=255)
 
     def __str__(self):