cmda-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xingwei...@apache.org
Subject [6/9] incubator-cmda git commit: Update ApacheCMDA-Frontend with KnowledgeGraph
Date Thu, 29 Oct 2015 22:56:29 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/ca952ad9/ApacheCMDA-Frontend/app/views/climate/scatterAndHistogramTwoVariable.scala.html
----------------------------------------------------------------------
diff --git a/ApacheCMDA-Frontend/app/views/climate/scatterAndHistogramTwoVariable.scala.html b/ApacheCMDA-Frontend/app/views/climate/scatterAndHistogramTwoVariable.scala.html
index edb1fc1..a22a37d 100644
--- a/ApacheCMDA-Frontend/app/views/climate/scatterAndHistogramTwoVariable.scala.html
+++ b/ApacheCMDA-Frontend/app/views/climate/scatterAndHistogramTwoVariable.scala.html
@@ -1,37 +1,28 @@
-@*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more		   *
- * contributor license agreements.  See the NOTICE file distributed with	   *
- * this work for additional information regarding copyright ownership.         *
- * The ASF licenses this file to You under the Apache License, Version 2.0     *
- * (the "License"); you may not use this file except in compliance with        *
- * the License.  You may obtain a copy of the License at                       *
- *                                                                             *
- *    http://www.apache.org/licenses/LICENSE-2.0                               *
- *																			   *
- * Unless required by applicable law or agreed to in writing, software         *
- * distributed under the License is distributed on an "AS IS" BASIS,           *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    *
- * See the License for the specific language governing permissions and         *
- * limitations under the License.											   *
- *******************************************************************************@ 
-
-@(parameters: metadata.ScatterHistogramTwoVar) @import helper._
+@(parameters: metadata.ScatterHistogramTwoVar)
+
+@import helper._
+
 <link rel="stylesheet"
 	href='@routes.Assets.at("stylesheets/livefitler.css")'>
