Merge pull request #33 from eea/develop

Develop

Products/Reportek/EnvelopeCustomDataflows.py

@@ -30,6 +30,7 @@
 
 """
 
+import datetime
 import json
 import logging
 import re
@@ -1553,6 +1554,20 @@ def get_previous_deliveries(self):
 
         return envs
 
+    def get_updated_report_id(self, old_rep_id, offset=None, rep_year=None):
+        """ Return an up to date report id, from an old report where offset is
+            current year +- offset or using the provided rep_year
+            Designed to work with copyFromPreviousDelivery script
+        """
+        if not rep_year:
+            rep_year = datetime.datetime.now().year
+            if offset:
+                rep_year = rep_year + int(offset)
+        rep_year = str(rep_year)
+        rep_id = re.sub(r'(?:19|20)\d{2}', rep_year, old_rep_id)
+
+        return rep_id
+
 
 # Initialize the class in order the security assertions be taken into account
 InitializeClass(EnvelopeCustomDataflows)

Products/Reportek/version.txt

@@ -1 +1 @@
-4.15
+4.2

docs/HISTORY.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+4.2 - (2022-02-16)
+---------------------------
+* Change: Develop
+  [olimpiurob]
+
 4.15 - (2022-02-15)
 ---------------------------
 * Change: Refs #145482; Changed required permission to View on get_previous_del… [olimpiurob]