Changeset 470 for tapas/web

Timestamp:

04/06/12 17:01:41 (12 years ago)

Author:

rboipsl

Message:

debut dev creation experiment file names

Location:

tapas/web

Files:

• project/formTapas_script.jsp (modified) (7 diffs)
• src/com/ether/Controller.java (modified) (3 diffs)

tapas/web/project/formTapas_script.jsp

@@ -153 +153 @@
         var jsonTapasForm = $.toJSON( tapasForm );
 
+
         if( jsonTapasForm )
             $.ajax( {
@@ -192 +193 @@
 
 
-
-
-
     displayObservatories: function( container )
     {
@@ -236 +234 @@
         jQuery.each( this.jSonInstrumentalFunctions, jQuery.proxy( function ( i, jsonInstrumentalFunction )
         {
-            this.selectInstrumentalFunctions.add( jsonInstrumentalFunction.value, tapasTexts[jsonInstrumentalFunction.value] );
+            this.selectInstrumentalFunctions.add( jsonInstrumentalFunction.value, tapasTexts[jsonInstrumentalFunction.text] );
         }, this ) );
         this.selectInstrumentalFunctions.selectFirst( true );
@@ -251 +249 @@
         jQuery.each( this.jSonClimatoReferences, jQuery.proxy( function ( i, jsonClimatoReference )
         {
-            this.selectClimatoReferences.add( jsonClimatoReference.value, tapasTexts[jsonClimatoReference.value] );
+            this.selectClimatoReferences.add( jsonClimatoReference.value, tapasTexts[jsonClimatoReference.text] );
         }, this ) );
         this.selectClimatoReferences.selectFirst( true );
@@ -297 +295 @@
 
         //fonction instrumentale
-        this.createTrList( "Instrumental function", "ifunction", tabPreference, "ilsf" );
+        this.createTrList( "Instrumental function", "ifunction", tabObservation, "ilsf" );
 
         this.createTr( "Resolving power", "irp", tabObservation );
@@ -378 +376 @@
         var instrument = new Object();
 
+        instrument.ilsfChoice = new Object();
+        instrument.ilsfChoice.firstValue = this.selectInstrumentalFunctions.getValuesInString();
+        instrument.ilsfChoice.secondValue = this.selectInstrumentalFunctions.getValue();
+
         instrument.spectralChoice = new Object();
+        this.selectSpectralUnits.remove("-1");
         instrument.spectralChoice.firstValue = this.selectSpectralUnits.getValuesInString();
         instrument.spectralChoice.secondValue = this.selectSpectralUnits.getValue();
@@ -385 +388 @@
 
 
-        instrument.resolvingPower=$( "#irp" ).val();
-        instrument.samplingRatio = $( "#isr" ).val();
+        instrument.resolvingPower=new Object();
+        instrument.resolvingPower.secondValue=$( "#irp" ).val();
+
+        instrument.samplingRatio = new Object();
+        instrument.samplingRatio.secondValue = $( "#isr" ).val();
 
         var observation = new Object();

tapas/web/src/com/ether/Controller.java

@@ -81 +81 @@
         try
         {
-            getTapasService().createXMLRequest( javaTapas ); // en 2ieme parametre
+            getTapasService().createXMLRequest( javaTapas, user ); // en 2ieme parametre
         }
         catch( ServiceException e )
@@ -157 +157 @@
             final JSONObject jsonInstrumentalFunction = new JSONObject();
             jsonInstrumentalFunction.put( "text", instrumentalFunction.name() );
-            jsonInstrumentalFunction.put( "value", instrumentalFunction.name() );
+            jsonInstrumentalFunction.put( "value", instrumentalFunction.ordinal() );
             jsonInstrumentalFunctions.add( jsonInstrumentalFunction );
         }
@@ -174 +174 @@
             final JSONObject jsonClimatoReference = new JSONObject();
             jsonClimatoReference.put( "text", climatoReference.name() );
-            jsonClimatoReference.put( "value", climatoReference.name() );
+            jsonClimatoReference.put( "value", climatoReference.ordinal() );
             jsonClimatoReferences.add( jsonClimatoReference );
         }