Merge branch 'release/5.2.3'

AtlasOfLivingAustralia · Jul 25, 2019 · 1e7cefa · 1e7cefa
2 parents 80e3aee + c9fbaad
commit 1e7cefa
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ plugins {
     //    id "com.moowork.node" version "1.1.1"
 }
 
-version "5.2.2"
+version "5.2.3"
 group "au.org.ala"
 description "Digivol application"
 

diff --git a/grails-app/taglib/au/org/ala/volunteer/TranscribeTagLib.groovy b/grails-app/taglib/au/org/ala/volunteer/TranscribeTagLib.groovy
@@ -196,6 +196,15 @@ class TranscribeTagLib {
             return '<span class="${auxClass}">&nbsp;</span>'
         }
 
+        def picklist
+        if (field.type.name() == 'autocomplete') {
+            if (field.fieldTypeClassifier) {
+                picklist = Picklist.findByNameAndFieldTypeClassifier(field.fieldType, field.fieldTypeClassifier)
+            } else {
+                picklist = Picklist.findByName(field.fieldType)
+            }
+        }
+
         def name = field.fieldType.name()
         def widgetName = genWidgetName(field, recordIdx)
         def cssClass = name
@@ -329,6 +338,7 @@ class TranscribeTagLib {
                     maxLength:200,
                     value: existingValue,
                     'class':"$cssClass form-control",
+                    'data-picklist-id' : picklist?.id,
                     validationRule: validationRule?.name,
                     tabindex: tabindex
                 )

diff --git a/grails-app/views/layouts/digivol-task.gsp b/grails-app/views/layouts/digivol-task.gsp
@@ -580,6 +580,13 @@
                                     var elemSelector = '#recordValues\\.' + recordIdx + '\\.verbatimLocalityID';
                                     $(elemSelector).val(item.key).attr('collector_name', item.name);;
                                 }
+                            } else if (fieldName == 'collectionCode') {
+                                var matches = $(this).attr("id").match(/^recordValues[.](\d+)[.]collectionCode$/);
+                                if (matches.length > 0) {
+                                    var recordIdx = matches[1];
+                                    var elemSelector = '#recordValues\\.' + recordIdx + '\\.collectionID';
+                                    $(elemSelector).val(item.key).attr('collector_name', item.name);;
+                                }
                             }
                         },
                         source: function(request, response) {

diff --git a/grails-app/views/task/_taskListTable.gsp b/grails-app/views/task/_taskListTable.gsp
@@ -46,18 +46,8 @@
 
             <g:each in="${extraFields}" var="field">
                 <td>
-                    %{-- Use validator fields for validated tasks, otherwise just pick a field --}%
-                    <g:if test="${taskInstance.fullyValidatedBy}">
-                        <g:if test="${projectInstance.requiredNumberOfTranscriptions > 1}">
-                            ${field?.value[taskInstance.id]?.find{!it.transcription}?.value}
-                        </g:if>
-                        <g:else>
-                            ${field?.value[taskInstance.id]?.find{it.transcription}?.value}
-                        </g:else>
-                    </g:if>
-                    <g:else>
-                        ${field?.value[taskInstance.id]?.value?.getAt(0)}
-                    </g:else>
+                    %{--Use superceded field or the first row --}%
+                    ${field?.value[taskInstance.id]?.value?.getAt(0)}
                 </td>
             </g:each>