Merge pull request #251 from AtlasOfLivingAustralia/dev

Preparing v6.4

.github/workflows/build.yml

@@ -7,6 +7,7 @@ on:
       - master
       - feature/**
       - hotfix/**
+      - release/**
 
 env:
   TZ: Australia/Canberra

README.md

@@ -7,7 +7,7 @@
 The ecodata client plugin is a grails plugin used to generate data entry forms from a metadata definition. It is used by the [MERIT](https://github.com/AtlasOfLivingAustralia/fieldcapture) and [BioCollect](https://github.com/AtlasOfLivingAustralia/fieldcapture) applications.
 
 ### Technologies
-* Grails framework 4.0.10
+* Grails framework 
 * Knockout JS
 * Bootstrap 4.6
 

build.gradle

@@ -18,7 +18,7 @@ plugins {
 }
 
 
-version "6.3"
+version "6.4-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"

grails-app/assets/javascripts/speciesModel.js

@@ -254,6 +254,9 @@ var SpeciesViewModel = function(data, options, context) {
     self.transients.bieUrl = ko.observable();
     self.transients.speciesInformation = ko.observable();
     self.transients.speciesTitle = ko.observable();
+    self.transients.matched = ko.computed(function() {
+        return self.guid() && self.guid() != "A_GUID" && self.listId != "unmatched";
+    });
     self.transients.editing = ko.observable(false);
     self.transients.textFieldValue = ko.observable();
     self.transients.bioProfileUrl =  ko.computed(function (){

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

@@ -138,7 +138,7 @@ public class EditModelWidgetRenderer implements ModelWidgetRenderer {
     }
 
     private static boolean isReadOnly(WidgetRenderContext context) {
-        context.model.readonly || context.dataModel.computed
+        context.model.readonly || context.dataModel?.computed
     }
     @Override
     void renderSelectMany(WidgetRenderContext context) {
@@ -371,8 +371,8 @@ public class EditModelWidgetRenderer implements ModelWidgetRenderer {
         context.writer << """<div${context.attributes.toString()}>
                                 <div data-bind="with:${context.source}" class="input-group"">
                                 <select class="form-control form-control-sm" data-bind="speciesSelect2:\$data" ${context.validationAttr}></select>
-                                <div class="input-group-append">
-                                    <span class="input-group-text" data-bind="visible:name(), popover: {title: transients.speciesTitle, content: transients.speciesInformation}"><i class="fa fa-info-circle"></i></span>
+                                <div class="input-group-append"">
+                                    <span class="input-group-text" data-bind="visible:name(), popover: {title: transients.speciesTitle, content: transients.speciesInformation}, css:{'bg-warning':!transients.matched()}"><i class="fa" data-bind="css:{'fa-info-circle':transients.matched(), 'fa-question-circle':!transients.matched()}"></i></span>
                                 </div>
                              </div></div>"""
     }