Merge branch 'new-ui'

Author: damianmoore

photonix/photos/migrations/0011_alter_tag_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.3 on 2021-07-22 23:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photos', '0010_auto_20210710_0959'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tag',
+            name='type',
+            field=models.CharField(choices=[('L', 'Location'), ('O', 'Object'), ('F', 'Face'), ('C', 'Color'), ('S', 'Style'), ('G', 'Generic'), ('E', 'Event'), ('A', 'Album')], db_index=True, max_length=1, null=True),
+        ),
+    ]

photonix/photos/migrations/0012_crt_photo_delete_fld.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.3 on 2021-07-30 14:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photos', '0011_alter_tag_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='photo',
+            name='deleted',
+            field=models.BooleanField(default=False),
+        ),
+    ]

photonix/photos/models.py

@@ -136,6 +136,7 @@ class Photo(UUIDModel, VersionedModel):
         help_text='assign rating to photo', verbose_name="Rating", null=True, blank=True)
     preferred_photo_file = models.ForeignKey('PhotoFile', related_name='+', null=True, on_delete=models.SET_NULL)  # File selected by the user that is the best version to be used
     thumbnailed_version = models.PositiveIntegerField(default=0)  # Version from photos.utils.thumbnails.THUMBNAILER_VERSION at time of generating the required thumbnails declared in settings.THUMBNAIL_SIZES
+    deleted = models.BooleanField(default=False)
 
     class Meta:
         ordering = ['-taken_at']
@@ -224,17 +225,18 @@ def base_image_path(self):
 
 
 SOURCE_CHOICES = (
-    ('H', 'Human'),
     ('C', 'Computer'),
+    ('H', 'Human'),
 )
 TAG_TYPE_CHOICES = (
-    ('L', 'Location'),
-    ('O', 'Object'),
-    ('F', 'Face'),
-    ('C', 'Color'),
+    ('A', 'Album'),  # Assigned to an album by user
+    ('C', 'Color'), # Color detected by classifier
+    ('E', 'Event'),  # Image creation date matches a festival or type of event
+    ('F', 'Face'), # Face detected by classifier
+    ('G', 'Generic'),  # Tags assigned by user
+    ('L', 'Location'), # Location detected using GPS coordinates by classifier
+    ('O', 'Object'), # Object detected by classifier
     ('S', 'Style'),  # See Karayev et al.: Recognizing Image Style
-    ('G', 'Generic'),  # Tags created by user
-    ('E', 'Event'),  # Checked image taken date is any festival date.
 )