').appendTo($(table));
+ if (title === 'Additional occurrence attributes') {
+ $('| Submitted on | ' + extraFieldValues.created_on + ' |
|---|
').appendTo(tbody);
+ $('| Last updated on | ' + extraFieldValues.updated_on + ' |
|---|
').appendTo(tbody);
+ }
$.each(attrs, function eachAttr() {
var val = this.value.match(/^http(s)?:\/\//)
? '' + this.value + ''
: this.value;
$('| ' + this.caption + ' | ' + val + ' |
|---|
').appendTo(tbody);
+ if (title === 'Recorder attributes' && this.system_function === 'email' && val.match(/@/)) {
+ // Store recorder email address for querying etc.
+ indiciaData.thisRecordEmail = val;
+ }
});
+ if (title === 'Additional occurrence attributes') {
+ if (extraFieldValues.licence) {
+ $('| Licence | ' + extraFieldValues.licence + ' |
|---|
').appendTo(tbody);
+ }
+ if (extraFieldValues.external_key) {
+ $('| ID in source system | ' + extraFieldValues.external_key + ' |
|---|
').appendTo(tbody);
+ }
+ }
});
},
dataType: 'json'
@@ -325,8 +345,11 @@
$(el).find('.loading-spinner').hide();
}
},
- error: function error(jqXHR, textStatus, errorThrown) {
- alert('Elasticsearch query failed');
+ error: function error(jqXHR) {
+ if (jqXHR.readyState === 4) {
+ // Don't bother if not done - i.e. error because user navigated away.
+ alert('Elasticsearch query failed');
+ }
},
dataType: 'json'
});
@@ -373,7 +396,7 @@
// Always treat fields as array so code can be consistent.
var fieldArr = Array.isArray(fields) ? fields : [fields];
$.each(fieldArr, function eachField(i, field) {
- var fieldClass = 'field-' + field.replace('.', '--').replace('_', '-').replace('#', '-');
+ var fieldClass = 'field-' + field.replace('.', '--').replace('_', '-').replace(/#/g, '-');
item = indiciaFns.getValueForField(doc, field);
if (item !== '') {
// Convert to hyperlink where relevant.
@@ -382,58 +405,14 @@
}
});
value = values.join(separator);
+ if (typeof value === 'undefined' || value === '') {
+ value = '-';
+ }
if (typeof value !== 'undefined' && value !== '') {
rows.push('| ' + caption + ' | ' + value + ' |
|---|
');
}
}
- function redetFormSubmit(e) {
- var data;
- e.preventDefault();
- if ($('#redet-species').val() === '') {
- validator.showErrors({ 'redet-species:taxon': 'Please type a few characters then choose a name from the list of suggestions' });
- } else if (validator.numberOfInvalids() === 0) {
- $.fancybox.close();
- data = {
- website_id: indiciaData.website_id,
- 'occurrence:id': occurrenceId,
- 'occurrence:taxa_taxon_list_id': $('#redet-species').val(),
- user_id: indiciaData.user_id
- };
- if ($('#redet-comment').val()) {
- data['occurrence_comment:comment'] = $('#redet-comment').val();
- }
- $.post(
- indiciaData.ajaxFormPostRedet,
- data,
- function onResponse(response) {
- if (typeof response.error !== 'undefined') {
- alert(response.error);
- }
- }
- );
- // Now post update to Elasticsearch. ill the website ID to temporarily disable the record.
- data = {
- ids: [occurrenceId],
- doc: {
- metadata: {
- website: {
- id: 0
- }
- }
- }
- };
- $.ajax({
- url: indiciaData.esProxyAjaxUrl + '/updateids/' + indiciaData.nid,
- type: 'post',
- data: data,
- success: function success() {
- $(dataGrid).idcDataGrid('hideRowAndMoveNext');
- }
- });
- }
- }
-
/**
* Declare public methods.
*/
@@ -471,47 +450,28 @@
// Clean tabs
$('.ui-tabs-nav').removeClass('ui-widget-header');
$('.ui-tabs-nav').removeClass('ui-corner-all');
- // Form validation for redetermination
- if (el.settings.allowRedetermination) {
- validator = $('#redet-form').validate();
- }
$(dataGrid).idcDataGrid('on', 'rowSelect', function rowSelect(tr) {
var doc;
var rows = [];
- var acceptedNameAnnotation;
- var vernaculardNameAnnotation;
+ var anAnnotation;
+ var vnAnnotation;
var key;
var externalMessage;
var msgClass = 'info';
- // Reset the redetermination form.
- $('#redet-form :input').val('');
+ // Clear the stored email until details loaded.
+ indiciaData.thisRecordEmail = null;
+
if (tr) {
doc = JSON.parse($(tr).attr('data-doc-source'));
occurrenceId = doc.id;
- acceptedNameAnnotation = doc.taxon.taxon_name === doc.taxon.accepted_name ? ' (as recorded)' : '';
- if (el.settings.allowRedetermination) {
- acceptedNameAnnotation +=
- '';
- }
- vernaculardNameAnnotation = doc.taxon.taxon_name === doc.taxon.vernacular_name ? ' (as recorded)' : '';
- addRow(rows, doc, 'ID', 'id');
- addRow(rows, doc, 'ID in source system', 'occurrence.source_system_key');
- // Deprecated doc field mappings had occurrence_external_key instead
- // of occurrence.source_system_key. This line can be removed if the
- // index has been rebuilt.
- addRow(rows, doc, 'ID in source system', 'occurrence_external_key');
+ anAnnotation = doc.taxon.taxon_name === doc.taxon.accepted_name ? ' (as entered)' : '';
+ vnAnnotation = doc.taxon.taxon_name === doc.taxon.vernacular_name ? ' (as entered)' : '';
+ addRow(rows, doc, 'ID|status|checks', ['id', '#status_icons#', '#data_cleaner_icons#'], ' | ');
+ addRow(rows, doc, 'Accepted name' + anAnnotation, ['taxon.accepted_name', 'taxon.accepted_name_authorship'], ' ');
+ addRow(rows, doc, 'Common name' + vnAnnotation, 'taxon.vernacular_name');
if (doc.taxon.taxon_name !== doc.taxon.accepted_name && doc.taxon.taxon_name !== doc.taxon.vernacular_name) {
- addRow(rows, doc, 'Given name', ['taxon.taxon_name', 'taxon.taxon_name_authorship'], ' ');
+ addRow(rows, doc, 'Name as entered', ['taxon.taxon_name', 'taxon.taxon_name_authorship'], ' ');
}
- addRow(rows, doc, 'Accepted name' + acceptedNameAnnotation,
- ['taxon.accepted_name', 'taxon.accepted_name_authorship'], ' ');
- addRow(rows, doc, 'Common name' + vernaculardNameAnnotation, 'taxon.vernacular_name');
- addRow(rows, doc, 'Taxonomy', ['taxon.phylum', 'taxon.order', 'taxon.family'], ' :: ');
- addRow(rows, doc, 'Licence', 'metadata.licence_code');
- addRow(rows, doc, 'Status', '#status_icons#');
- addRow(rows, doc, 'Checks', '#data_cleaner_icons#');
- addRow(rows, doc, 'Date', '#event_date#');
- addRow(rows, doc, 'Output map ref', 'location.output_sref');
if (el.settings.locationTypes) {
addRow(rows, doc, 'Location', 'location.verbatim_locality');
$.each(el.settings.locationTypes, function eachType() {
@@ -520,14 +480,33 @@
} else {
addRow(rows, doc, 'Location', '#locality#');
}
- addRow(rows, doc, 'Sample comments', 'event.event_remarks');
- addRow(rows, doc, 'Occurrence comments', 'occurrence.occurrence_remarks');
- addRow(rows, doc, 'Submitted on', 'metadata.created_on');
- addRow(rows, doc, 'Last updated on', 'metadata.updated_on');
+ addRow(rows, doc, 'Grid ref', 'location.output_sref');
+ addRow(rows, doc, 'Date seen', '#event_date#');
+ addRow(rows, doc, 'Recorder', 'event.recorded_by');
+ addRow(rows, doc, 'Determiner', 'identification.identified_by');
addRow(rows, doc, 'Dataset',
['metadata.website.title', 'metadata.survey.title', 'metadata.group.title'], ' :: ');
+ addRow(rows, doc, 'Sample comment', 'event.event_remarks');
+ addRow(rows, doc, 'Occurrence comment', 'occurrence.occurrence_remarks');
+
+ extraFieldValues = {
+ created_on: indiciaFns.getValueForField(doc, 'metadata.created_on'),
+ updated_on: indiciaFns.getValueForField(doc, 'metadata.updated_on'),
+ licence: indiciaFns.getValueForField(doc, 'metadata.licence_code'),
+ external_key: indiciaFns.getValueForField(doc, 'occurrence.source_system_key'),
+ };
+
$(recordDetails).html('');
$(recordDetails).append('');
+ rows = [];
+ addRow(rows, doc, 'Taxonomy', ['taxon.phylum', 'taxon.order', 'taxon.family'], ' :: ');
+ if (el.settings.extraLocationTypes) {
+ $.each(el.settings.extraLocationTypes, function eachType() {
+ addRow(rows, doc, this, '#higher_geography:' + this + ':name#');
+ });
+ }
+ $(recordDetails).append('Derived info
');
+ $(recordDetails).append('');
loadedAttrsOcurrenceId = 0;
// Reference to doc.occurrence_external_key is deprecated and can be
// removed if the BRC index has been re-indexed.
@@ -558,15 +537,6 @@
$(el).find('.empty-message').show();
$(el).find('.tabs').hide();
});
- if (el.settings.allowRedetermination) {
- indiciaFns.on('click', '#popup-redet', {}, function expandRedet() {
- $.fancybox($('#redet-form'));
- });
- indiciaFns.on('click', '#cancel-redet', {}, function expandRedet() {
- $.fancybox.close();
- });
- $('#redet-form').submit(redetFormSubmit);
- }
},
on: function on(event, handler) {
diff --git a/js/indicia.datacomponents/jquery.idc.verificationButtons.js b/js/indicia.datacomponents/jquery.idc.verificationButtons.js
index 7cae7a61..4dad90f6 100644
--- a/js/indicia.datacomponents/jquery.idc.verificationButtons.js
+++ b/js/indicia.datacomponents/jquery.idc.verificationButtons.js
@@ -17,6 +17,11 @@
* @link https://github.com/indicia-team/client_helpers
*/
+ /**
+ * @todo:
+ * 2. Test if ajax methods still work in call to helper_base without calling iform_load_helpers.
+ * 3. General check of old verification form.
+ */
/**
* Output plugin for verification buttons.
*/
@@ -24,6 +29,11 @@
'use strict';
var $ = jQuery;
+ /**
+ * Currently selected row ID.
+ */
+ var occurrenceId;
+
/**
* Declare default settings.
*/
@@ -36,9 +46,22 @@
var callbacks = {
};
+ /**
+ * jQuery validation instance.
+ */
+ var emailFormvalidator;
+
+ /**
+ * jQuery validation instance.
+ */
+ var redetFormValidator;
+
var dataGrid;
- var saveVerifyComment = function saveVerifyComment(occurrenceIds, status, comment) {
+ /**
+ * Saves the comment associated with a verification or query event.
+ */
+ function saveVerifyComment(occurrenceIds, status, comment) {
var commentToSave;
var allTableMode = $(dataGrid).find('.multi-mode-table.active').length > 0;
var data = {
@@ -89,7 +112,9 @@
function success(response) {
if (allTableMode) {
$('body > .loading-spinner').remove();
- alert(response.updated + ' record(s) updated.');
+ // Unset all table mode as this is a "dangerous" state that should be explicitly chosen each time.
+ $(dataGrid).find('.multi-mode-table.active').removeClass('active');
+ $(dataGrid).find('.multi-mode-selected').addClass('active');
// Wait a moment before refresh as Elastic updates not quite immediate.
setTimeout(function doPopulate() {
indiciaFns.populateDataSources();
@@ -145,15 +170,13 @@
data: data,
success: function success(response) {
if (typeof response.error !== 'undefined' || (response.code && response.code !== 200)) {
- alert('Elasticsearch update failed');
+ alert(indiciaData.lang.verificationButtons.elasticsearchUpdateError);
} else {
if (response.updated !== occurrenceIds.length) {
- alert('An error occurred whilst updating the reporting index. It may not reflect your changes ' +
- 'temporarily but will be updated automatically later.');
+ alert(indiciaData.lang.verificationButtons.elasticsearchUpdateError);
} else {
$('body > .loading-spinner').remove();
if (occurrenceIds.length > 1) {
- alert(response.updated + ' record(s) updated.');
// Wait a moment before refresh as Elastic updates not quite immediate.
setTimeout(function doPopulate() {
indiciaFns.populateDataSources();
@@ -166,8 +189,8 @@
$(dataGrid).find('.multiselect-all').prop('checked', false);
}
},
- error: function error(jqXHR, textStatus, errorThrown) {
- alert('Elasticsearch update failed');
+ error: function error() {
+ alert(indiciaData.lang.verificationButtons.elasticsearchUpdateError);
},
dataType: 'json'
}).always(function cleanup() {
@@ -176,9 +199,12 @@
$('body > .loading-spinner').remove();
}
});
- };
+ }
- var commentPopup = function commentPopup(status) {
+ /**
+ * Displays a popup dialog for capturing a verification or query comment.
+ */
+ function commentPopup(status, commentInstruction) {
var doc;
var fs;
var heading;
@@ -194,7 +220,7 @@
? $(dataGrid).find('.multiselect:checked').closest('tr')
: $(dataGrid).find('tr.selected');
if (selectedTrs.length === 0) {
- alert('There are no selected records. Either select some rows using the checkboxes in the leftmost column or set the "Apply decision to" mode to "all".');
+ alert(indiciaData.lang.verificationButtons.nothingSelected);
return;
}
$.each(selectedTrs, function eachRow() {
@@ -209,7 +235,7 @@
if (status.query) {
statusData.push('data-query="' + status.query + '"');
}
- fs = $('