Merge pull request #179 from AtlasOfLivingAustralia/feature/issue176

Add score/behaviour support to species fields. #176

Author: salomon-j

grails-app/assets/javascripts/speciesModel.js

@@ -221,9 +221,11 @@ var speciesSearchEngines = function() {
  * Manages the species data type in the output model.
  * Allows species information to be searched for and displayed.
  */
-var SpeciesViewModel = function(data, options) {
+var SpeciesViewModel = function(data, options, context) {
 
     var self = this;
+    ecodata.forms.DataModelItem.apply(self, [options.metadata || {}, context, options]);
+
     var params = [];
     var species = data;
     var populate = options.populate || false;
@@ -285,6 +287,10 @@ var SpeciesViewModel = function(data, options) {
         }
     };
 
+    self.toJSON = function() {
+        return self.toJS();
+    }
+
     self.loadData = function(data) {
         if (!data) data = {};
 

grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy

@@ -712,8 +712,8 @@ class ModelJSTagLib {
         def attrs = ctx.attrs
         def model = ctx.dataModel
         String configVarName = ctx.dataModel.name+"Config"
-        ctx.out << INDENT*3 << "var ${configVarName} = _.extend(config, {printable:'${ctx.attrs.printable?:''}', dataFieldName:'${model.name}', output: '${attrs.output}', surveyName: '${attrs.surveyName?:""}' });\n"
-        ctx.out << INDENT*3 << "${ctx.propertyPath}.${ctx.dataModel.name} = new SpeciesViewModel({}, ${configVarName});\n"
+        ctx.out << INDENT*3 << "var ${configVarName} = _.extend(config, {printable:'${ctx.attrs.printable?:''}', dataFieldName:'${model.name}', output: '${attrs.output}', surveyName: '${attrs.surveyName?:""}', metadata:self.dataModel['${model.name}']});\n"
+        ctx.out << INDENT*3 << "${ctx.propertyPath}.${ctx.dataModel.name} = new SpeciesViewModel({}, ${configVarName}, self.\$context);\n"
     }
 
     def imageModel(JSModelRenderContext ctx) {

src/main/groovy/au/org/ala/ecodata/forms/ViewModelWidgetRenderer.groovy

@@ -184,7 +184,7 @@ class ViewModelWidgetRenderer implements ModelWidgetRenderer {
 
     private void renderReadOnlySpecies(WidgetRenderContext context) {
         context.databindAttrs.add 'with', context.source
-        context.writer << """<span data-bind="${context.databindAttrs.toString()}"><span${context.attributes.toString()} data-bind='text:name'></span>
+        context.writer << """<span data-bind='${context.databindAttrs.toString()}'><span${context.attributes.toString()} data-bind='text:name'></span>
             <a href="#" data-bind="popover: {title: name, content: transients.speciesInformation}"><i class="icon-info-sign"></i></a>
             </span>"""
     }