-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/easyweb/static/des_components/des-pages/des-data-analysis.html b/easyweb/static/des_components/des-pages/des-data-analysis.html
index bd4d216..8b77dec 100644
--- a/easyweb/static/des_components/des-pages/des-data-analysis.html
+++ b/easyweb/static/des_components/des-pages/des-data-analysis.html
@@ -181,14 +181,33 @@
+
- Upload File (csv, with COADDID or RA,DEC as uncommented header)
-
-
+ Upload csv file (with header). Or enter values manually (with header).
-
+
+
+
+
+
+
+
+ [[file_name]]
+
+
+
+
+
+
+
+
+ [[enter_values]]
+
+
+
+
@@ -414,12 +439,17 @@
value : ""
}
},
+ get filesDA(){
+ return this.$.filesDA.files[0];
+ },
+ /**
get file1(){
return this.$.file1.files[0];
},
get file2(){
return this.$.file2.files[0];
},
+ **/
emailcheck: function(){
var emailbox = document.getElementById("da_sendemail");
var edialog = document.getElementById("da_emaildialog");
@@ -432,6 +462,16 @@
document.getElementById("da_validemail").value='';
}
},
+ _fileChange: function () {
+ this.file_name = this.filesDA.name;
+ console.log('File to read: ' + this.file_name);
+ document.getElementById("da_submitJobButton").disabled=false;
+ document.getElementById("da_enterManually").disabled=true;
+ document.getElementById("da_uploadicon").icon = "done";
+
+ this.submit_type = 'csvfileDA';
+ },
+ /**
_fileChange1: function(){
this.file_name = this.file1.name;
console.log('File to read : ' + this.file_name );
@@ -458,14 +498,20 @@
this.submit_type = 'coordfile';
// document.getElementById("filename").value = this.file_name;
},
+ **/
clear: function(){
document.getElementById("da_submitJobButton").disabled=true;
- document.getElementById("da_enterCoadds").disabled=false;
- document.getElementById("da_enterCoords").disabled=false;
- document.getElementById("da_uploadFileCoadd").disabled=false;
- document.getElementById("da_uploadFileCoord").disabled=false;
- document.getElementById("da_keyboardiconcoadd").style.display='inline-block';
- document.getElementById("da_keyboardiconcoord").style.display='inline-block';
+ //document.getElementById("da_enterCoadds").disabled=false;
+ //document.getElementById("da_enterCoords").disabled=false;
+ //document.getElementById("da_uploadFileCoadd").disabled=false;
+ //document.getElementById("da_uploadFileCoord").disabled=false;
+ //document.getElementById("da_keyboardiconcoadd").style.display='inline-block';
+ //document.getElementById("da_keyboardiconcoord").style.display='inline-block';
+
+ document.getElementById("da_enterManually").disabled=false;
+ document.getElementById("da_uploadFile").disabled=false;
+ document.getElementById("da_keyboardicon").style.display="inline-block";
+
document.getElementById("da_radiusSlider").value="4.0";
document.getElementById("da_radiusLabel").innerHTML="4.0";
document.getElementById("da_wise").checked=false;
@@ -476,32 +522,46 @@
document.getElementById("da_gzzw1").checked=false;
document.getElementById("da_spreadmag").checked=false;
document.getElementById("da_sendemail").checked=false;
- document.getElementById("desPositionsCoaddsDA").clear();
- document.getElementById("desPositionsCoordsDA").clear();
+ //document.getElementById("desPositionsCoaddsDA").clear();
+ //document.getElementById("desPositionsCoordsDA").clear();
+ document.getElementById("desPositionsDA").clear();
document.getElementById("da_validemail").value='';
document.getElementById("da_validname").value='';
- document.getElementById("da_uploadiconcoadd").icon = "backup";
- document.getElementById("da_uploadiconcoord").icon = "backup";
- document.getElementById("da_keyboardiconcoadd").icon = "hardware:keyboard";
- document.getElementById("da_keyboardiconcoord").icon = "hardware:keyboard";
+ //document.getElementById("da_uploadiconcoadd").icon = "backup";
+ //document.getElementById("da_uploadiconcoord").icon = "backup";
+ //document.getElementById("da_keyboardiconcoadd").icon = "hardware:keyboard";
+ //document.getElementById("da_keyboardiconcoord").icon = "hardware:keyboard";
// document.getElementById("coaddTag").selected="0";
+ document.getElementById("da_uploadicon").icon = "backup";
+ document.getElementById("da_keyboardicon").icon = "hardware:keyboard";
this.file_name = "Upload File";
this.job_comment = "";
// document.getElementById("jobcommentcoadds").value="";
+
+ var upIcon = document.getElementById("da_uploadicon").style.display="inline-block";
- var upIcon1 = document.getElementById("da_uploadiconcoadd").style.display='inline-block';
- var upIcon2 = document.getElementById("da_uploadiconcoord").style.display='inline-block';
+ //var upIcon1 = document.getElementById("da_uploadiconcoadd").style.display='inline-block';
+ //var upIcon2 = document.getElementById("da_uploadiconcoord").style.display='inline-block';
this.enter_values = "Enter Values";
+ this.$.filesDA.value = "";
//$('#dothis')[0].checked=false;
- this.$.file1.value = "";
- this.$.file2.value = "";
+ //this.$.file1.value = "";
+ //this.$.file2.value = "";
},
+ /**
_countCoadds: function(coadds) {
console.log(coadds);
},
_countCoords: function(coords) {
console.log(coords);
},
+ **/
+ _da_openManualEntry: function () {
+ var inputDialog = document.getElementById("da_inputValuesDialog");
+ inputDialog.open();
+ this.submit_type = 'manualDA';
+ },
+ /**
_da_openCoadds: function(){
var inputCoaddDialog = document.getElementById("da_inputCoaddsDialog");
inputCoaddDialog.open();
@@ -512,6 +572,7 @@
inputCoordDialog.open();
this.submit_type = 'manualCoords';
},
+ **/
completeHandler: function(){
console.log('YESSSSS');
document.getElementById('desDataAnalysis').clear();
@@ -529,8 +590,11 @@
},
_submitJob: function(event){
var formdata = new FormData();
- formdata.append('csvfile1', this.$.file1.files[0]);
- formdata.append('csvfile2', this.$.file2.files[0]);
+ //formdata.append('csvfile1', this.$.file1.files[0]);
+ //formdata.append('csvfile2', this.$.file2.files[0]);
+
+ formdata.append('csvfile', this.$.filesDA.files[0]);
+
formdata.append('da_radius', document.getElementById("da_radiusSlider").value);
formdata.append('da_wise', document.getElementById("da_wise").checked);
@@ -546,8 +610,9 @@
formdata.append('da_email', document.getElementById("da_validemail").value);
formdata.append('da_name', document.getElementById("da_validname").value);
formdata.append('da_submit_type', this.submit_type);
- formdata.append('da_coadds',document.getElementById("da_enteredCoadds").value);
- formdata.append('da_coords',document.getElementById("da_enteredCoords").value);
+ //formdata.append('da_coadds',document.getElementById("da_enteredCoadds").value);
+ //formdata.append('da_coords',document.getElementById("da_enteredCoords").value);
+ formdata.append('da_positions',document.getElementById("da_enteredPositions").value);
var fluxwav = document.getElementById("da_fluxwav").checked;
var magwav = document.getElementById("da_magwav").checked;
@@ -557,7 +622,7 @@
if (fluxwav == false && magwav == false && grri == false && gzzw1 == false && spread == false){
document.getElementById('desDataAnalysis').errorHandler2();
}
- else{
+ else {
$.ajax({
url: '/easyweb/dr1_vistools/',
type: 'POST',
diff --git a/easyweb/static/des_components/des-pages/des-home.html b/easyweb/static/des_components/des-pages/des-home.html
index 7ca5a6f..28a2243 100644
--- a/easyweb/static/des_components/des-pages/des-home.html
+++ b/easyweb/static/des_components/des-pages/des-home.html
@@ -148,17 +148,21 @@
+
+
+
+
@@ -175,18 +179,20 @@
+
-
+
-
-
+
+
+
diff --git a/easyweb/static/des_components/des-pages/des-positions-bc.html b/easyweb/static/des_components/des-pages/des-positions-bc.html
index 1119e97..4b546c7 100644
--- a/easyweb/static/des_components/des-pages/des-positions-bc.html
+++ b/easyweb/static/des_components/des-pages/des-positions-bc.html
@@ -16,10 +16,9 @@
-
Switch between positions and ids (Header is needed)
-
-
-
+
Switch between positions and ids (Header is needed)
+
+
Close
diff --git a/easyweb/static/des_components/des-pages/des-positions-da.html b/easyweb/static/des_components/des-pages/des-positions-da.html
new file mode 100644
index 0000000..41ab27b
--- /dev/null
+++ b/easyweb/static/des_components/des-pages/des-positions-da.html
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
Switch between positions and ids (Header is needed)
+
+
+
+
+
+
+
+
+
+
diff --git a/easyweb/static/des_components/des-side-toolbar.html b/easyweb/static/des_components/des-side-toolbar.html
index 95ee298..26273f3 100644
--- a/easyweb/static/des_components/des-side-toolbar.html
+++ b/easyweb/static/des_components/des-side-toolbar.html
@@ -2,145 +2,150 @@
-
-
-
+
+
+
-
-
-
+
diff --git a/easyweb/static/elements/elements-built.html b/easyweb/static/elements/elements-built.html
index 18e7b53..351411d 100644
--- a/easyweb/static/elements/elements-built.html
+++ b/easyweb/static/elements/elements-built.html
@@ -12,6 +12,8 @@
+
+
@@ -40455,142 +40457,147 @@ App name
-
-
-
+
+
+
+
+
+
+
-
+
+
+
@@ -40614,33 +40621,34 @@ App name
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -50132,17 +50140,21 @@ {{jobid}}
+
+
+
+
@@ -50159,18 +50171,20 @@ {{jobid}}
+
-
+
-
-
+
+
+
@@ -51460,10 +51474,9 @@ Tile properties
-
Switch between positions and ids (Header is needed)
-
-
-
+
Switch between positions and ids (Header is needed)
+
+
Close
@@ -51645,282 +51658,77 @@
Tile properties
-
+
-
-
-
+
+
+
-
+
Switch between positions and ids (Header is needed)
+
+
-
-
-
-
-
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-
-
-
-
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-
-
-
-
-
-
-
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-
-
-
-
-
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-
-
-
-
-
-
-
-
- Prev
-
-
-
- Next
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-
-
-
-
-
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-
-
-
-
-
-
-
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-
-
-
-
-
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-
-
-
-
-
-
-
-
- Prev
-
-
-
- Next
-
-
-
-
-
-
-
-
-
@@ -53423,15 +53231,34 @@
+
- Upload File (csv, with COADDID or RA,DEC as uncommented header)
-
-
+ Upload csv file (with header). Or enter values manually (with header).
-
-
+
+
+
+
+
+
+
+ [[file_name]]
+
+
+
+
+
+
+
+
+ [[enter_values]]
+
+
+
+
@@ -53656,12 +53489,17 @@
value : ""
}
},
+ get filesDA(){
+ return this.$.filesDA.files[0];
+ },
+ /**
get file1(){
return this.$.file1.files[0];
},
get file2(){
return this.$.file2.files[0];
},
+ **/
emailcheck: function(){
var emailbox = document.getElementById("da_sendemail");
var edialog = document.getElementById("da_emaildialog");
@@ -53674,6 +53512,16 @@
document.getElementById("da_validemail").value='';
}
},
+ _fileChange: function () {
+ this.file_name = this.filesDA.name;
+ console.log('File to read: ' + this.file_name);
+ document.getElementById("da_submitJobButton").disabled=false;
+ document.getElementById("da_enterManually").disabled=true;
+ document.getElementById("da_uploadicon").icon = "done";
+
+ this.submit_type = 'csvfileDA';
+ },
+ /**
_fileChange1: function(){
this.file_name = this.file1.name;
console.log('File to read : ' + this.file_name );
@@ -53700,14 +53548,20 @@
this.submit_type = 'coordfile';
// document.getElementById("filename").value = this.file_name;
},
+ **/
clear: function(){
document.getElementById("da_submitJobButton").disabled=true;
- document.getElementById("da_enterCoadds").disabled=false;
- document.getElementById("da_enterCoords").disabled=false;
- document.getElementById("da_uploadFileCoadd").disabled=false;
- document.getElementById("da_uploadFileCoord").disabled=false;
- document.getElementById("da_keyboardiconcoadd").style.display='inline-block';
- document.getElementById("da_keyboardiconcoord").style.display='inline-block';
+ //document.getElementById("da_enterCoadds").disabled=false;
+ //document.getElementById("da_enterCoords").disabled=false;
+ //document.getElementById("da_uploadFileCoadd").disabled=false;
+ //document.getElementById("da_uploadFileCoord").disabled=false;
+ //document.getElementById("da_keyboardiconcoadd").style.display='inline-block';
+ //document.getElementById("da_keyboardiconcoord").style.display='inline-block';
+
+ document.getElementById("da_enterManually").disabled=false;
+ document.getElementById("da_uploadFile").disabled=false;
+ document.getElementById("da_keyboardicon").style.display="inline-block";
+
document.getElementById("da_radiusSlider").value="4.0";
document.getElementById("da_radiusLabel").innerHTML="4.0";
document.getElementById("da_wise").checked=false;
@@ -53718,32 +53572,46 @@
document.getElementById("da_gzzw1").checked=false;
document.getElementById("da_spreadmag").checked=false;
document.getElementById("da_sendemail").checked=false;
- document.getElementById("desPositionsCoaddsDA").clear();
- document.getElementById("desPositionsCoordsDA").clear();
+ //document.getElementById("desPositionsCoaddsDA").clear();
+ //document.getElementById("desPositionsCoordsDA").clear();
+ document.getElementById("desPositionsDA").clear();
document.getElementById("da_validemail").value='';
document.getElementById("da_validname").value='';
- document.getElementById("da_uploadiconcoadd").icon = "backup";
- document.getElementById("da_uploadiconcoord").icon = "backup";
- document.getElementById("da_keyboardiconcoadd").icon = "hardware:keyboard";
- document.getElementById("da_keyboardiconcoord").icon = "hardware:keyboard";
+ //document.getElementById("da_uploadiconcoadd").icon = "backup";
+ //document.getElementById("da_uploadiconcoord").icon = "backup";
+ //document.getElementById("da_keyboardiconcoadd").icon = "hardware:keyboard";
+ //document.getElementById("da_keyboardiconcoord").icon = "hardware:keyboard";
// document.getElementById("coaddTag").selected="0";
+ document.getElementById("da_uploadicon").icon = "backup";
+ document.getElementById("da_keyboardicon").icon = "hardware:keyboard";
this.file_name = "Upload File";
this.job_comment = "";
// document.getElementById("jobcommentcoadds").value="";
+
+ var upIcon = document.getElementById("da_uploadicon").style.display="inline-block";
- var upIcon1 = document.getElementById("da_uploadiconcoadd").style.display='inline-block';
- var upIcon2 = document.getElementById("da_uploadiconcoord").style.display='inline-block';
+ //var upIcon1 = document.getElementById("da_uploadiconcoadd").style.display='inline-block';
+ //var upIcon2 = document.getElementById("da_uploadiconcoord").style.display='inline-block';
this.enter_values = "Enter Values";
+ this.$.filesDA.value = "";
//$('#dothis')[0].checked=false;
- this.$.file1.value = "";
- this.$.file2.value = "";
+ //this.$.file1.value = "";
+ //this.$.file2.value = "";
},
+ /**
_countCoadds: function(coadds) {
console.log(coadds);
},
_countCoords: function(coords) {
console.log(coords);
},
+ **/
+ _da_openManualEntry: function () {
+ var inputDialog = document.getElementById("da_inputValuesDialog");
+ inputDialog.open();
+ this.submit_type = 'manualDA';
+ },
+ /**
_da_openCoadds: function(){
var inputCoaddDialog = document.getElementById("da_inputCoaddsDialog");
inputCoaddDialog.open();
@@ -53754,6 +53622,7 @@
inputCoordDialog.open();
this.submit_type = 'manualCoords';
},
+ **/
completeHandler: function(){
console.log('YESSSSS');
document.getElementById('desDataAnalysis').clear();
@@ -53771,8 +53640,11 @@
},
_submitJob: function(event){
var formdata = new FormData();
- formdata.append('csvfile1', this.$.file1.files[0]);
- formdata.append('csvfile2', this.$.file2.files[0]);
+ //formdata.append('csvfile1', this.$.file1.files[0]);
+ //formdata.append('csvfile2', this.$.file2.files[0]);
+
+ formdata.append('csvfile', this.$.filesDA.files[0]);
+
formdata.append('da_radius', document.getElementById("da_radiusSlider").value);
formdata.append('da_wise', document.getElementById("da_wise").checked);
@@ -53788,8 +53660,9 @@
formdata.append('da_email', document.getElementById("da_validemail").value);
formdata.append('da_name', document.getElementById("da_validname").value);
formdata.append('da_submit_type', this.submit_type);
- formdata.append('da_coadds',document.getElementById("da_enteredCoadds").value);
- formdata.append('da_coords',document.getElementById("da_enteredCoords").value);
+ //formdata.append('da_coadds',document.getElementById("da_enteredCoadds").value);
+ //formdata.append('da_coords',document.getElementById("da_enteredCoords").value);
+ formdata.append('da_positions',document.getElementById("da_enteredPositions").value);
var fluxwav = document.getElementById("da_fluxwav").checked;
var magwav = document.getElementById("da_magwav").checked;
@@ -53799,7 +53672,7 @@
if (fluxwav == false && magwav == false && grri == false && gzzw1 == false && spread == false){
document.getElementById('desDataAnalysis').errorHandler2();
}
- else{
+ else {
$.ajax({
url: '/easyweb/dr1_vistools/',
type: 'POST',
diff --git a/easyweb/static/elements/elements.html b/easyweb/static/elements/elements.html
index f06b01a..489e4d8 100644
--- a/easyweb/static/elements/elements.html
+++ b/easyweb/static/elements/elements.html
@@ -92,8 +92,9 @@
-
-
+
+
+
diff --git a/easyweb/static/scripts/app.js b/easyweb/static/scripts/app.js
index 5f3c662..975999f 100644
--- a/easyweb/static/scripts/app.js
+++ b/easyweb/static/scripts/app.js
@@ -37,9 +37,9 @@
if (appr.data.view == 'deslabs') sel_page = "6";
if (appr.data.view == 'finding-chart') sel_page = "7";
if (appr.data.view == 'footprint') sel_page = "8";
- // if (appr.data.view == 'data-analysis') sel_page = "9";
- if (appr.data.view == 'my-jobs') sel_page = "9";
- if (appr.data.view == 'help-form') sel_page = "10";
+ if (appr.data.view == 'data-analysis') sel_page = "9";
+ if (appr.data.view == 'my-jobs') sel_page = "10";
+ if (appr.data.view == 'help-form') sel_page = "11";
app.selection=sel_page;
pages.select(sel_page);
menu.select(sel_page);
@@ -60,9 +60,9 @@
if (appr.data.view == 'deslabs') sel_page = "6";
if (appr.data.view == 'finding-chart') sel_page = "7";
if (appr.data.view == 'footprint') sel_page = "8";
- // if (appr.data.view == 'data-analysis') sel_page = "9";
- if (appr.data.view == 'my-jobs') sel_page = "9";
- if (appr.data.view == 'help-form') sel_page = "10";
+ if (appr.data.view == 'data-analysis') sel_page = "9";
+ if (appr.data.view == 'my-jobs') sel_page = "10";
+ if (appr.data.view == 'help-form') sel_page = "11";
app.selection=sel_page;
pages.select(sel_page);
menu.select(sel_page);
@@ -109,24 +109,27 @@
app.examplequerybox.setValue('\n\n\n\n\n\n\n\n\n\n\n');
app.examplequerybox.focus();
+
var xsize = document.getElementById("xsizeSlider");
xsize.addEventListener('value-change', function() {
- document.getElementById("xsizeLabel").textContent = xsize.value;
+ document.getElementById("xsizeLabel").textContent = xsize.value;
});
var ysize = document.getElementById("ysizeSlider");
ysize.addEventListener('value-change', function() {
- document.getElementById("ysizeLabel").textContent = ysize.value;
+ document.getElementById("ysizeLabel").textContent = ysize.value;
});
+
var xsizeS = document.getElementById("xsizeSliderS");
xsizeS.addEventListener('value-change', function() {
- document.getElementById("xsizeLabelS").textContent = xsizeS.value;
+ document.getElementById("xsizeLabelS").textContent = xsizeS.value;
});
var ysizeS = document.getElementById("ysizeSliderS");
ysizeS.addEventListener('value-change', function() {
- document.getElementById("ysizeLabelS").textContent = ysizeS.value;
+ document.getElementById("ysizeLabelS").textContent = ysizeS.value;
});
+
var fc_xsize = document.getElementById("fc_xsizeSlider");
fc_xsize.addEventListener('value-change', function() {
document.getElementById("fc_xsizeLabel").textContent = fc_xsize.value;
@@ -136,15 +139,17 @@
document.getElementById("fc_ysizeLabel").textContent = fc_ysize.value;
});
var fc_mag = document.getElementById("fc_magSlider");
- fc_mag.addEventListener('value-change', function() {
- document.getElementById("fc_magLabel").textContent = fc_mag.value;
- });
+ fc_mag.addEventListener('value-change', function() {
+ document.getElementById("fc_magLabel").textContent = fc_mag.value;
+ });
- var da_radius = document.getElementById("da_radiusSlider");
+
+ var da_radius = document.getElementById("da_radiusSlider");
da_radius.addEventListener('value-change', function() {
document.getElementById("da_radiusLabel").textContent = da_radius.value;
});
+
var bc_xsize = document.getElementById("bc_xsizeSlider");
bc_xsize.addEventListener('value-change', function() {
document.getElementById("bc_xsizeLabel").textContent = bc_xsize.value;
@@ -154,6 +159,7 @@
document.getElementById("bc_ysizeLabel").textContent = bc_ysize.value;
});
+
var se_xsize = document.getElementById("se_xsizeSlider");
se_xsize.addEventListener('value-change', function() {
document.getElementById("se_xsizeLabel").textContent = se_xsize.value;
@@ -171,6 +177,7 @@
document.getElementById("se_psffwhmLabel").textContent = se_psffwhm.value;
});
+
// var res = document.getElementById("response");
// res.style.marginTop = $("#queryBox").height() + $("#query-table").height() + 35;
// console.log("margin top of res: ", res.style.marginTop)
diff --git a/easyweb/static/scripts/app.min.js b/easyweb/static/scripts/app.min.js
index b7826a4..a4609c8 100644
--- a/easyweb/static/scripts/app.min.js
+++ b/easyweb/static/scripts/app.min.js
@@ -1 +1 @@
-(function(document){'use strict';var app=document.querySelector('#app');app.baseUrl='/';if(window.location.port===''){};window.addEventListener('WebComponentsReady',function(){var pages=document.getElementById("mainPages");var menu=document.querySelector('paper-menu');var appr=document.getElementById('approute');var sel_page="0";if(appr.data.view=='db-access')sel_page="1";if(appr.data.view=='db-schema')sel_page="2";if(appr.data.view=='db-examples')sel_page="3";if(appr.data.view=='bulk-cutouts')sel_page="4";if(appr.data.view=='s2se-cutouts')sel_page="5";if(appr.data.view=='deslabs')sel_page="6";if(appr.data.view=='finding-chart')sel_page="7";if(appr.data.view=='footprint')sel_page="8";if(appr.data.view=='my-jobs')sel_page="9";if(appr.data.view=='help-form')sel_page="10";app.selection=sel_page;pages.select(sel_page);menu.select(sel_page);appr.addEventListener('data-changed',function(event){event.stopPropagation();if(appr.data.view=='')sel_page="0";if(appr.data.view=='db-access')sel_page="1";if(appr.data.view=='db-schema')sel_page="2";if(appr.data.view=='db-examples')sel_page="3";if(appr.data.view=='bulk-cutouts')sel_page="4";if(appr.data.view=='s2se-cutouts')sel_page="5";if(appr.data.view=='deslabs')sel_page="6";if(appr.data.view=='finding-chart')sel_page="7";if(appr.data.view=='footprint')sel_page="8";if(appr.data.view=='my-jobs')sel_page="9";if(appr.data.view=='help-form')sel_page="10";app.selection=sel_page;pages.select(sel_page);menu.select(sel_page);});menu.addEventListener('iron-select',function(){app.selection=menu.selected;pages.select(menu.selected);app.editor.refresh();if(app.$.drawerLayout.narrow){app.$.drawer.close();}});menu.addEventListener('iron-activate',function(){});myQuery=document.getElementById("queryBox");app.editor=CodeMirror.fromTextArea(myQuery,{lineNumbers:true,mode:'text/x-plsql',autofocus:true,});app.editor.setValue('-- Insert Query --\n\n\n');app.editor.focus();app.editor.execCommand('goLineDown');myJobQuery=document.getElementById("jobQueryBox");app.jobquerybox=CodeMirror.fromTextArea(myJobQuery,{lineNumbers:false,mode:'text/x-plsql',readOnly:'nocursor',autofocus:true,});app.jobquerybox.setValue('\n\n\n\n\n\n\n\n\n\n');app.jobquerybox.focus();myExampleQuery=document.getElementById("exampleQueryBox");app.examplequerybox=CodeMirror.fromTextArea(myExampleQuery,{lineNumbers:false,mode:'text/x-plsql',readOnly:'nocursor',autofocus:true,viewportMargin:50,});app.examplequerybox.setValue('\n\n\n\n\n\n\n\n\n\n\n');app.examplequerybox.focus();var xsize=document.getElementById("xsizeSlider");xsize.addEventListener('value-change',function(){document.getElementById("xsizeLabel").textContent=xsize.value;});var ysize=document.getElementById("ysizeSlider");ysize.addEventListener('value-change',function(){document.getElementById("ysizeLabel").textContent=ysize.value;});var xsizeS=document.getElementById("xsizeSliderS");xsizeS.addEventListener('value-change',function(){document.getElementById("xsizeLabelS").textContent=xsizeS.value;});var ysizeS=document.getElementById("ysizeSliderS");ysizeS.addEventListener('value-change',function(){document.getElementById("ysizeLabelS").textContent=ysizeS.value;});var fc_xsize=document.getElementById("fc_xsizeSlider");fc_xsize.addEventListener('value-change',function(){document.getElementById("fc_xsizeLabel").textContent=fc_xsize.value;});var fc_ysize=document.getElementById("fc_ysizeSlider");fc_ysize.addEventListener('value-change',function(){document.getElementById("fc_ysizeLabel").textContent=fc_ysize.value;});var fc_mag=document.getElementById("fc_magSlider");fc_mag.addEventListener('value-change',function(){document.getElementById("fc_magLabel").textContent=fc_mag.value;});var da_radius=document.getElementById("da_radiusSlider");da_radius.addEventListener('value-change',function(){document.getElementById("da_radiusLabel").textContent=da_radius.value;});var bc_xsize=document.getElementById("bc_xsizeSlider");bc_xsize.addEventListener('value-change',function(){document.getElementById("bc_xsizeLabel").textContent=bc_xsize.value;});var bc_ysize=document.getElementById("bc_ysizeSlider");bc_ysize.addEventListener('value-change',function(){document.getElementById("bc_ysizeLabel").textContent=bc_ysize.value;});var se_xsize=document.getElementById("se_xsizeSlider");se_xsize.addEventListener('value-change',function(){document.getElementById("se_xsizeLabel").textContent=se_xsize.value;});var se_ysize=document.getElementById("se_ysizeSlider");se_ysize.addEventListener('value-change',function(){document.getElementById("se_ysizeLabel").textContent=se_ysize.value;});var se_airmass=document.getElementById("se_airmassSlider");se_airmass.addEventListener('value-change',function(){document.getElementById("se_airmassLabel").textContent=se_airmass.value;});var se_psffwhm=document.getElementById("se_psffwhmSlider");se_psffwhm.addEventListener('value-change',function(){document.getElementById("se_psffwhmLabel").textContent=se_psffwhm.value;});});})(document);
\ No newline at end of file
+(function(document){'use strict';var app=document.querySelector('#app');app.baseUrl='/';if(window.location.port===''){};window.addEventListener('WebComponentsReady',function(){var pages=document.getElementById("mainPages");var menu=document.querySelector('paper-menu');var appr=document.getElementById('approute');var sel_page="0";if(appr.data.view=='db-access')sel_page="1";if(appr.data.view=='db-schema')sel_page="2";if(appr.data.view=='db-examples')sel_page="3";if(appr.data.view=='bulk-cutouts')sel_page="4";if(appr.data.view=='s2se-cutouts')sel_page="5";if(appr.data.view=='deslabs')sel_page="6";if(appr.data.view=='finding-chart')sel_page="7";if(appr.data.view=='footprint')sel_page="8";if(appr.data.view=='data-analysis')sel_page="9";if(appr.data.view=='my-jobs')sel_page="10";if(appr.data.view=='help-form')sel_page="11";app.selection=sel_page;pages.select(sel_page);menu.select(sel_page);appr.addEventListener('data-changed',function(event){event.stopPropagation();if(appr.data.view=='')sel_page="0";if(appr.data.view=='db-access')sel_page="1";if(appr.data.view=='db-schema')sel_page="2";if(appr.data.view=='db-examples')sel_page="3";if(appr.data.view=='bulk-cutouts')sel_page="4";if(appr.data.view=='s2se-cutouts')sel_page="5";if(appr.data.view=='deslabs')sel_page="6";if(appr.data.view=='finding-chart')sel_page="7";if(appr.data.view=='footprint')sel_page="8";if(appr.data.view=='data-analysis')sel_page="9";if(appr.data.view=='my-jobs')sel_page="10";if(appr.data.view=='help-form')sel_page="11";app.selection=sel_page;pages.select(sel_page);menu.select(sel_page);});menu.addEventListener('iron-select',function(){app.selection=menu.selected;pages.select(menu.selected);app.editor.refresh();if(app.$.drawerLayout.narrow){app.$.drawer.close();}});menu.addEventListener('iron-activate',function(){});myQuery=document.getElementById("queryBox");app.editor=CodeMirror.fromTextArea(myQuery,{lineNumbers:true,mode:'text/x-plsql',autofocus:true,});app.editor.setValue('-- Insert Query --\n\n\n');app.editor.focus();app.editor.execCommand('goLineDown');myJobQuery=document.getElementById("jobQueryBox");app.jobquerybox=CodeMirror.fromTextArea(myJobQuery,{lineNumbers:false,mode:'text/x-plsql',readOnly:'nocursor',autofocus:true,});app.jobquerybox.setValue('\n\n\n\n\n\n\n\n\n\n');app.jobquerybox.focus();myExampleQuery=document.getElementById("exampleQueryBox");app.examplequerybox=CodeMirror.fromTextArea(myExampleQuery,{lineNumbers:false,mode:'text/x-plsql',readOnly:'nocursor',autofocus:true,viewportMargin:50,});app.examplequerybox.setValue('\n\n\n\n\n\n\n\n\n\n\n');app.examplequerybox.focus();var xsize=document.getElementById("xsizeSlider");xsize.addEventListener('value-change',function(){document.getElementById("xsizeLabel").textContent=xsize.value;});var ysize=document.getElementById("ysizeSlider");ysize.addEventListener('value-change',function(){document.getElementById("ysizeLabel").textContent=ysize.value;});var xsizeS=document.getElementById("xsizeSliderS");xsizeS.addEventListener('value-change',function(){document.getElementById("xsizeLabelS").textContent=xsizeS.value;});var ysizeS=document.getElementById("ysizeSliderS");ysizeS.addEventListener('value-change',function(){document.getElementById("ysizeLabelS").textContent=ysizeS.value;});var fc_xsize=document.getElementById("fc_xsizeSlider");fc_xsize.addEventListener('value-change',function(){document.getElementById("fc_xsizeLabel").textContent=fc_xsize.value;});var fc_ysize=document.getElementById("fc_ysizeSlider");fc_ysize.addEventListener('value-change',function(){document.getElementById("fc_ysizeLabel").textContent=fc_ysize.value;});var fc_mag=document.getElementById("fc_magSlider");fc_mag.addEventListener('value-change',function(){document.getElementById("fc_magLabel").textContent=fc_mag.value;});var da_radius=document.getElementById("da_radiusSlider");da_radius.addEventListener('value-change',function(){document.getElementById("da_radiusLabel").textContent=da_radius.value;});var bc_xsize=document.getElementById("bc_xsizeSlider");bc_xsize.addEventListener('value-change',function(){document.getElementById("bc_xsizeLabel").textContent=bc_xsize.value;});var bc_ysize=document.getElementById("bc_ysizeSlider");bc_ysize.addEventListener('value-change',function(){document.getElementById("bc_ysizeLabel").textContent=bc_ysize.value;});var se_xsize=document.getElementById("se_xsizeSlider");se_xsize.addEventListener('value-change',function(){document.getElementById("se_xsizeLabel").textContent=se_xsize.value;});var se_ysize=document.getElementById("se_ysizeSlider");se_ysize.addEventListener('value-change',function(){document.getElementById("se_ysizeLabel").textContent=se_ysize.value;});var se_airmass=document.getElementById("se_airmassSlider");se_airmass.addEventListener('value-change',function(){document.getElementById("se_airmassLabel").textContent=se_airmass.value;});var se_psffwhm=document.getElementById("se_psffwhmSlider");se_psffwhm.addEventListener('value-change',function(){document.getElementById("se_psffwhmLabel").textContent=se_psffwhm.value;});});})(document);
\ No newline at end of file