Changeset 442

Timestamp:

03/26/12 17:49:46 (12 years ago)

Author:

vmipsl

Message:

Spectral units

Location:

tapas

Files:

• domain/interface/com/ether/SpectralUnit.java (modified) (2 diffs)
• web/project/formTapas.jsp (modified) (3 diffs)
• web/project/formTapas_script.jsp (modified) (5 diffs)
• web/src/com/ether/Controller.java (modified) (7 diffs)
• web/src/messages_en.properties (modified) (2 diffs)
• web/src/messages_fr.properties (modified) (1 diff)

tapas/domain/interface/com/ether/SpectralUnit.java

@@ -1 +1 @@
 package com.ether;
-
-import java.lang.reflect.Field;
 
 /**
@@ -9 +7 @@
 public enum SpectralUnit
 {
-    NM,
+    NM_VACUUM,
+    NM_STANDARD,
     CM
 

tapas/web/project/formTapas.jsp

@@ -1 +1 @@
 <%@ page import="com.ether.WebException" %>
+<%@ page import="com.ether.SpectralUnit" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
@@ -29 +30 @@
     <tiles:put name="body" type="string">
 
-        <div id="formulaire">
-
-        </div>
+        <div id="formulaire"></div>
 
         <div id="errors"></div>
@@ -39 +38 @@
             tapasTexts["label.submitButton"] = '<spring:message code="label.submitButton"/>';
             tapasTexts["<%=WebException.WebCode.ERROR_JSON_TAPAS_IS_NULL%>"] = "<spring:message code="error.ERROR_JSON_TAPAS_IS_NULL"/>";
+            tapasTexts["<%=SpectralUnit.NM_STANDARD%>"] = "<spring:message code="label.spectralUnit.NM_STANDARD"/>";
+            tapasTexts["<%=SpectralUnit.NM_VACUUM%>"] = "<spring:message code="label.spectralUnit.NM_VACUUM"/>";
+            tapasTexts["<%=SpectralUnit.CM%>"] = "<spring:message code="label.spectralUnit.CM"/>";
 
-            //var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonObservatories},${jSonSelectUnits});
-            var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonObservatories});
+            var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonObservatories}, ${jSonSpectralUnits});
         </script>
 

tapas/web/project/formTapas_script.jsp

@@ -2 +2 @@
 var InterfaceTapas = Class.create( {
 
-    initialize: function( jsonFileFormats, jsonYesNos, jsonObservatories )
+    initialize: function( jsonFileFormats, jsonYesNos, jsonObservatories, jSonSpectralUnits )
     {
         /** *********** CONTAINERS *********** **/
@@ -11 +11 @@
         this.jsonYesNos = jsonYesNos || null;
         this.jSonObservatories = jsonObservatories || null;
-        //this.jSonSelectUnits = jsonSelectUnits || null;
+        this.jSonSpectralUnits = jSonSpectralUnits || null;
 
         this.containerErrors.hide();
@@ -103 +103 @@
         this.createTr( "LOS declension", "ide", tabObservation );
         this.createTr( "Zenith angle", "iza", tabObservation );
-        // this.createTrList("Spectral unit", "ispectral_choice", tabObservation, 'spectralUnit');
+        this.createTrList( "Spectral unit", "ispectral_choice", tabObservation, 'spectralUnit' );
         this.createTr( "Spectral range", "ispectral_ranger", tabObservation );
 
@@ -207 +207 @@
         //ajouter select vide avec add
         this.selectSpectralUnits.add( "-1", "-- Select unit --" );
