Merge pull request #1400 from IFRCGo/feature/fix-3w-2329

Adding description to project

Author: szabozoltan69

api/models.py

@@ -1105,6 +1105,8 @@ def save(self, *args, **kwargs):
         return super(GeneralDocument, self).save(*args, **kwargs)
 
     def __str__(self):
+        if self.document_url:
+            return ('%s' % self.document_url)[8:]  # 8 = len('https://')
         return ('%s' % self.document)[10:]  # 10 = len('documents/')
 
 

deployments/migrations/0064_auto_20220414_0842.py

@@ -0,0 +1,46 @@
+# Generated by Django 2.2.27 on 2022-04-14 08:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+import tinymce.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0152_countryoffieldreporttoreview'),
+        ('deployments', '0063_auto_20220413_1438'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='description',
+            field=tinymce.models.HTMLField(blank=True, default='', verbose_name='description'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='description_ar',
+            field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='description'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='description_en',
+            field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='description'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='description_es',
+            field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='description'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='description_fr',
+            field=tinymce.models.HTMLField(blank=True, default='', null=True, verbose_name='description'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='document',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='api.GeneralDocument', verbose_name='linked document'),
+        ),
+    ]

deployments/models.py

@@ -2,6 +2,7 @@
 from datetime import datetime
 from enumfields import EnumIntegerField
 from enumfields import IntEnum
+from tinymce import HTMLField
 
 from django.db import models
 from django.utils import timezone
@@ -25,6 +26,7 @@
     Profile,
     UserCountry,
     VisibilityCharChoices,
+    GeneralDocument,
 )
 
 DATE_FORMAT = '%Y/%m/%d %H:%M'
@@ -439,6 +441,8 @@ class Project(models.Model):
     )  # this is the current operation
     dtype = models.ForeignKey(DisasterType, verbose_name=_('disaster type'), null=True, blank=True, on_delete=models.SET_NULL)
     name = models.TextField(verbose_name=_('name'))
+    description = HTMLField(verbose_name=_('description'), blank=True, default='')
+    document = models.ForeignKey(GeneralDocument, verbose_name=_('linked document'), null=True, blank=True, on_delete=models.SET_NULL)
     programme_type = EnumIntegerField(ProgrammeTypes, verbose_name=_('programme type'))
     primary_sector = EnumIntegerField(Sectors, verbose_name=_('sector'))
     secondary_sectors = ArrayField(