+
 @scripts = {
-<script src='@routes.Assets.at("javascripts/edit_button.js")'></script>
-<script src='@routes.Assets.at("javascripts/livefilter.js")'></script>
-<script type="text/javascript"
-	src='@routes.Assets.at("javascripts/jquery-1.9.0.min.js")'></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.min.js"></script>
-	<script type="
-	text/javascript" src='@routes.Assets.at("javascripts/json2.js")'></script>
-<script type="text/javascript" src="@routes.Assets.at("javascripts/xmisc.js")"></script>
-<script type="text/javascript">
+	<script src='@routes.Assets.at("javascripts/edit_button.js")'></script>
+	<script src='@routes.Assets.at("javascripts/livefilter.js")'></script>
+	<script type="text/javascript" src='@routes.Assets.at("javascripts/jquery-1.9.0.min.js")'></script>
+	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.min.js"></script>
+	<script type="text/javascript" src='@routes.Assets.at("javascripts/json2.js")'></script>
+	<script type="text/javascript" src="@routes.Assets.at("javascripts/xmisc.js")"></script>
+	<script type="text/javascript">
 	var Response = null;
     var variable1 = "";
     var variable2 = "";
+
+
+    // called on load or reload
     window.onload = function() {
+      
+      // no data to download yet
+      //disable_download_button();
       changeDataSource();
       select_data1(1);
       changeDataSource2();
@@ -40,6 +31,7 @@
       select_var1(1);
       changeVariableName2();
       select_var1(2); 
+      
       disable_pres1(1);
       disable_pres1(2);
       $('#t0').val($('#startYearMonth').text());
@@ -54,10 +46,14 @@
       $('#Image').html('<img src="'+imageUrl+'" width=680 />');
       $('#data_url').html($('#dataURL').text());
       $('#Response').html($('serviceResponseText').text());
+      
     }
+    
     function changeDataSource(){
     	var dataSource = $('#source1').text();
+     	//dataSource = "NASA_QuikSCAT";
      	var x = document.getElementById("data1");
+     	
      	if(dataSource == "cccma_canesm2" ){
      		x.options[0].selected=true;
      	}
@@ -136,10 +132,14 @@
      	else if(dataSource == "ecmwf_interim" ){
      		x.options[25].selected=true;
      	}
+        //$('#data option:contains('+dataSource+')').prop({selected: true});
     }
+    
     function changeDataSource2(){
     	var dataSource = $('#source2').text();
+     	//dataSource = "NASA_QuikSCAT";
      	var x = document.getElementById("data2");
+     	
      	if(dataSource == "cccma_canesm2" ){
         x.options[0].selected=true;
       }
@@ -218,7 +218,9 @@
       else if(dataSource == "ecmwf_interim" ){
         x.options[25].selected=true;
       }
+        //$('#data option:contains('+dataSource+')').prop({selected: true});
     }
+    
     function changeVariableName(){
     	var var_string = $('#variableName1').text();
      	var x = document.getElementById("var1");
@@ -273,6 +275,7 @@
         else if (var_string == "rsut")
         	x.options[24].selected=true;
     }
+    
     function changeVariableName2(){
     	var var_string = $('#variableName2').text();
      	var x = document.getElementById("var2");
@@ -327,25 +330,33 @@
         else if (var_string == "rsut")
         	x.options[24].selected=true;
     }
+    // disable download data button
     function disable_download_button()
     {
       var x=document.getElementById("download_data");
       x.disabled=false;
     }
+
+    // enable download data button
     function enable_download_button()
     {
       var x=document.getElementById("download_data");
       x.disabled=false;
     }
+
+
+    // disable all vars1 in dropdown menu
     function unset_vars1(ID)
     {
       var x;
+
       if (ID == 1) {
         x=document.getElementById("var1");
       }
       else if (ID == 2) {
         x=document.getElementById("var2");
       }
+
       x.options[0].disabled=true;
       x.options[1].disabled=true;
       x.options[2].disabled=true;
@@ -380,6 +391,9 @@
       x.options[31].disabled=true;
       x.options[32].disabled=true;
     }
+
+
+    // disable pressure level box for 2D var
     function disable_pres1(ID)
     {
       var x;
@@ -389,9 +403,12 @@
       else if (ID == 2) {
         x=document.getElementById("pres2");
       }
+
       x.value = "N/A";
       x.disabled=true;
     }
+
+    // enable pressure level box for 3D var
     function enable_pres1(ID)
     {
       var x;
@@ -401,26 +418,38 @@
       else if (ID == 2) {
         x=document.getElementById("pres2");
       }
+
+      /* x.value = "500"; */
       x.disabled=false;
     }
+
+    // form variable1 or variable2 string based on "var" dropdown selection
     function select_var1(ID)
     {
       var var_string;
+
       if (ID == 1) {
         var_string = $("#var1").val();
       }
       else if (ID == 2) {
         var_string = $("#var2").val();
       }
+
+      // alert("var_string: " + var_string)
+
+      // disable the download button because of this change  
       disable_download_button();  
+  
       if (var_string == "Total Cloud Fraction") { 
         if (ID == 1) {
-          variable1 = "clt";  
+          variable1 = "clt";  // a 2D var
         }
         else if (ID == 2) {
-          variable2 = "clt";  
+          variable2 = "clt";  // a 2D var
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
+        // alert("variable1: " + variable1)
       }
       else if (var_string == "Surface Temperature") {
         if (ID == 1) {
@@ -429,6 +458,7 @@
         else if (ID == 2) {
           variable2 = "ts";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Sea Surface Temperature") { 
@@ -438,6 +468,7 @@
         else if (ID == 2) {
           variable2 = "tos";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Precipitation Flux") { 
@@ -447,6 +478,7 @@
         else if (ID == 2) {
           variable2 = "pr";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Eastward Near-Surface Wind") { 
@@ -456,6 +488,7 @@
         else if (ID == 2) {
           variable2 = "uas";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Northward Near-Surface Wind") {  
@@ -465,6 +498,7 @@
         else if (ID == 2) {
           variable2 = "vas";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Near-Surface Wind Speed") { 
@@ -474,6 +508,7 @@
         else if (ID == 2) {
           variable2 = "sfcWind";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Sea Surface Height") { 
@@ -483,6 +518,7 @@
         else if (ID == 2) {
           variable2 = "zos";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Leaf Area Index") { 
@@ -492,6 +528,7 @@
         else if (ID == 2) {
           variable2 = "lai";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Equivalent Water Height Over Land") {
@@ -501,6 +538,7 @@
         else if (ID == 2) {
           variable2 = "zl";  
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Equivalent Water Height Over Ocean") {
@@ -510,6 +548,7 @@
         else if (ID == 2) {
           variable2 = "zo";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Ocean Heat Content Anomaly within 700 m Depth") {
@@ -519,6 +558,7 @@
         else if (ID == 2) {
           variable2 = "ohc700";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Ocean Heat Content Anomaly within 2000 m Depth") {
@@ -528,6 +568,7 @@
         else if (ID == 2) {
           variable2 = "ohc2000";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Surface Downwelling Longwave Radiation") {
@@ -537,6 +578,7 @@
         else if (ID == 2) {
           variable2 = "rlds";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Surface Downwelling Shortwave Radiation") {
@@ -546,6 +588,7 @@
         else if (ID == 2) {
           variable2 = "rsds";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Surface Upwelling Longwave Radiation") {
@@ -555,6 +598,7 @@
         else if (ID == 2) {
           variable2 = "rlus";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Surface Upwelling Shortwave Radiation") {
@@ -564,6 +608,7 @@
         else if (ID == 2) {
           variable2 = "rsus";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Surface Downwelling Clear-Sky Longwave Radiation") {
@@ -573,6 +618,7 @@
         else if (ID == 2) {
           variable2 = "rldscs";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Surface Downwelling Clear-Sky Shortwave Radiation") {
@@ -582,6 +628,7 @@
         else if (ID == 2) {
           variable2 = "rsdscs";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Surface Upwelling Clear-Sky Shortwave Radiation") {
@@ -591,6 +638,7 @@
         else if (ID == 2) {
           variable2 = "rsuscs";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "TOA Incident Shortwave Radiation") {
@@ -600,6 +648,7 @@
         else if (ID == 2) {
           variable2 = "rsdt";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "TOA Outgoing Clear-Sky Longwave Radiation") {
@@ -609,6 +658,7 @@
         else if (ID == 2) {
           variable2 = "rlutcs";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "TOA Outgoing Longwave Radiation") {
@@ -618,6 +668,7 @@
         else if (ID == 2) {
           variable2 = "rlut";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "TOA Outgoing Clear-Sky Shortwave Radiation") {
@@ -627,6 +678,7 @@
         else if (ID == 2) {
           variable2 = "rsutcs";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "TOA Outgoing Shortwave Radiation") {
@@ -636,6 +688,7 @@
         else if (ID == 2) {
           variable2 = "rsut";
         }
+        // disable pressure level box for 2D var
         disable_pres1(ID);
       }
       else if (var_string == "Air Temperature") {
@@ -645,6 +698,7 @@
         else if (ID == 2) {
           variable2 = "ta";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
       else if (var_string == "Specific Humidity") {
@@ -654,6 +708,7 @@
         else if (ID == 2) {
           variable2 = "hus";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
       else if (var_string == "Cloud Ice Water Content") {
@@ -663,6 +718,7 @@
         else if (ID == 2) {
           variable2 = "cli";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
       else if (var_string == "Cloud Liquid Water Content") {
@@ -672,6 +728,7 @@
         else if (ID == 2) {
           variable2 = "clw";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
       else if (var_string == "Ocean Temperature") {
@@ -681,6 +738,7 @@
         else if (ID == 2) {
           variable2 = "ot";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
       else if (var_string == "Ocean Salinity") {
@@ -690,6 +748,7 @@
         else if (ID == 2) {
           variable2 = "os";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
       else if (var_string == "Vertical Wind Velocity") {
@@ -699,6 +758,7 @@
         else if (ID == 2) {
           variable2 = "wap";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
       else if (var_string == "Relative Humidity") {
@@ -708,13 +768,20 @@
         else if (ID == 2) {
           variable2 = "hur";
         }
+        // enable pressure level box for 3D var
         enable_pres1(ID);
       }
+
+      // alert("variable1: " + variable1)
     }
+
+
+    // set up "var1" dropdown based status of "data1" dropdown
     function select_data1(ID)
     {
       var data_string;
       var x;
+
       if (ID == 1) {
         data_string = $("#data1").val();
         x = document.getElementById("var1");
@@ -723,64 +790,106 @@
         data_string = $("#data2").val();
         x = document.getElementById("var2");
       }
+
+      // alert(ID);
+      // alert(data_string);
+
+      // disable the download button because of this change
       disable_download_button();
+
+      // disable corresponding "var" options
       if (data_string == "NASA/AMSRE") {
-        unset_vars1(ID); 
+
+        unset_vars1(ID); // disable all options in "var" dropdown first
+
         x.options[3].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[3].disabled=false;
+
       }
       else if (data_string == "NASA/MODIS") {
+
         unset_vars1(ID);
+
         x.options[1].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[1].disabled=false;
         x.options[8].disabled=false;
+
       }
       else if (data_string == "NASA/TRMM") {
+
         unset_vars1(ID);
+
         x.options[0].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[0].disabled=false;
+
       }
       else if (data_string == "NASA/GPCP") {
+
         unset_vars1(ID);
+
         x.options[0].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[0].disabled=false;
+
       }
       else if (data_string == "NASA/QuikSCAT") {
+
         unset_vars1(ID);
+
         x.options[4].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[4].disabled=false;
         x.options[5].disabled=false;
         x.options[6].disabled=false;
+
       }
       else if (data_string == "NASA/AVISO") {
+
         unset_vars1(ID);
+
         x.options[7].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[7].disabled=false;
+
       }
       else if (data_string == "NASA/GRACE") {
+
         unset_vars1(ID);
+
         x.options[9].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[9].disabled=false;
         x.options[10].disabled=false;
+
       }
       else if (data_string == "NOAA/NODC") {
+
         unset_vars1(ID);
+
         x.options[11].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[11].disabled=false;
         x.options[12].disabled=false;
+
       }
       else if (data_string == "NASA/CERES") {
+
         unset_vars1(ID);
+
         x.options[13].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[13].disabled=false;
         x.options[14].disabled=false;
         x.options[15].disabled=false;
@@ -793,38 +902,65 @@
         x.options[22].disabled=false;
         x.options[23].disabled=false;
         x.options[24].disabled=false;
+        // The following 6 commented out
+        // per request by Benyang
+        // x.options[25].disabled=false;
+        // x.options[26].disabled=false;
+        // x.options[27].disabled=false;
+        // x.options[28].disabled=false;
+        // x.options[29].disabled=false;
+        // x.options[30].disabled=false;
+
       }
       else if (data_string == "NASA/AIRS") {
+
         unset_vars1(ID);
+
         x.options[25].selected=true;
-        enable_pres1(ID); 
+        enable_pres1(ID); // the selected one is 3D
+
         x.options[25].disabled=false;
         x.options[26].disabled=false;
+
       }
       else if (data_string == "NASA/MLS") {
+
         unset_vars1(ID);
+
         x.options[25].selected=true;
-        enable_pres1(ID); 
+        enable_pres1(ID); // the selected one is 3D
+
         x.options[25].disabled=false;
         x.options[26].disabled=false;
+
       }
       else if (data_string == "ARGO/ARGO") {
+
         unset_vars1(ID);
+
         x.options[29].selected=true;
-        enable_pres1(ID); 
+        enable_pres1(ID); // the selected one is 3D
+
         x.options[29].disabled=false;
         x.options[30].disabled=false;
+
+        // alert("in ARGO ...");
+        // alert(data_string);
       }
       else if (data_string == "CCCMA/CANAM4") {
+
         unset_vars1(ID);
+
         x.options[0].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[0].disabled=false;
         x.options[1].disabled=false;
         x.options[2].disabled=false;
         x.options[4].disabled=false;
         x.options[5].disabled=false;
         x.options[6].disabled=false;
+
         x.options[13].disabled=false;
         x.options[14].disabled=false;
         x.options[15].disabled=false;
@@ -841,17 +977,22 @@
         x.options[26].disabled=false;
         x.options[27].disabled=false;
         x.options[28].disabled=false;
+
       }
       else if (data_string == "CSIRO/MK3.6") {
+
         unset_vars1(ID);
+
         x.options[0].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[0].disabled=false;
         x.options[1].disabled=false;
         x.options[2].disabled=false;
         x.options[4].disabled=false;
         x.options[5].disabled=false;
         x.options[6].disabled=false;
+
         x.options[13].disabled=false;
         x.options[14].disabled=false;
         x.options[15].disabled=false;
@@ -870,11 +1011,15 @@
         x.options[28].disabled=false;
         x.options[31].disabled=false;
         x.options[32].disabled=false;
+
       }
       else if (data_string == "NCAR/CAM5") {
+
         unset_vars1(ID);
+
         x.options[0].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[0].disabled=false;
         x.options[1].disabled=false;
         x.options[2].disabled=false;
@@ -884,6 +1029,7 @@
         x.options[6].disabled=false;
         x.options[7].disabled=false;
         x.options[8].disabled=false;
+
         x.options[14].disabled=false;
         x.options[15].disabled=false;
         x.options[16].disabled=false;
@@ -901,7 +1047,9 @@
         x.options[28].disabled=false;
         x.options[31].disabled=false;
         x.options[32].disabled=false;
+
       }
+
       else if (data_string == "CCCMA/CANESM2" || data_string == "GFDL/ESM2G" ||
                data_string == "GISS/E2-H" || data_string == "GISS/E2-R" ||
                data_string == "NCC/NORESM" ||
@@ -909,9 +1057,12 @@
                data_string == "GFDL/CM3" || data_string == "IPSL/CM5A-LR" ||
                data_string == "MIROC/MIROC5" || data_string == "UKMO/HadGEM2-A"
               ) {
+
         unset_vars1(ID);
+
         x.options[0].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[0].disabled=false;
         x.options[1].disabled=false;
         x.options[2].disabled=false;
@@ -921,6 +1072,7 @@
         x.options[6].disabled=false;
         x.options[7].disabled=false;
         x.options[8].disabled=false;
+
         x.options[13].disabled=false;
         x.options[14].disabled=false;
         x.options[15].disabled=false;
@@ -939,79 +1091,143 @@
         x.options[28].disabled=false;
         x.options[31].disabled=false;
         x.options[32].disabled=false;
+
       }
       else if (data_string == "ECMWF/interim") {
         unset_vars1(ID);
+
         x.options[3].selected=true;
-        disable_pres1(ID); 
+        disable_pres1(ID); // the selected one is 2D
+
         x.options[3].disabled=false;
         x.options[31].disabled=false;
         x.options[32].disabled=false;
       }
+
+      // form variable string
       select_var1(ID);
     }
+
+
     $(document).ready(function(){
+
+      /* $("a").click(function(event){
+        alert("As you can see, the link no longer took you to jquery.com");
+        event.preventDefault();
+      }); */
+
+
       $("#download_data").click(function(event) {
         var durl = $("#data_url").val();
+        // alert(durl);
         window.location.assign(durl);
       });
+
+
       $("#scatterPlot2V").click(function(event) {
+        // alert('****** inside scatterPlot2V()!');
         Response = null;
+
+        // no data to download yet
         disable_download_button();
+
         $("#Response").html("Calculating ...");
         $("#data_url").html("Calculating ...");
         $("#Image").html("");
+
+        // sample url: http://cmacws.jpl.nasa.gov:9002/svc/scatterPlot2V?model1=ukmo_hadgem2-a&var1=ts&pres1=200&model2=ukmo_hadgem2-a&var2=clt&pres2=200&start_time=199001&end_time=199512&lon1=0&lon2=100&lat1=-29&lat2=29
+        // form url string
+        // var url = "http://cmacws.jpl.nasa.gov:9002/svc/scatterPlot2V?";
+        //var url = "http://" + "einstein.sv.cmu.edu" + ":9002/svc/scatterPlot2V?";
         var url = "http://" + window.location.hostname + ":9002/svc/scatterPlot2V?";
+        // alert("url: " + url);
+
         var d1 = $("#data1").val();
         var model1 = d1.replace("/", "_");
         model1 = model1.toLowerCase();
+
         var arglist = "";
         arglist = arglist.concat("model1=");
         arglist = arglist.concat(model1);
+
+        // alert("arglist: " + arglist);
+
         var v1 = $("#var1").val();
         arglist = arglist.concat("&var1=");
         arglist = arglist.concat(variable1);
+
+        // alert("arglist: " + arglist);
+
         var pres1 = $("#pres1").val();
         arglist = arglist.concat("&pres1=");
         arglist = arglist.concat(pres1);
+
         var d2 = $("#data2").val();
         var model2 = d2.replace("/", "_");
         model2 = model2.toLowerCase();
+
         arglist = arglist.concat("&model2=");
         arglist = arglist.concat(model2);
+
+        // alert("arglist: " + arglist);
+
         var v2 = $("#var2").val();
         arglist = arglist.concat("&var2=");
         arglist = arglist.concat(variable2);
+
+        // alert("arglist: " + arglist);
+
         var pres2 = $("#pres2").val();
         arglist = arglist.concat("&pres2=");
         arglist = arglist.concat(pres2);
+
         var t0 = $("#t0").val();
         var t1 = $("#t1").val();
+
         t0 = t0.replace("-", "");
         t1 = t1.replace("-", "");
+
         arglist = arglist.concat("&start_time=");
         arglist = arglist.concat(t0);
+
         arglist = arglist.concat("&end_time=");
         arglist = arglist.concat(t1);
+
+        // alert("arglist: " + arglist);
+
         var lon0 = $("#lon0").val();
         var lon1 = $("#lon1").val();
         var lat0 = $("#lat0").val();
         var lat1 = $("#lat1").val();
+
         arglist = arglist.concat("&lon1=");
         arglist = arglist.concat(lon0);
+
         arglist = arglist.concat("&lon2=");
         arglist = arglist.concat(lon1);
+
         arglist = arglist.concat("&lat1=");
         arglist = arglist.concat(lat0);
+
         arglist = arglist.concat("&lat2=");
         arglist = arglist.concat(lat1);
+
         var nSample = $("#nSample").val();
         arglist = arglist.concat("&nSample=");
         arglist = arglist.concat(nSample);
+
+        // alert("arglist: " + arglist);
+
         var purpose = $("#purpose").val();
         arglist = arglist.concat("&purpose=");
         arglist = arglist.concat(purpose);
+
+        // url = url + encodeURIComponent(arglist);
         url = url + encodeURI(arglist);
+        // url = url + arglist;
+        // alert("url: " + url);
+
+        //var urlTimeBounds = "http://" + "einstein.sv.cmu.edu" + ":9002/svc/two_time_bounds?";
         var urlTimeBounds = "http://" + window.location.hostname + ":9002/svc/two_time_bounds?";
         var arglistTB = "";
         arglistTB = arglistTB.concat("serviceType=");
@@ -1025,6 +1241,8 @@
         arglistTB = arglistTB.concat("&var2=");
         arglistTB = arglistTB.concat(variable2);
         urlTimeBounds = urlTimeBounds + encodeURI(arglistTB);
+        // alert("urlTimeBounds: " + urlTimeBounds);
+
         $.ajax({
             type: "GET",
             url: urlTimeBounds,
@@ -1032,7 +1250,9 @@
             data: null,
             success: function(data, textStatus, xhr) {
                 Response = data;
+                // alert("data: " + data);
                 if (data.success == false) {
+                    // alert(data.error);
                     Response = null;
                     var text = JSON.stringify(data, null, 4);
                     text = "Error in backend: <br>" + text; 
@@ -1041,56 +1261,81 @@
                     return;
                 }
                 var text = JSON.stringify(data, null, 4);
+                // alert("text: " + text);
+                // $("#Response").html("<pre>"+text+"</pre>");
+                // $("#Response").html(text);
+
                 var tb1 = data.time_bounds1;
                 var bds1 = String(tb1).split(",");
+                // alert("tb1: " + tb1);
+                // alert("bds1: " + bds1);
                 var lowerT1 = parseInt(bds1[0]);
+                // alert("inside ajax, lowerT1: " + lowerT1);
                 var upperT1 = parseInt(bds1[1]);
+                // alert("upperT1: " + upperT1);
+
                 var tb2 = data.time_bounds2;
                 var bds2 = String(tb2).split(",");
+                // alert("tb2: " + tb2);
+                // alert("bds2: " + bds2);
                 var lowerT2 = parseInt(bds2[0]);
+                // alert("inside ajax, lowerT2: " + lowerT2);
                 var upperT2 = parseInt(bds2[1]);
+                // alert("upperT2: " + upperT2);
+
                 var t0I = parseInt(t0);
                 var t1I = parseInt(t1);
+                // alert("t0: " + t0I);
+                // alert("t1: " + t1I);
+
                 var lowerT, upperT;
-                if (lowerT1 == 0  || upperT1 == 0){ 
+                // compute the intersection of the two data bounds
+                if (lowerT1 == 0  || upperT1 == 0){ // no data-1
                   alert("We do not have data for the data-1 source and variable configuration.");
                   return;
                 }
-                else if (lowerT2 == 0  || upperT2 == 0){ 
+                else if (lowerT2 == 0  || upperT2 == 0){ // no data-2
                   alert("We do not have data for the data-2 source and variable configuration.");
                   return;
                 }
-                else if (lowerT2 > upperT1 || lowerT1 > upperT2) { 
+                else if (lowerT2 > upperT1 || lowerT1 > upperT2) { // no intersection
                   alert("The two data sets/vars do not have a common time range.");
                   return;
                 }
-                else { 
-                  if (lowerT1 > lowerT2) { 
+                else { // compute intersection
+                  if (lowerT1 > lowerT2) { // pick bigger lower time bound
                     lowerT = lowerT1;
                   }
                   else {
                     lowerT = lowerT2;
                   }
-                  if (upperT1 > upperT2) { 
+
+                  if (upperT1 > upperT2) { // pick smaller upper time bound
                     upperT = upperT2;
                   }
                   else {
                     upperT = upperT1;
                   }
                 }
+                // alert("lowerT: " + lowerT);
+                // alert("upperT: " + upperT);
+
                 if (t0I < lowerT && t1I < lowerT ||
                     t0I > upperT && t1I > upperT) {
                   alert("We do not have data that span your time range. Try the range inside ["+lowerT+", "+upperT+"].");
                   return;
                 }
+
                 if (t0I < lowerT && t1I <= upperT) {
                   alert("Your start year-month is out of bound. It has to be in or later than " + lowerT +
                         ". We will use the range ["+lowerT+", "+t1I+"] for you.");
                 }
+
                 if (t1I > upperT && t0I >= lowerT) {
                   alert("Your end year-month is out of bound. It has to be in or earlier than " + upperT +
                         ". We will use the range ["+t0I+", "+upperT+"] for you.");
                 }
+
                 if (t0I < lowerT && t1I > upperT ) {
                   alert("Both of your start and end year-months are out of bounds. They have to be in or earlier than " + upperT +
                         ", and in or later than " + lowerT + ". We will use the range ["+lowerT+", "+upperT+"] for you.");
@@ -1099,10 +1344,15 @@
             error: function(xhr, textStatus, errorThrown) {
 		$("#Response").html("error!");
 		$("#data_url").html("error!");
+                // alert("xhr.status: "+xhr.status);
+                // alert("error status: "+textStatus);
             },
             complete: function(xhr, textStatus) {
+                //alert("complete status: "+textStatus);
             }
         });
+
+
         $.ajax({
             type: "GET",
             url: url,
@@ -1110,39 +1360,60 @@
             data: null,
             success: function(data, textStatus, xhr) {
                 Response = data;
+                // alert("data: " + data);
                 if (data.success == false) {
+                    // alert(data.error);
                     Response = null;
                     var text = JSON.stringify(data, null, 4);
+
                     if (text.indexOf("No Data") != -1) {
                       $("#Image").html("No Data");
                       $("#Response").html("No Data");
                       $("#data_url").html("No Data");
                       return;
                     }
+
                     text = "Error in backend: <br>" + text; 
+                    // $("#Response").html("<span style='color:red'>" + text + "</span>");
                     $("#Response").html(text);
                     $("#data_url").html(text);
+
                     return;
                 }
                 var text = JSON.stringify(data, null, 4);
+                // alert(text);
+                // $("#Response").html("<pre>"+text+"</pre>");
                 $("#Response").html(text);
+
                 var html = "<img src='"+data.url+"' width='820'/>";
+                // alert(html);
                 $("#Image").html(html);
+
+                // post dataUrl to textarea and enable download button
                 $("#data_url").html(data.dataUrl);
                 enable_download_button();
             },
             error: function(xhr, textStatus, errorThrown) {
                 $("#Response").html("error!");
                 $("#data_url").html("error!");
+                // alert("xhr.status: "+xhr.status);
+                // alert("error status: "+textStatus);
             },
             complete: function(xhr, textStatus) {
+                //alert("complete status: "+textStatus);
             }
         });
+
       });
     });
     </script>
-} @main("Service 19", scripts){ @flash_message()
+}
+    
+@main("Service 19", scripts){
+	
+@flash_message() 
 <p>
+
 <div id="source1" style="display: none;">@parameters.getSource1()</div>
 <div id="variableName1" style="display: none;">@parameters.getVaribaleName1()</div>
 <div id="pressureLevel1" style="display: none;">@parameters.getPressureLevel1()</div>
@@ -1160,243 +1431,270 @@
 <div id="image" style="display: none;">@parameters.getImage()</div>
 <div id="dataURL" style="display: none;">@parameters.getDataUrl()</div>
 <div id="serviceResponseText" style="display: none;">@parameters.getServiceResponse()</div>
+
 <table border="1" align="center">
-	<tr>
-		<td colspan="4">
-			<center>
-				<b>Service: Scatter and Histogram Plot of Two Variables</b><br>
-				<br> This service generates a scatter plot between two
-				specified variables and the histograms of the two variables, and
-				calculates the correlation of the two variables. The two variables
-				can be either a two-dimensional variable or a slice of a
-				three-dimensional variable at a specific pressure level. The number
-				of samples used for this analysis should be specified. <br>
-				<br>
-			</center>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<center>data 1</center>
-		</td>
-		<td colspan="2">
-			<center>data 2</center>
-		</td>
-	</tr>
-	<tr>
-		<td>source:</td>
-		<td><select name="data1" , id="data1" onchange="select_data1(1)">
-				<optgroup label="Model: Historical">
-					<option selected="CCCMA/CANESM2">CCCMA/CANESM2</option>
-					<option>GFDL/ESM2G</option>
-					<option>GISS/E2-H</option>
-					<option>GISS/E2-R</option>
-					<option>NCAR/CAM5</option>
-					<option>NCC/NORESM</option>
-					<option>UKMO/HadGEM2-ES</option>
-				</optgroup>
-				<optgroup label="Model: AMIP">
-					<option>CCCMA/CANAM4</option>
-					<option>CSIRO/MK3.6</option>
-					<option>GFDL/CM3</option>
-					<option>IPSL/CM5A-LR</option>
-					<option>MIROC/MIROC5</option>
-					<option>UKMO/HadGEM2-A</option>
-				</optgroup>
-				<optgroup label="Observation">
-					<option>NASA/MODIS</option>
-					<option>NASA/AMSRE</option>
-					<option>NASA/TRMM</option>
-					<option>NASA/GPCP</option>
-					<option>NASA/QuikSCAT</option>
-					<option>NASA/AVISO</option>
-					<option>NASA/GRACE</option>
-					<option>NOAA/NODC</option>
-					<option>NASA/CERES</option>
-					<option>NASA/AIRS</option>
-					<option>NASA/MLS</option>
-					<option>ARGO/ARGO</option>
-				</optgroup>
-				<optgroup label="Reanalysis">
-					<option>ECMWF/interim</option>
-				</optgroup>
-		</select></td>
-		<td>source:</td>
-		<td><select name="data2" , id="data2" onchange="select_data1(2)">
-				<optgroup label="Model: Historical">
-					<option selected="CCCMA/CANESM2">CCCMA/CANESM2</option>
-					<option>GFDL/ESM2G</option>
-					<option>GISS/E2-H</option>
-					<option>GISS/E2-R</option>
-					<option>NCAR/CAM5</option>
-					<option>NCC/NORESM</option>
-					<option>UKMO/HadGEM2-ES</option>
-				</optgroup>
-				<optgroup label="Model: AMIP">
-					<option>CCCMA/CANAM4</option>
-					<option>CSIRO/MK3.6</option>
-					<option>GFDL/CM3</option>
-					<option>IPSL/CM5A-LR</option>
-					<option>MIROC/MIROC5</option>
-					<option>UKMO/HadGEM2-A</option>
-				</optgroup>
-				<optgroup label="Observation">
-					<option>NASA/MODIS</option>
-					<option>NASA/AMSRE</option>
-					<option>NASA/TRMM</option>
-					<option>NASA/GPCP</option>
-					<option>NASA/QuikSCAT</option>
-					<option>NASA/AVISO</option>
-					<option>NASA/GRACE</option>
-					<option>NOAA/NODC</option>
-					<option>NASA/CERES</option>
-					<option>NASA/AIRS</option>
-					<option>NASA/MLS</option>
-					<option>ARGO/ARGO</option>
-				</optgroup>
-				<optgroup label="Reanalysis">
-					<option>ECMWF/interim</option>
-				</optgroup>
-		</select></td>
-	</tr>
-	<tr>
-		<td>variable name:</td>
-		<td><select name="var1" , id="var1" onchange="select_var1(1)">
-				<option>Precipitation Flux</option>
-				<option>Total Cloud Fraction</option>
-				<option>Surface Temperature</option>
-				<option>Sea Surface Temperature</option>
-				<option>Eastward Near-Surface Wind</option>
-				<option>Northward Near-Surface Wind</option>
-				<option>Near-Surface Wind Speed</option>
-				<option>Sea Surface Height</option>
-				<option>Leaf Area Index</option>
-				<option>Equivalent Water Height Over Land</option>
-				<option>Equivalent Water Height Over Ocean</option>
-				<option>Ocean Heat Content Anomaly within 700 m Depth</option>
-				<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
-				<option>Surface Downwelling Longwave Radiation</option>
-				<option>Surface Downwelling Shortwave Radiation</option>
-				<option>Surface Upwelling Longwave Radiation</option>
-				<option>Surface Upwelling Shortwave Radiation</option>
-				<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
-				<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
-				<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
-				<option>TOA Incident Shortwave Radiation</option>
-				<option>TOA Outgoing Longwave Radiation</option>
-				<option>TOA Outgoing Shortwave Radiation</option>
-				<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
-				<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
-				<option>Air Temperature</option>
-				<option>Specific Humidity</option>
-				<option>Cloud Ice Water Content</option>
-				<option>Cloud Liquid Water Content</option>
-				<option>Ocean Temperature</option>
-				<option>Ocean Salinity</option>
-				<option>Vertical Wind Velocity</option>
-				<option>Relative Humidity</option>
-		</select></td>
-		<td>variable name:</td>
-		<td><select name="var2" , id="var2" onchange="select_var1(2)">
-				<option>Precipitation Flux</option>
-				<option>Total Cloud Fraction</option>
-				<option>Surface Temperature</option>
-				<option>Sea Surface Temperature</option>
-				<option>Eastward Near-Surface Wind</option>
-				<option>Northward Near-Surface Wind</option>
-				<option>Near-Surface Wind Speed</option>
-				<option>Sea Surface Height</option>
-				<option>Leaf Area Index</option>
-				<option>Equivalent Water Height Over Land</option>
-				<option>Equivalent Water Height Over Ocean</option>
-				<option>Ocean Heat Content Anomaly within 700 m Depth</option>
-				<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
-				<option>Surface Downwelling Longwave Radiation</option>
-				<option>Surface Downwelling Shortwave Radiation</option>
-				<option>Surface Upwelling Longwave Radiation</option>
-				<option>Surface Upwelling Shortwave Radiation</option>
-				<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
-				<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
-				<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
-				<option>TOA Incident Shortwave Radiation</option>
-				<option>TOA Outgoing Longwave Radiation</option>
-				<option>TOA Outgoing Shortwave Radiation</option>
-				<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
-				<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
-				<option>Air Temperature</option>
-				<option>Specific Humidity</option>
-				<option>Cloud Ice Water Content</option>
-				<option>Cloud Liquid Water Content</option>
-				<option>Ocean Temperature</option>
-				<option>Ocean Salinity</option>
-				<option>Vertical Wind Velocity</option>
-				<option>Relative Humidity</option>
-		</select></td>
-	</tr>
-	<tr>
-		<td>atmosphere pressure level (hPa) <br> or ocean pressure
-			level (dbar)
-		</td>
-		<td><input id="pres1" value="500" alt="pressure" /></td>
-		<td>atmosphere pressure level (hPa) <br> or ocean pressure
-			level (dbar)
-		</td>
-		<td><input id="pres2" value="500" alt="pressure" /></td>
-	</tr>
-	<tr>
-	</tr>
-	<tr>
-		<td>start year-month:</td>
-		<td><input id="t0" value="2004-01" alt="start" /></td>
-		<td>end year-month:</td>
-		<td><input id="t1" value="2004-12" alt="end" /></td>
-	</tr>
-	<tr>
-		<td>start lat (deg):</td>
-		<td><input id="lat0" value="-90" /></td>
-		<td>end lat (deg):</td>
-		<td><input id="lat1" value="90" /></td>
-	</tr>
-	<tr>
-		<td>start lon (deg):</td>
-		<td><input id="lon0" value="0" /></td>
-		<td>end lon (deg):</td>
-		<td><input id="lon1" value="360" /></td>
-	</tr>
-	<tr>
-		<td>number of samples:</td>
-		<td><input id="nSample" value="500" /></td>
-	</tr>
-	</tr>
-	<tr>
-		<td colspan="1">Execution purpose</td>
-		<td colspan="3">
-			<form>
-				<textarea name="purpose" id="purpose" rows="4" cols="50"> </textarea>
-			</form>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2" align="center"><input id="scatterPlot2V"
-			type="submit" value="            Run Again            "
-			style="height: 28px" /></td>
-		<form>
-			<td colspan="2" align="center"><input id="download_data"
-				type="button" value="Download Data" style="height: 28px" /></td>
-		</form>
-	</tr>
-	<tr>
-		<td colspan="4">
-			<div id="Image">Image Here</div>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="4" align="center"><textarea readonly id="data_url"
-				cols="130" rows="2">Data URL Here</textarea></td>
-	</tr>
-	<tr>
-		<td colspan="4" align="center"><textarea id="Response" cols="130"
-				rows="6">Service Response Text Here</textarea></td>
-	</tr>
+
+<tr>
+<td colspan="4">
+<center>
+<b>Service: Scatter and Histogram Plot of Two Variables</b><br><br>
+This service generates a scatter plot between two specified variables and the histograms of the two variables, and calculates the correlation of the two variables. The two variables can be either a two-dimensional variable or a slice of a three-dimensional variable at a specific pressure level. The number of samples used for this analysis should be specified. <br><br>
+</center>
+</td>
+</tr>
+
+<tr>
+<td colspan="2">
+<center>
+data 1
+</center>
+</td>
+
+<td colspan="2">
+<center>
+data 2
+</center>
+</td>
+</tr>
+
+<tr>
+<td>source:</td><td><select name="data1", id="data1" onchange="select_data1(1)">
+<optgroup label="Model: Historical">
+<option selected="CCCMA/CANESM2">CCCMA/CANESM2</option>
+<option>GFDL/ESM2G</option>
+<option>GISS/E2-H</option>
+<option>GISS/E2-R</option>
+<option>NCAR/CAM5</option>
+<option>NCC/NORESM</option>
+<option>UKMO/HadGEM2-ES</option>
+</optgroup>
+<optgroup label="Model: AMIP">
+<option>CCCMA/CANAM4</option>
+<option>CSIRO/MK3.6</option>
+<option>GFDL/CM3</option>
+<option>IPSL/CM5A-LR</option>
+<option>MIROC/MIROC5</option>
+<option>UKMO/HadGEM2-A</option>
+</optgroup>
+<!-- <option>NASA/obs4MIPs</option>  -->
+<optgroup label="Observation">
+<option>NASA/MODIS</option>
+<option>NASA/AMSRE</option>
+<option>NASA/TRMM</option>
+<option>NASA/GPCP</option>
+<option>NASA/QuikSCAT</option>
+<option>NASA/AVISO</option>
+<option>NASA/GRACE</option>
+<option>NOAA/NODC</option>
+<option>NASA/CERES</option>
+<option>NASA/AIRS</option>
+<option>NASA/MLS</option>
+<option>ARGO/ARGO</option>
+</optgroup>
+<optgroup label="Reanalysis">
+<option>ECMWF/interim</option>
+</optgroup>
+</select></td>
+
+<td>source:</td><td><select name="data2", id="data2" onchange="select_data1(2)">
+<optgroup label="Model: Historical">
+<option selected="CCCMA/CANESM2">CCCMA/CANESM2</option>
+<option>GFDL/ESM2G</option>
+<option>GISS/E2-H</option>
+<option>GISS/E2-R</option>
+<option>NCAR/CAM5</option>
+<option>NCC/NORESM</option>
+<option>UKMO/HadGEM2-ES</option>
+</optgroup>
+<optgroup label="Model: AMIP">
+<option>CCCMA/CANAM4</option>
+<option>CSIRO/MK3.6</option>
+<option>GFDL/CM3</option>
+<option>IPSL/CM5A-LR</option>
+<option>MIROC/MIROC5</option>
+<option>UKMO/HadGEM2-A</option>
+</optgroup>
+<!-- <option>NASA/obs4MIPs</option>  -->
+<optgroup label="Observation">
+<option>NASA/MODIS</option>
+<option>NASA/AMSRE</option>
+<option>NASA/TRMM</option>
+<option>NASA/GPCP</option>
+<option>NASA/QuikSCAT</option>
+<option>NASA/AVISO</option>
+<option>NASA/GRACE</option>
+<option>NOAA/NODC</option>
+<option>NASA/CERES</option>
+<option>NASA/AIRS</option>
+<option>NASA/MLS</option>
+<option>ARGO/ARGO</option>
+</optgroup>
+<optgroup label="Reanalysis">
+<option>ECMWF/interim</option>
+</optgroup>
+</select></td>
+
+</tr>
+
+<tr>
+
+<td>variable name:</td><td><select name="var1", id="var1" onchange="select_var1(1)">
+<option>Precipitation Flux</option>
+<option>Total Cloud Fraction</option>
+<option>Surface Temperature</option>
+<option>Sea Surface Temperature</option>
+<option>Eastward Near-Surface Wind</option>
+<option>Northward Near-Surface Wind</option>
+<option>Near-Surface Wind Speed</option>
+<option>Sea Surface Height</option>
+<option>Leaf Area Index</option>
+<option>Equivalent Water Height Over Land</option>
+<option>Equivalent Water Height Over Ocean</option>
+<option>Ocean Heat Content Anomaly within 700 m Depth</option>
+<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
+<option>Surface Downwelling Longwave Radiation</option>
+<option>Surface Downwelling Shortwave Radiation</option>
+<option>Surface Upwelling Longwave Radiation</option>
+<option>Surface Upwelling Shortwave Radiation</option>
+<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
+<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
+<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
+<option>TOA Incident Shortwave Radiation</option>
+<option>TOA Outgoing Longwave Radiation</option>
+<option>TOA Outgoing Shortwave Radiation</option>
+<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
+<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
+<option>Air Temperature</option>
+<option>Specific Humidity</option>
+<option>Cloud Ice Water Content</option>
+<option>Cloud Liquid Water Content</option>
+<option>Ocean Temperature</option>
+<option>Ocean Salinity</option>
+<option>Vertical Wind Velocity</option>  
+<option>Relative Humidity</option>
+</select>
+</td>
+
+
+<td>variable name:</td><td><select name="var2", id="var2" onchange="select_var1(2)">
+<option>Precipitation Flux</option>
+<option>Total Cloud Fraction</option>
+<option>Surface Temperature</option>
+<option>Sea Surface Temperature</option>
+<option>Eastward Near-Surface Wind</option>
+<option>Northward Near-Surface Wind</option>
+<option>Near-Surface Wind Speed</option>
+<option>Sea Surface Height</option>
+<option>Leaf Area Index</option>
+<option>Equivalent Water Height Over Land</option>
+<option>Equivalent Water Height Over Ocean</option>
+<option>Ocean Heat Content Anomaly within 700 m Depth</option>
+<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
+<option>Surface Downwelling Longwave Radiation</option>
+<option>Surface Downwelling Shortwave Radiation</option>
+<option>Surface Upwelling Longwave Radiation</option>
+<option>Surface Upwelling Shortwave Radiation</option>
+<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
+<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
+<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
+<option>TOA Incident Shortwave Radiation</option>
+<option>TOA Outgoing Longwave Radiation</option>
+<option>TOA Outgoing Shortwave Radiation</option>
+<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
+<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
+<option>Air Temperature</option>
+<option>Specific Humidity</option>
+<option>Cloud Ice Water Content</option>
+<option>Cloud Liquid Water Content</option>
+<option>Ocean Temperature</option>
+<option>Ocean Salinity</option>
+<option>Vertical Wind Velocity</option>  
+<option>Relative Humidity</option>
+</select>
+</td>
+
+</tr>
+
+<tr>
+
+<td>
+atmosphere pressure level (hPa) <br> or ocean pressure level (dbar)
+</td>
+<td>
+<input id="pres1" value="500" alt="pressure"/>
+</td>
+
+<td>
+atmosphere pressure level (hPa) <br> or ocean pressure level (dbar)
+</td>
+<td>
+<input id="pres2" value="500" alt="pressure"/>
+</td>
+
+</tr>
+
+<tr>
+</tr>
+
+<tr>
+<td>start year-month:</td><td><input id="t0" value="2004-01" alt="start"/></td>
+<td>end year-month:</td><td><input id="t1" value="2004-12" alt="end"/></td>
+</tr>
+
+
+<tr>
+<td>start lat (deg):</td><td><input id="lat0" value="-90"/></td>
+<td>end lat (deg):</td><td><input id="lat1" value="90"/></td>
+</tr>
+
+<tr>
+<td>start lon (deg):</td><td><input id="lon0" value="0"/></td>
+<td>end lon (deg):</td><td><input id="lon1" value="360"/></td>
+</tr>
+
+<tr>  
+<td>number of samples:</td><td><input id="nSample" value="500"/></td></tr>
+</tr>
+
+<tr>
+<td colspan="1">
+Execution purpose
+</td>
+<td colspan="3">
+<form>
+<textarea name="purpose" id="purpose" rows="4" cols="50"> </textarea>
+</form>
+</td>
+</tr>
+
+<tr>
+<td colspan="2" align="center"><input id="scatterPlot2V" type="submit" value="            Run Again            " style="height:28px"/></td>
+<form>
+<td colspan="2" align="center"><input id="download_data" type="button" value="Download Data" style="height:28px"/>
+</td>
+</form>
+
+</tr>
+
+<tr>
+<td colspan="4">
+<div id="Image">Image Here</div>
+</td>
+</tr>
+
+<tr>
+<td colspan="4" align="center">
+<textarea readonly id="data_url" cols="130" rows="2">Data URL Here</textarea>
+</td>
+</tr>
+
+<tr>
+<td colspan="4" align="center">
+<textarea id="Response" cols="130" rows="6">Service Response Text Here</textarea>
+</td>
+</tr>
+
 </table>
 }
+	
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/ca952ad9/ApacheCMDA-Frontend/app/views/climate/searchDataSet.scala.html
----------------------------------------------------------------------
diff --git a/ApacheCMDA-Frontend/app/views/climate/searchDataSet.scala.html b/ApacheCMDA-Frontend/app/views/climate/searchDataSet.scala.html
index 68f260a..31b9265 100644
--- a/ApacheCMDA-Frontend/app/views/climate/searchDataSet.scala.html
+++ b/ApacheCMDA-Frontend/app/views/climate/searchDataSet.scala.html
@@ -1,20 +1,3 @@
-@*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more		   *
- * contributor license agreements.  See the NOTICE file distributed with	   *
- * this work for additional information regarding copyright ownership.         *
- * The ASF licenses this file to You under the Apache License, Version 2.0     *
- * (the "License"); you may not use this file except in compliance with        *
- * the License.  You may obtain a copy of the License at                       *
- *                                                                             *
- *    http://www.apache.org/licenses/LICENSE-2.0                               *
- *																			   *
- * Unless required by applicable law or agreed to in writing, software         *
- * distributed under the License is distributed on an "AS IS" BASIS,           *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    *
- * See the License for the specific language governing permissions and         *
- * limitations under the License.											   *
- *******************************************************************************@ 
-
 @(dataSetForm: play.data.Form[DataSet])
 
 @import helper._
@@ -508,7 +491,7 @@
 	@flash_message()   
 	 
     <h1 style="margin-left:490px">Search Dataset</h1>
-    @helper.form(routes.DatasetController.getSearchResult()) {
+    @helper.form(routes.dataSetController.getSearchResult()) {
     	<div class="ui-widget col-sm-offset-3 col-sm-7">
     	<div class = "form-group">
     		@inputText(dataSetForm("Dataset Name"), 'class -> "form-control", 'id -> "dataSetName", '_label -> Messages("Dataset Name"), 'placeholder -> "ARGO Ocean Temperature", 'size->70) 

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/ca952ad9/ApacheCMDA-Frontend/app/views/climate/searchGenerateWorkflow.scala.html
----------------------------------------------------------------------
diff --git a/ApacheCMDA-Frontend/app/views/climate/searchGenerateWorkflow.scala.html b/ApacheCMDA-Frontend/app/views/climate/searchGenerateWorkflow.scala.html
index a11b1ff..75f9862 100644
--- a/ApacheCMDA-Frontend/app/views/climate/searchGenerateWorkflow.scala.html
+++ b/ApacheCMDA-Frontend/app/views/climate/searchGenerateWorkflow.scala.html
@@ -1,20 +1,3 @@
-@*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more		   *
- * contributor license agreements.  See the NOTICE file distributed with	   *
- * this work for additional information regarding copyright ownership.         *
- * The ASF licenses this file to You under the Apache License, Version 2.0     *
- * (the "License"); you may not use this file except in compliance with        *
- * the License.  You may obtain a copy of the License at                       *
- *                                                                             *
- *    http://www.apache.org/licenses/LICENSE-2.0                               *
- *																			   *
- * Unless required by applicable law or agreed to in writing, software         *
- * distributed under the License is distributed on an "AS IS" BASIS,           *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    *
- * See the License for the specific language governing permissions and         *
- * limitations under the License.											   *
- *******************************************************************************@ 
-
 @(serviceLogForm: play.data.Form[metadata.ServiceLog])
 
 @import helper._

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/ca952ad9/ApacheCMDA-Frontend/app/views/climate/searchLogResult.scala.html
----------------------------------------------------------------------
diff --git a/ApacheCMDA-Frontend/app/views/climate/searchLogResult.scala.html b/ApacheCMDA-Frontend/app/views/climate/searchLogResult.scala.html
index 3e2a1a6..3bdfed1 100644
--- a/ApacheCMDA-Frontend/app/views/climate/searchLogResult.scala.html
+++ b/ApacheCMDA-Frontend/app/views/climate/searchLogResult.scala.html
@@ -1,20 +1,3 @@
-@*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more		   *
- * contributor license agreements.  See the NOTICE file distributed with	   *
- * this work for additional information regarding copyright ownership.         *
- * The ASF licenses this file to You under the Apache License, Version 2.0     *
- * (the "License"); you may not use this file except in compliance with        *
- * the License.  You may obtain a copy of the License at                       *
- *                                                                             *
- *    http://www.apache.org/licenses/LICENSE-2.0                               *
- *																			   *
- * Unless required by applicable law or agreed to in writing, software         *
- * distributed under the License is distributed on an "AS IS" BASIS,           *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    *
- * See the License for the specific language governing permissions and         *
- * limitations under the License.											   *
- *******************************************************************************@ 
-
 @(serviceLogs: List[metadata.ServiceLog])
 
 @import helper._

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/ca952ad9/ApacheCMDA-Frontend/app/views/climate/searchLogResultWorkflow.scala.html
----------------------------------------------------------------------
diff --git a/ApacheCMDA-Frontend/app/views/climate/searchLogResultWorkflow.scala.html b/ApacheCMDA-Frontend/app/views/climate/searchLogResultWorkflow.scala.html
index 18ace8e..fb443ce 100644
--- a/ApacheCMDA-Frontend/app/views/climate/searchLogResultWorkflow.scala.html
+++ b/ApacheCMDA-Frontend/app/views/climate/searchLogResultWorkflow.scala.html
@@ -1,20 +1,3 @@
-@*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more		   *
- * contributor license agreements.  See the NOTICE file distributed with	   *
- * this work for additional information regarding copyright ownership.         *
- * The ASF licenses this file to You under the Apache License, Version 2.0     *
- * (the "License"); you may not use this file except in compliance with        *
- * the License.  You may obtain a copy of the License at                       *
- *                                                                             *
- *    http://www.apache.org/licenses/LICENSE-2.0                               *
- *																			   *
- * Unless required by applicable law or agreed to in writing, software         *
- * distributed under the License is distributed on an "AS IS" BASIS,           *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    *
- * See the License for the specific language governing permissions and         *
- * limitations under the License.											   *
- *******************************************************************************@ 
-
 @(serviceLogs: List[metadata.ServiceLog], userId: String, start: String, end: String, jsonData: String)
 
 @import helper._

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/ca952ad9/ApacheCMDA-Frontend/app/views/climate/searchServiceLog.scala.html
----------------------------------------------------------------------
diff --git a/ApacheCMDA-Frontend/app/views/climate/searchServiceLog.scala.html b/ApacheCMDA-Frontend/app/views/climate/searchServiceLog.scala.html
index 0e30c47..62e02af 100644
--- a/ApacheCMDA-Frontend/app/views/climate/searchServiceLog.scala.html
+++ b/ApacheCMDA-Frontend/app/views/climate/searchServiceLog.scala.html
@@ -1,20 +1,3 @@
-@*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more		   *
- * contributor license agreements.  See the NOTICE file distributed with	   *
- * this work for additional information regarding copyright ownership.         *
- * The ASF licenses this file to You under the Apache License, Version 2.0     *
- * (the "License"); you may not use this file except in compliance with        *
- * the License.  You may obtain a copy of the License at                       *
- *                                                                             *
- *    http://www.apache.org/licenses/LICENSE-2.0                               *
- *																			   *
- * Unless required by applicable law or agreed to in writing, software         *
- * distributed under the License is distributed on an "AS IS" BASIS,           *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    *
- * See the License for the specific language governing permissions and         *
- * limitations under the License.											   *
- *******************************************************************************@ 
-
 @(serviceLogForm: play.data.Form[metadata.ServiceLog])
 
 @import helper._

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/ca952ad9/ApacheCMDA-Frontend/app/views/climate/serviceLog.scala.html
----------------------------------------------------------------------
diff --git a/ApacheCMDA-Frontend/app/views/climate/serviceLog.scala.html b/ApacheCMDA-Frontend/app/views/climate/serviceLog.scala.html
index 0b02416..b9845c8 100644
--- a/ApacheCMDA-Frontend/app/views/climate/serviceLog.scala.html
+++ b/ApacheCMDA-Frontend/app/views/climate/serviceLog.scala.html
@@ -1,20 +1,3 @@
-@*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more		   *
- * contributor license agreements.  See the NOTICE file distributed with	   *
- * this work for additional information regarding copyright ownership.         *
- * The ASF licenses this file to You under the Apache License, Version 2.0     *
- * (the "License"); you may not use this file except in compliance with        *
- * the License.  You may obtain a copy of the License at                       *
- *                                                                             *
- *    http://www.apache.org/licenses/LICENSE-2.0                               *
- *																			   *
- * Unless required by applicable law or agreed to in writing, software         *
- * distributed under the License is distributed on an "AS IS" BASIS,           *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    *
- * See the License for the specific language governing permissions and         *
- * limitations under the License.											   *
- *******************************************************************************@ 
-
 @(serviceLogs: List[metadata.ServiceLog], serviceLogForm: play.data.Form[metadata.ServiceLog])
 
 @import helper._


Mime
View raw message