Merge pull request #1522 from IFRCGo/develop

AnnualSplit hotfix

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.454
+
+### Added
+ - Unhiding and fixing Annual Figures input
+ - DREF import fixes
+
 ## 1.1.453
 
 ### Added
@@ -2043,7 +2049,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.453...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.454...HEAD
+[1.1.454]: https://github.com/IFRCGo/go-api/compare/1.1.453...1.1.454
 [1.1.453]: https://github.com/IFRCGo/go-api/compare/1.1.452...1.1.453
 [1.1.452]: https://github.com/IFRCGo/go-api/compare/1.1.451...1.1.452
 [1.1.451]: https://github.com/IFRCGo/go-api/compare/1.1.450...1.1.451

deployments/serializers.py

@@ -377,11 +377,6 @@ class Meta:
         }
 
     def validate(self, data):
-        #if self.context and 'request' in self.context:
-        #    if 'is_annual_report' in self.context['request'].data:
-        #        data['is_annual_report'] = self.context['request'].data['is_annual_report']
-        #    if 'annual_split_detail' in self.context['request'].data:
-        #        data['annual_split_detail'] = self.context['request'].data['annual_split_detail']
         d_project_districts = data['project_districts']
         # Override country with district's country
         if isinstance(d_project_districts, list) and len(d_project_districts):
@@ -401,12 +396,23 @@ def validate(self, data):
 
     def create(self, validated_data):
         project = super().create(validated_data)
+        # create does not bear the non-Project extra fields (which are needed for AnnualSplits), so we must đouble:
+        if self.context and 'request' in self.context:
+            if 'is_annual_report' in self.context['request'].data:
+                project.is_annual_report = self.context['request'].data['is_annual_report']
+            if 'annual_split_detail' in self.context['request'].data:
+                project.annual_split_detail = self.context['request'].data['annual_split_detail']
         project.user = self.context['request'].user
         project.save()
         return project
 
     def update(self, instance, validated_data):
         validated_data['modified_by'] = self.context['request'].user
+        if self.context and 'request' in self.context:  # code đuplication
+            if 'is_annual_report' in self.context['request'].data:
+                validated_data['is_annual_report'] = self.context['request'].data['is_annual_report']
+            if 'annual_split_detail' in self.context['request'].data:
+                validated_data['annual_split_detail'] = self.context['request'].data['annual_split_detail']
         return super().update(instance, validated_data)
 
 

main/__init__.py

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

poetry.lock

@@ -66,7 +66,7 @@ python-dateutil = "==2.8.0"
 python-docx = "==0.8.11"
 python-mimeparse = "==1.6.0"
 pytz = "==2019.1"
-requests = "==2.27.1"
+requests = "==2.28.1"
 tabula-py = "==1.2.0"
 typing = "==3.6.2"
 # urllib3 = "==1.26.8"