Merge branch 'hotfix/3.2.5' into 'master'

Hotfix/3.2.5 - master

See merge request bevillingsplatform/bevillingsplatform!1008

Author: Søren Howe Gersager

NEWS.rst

@@ -1,3 +1,13 @@
+Version 3.2.5, 2020-12-02
+-------------------------
+
+Hotfix release
+
+Bug fixes
+^^^^^^^^^
+
+* Use correct date limits for supplementary activity creation.
+
 Version 3.2.4, 2020-11-24
 -------------------------
 

VERSION

@@ -1 +1 @@
-3.2.4
+3.2.5

frontend-tests/utils/utils.js

@@ -27,7 +27,7 @@ function createDate(offset) {
         local_offset = Math.floor(Math.random()*180)
     }
     today.setDate(today.getDate() + parseInt(local_offset))
-    return `2020-${ leadZero(today.getMonth() + 1) }-${ leadZero(today.getDate()) }`
+    return `${ today.getFullYear() }-${ leadZero(today.getMonth() + 1) }-${ leadZero(today.getDate()) }`
 }
 
 async function useSelectBox(t, select_id, select_option) {

frontend/src/components/mixins/ActivityDateEditMixin.js

@@ -9,6 +9,16 @@ import { epoch2DateStr, tenYearsAgo, inEighteenYears, json2jsDate } from '../fil
 
 export default {
     computed: {
+        acts: function() {
+            return this.$store.getters.getActivities
+        },
+        main_activities: function() {
+            if (this.acts) {
+                return this.acts.filter(function(act) {
+                    return act.activity_type === 'MAIN_ACTIVITY'
+                })
+            }
+        },
         act: function() {
             return this.$store.getters.getActivity
         },
@@ -51,26 +61,37 @@ export default {
             return json2jsDate(dt)
         },
         getMainActStartDate: function() {
-            let start_date
-            if (this.appropriation.granted_from_date) {
-                start_date = this.appropriation.granted_from_date
-            } else if (this.appropriation.main_activity && this.appropriation.main_activity.start_date) {
-                start_date = this.appropriation.main_activity.start_date
-            } else {
-                start_date = null
-            }
-            return start_date
+            let acts = this.sortMainActs()
+            return this.getBestDate(acts,'start')
         },
         getMainActEndDate: function() {
-            let end_date
-            if (this.appropriation.granted_to_date) {
-                end_date = this.appropriation.granted_to_date
-            } else if (this.appropriation.main_activity && this.appropriation.main_activity.end_date) {
-                end_date = this.appropriation.main_activity.end_date
-            } else {
-                end_date = null
+            let acts = this.sortMainActs()
+            return this.getBestDate(acts,'end')
+        },
+        getBestDate(arr, criteria) {
+            if (arr.length) {
+                let best_date = null
+                if (criteria === 'start') {
+                    best_date = arr[0].start_date
+                } else {
+                    best_date = arr[arr.length - 1].end_date
+                }
+                return best_date
             }
-            return end_date
+        },
+        sortMainActs() {
+            // Sort mainActs list by start date
+            return this.main_activities.sort(function(a,b) {
+                const a_start_date = new Date(a.start_date).getTime(),
+                    b_start_date = new Date(b.start_date).getTime()
+                if (a_start_date > b_start_date) {
+                    return 1
+                } else if (b_start_date > a_start_date) {
+                    return -1
+                } else {
+                    return 0
+                }
+            })
         }
     }
-}
+}