ENH: collections - rename flaws and add notes (#41)

ccdb/collections_ccdb/migrations/0005_rename_flaws_field.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2017-12-04 12:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('collections_ccdb', '0004_DATA_reset_sequences'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='collection',
+            old_name='flaw',
+            new_name='collection_flaw',
+        ),
+    ]

ccdb/collections_ccdb/migrations/0006_collection_notes.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2017-12-04 12:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('collections_ccdb', '0005_rename_flaws_field'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='collection',
+            name='notes',
+            field=models.TextField(blank=True),
+        ),
+    ]

ccdb/collections_ccdb/models.py

@@ -68,6 +68,7 @@ class Collection(models.Model):
     collection_start_time = models.TimeField(blank=True, null=True)
     collection_end_date = models.DateField(blank=True, null=True)
     collection_end_time = models.TimeField(blank=True, null=True)
+    notes = models.TextField(blank=True, null=False)
     storage_location = models.ForeignKey('locations.StorageLocation',
                                          blank=True, null=True,
                                          related_name='collections')
@@ -78,8 +79,8 @@ class Collection(models.Model):
                                 related_name='collections')
     adfg_permit = models.ForeignKey(ADFGPermit, blank=True, null=True,
                                     related_name='collections')
-    flaw = models.ForeignKey(Flaw, blank=True, null=True,
-                             related_name='collections')
+    collection_flaw = models.ForeignKey(Flaw, blank=True, null=True,
+                                        related_name='collections')
     display_name = models.CharField(max_length=255, editable=False)
 
     def save(self, *args, **kwargs):

ccdb/collections_ccdb/serializers.py

@@ -15,7 +15,7 @@ class CollectionSerializer(serializers.ModelSerializer):
             'ccdb.collections_ccdb.serializers.CollectionMethodSerializer',
         'collection_type':
             'ccdb.collections_ccdb.serializers.CollectionTypeSerializer',
-        'flaw': 'ccdb.collections_ccdb.serializers.FlawSerializer',
+        'collection_flaw': 'ccdb.collections_ccdb.serializers.FlawSerializer',
         'collection_species':
             'ccdb.species.serializers.CollectionSpeciesSerializer',
         'datasheets':
@@ -29,8 +29,8 @@ class CollectionSerializer(serializers.ModelSerializer):
                   'collection_start_date', 'collection_start_time',
                   'collection_end_date', 'collection_end_time',
                   'storage_location', 'specimen_state', 'process_type',
-                  'reagent', 'adfg_permit', 'flaw', 'display_name',
-                  'collection_species', 'datasheets')
+                  'reagent', 'adfg_permit', 'collection_flaw', 'display_name',
+                  'collection_species', 'datasheets', 'notes')
         read_only_fields = ('collection_species', 'datasheets')
 
 

ccdb/collections_ccdb/tests/factories.py

@@ -61,12 +61,13 @@ class CollectionFactory(DjangoModelFactory):
     collection_start_time = None
     collection_end_date = FuzzyDate(date(2015, 1, 1))
     collection_end_time = None
+    notes = FuzzyText(length=150)
     storage_location = SubFactory(StorageLocationFactory)
     specimen_state = FuzzyText(length=50)
     process_type = SubFactory(ProcessTypeFactory)
     reagent = SubFactory(ReagentFactory)
     adfg_permit = SubFactory(ADFGPermitFactory)
-    flaw = SubFactory(FlawFactory)
+    collection_flaw = SubFactory(FlawFactory)
 
 
 class DatasheetAttachmentFactory(DjangoModelFactory):