Merge pull request #1401 from IFRCGo/develop

Mid-april deployment

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.436
+
+### Added
+ - Tests trailing the changes
+ - Adding Description + GeneralDocument to deployment.project
+ - Add contact details to the 3w project
+ - Countries of Field Report to review
+ - Admin page - WikiJS Links
+ - Adding reversion.register() decorators to 72 important models
+
 ## 1.1.435
 ## 1.1.431
 
@@ -1949,8 +1959,12 @@ 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.435...HEAD
-[1.1.435]: https://github.com/IFRCGo/go-api/compare/1.1.431...1.1.435
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.436...HEAD
+[1.1.436]: https://github.com/IFRCGo/go-api/compare/1.1.435...1.1.436
+[1.1.435]: https://github.com/IFRCGo/go-api/compare/1.1.434...1.1.435
+[1.1.434]: https://github.com/IFRCGo/go-api/compare/1.1.433...1.1.434
+[1.1.433]: https://github.com/IFRCGo/go-api/compare/1.1.432...1.1.433
+[1.1.432]: https://github.com/IFRCGo/go-api/compare/1.1.431...1.1.432
 [1.1.431]: https://github.com/IFRCGo/go-api/compare/1.1.430...1.1.431
 [1.1.430]: https://github.com/IFRCGo/go-api/compare/1.1.429...1.1.430
 [1.1.429]: https://github.com/IFRCGo/go-api/compare/1.1.428...1.1.429

api/admin.py

@@ -208,7 +208,9 @@ def appeals(self, instance):
     appeals.short_description = 'Appeals'
 
     # To add the 'Notify subscribers now' button
-    change_form_template = "admin/emergency_changeform.html"
+    # WikiJS links added
+    change_form_template = "admin/emergency_change_form.html"
+    change_list_template = "admin/emergency_change_list.html"
 
     # Overwriting readonly fields for Edit mode
     def changeform_view(self, request, *args, **kwargs):
@@ -292,6 +294,9 @@ class FieldReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAd
     readonly_fields = ('report_date', 'created_at', 'updated_at')
     list_filter = [MembershipFilter]
     actions = ['create_events', 'export_field_reports', ]
+    # WikiJS links added
+    change_form_template = "admin/fieldreport_change_form.html"
+    change_list_template = "admin/fieldreport_change_list.html"
 
     def create_events(self, request, queryset):
         for report in queryset:
@@ -370,6 +375,10 @@ class AppealAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
     actions = ['create_events', 'confirm_events']
     autocomplete_fields = ('event', 'country',)
 
+    # WikiJS links added
+    change_form_template = "admin/appeal_change_form.html"
+    change_list_template = "admin/appeal_change_list.html"
+
     def create_events(self, request, queryset):
         for appeal in queryset:
             event = models.Event.objects.create(
@@ -595,6 +604,10 @@ class SituationReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, Translati
     region_in = 'event__regions__in'
     autocomplete_fields = ('event',)
 
+    # WikiJS links added
+    change_form_template = "admin/situationreport_change_form.html"
+    change_list_template = "admin/situationreport_change_list.html"
+
     def get_queryset(self, request):
         return super().get_queryset(request).select_related('type', 'event')
 
@@ -611,9 +624,8 @@ class SituationReportTypeAdmin(CompareVersionAdmin):
 class CronJobAdmin(CompareVersionAdmin):
     list_display = ('name', 'created_at', 'num_result', 'status')
     search_fields = ('name', 'created_at',)
-    readonly_fields = ('created_at',)
+    readonly_fields = ('created_at', 'message_display',)
     list_filter = ('status', 'name')
-    readonly_fields = ('message_display',)
 
     def message_display(self, obj):
         style_class = {
@@ -757,6 +769,26 @@ def get_actions(self, request):
         return actions
 
 
+class CountryOfFieldReportToReviewAdmin(admin.ModelAdmin):
+    list_display = ('country',)
+
+    @classmethod
+    def has_delete_permission(cls, request, obj=None):
+        return request.user.is_superuser
+
+    @classmethod
+    def has_view_permission(cls, request, obj=None):
+        return request.user.is_superuser
+
+    @classmethod
+    def has_change_permission(cls, request, obj=None):
+        return request.user.is_superuser
+
+    @classmethod
+    def has_add_permission(cls, request, obj=None):
+        return request.user.is_superuser
+
+
 admin.site.register(models.DisasterType, DisasterTypeAdmin)
 admin.site.register(models.Event, EventAdmin)
 admin.site.register(models.GDACSEvent, GdacsAdmin)
@@ -784,6 +816,7 @@ def get_actions(self, request):
 admin.site.register(models.MainContact, MainContactAdmin)
 admin.site.register(models.UserCountry, UserCountryAdmin)
 admin.site.register(models.UserRegion, UserRegionAdmin)
+admin.site.register(models.CountryOfFieldReportToReview, CountryOfFieldReportToReviewAdmin)
 # admin.site.register(Revision, RevisionAdmin)
 
 admin.site.site_url = 'https://' + settings.FRONTEND_URL

api/drf_views.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+from pytz import utc
 from rest_framework.status import HTTP_201_CREATED, HTTP_200_OK
 from rest_framework.generics import GenericAPIView, CreateAPIView, UpdateAPIView
 from rest_framework.response import Response
@@ -55,7 +57,8 @@
     RequestChoices,
     EPISourceChoices,
     MainContact,
-    UserCountry
+    UserCountry,
+    CountryOfFieldReportToReview,
 )
 
 from .serializers import (
@@ -117,6 +120,8 @@
 
     # Go Historical
     GoHistoricalSerializer,
+
+    CountryOfFieldReportToReviewSerializer,
 )
 from .logger import logger
 
@@ -821,6 +826,9 @@ def map_many_to_many_relations(self, data):
             if prop in data:
                 del data[prop]
 
+        if 'start_date' in data:
+            data['start_date'] = datetime.strptime(data['start_date'], '%Y-%m-%dT%H:%M:%S.%f%z')\
+                .replace(tzinfo=utc)
         return data, locations, meta, partners
 
     def save_locations(self, instance, locations, is_update=False):
@@ -1023,3 +1031,12 @@ class GoHistoricalViewSet(viewsets.ReadOnlyModelViewSet):
 
     def get_queryset(self):
         return Event.objects.filter(appeals__isnull=False)
+
+class CountryOfFieldReportToReviewViewset(viewsets.ReadOnlyModelViewSet):
+    queryset = CountryOfFieldReportToReview.objects.order_by('country')
+    serializer_class = CountryOfFieldReportToReviewSerializer
+    search_fields = ('country__name',)  # for /docs
+
+    class Meta:
+        model = CountryOfFieldReportToReview
+        fields = ('country_id')

api/migrations/0152_countryoffieldreporttoreview.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.27 on 2022-04-12 13:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0151_merge_20220325_1027'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CountryOfFieldReportToReview',
+            fields=[
+                ('country', models.OneToOneField(on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='api.Country', verbose_name='country')),
+            ],
+            options={
+                'verbose_name': 'Country of Field Report to review',
+                'verbose_name_plural': 'Countries of Field Report to review',
+            },
+        ),
+    ]