diff --git a/rcr/forms.py b/rcr/forms.py index 7d2277c7..7d1add11 100644 --- a/rcr/forms.py +++ b/rcr/forms.py @@ -21,7 +21,7 @@ from django.contrib.auth.models import User class ItemForm(ModelForm): class Meta: model = Item - exclude = ["rcr_platform_id", "name", "assessed_by", "assessed_date"] + exclude = ["rcr_platform_id", "name", "assessed_by", "assessed_date", "assigned_to"] #fields = ["category", "level"] class AssessorAssignmentForm(Form): diff --git a/rcr/migrations/0006_item_outcome_free_text.py b/rcr/migrations/0006_item_outcome_free_text.py new file mode 100644 index 00000000..60b0bc40 --- /dev/null +++ b/rcr/migrations/0006_item_outcome_free_text.py @@ -0,0 +1,21 @@ +# Generated by Django 4.1.4 on 2023-12-13 20:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("rcr", "0005_item_assigned_to_alter_item_assessed_by"), + ] + + operations = [ + migrations.AddField( + model_name="item", + name="outcome_free_text", + field=models.CharField( + default="", + help_text="Reason for outcome (if not available above)", + max_length=255, + ), + ), + ] diff --git a/rcr/migrations/0007_alter_item_outcome_free_text.py b/rcr/migrations/0007_alter_item_outcome_free_text.py new file mode 100644 index 00000000..d9e9f057 --- /dev/null +++ b/rcr/migrations/0007_alter_item_outcome_free_text.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.4 on 2023-12-13 20:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rcr', '0006_item_outcome_free_text'), + ] + + operations = [ + migrations.AlterField( + model_name='item', + name='outcome_free_text', + field=models.CharField(blank=True, default='', help_text='Reason for outcome (if not available above)', max_length=255), + ), + ] diff --git a/rcr/migrations/0008_alter_item_options.py b/rcr/migrations/0008_alter_item_options.py new file mode 100644 index 00000000..23593cde --- /dev/null +++ b/rcr/migrations/0008_alter_item_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.4 on 2023-12-13 21:56 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('rcr', '0007_alter_item_outcome_free_text'), + ] + + operations = [ + migrations.AlterModelOptions( + name='item', + options={'ordering': ('pk',)}, + ), + ] diff --git a/rcr/models.py b/rcr/models.py index 9b2c5520..71915e9d 100644 --- a/rcr/models.py +++ b/rcr/models.py @@ -30,9 +30,13 @@ class Item(models.Model): 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) + class Meta: + ordering = ("pk",) + def __str__(self): return self.name diff --git a/rcr/templates/rcr/item_update.html b/rcr/templates/rcr/item_update.html index 1440b46c..9d8a25b7 100644 --- a/rcr/templates/rcr/item_update.html +++ b/rcr/templates/rcr/item_update.html @@ -10,6 +10,11 @@