diff --git a/templatesAndSettings/templates/chartAnnotation.html b/templatesAndSettings/templates/chartAnnotation.html
index b616984..b80e662 100644
--- a/templatesAndSettings/templates/chartAnnotation.html
+++ b/templatesAndSettings/templates/chartAnnotation.html
@@ -180,116 +180,137 @@
{{ "site_header"|get_title:6 }}
$(document).ready(function() {
$('#annotationButton').click(function () {
//console.log('hello');
- var $report= $('#report');
- var annotation = $("#annotation").val();
- var cvqualitycode = $("#SelectedQualityCode").val();
- var setNaN = document.getElementById('setNaN').checked //$("#setNaN").checked;
- //console.log('annotate');
- var selectedResult = {{SelectedResults|safe}};
- //console.log(selectedResult);
- //$report.html('annotation \'' + annotation + '\' saved.');
- //console.log(cvqualitycode);
- //var annotationButton = document.getElementById("annotationButton"); //$("#email_data");
- //annotationButton.firstChild.data = "annotation saved";
- var annotationButton = document.getElementById("annotationButton");
- annotationButton.disabled = true;
- annotationButton.firstChild.data = "annotating values";
- $.ajax({
- url: "{{prefixpath}}../addannotation/",
- type: "POST",
- timeout: 0,
- data: {
- 'resultidu': selectedResult,
- 'annotationvals': annotationvals,
- 'cvqualitycode': cvqualitycode,
- 'annotation': annotation,
- 'setNaN': setNaN,
- 'csrfmiddlewaretoken': '{{ csrf_token }}',
- },
- cache:false,
- success: function(json) {
- var annotationButton = document.getElementById("annotationButton");
- //clearSelectPoints();
- if (typeof json.error != "undefined"){
- annotationButton.firstChild.data = "Values added: "+json.error + " reloading page";
- } else if(setNaN){
- annotationButton.firstChild.data = "reloading page";
- }else{
- annotationButton.firstChild.data = "Annotation complete, add another";
- }
- annotationButton.disabled = false;
- if(setNaN){
- location.reload();
- }
- },
- });
+ if(annotationvals.length > 0){
+ var report= document.getElementById('report');
+ report.firstChild.innerHTML = '';
+ var annotation = $("#annotation").val();
+ var cvqualitycode = $("#SelectedQualityCode").val();
+ var setNaN = document.getElementById('setNaN').checked //$("#setNaN").checked;
+ //console.log('annotate');
+ var selectedResult = {{SelectedResults|safe}};
+ //console.log(selectedResult);
+ //$report.html('annotation \'' + annotation + '\' saved.');
+ //console.log(cvqualitycode);
+ //var annotationButton = document.getElementById("annotationButton"); //$("#email_data");
+ //annotationButton.firstChild.data = "annotation saved";
+ var annotationButton = document.getElementById("annotationButton");
+ annotationButton.disabled = true;
+ annotationButton.firstChild.data = "annotating values";
+ $.ajax({
+ url: "{{prefixpath}}../addannotation/",
+ type: "POST",
+ timeout: 0,
+ data: {
+ 'resultidu': selectedResult,
+ 'annotationvals': annotationvals,
+ 'cvqualitycode': cvqualitycode,
+ 'annotation': annotation,
+ 'setNaN': setNaN,
+ 'csrfmiddlewaretoken': '{{ csrf_token }}',
+ },
+ cache:false,
+ success: function(json) {
+ var annotationButton = document.getElementById("annotationButton");
+ //clearSelectPoints();
+ if (typeof json.error != "undefined"){
+ annotationButton.firstChild.data = "Values added: "+json.error + " reloading page";
+ } else if(setNaN){
+ annotationButton.firstChild.data = "reloading page";
+ }else{
+ annotationButton.firstChild.data = "Annotation complete, add another";
+ }
+ annotationButton.disabled = false;
+ if(setNaN){
+ location.reload();
+ }
+ },
+ });
+ } else{
+ var report= document.getElementById('report');
+ report.firstChild.innerHTML = 'you must select points to annotate above.';
+ };
});
$('#offsetButton').click(function () {
- //console.log('hello');
- var $report= $('#report');
- var offset = $("#offset").val();
- //console.log('annotate');
- var selectedResult = {{SelectedResults|safe}};
- //console.log(selectedResult);
- //$report.html('annotation \'' + annotation + '\' saved.');
- var offsetButton = document.getElementById("offsetButton");
- offsetButton.disabled = true;
- offsetButton.firstChild.data = "offsetting values";
- //console.log(annotationvals);
- $.ajax({
- url: "{{prefixpath}}../addoffset/",
- type: "POST",
- cache:false,
- data: {
- 'resultidu': selectedResult,
- 'offsetvals': annotationvals,
- 'offset': offset,
- 'csrfmiddlewaretoken': '{{ csrf_token }}',
- },
- success: function(json) {
- //console.log("success");
- var offsetButton = document.getElementById("offsetButton");
- offsetButton.firstChild.data = "reloading page";
- offsetButton.disabled = false;
- //offsetPoints(parseFloat(offset));
- //setTimeout(function(){location.reload();},100);
- location.reload();
- },
- });
+ if(annotationvals.length > 0){
+ var report= document.getElementById('report');
+ report.firstChild.innerHTML = '';
+ //console.log('hello');
+ var $report= $('#report');
+ var offset = $("#offset").val();
+ //console.log('annotate');
+ var selectedResult = {{SelectedResults|safe}};
+ //console.log(selectedResult);
+ //$report.html('annotation \'' + annotation + '\' saved.');
+ var offsetButton = document.getElementById("offsetButton");
+ offsetButton.disabled = true;
+ offsetButton.firstChild.data = "offsetting values";
+ //console.log(annotationvals);
+ $.ajax({
+ url: "{{prefixpath}}../addoffset/",
+ type: "POST",
+ cache:false,
+ data: {
+ 'resultidu': selectedResult,
+ 'offsetvals': annotationvals,
+ 'offset': offset,
+ 'csrfmiddlewaretoken': '{{ csrf_token }}',
+ },
+ success: function(json) {
+ //console.log("success");
+ var offsetButton = document.getElementById("offsetButton");
+ offsetButton.firstChild.data = "reloading page";
+ offsetButton.disabled = false;
+ //offsetPoints(parseFloat(offset));
+ //setTimeout(function(){location.reload();},100);
+ location.reload();
+ },
+ });
+ } else{
+ var report= document.getElementById('report');
+ report.firstChild.innerHTML = 'you must select points to offset above.';
+
+ };
});
$('#shiftValuesButton').click(function () {
- var $report= $('#report');
- var shift = $("#shiftValues").val();
- var selectedResult = {{SelectedResults|safe}};
- var shiftValuesButton = document.getElementById("shiftValuesButton");
- var radios = document.getElementsByName("shiftdirection");
- var direction = "forward";
- for (var i = 0, length = radios.length; i 0){
+ var report= document.getElementById('report');
+ report.firstChild.innerHTML = '';
+ var $report= document.getElementById("$report");
+ var shift = $("#shiftValues").val();
+ var selectedResult = {{SelectedResults|safe}};
+ var shiftValuesButton = document.getElementById("shiftValuesButton");
+ var radios = document.getElementsByName("shiftdirection");
+ var direction = "forward";
+ for (var i = 0, length = radios.length; i{{ "site_header"|get_title:6 }}
{% if useDataset %}
{{datasetAbstract}}
{% endif %}
-
+
Add an annotation for the selected points |
to see more details about how to add annotations see The CZ Manager docs |