Add option to upload additional pictures and fix progress calculation

aleksis/apps/abi/migrations/0014_pictures.py

+# Generated by Django 3.2.9 on 2021-11-19 17:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('abi', '0013_comment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='additional_picture_1',
+            field=models.ImageField(blank=True, upload_to='abi/additional1/', verbose_name='Additional picture 1'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='additional_picture_2',
+            field=models.ImageField(blank=True, upload_to='abi/additional2/', verbose_name='Additional picture 2'),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='current_picture',
+            field=models.ImageField(blank=True, default='', upload_to='abi/current/', verbose_name='Current picture'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='old_picture',
+            field=models.ImageField(blank=True, default='', upload_to='abi/old/', verbose_name='Picture from the childhood'),
+            preserve_default=False,
+        ),
+    ]

aleksis/apps/abi/models.py

@@ -86,6 +86,10 @@ class AbiPerson(ExtensibleModel):
                 pictures.append(_("Current picture"))
             if self.profile.old_picture:
                 pictures.append(_("Old picture"))
+            if self.profile.additional_picture_1:
+                pictures.append(_("Additional picture 1"))
+            if self.profile.additional_picture_2:
+                pictures.append(_("Additional picture 2"))
         return pictures
 
     class Meta:
@@ -136,14 +140,20 @@ class Profile(ExtensibleModel):
     old_picture = models.ImageField(
         blank=True, upload_to="abi/old/", verbose_name=_("Picture from the childhood")
     )
+    additional_picture_1 = models.ImageField(
+        blank=True, upload_to="abi/additional1/", verbose_name=_("Additional picture 1")
+    )
+    additional_picture_2 = models.ImageField(
+        blank=True, upload_to="abi/additional2/", verbose_name=_("Additional picture 2")
+    )
 
     @property
     def progress_of_own_fields(self):
-        return len(list(filter(bool, [self.nickname, self.current_picture, self.old_picture])))
+        return len(list(filter(bool, [self.nickname])))
 
     @classmethod
     def get_number_of_own_fields(cls):
-        return 3
+        return 1
 
     def __str__(self):
         return str(self.person)