Merge pull request #155 from AtlasOfLivingAustralia/feature/issue153

Feature/issue153

Author: chrisala

grails-app/assets/javascripts/forms-knockout-bindings.js

@@ -868,16 +868,25 @@
      */
     ko.bindingHandlers.toggleVisibility = {
         init: function (element, valueAccessor) {
-
+            var unwrapped = ko.utils.unwrapObservable(valueAccessor());
             var visibleClass = 'fa-angle-down';
             var hiddenClass = 'fa-angle-up';
 
             var $element = $(element);
             var $i = $('<i></i>').addClass('fa').addClass(visibleClass);
+            if (unwrapped.collapsedByDefault != undefined && !unwrapped.collapsedByDefault) {
+                $i = $('<i></i>').addClass('fa').addClass(hiddenClass);
+            }
             $element.append($i);
 
             $element.click(function() {
-               var selector = valueAccessor();
+                var selector = '';
+                if (unwrapped.collapsedByDefault != undefined && unwrapped.blockId) {
+                    selector = unwrapped.blockId;
+                } else {
+                    selector = unwrapped;
+                }
+
                var $section = $(selector);
                if ($section.is(':visible')) {
                    $section.hide();

grails-app/assets/javascripts/forms.js

@@ -1114,6 +1114,8 @@ function orEmptyArray(v) {
         });
         self.transients.optional = config.optional || false;
         self.transients.questionText = config.optionalQuestionText || 'Not applicable';
+        self.transients.description = config.outputDescription;
+        self.transients.collapsedByDefault = config.collapsedByDefault || false;
         self.transients.dummy = ko.observable();
 
         self.downloadTemplate = function (listName) {

grails-app/services/au/org/ala/ecodata/forms/ActivityFormService.groovy

@@ -58,7 +58,7 @@ class ActivityFormService {
         model.metaModel = new JSONObject(activityForm)
         model.metaModel.remove('sections')
         model.metaModel.outputs = new JSONArray(formSections.collect{it.name})
-        model.metaModel.outputConfig = new JSONArray(formSections.collect{new JSONObject(outputName:it.name, optional:it.optional, collapsedByDefault:it.collapsedByDefault, optionalQuestionText:it.optionalQuestionText)})
+        model.metaModel.outputConfig = new JSONArray(formSections.collect{new JSONObject(outputName:it.name, optional:it.optional, collapsedByDefault:it.collapsedByDefault, optionalQuestionText:it.optionalQuestionText, outputDescription:it.description)})
 
         // the array of output models
         model.outputModels = formSections.collectEntries { [ it.name, it.template] }

src/test/groovy/au/org/ala/ecodata/forms/ActivityFormServiceSpec.groovy

@@ -44,14 +44,16 @@ class ActivityFormServiceSpec extends Specification implements ServiceUnitTest<A
     void "the service will produce a backwards compatible response after retrieving a form"() {
         setup:
         String name = "test form"
-        Map activityForm = [name:name, formVersion:1, sections:[[name:'output', optional:false, collapsedByDefault:false, optionalQuestionText:null, template:[modelName:'test']]]]
+        String description = "test form description"
+        Map activityForm = [name:name, description:description, formVersion:1, sections:[[name:'output', optional:false, collapsedByDefault:false, optionalQuestionText:null, template:[modelName:'test']]]]
 
         when:
         def result = service.getActivityAndOutputMetadata(name)
 
         then:
         1 * webService.getJson({it.endsWith(ActivityFormService.ACTIVITY_FORM_PATH+"?name=test+form")}) >> activityForm
         result.metaModel.name == activityForm.name
+        result.metaModel.description == activityForm.description
         result.metaModel.formVersion == activityForm.formVersion
         result.metaModel.outputs.size() == 1
         result.metaModel.outputs[0] == activityForm.sections[0].name