Merge pull request #1495 from IFRCGo/develop

Fewer editor features, response-activity event search

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.448
+
+### Added
+ - Fewer editor features on admin (sync with frontend)
+ - Fix response-activity event search on 3w form
+
 ## 1.1.447
 ## 1.1.446
 
@@ -2016,7 +2022,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.447...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.448...HEAD
+[1.1.448]: https://github.com/IFRCGo/go-api/compare/1.1.447...1.1.448
 [1.1.447]: https://github.com/IFRCGo/go-api/compare/1.1.446...1.1.447
 [1.1.446]: https://github.com/IFRCGo/go-api/compare/1.1.445...1.1.446
 [1.1.445]: https://github.com/IFRCGo/go-api/compare/1.1.444...1.1.445

api/drf_views.py

@@ -389,6 +389,10 @@ def get_queryset(self, *args, **kwargs):
         if self.action == 'mini_events':
             # return Event.objects.filter(parent_event__isnull=True).select_related('dtype')
             return qset.filter(parent_event__isnull=True).select_related('dtype')
+        if self.action == 'response_activity_events':
+            return qset.filter(parent_event__isnull=True).filter(
+                Q(auto_generated=False) | Q(auto_generated_source='New field report')
+                ).select_related('dtype')
         return (
             # Event.objects.filter(parent_event__isnull=True)
             qset.filter(parent_event__isnull=True).select_related('dtype')
@@ -448,6 +452,10 @@ def retrieve(self, request, pk=None, *args, **kwargs):
     def mini_events(self, request):
         return super().list(request)
 
+    @action(methods=['get'], detail=False, url_path='response-activity')
+    def response_activity_events(self, request):
+        return super().list(request)
+
 
 class EventSnippetFilter(filters.FilterSet):
     event = filters.NumberFilter(field_name='event', lookup_expr='exact')

eap/migrations/0001_initial.py

@@ -76,7 +76,7 @@ class Migration(migrations.Migration):
             name='EarlyAction',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sector', enumfields.fields.EnumIntegerField(enum=deployments.models.Sectors, verbose_name='sector')),
+                ('sector', models.IntegerField(choices=[(0, 'Shelter, Housing And Settlements'), (1, 'Livelihoods'), (2, 'Multi-purpose Cash'), (3, 'Health And Care'), (4, 'Water, Sanitation And Hygiene'), (5, 'Protection, Gender And Inclusion'), (6, 'Education'), (7, 'Migration'), (8, 'Risk Reduction, Climate Adaptation And Recovery'), (9, 'Community Engagement And Accountability'), (10, 'Environment Sustainability'), (11, 'Shelter Cluster Coordination')], verbose_name='sector')),
                 ('budget_per_sector', models.IntegerField(blank=True, null=True, verbose_name='Budget per sector (CHF)')),
                 ('prioritized_risk', models.TextField(blank=True, null=True, verbose_name='Prioritized risk')),
                 ('targeted_people', models.IntegerField(blank=True, null=True, verbose_name='Targeted people')),

eap/models.py

@@ -4,7 +4,7 @@
 
 from main.enums import TextChoices
 from deployments.models import Sectors
-from enumfields import EnumIntegerField
+from main.enums import IntegerChoices
 from api.models import (
     Country,
     District,
@@ -32,7 +32,23 @@ def __str__(self):
 
 
 class EarlyAction(models.Model):
-    sector = EnumIntegerField(Sectors, verbose_name=_('sector'))
+    class Sector(IntegerChoices):
+        SHELTER_HOUSING_AND_SETTLEMENTS = 0, _('Shelter, Housing And Settlements')
+        LIVELIHOODS = 1, _('Livelihoods')
+        MULTI_PURPOSE_CASH = 2, _('Multi-purpose Cash')
+        HEALTH_AND_CARE = 3, _('Health And Care')
+        WATER_SANITATION_AND_HYGIENE = 4, _('Water, Sanitation And Hygiene')
+        PROTECTION_GENDER_AND_INCLUSION = 5, _('Protection, Gender And Inclusion')
+        EDUCATION = 6, _('Education')
+        MIGRATION = 7, _('Migration')
+        RISK_REDUCTION_CLIMATE_ADAPTATION_AND_RECOVERY = \
+            8, _('Risk Reduction, Climate Adaptation And Recovery')
+        COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY = \
+            9, _('Community Engagement And Accountability')
+        ENVIRONMENT_SUSTAINABILITY = 10, _('Environment Sustainability')
+        SHELTER_CLUSTER_COORDINATION = 11, _('Shelter Cluster Coordination')
+
+    sector = models.IntegerField(choices=Sector.choices, verbose_name=_('sector'))
     budget_per_sector = models.IntegerField(verbose_name=_('Budget per sector (CHF)'), null=True, blank=True)
     indicators = models.ManyToManyField(EarlyActionIndicator, verbose_name=_('Indicators'), blank=True)
 

main/__init__.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ['celery_app']
-__version__ = '1.1.447'
+__version__ = '1.1.448'

main/settings.py

@@ -265,27 +265,23 @@
     'selector': 'textarea',
     'theme': 'modern',
     'plugins': '''
-        textcolor save link image media preview codesample contextmenu
-        table code lists fullscreen  insertdatetime  nonbreaking
-        contextmenu directionality searchreplace wordcount visualblocks
-        visualchars code fullscreen autolink lists  charmap print  hr
-        anchor pagebreak
+        anchor autolink charmap code codesample contextmenu directionality
+        fullscreen hr image insertdatetime link lists media nonbreaking
+        pagebreak preview print save searchreplace table textcolor
+        visualblocks visualchars
         ''',
     'toolbar1': '''
-        bold italic underline fontsizeselect
+        bold italic underline superscript subscript fontsizeselect
         | forecolor | alignleft alignright | aligncenter alignjustify
         | indent outdent | bullist numlist |
         | link visualchars charmap hr nonbreaking | code preview fullscreen
         ''',
-    'toolbar2': '''
-        media embed
-        ''',
     'force_p_newlines': True,
     'force_br_newlines': True,
     'forced_root_block': '',
     'contextmenu': 'formats | link',
-    'menubar': True,
-    'statusbar': True,
+    'menubar': False,
+    'statusbar': False,
     # https://www.tiny.cloud/docs/configure/content-filtering/#invalid_styles
     'invalid_styles': {
         '*': 'opacity'  # Global invalid style