Merge pull request #268 from AtlasOfLivingAustralia/feature/issue267

Feature/issue267
AtlasOfLivingAustralia · Dec 19, 2024 · 13b7792 · 13b7792
2 parents aaf9bbd + ea8c37f
commit 13b7792
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ plugins {
 }
 
 
-version "7.1-SNAPSHOT"
+version "7.2-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"

diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
@@ -1103,6 +1103,8 @@ function orEmptyArray(v) {
         var parent = context.parent;
         var listName = context.listName;
         var modelName = context.outputModel.name;
+        var activityForm = context.activity && context.activity.type;
+        var formVersion = context.activity && context.activity.formVersion;
 
         self.listParent = context.parent;
         self.listName = listName;
@@ -1131,7 +1133,10 @@ function orEmptyArray(v) {
         self.downloadTemplate = function () {
             // Download a blank template if we are appending, otherwise download a template containing the existing data.
             if (self.appendTableRows()) {
-                var url = config.excelOutputTemplateUrl + '?listName=' + listName + '&type=' + modelName;
+                var url = config.excelOutputTemplateUrl + '?listName=' + listName + '&activityForm='+activityForm+'&type=' + modelName;
+                if (formVersion) {
+                    url+= '&formVersion=' + formVersion;
+                }
                 $.fileDownload(url)
                     .fail(function (error){
                             bootbox.alert('File download failed! ' + error);
@@ -1155,10 +1160,12 @@ function orEmptyArray(v) {
                 type: modelName,
                 editMode: editMode || false,
                 allowExtraRows: userAddedRows || false,
+                activityForm: activityForm,
+                formVersion: formVersion,
                 data: JSON.stringify(data)
             };
             var url = config.excelOutputTemplateUrl;
-            $.fileDownload(url, {
+            return $.fileDownload(url, {
                 httpMethod: 'POST',
                 data: params
             });
@@ -1179,7 +1186,7 @@ function orEmptyArray(v) {
             dataType: 'json',
             uploadTemplateId: listName + "template-upload",
             downloadTemplateId: listName + "template-download",
-            formData: {type: context.outputModel.name, listName: listName}
+            formData: {type: context.outputModel.name, listName: listName,  activityForm: activityForm, formVersion: formVersion}
 
         };
         self.uploadFailed = function (message) {