Changeset 442 for tapas/web/src

Timestamp:

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

Author:

vmipsl

Message:

Spectral units

Location:

tapas/web/src

Files:

• com/ether/Controller.java (modified) (7 diffs)
• messages_en.properties (modified) (2 diffs)
• messages_fr.properties (modified) (1 diff)

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)
 
 ################################################################