-        jQuery.each( this.jSonSpectralUnit, jQuery.proxy( function ( i, jsonSpectralUnit )
+        jQuery.each( this.jSonSpectralUnits, jQuery.proxy( function ( i, jsonSpectralUnit )
         {
-            this.selectSpectralUnits.add( jsonSpectralUnit.id, jsonSpectralUnit.name );
+            this.selectSpectralUnits.add( jsonSpectralUnit.value, tapasTexts[jsonSpectralUnit.value] );
         }, this ) );
         this.selectSpectralUnits.selectFirst( true );
@@ -238 +238 @@
 
         preference.rayleighExtinction = new Object();
-        ;
+
         preference.h2oExtinction = pair;
         preference.o3Extinction = pair;

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

@@ -8 +8 @@
 import com.ether.tapas.Tapas;
 import com.ether.user.User;
-import com.ether.user.UserRole;
 import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
@@ -15 +14 @@
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
@@ -30 +27 @@
     /** *********************** VIEWS ***************************** **/
     /** *********************************************************** **/
+    /**
+     * View for the form
+     *
+     * @return
+     * @throws WebException
+     */
     //@ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = true, defaultView = VIEW_INDEX)
     @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = false, defaultView = VIEW_INDEX)
@@ -43 +46 @@
             jsonObject.put( "jSonYesNos", getJSONYesNo() );
             jsonObject.put( "jSonObservatories", allObservatories );
+            jsonObject.put( "jSonSpectralUnits", getJSONSpectralUnit() );
             return jsonObject;
         }
@@ -53 +57 @@
 
 
-
-
-
     /** *********************************************************** **/
     /** *********************** CALLS ***************************** **/
     /** *********************************************************** **/
+    /**
+     * This method create a XML file filled with the javaTapas fields
+     *
+     * @param javaTapas
+     * @param user
+     * @return
+     * @throws WebException
+     */
     @ControllerMethod(jsonResult = true, userMandatory = true)
     public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) // TODO rajouter parametre USER
@@ -89 +98 @@
         {
             final JSONObject jsonFileFormat = new JSONObject();
-            jsonFileFormat .put( "text", fileFormat.name() );
-            jsonFileFormat .put( "value", fileFormat.name() );
-            jsonFileFormats.add( jsonFileFormat  );
+            jsonFileFormat.put( "text", fileFormat.name() );
+            jsonFileFormat.put( "value", fileFormat.name() );
+            jsonFileFormats.add( jsonFileFormat );
         }
         return jsonFileFormats;
@@ -105 +114 @@
         {
             final JSONObject jsonYesNo = new JSONObject();
-            jsonYesNo .put( "text", yesNo.name() );
-            jsonYesNo .put( "value", yesNo.name() );
+            jsonYesNo.put( "text", yesNo.name() );
+            jsonYesNo.put( "value", yesNo.name() );
             jsonYesNos.add( jsonYesNo );
         }
         return jsonYesNos;
+    }
+
+    private List<JSONObject> getJSONSpectralUnit()
+    {
+        final SpectralUnit[] spectralUnits = SpectralUnit.values();
+
+        final List<JSONObject> jsonSpectralUnits = new ArrayList<JSONObject>( spectralUnits.length );
+
+        for( final SpectralUnit spectralUnit : spectralUnits )
+        {
+            final JSONObject jsonSpectralUnit = new JSONObject();
+            jsonSpectralUnit.put( "text", spectralUnit.name() );
+            jsonSpectralUnit.put( "value", spectralUnit.name() );
+            jsonSpectralUnits.add( jsonSpectralUnit );
+        }
+        return jsonSpectralUnits;
     }
 

tapas/web/src/messages_en.properties

@@ -24 +24 @@
 
 label.submitButton=RUN
+
+label.spectralUnit.NM_STANDARD=Standard Wavelength (nm)
+label.spectralUnit.NM_VACUUM=Vacuum Wavelength (nm)
+label.spectralUnit.CM=Wavenumber (cm-1)
 
 ################################################################
@@ -108 +112 @@
 
 bo.user.emailNotSend=The email to the user cannot be sent, the email seems not valid :
+

tapas/web/src/messages_fr.properties

@@ -24 +24 @@
 
 label.submitButton=COURIR
+
+label.spectralUnit.NM_STANDARD=Standard Wavelength (nm)
+label.spectralUnit.NM_VACUUM=Vacuum Wavelength (nm)
+label.spectralUnit.CM=Wavenumber (cm-1)
 
 ################################################################