Changeset 445 for tapas/web

Timestamp:

04/02/12 16:23:01 (12 years ago)

Author:

vmipsl

Message:

gestion date calendrier/serialisation

Location:

tapas/web

Files:

• project/formTapas_script.jsp (modified) (7 diffs)
• src/com/ether/Controller.java (modified) (1 diff)
• src/com/ether/ControllerEther.java (modified) (4 diffs)
• src/com/ether/WebHelper.java (modified) (3 diffs)

tapas/web/project/formTapas_script.jsp

@@ -88 +88 @@
         td1.html( texte1 );
         td3.html( texte2 );
-        td2.append(input1);
-        td3.append(input2);
-
-        tr.append(td1);
-        tr.append(td2);
-        tr.append(td3);
-        tr.append(td4);
-        container.append(tr);
+        td2.append( input1 );
+        td3.append( input2 );
+
+        tr.append( td1 );
+        tr.append( td2 );
+        tr.append( td3 );
+        tr.append( td4 );
+        container.append( tr );
     },
 
@@ -143 +143 @@
     handleCreateXML: function( result )
     {
-        var bob = jQuery.parseJSON( result ).result;
-        alert( bob );
+        try
+        {
+            var bob = jQuery.parseJSON( result ).result;
+            alert( "OK " + bob );
+        }
+        catch( err )
+        {
+            document.location.reload();
+        }
     },
 
@@ -270 +277 @@
         //this.tabInput = new Array(3);
         this.createTrList( "File format", "iformat", tabPreference, 'format' );
-        this.createTrList( "Rayleigh extinction", "irextinction", tabPreference,'yesno' );
+        this.createTrList( "Rayleigh extinction", "irextinction", tabPreference, 'yesno' );
         this.createTrList( "H20 extinction", "ih2oe", tabPreference, 'yesno' );
         this.createTrList( "O3 extinction", "io3e", tabPreference, 'yesno' );
@@ -305 +312 @@
 
         // Ajout du calendrier APRES la création du formulaire
-       this.createCalendar( tabObservation, "Date measurement");
+        this.createCalendar( tabObservation, "Date measurement" );
 
         //jQuery.proxy permet d'envoyer le contexte this courant
@@ -322 +329 @@
         //toutes les valeurs possibles
         preference.format.firstValue = this.selectFormats.getValues();
-
         //la valeur selectionnee
         preference.format.secondValue = this.selectFormats.getValue();
 
         preference.rayleighExtinction = new Object
-        preference.rayleighExtinction.firstValue="YES,NO";
-        preference.rayleighExtinction.secondValue=$( "#select_irextinction" ).val();
-
+        preference.rayleighExtinction.firstValue = "YES,NO";
+        preference.rayleighExtinction.secondValue = $( "#select_irextinction" ).val();
 
         preference.h2oExtinction = new Object();
-        preference.h2oExtinction.firstValue="YES,NO";
-        preference.h2oExtinction.secondValue=$( "#select_ih2oe" ).val();
-
+        preference.h2oExtinction.firstValue = "YES,NO";
+        preference.h2oExtinction.secondValue = $( "#select_ih2oe" ).val();
 
         preference.o3Extinction = new Object();
-        preference.o3Extinction.firstValue="";
-        preference.o3Extinction.secondValue="";
+        preference.o3Extinction.firstValue = "";
+        preference.o3Extinction.secondValue = "";
 
         preference.o2Extinction = new Object();
-        preference.o2Extinction.firstValue="";
-        preference.o2Extinction.secondValue="";
+        preference.o2Extinction.firstValue = "";
+        preference.o2Extinction.secondValue = "";
 
         preference.co2Extinction = new Object();
-        preference.co2Extinction.firstValue="";
-        preference.co2Extinction.secondValue="";
+        preference.co2Extinction.firstValue = "";
+        preference.co2Extinction.secondValue = "";
 
 
         // OBSERVATION
         var observatory = new Object();
-
         observatory.name = "";
-
-
-        observatory.longitude = "";
-        observatory.latitude = "";
-        observatory.altitude = "";
-
+        observatory.longitude = 1;
+        observatory.latitude = 2;
+        observatory.altitude = 3;
 
         // Los
         var los = new Object();
-
-
         los.raJ2000 = "";
         los.decJ2000 = "";
-
         los.zenithAngle = new Object();
         los.zenithAngle.min = "0";
         los.zenithAngle.max = "90";
-        los.zenithAngle.value = "";
-
-
+        los.zenithAngle.value = "2";
 
         // Instrument
         var instrument = new Object();
-
         instrument.spectralChoice = new Object();
         instrument.spectralChoice.firstValue = this.selectSpectralUnits.getValues();
         instrument.spectralChoice.secondValue = this.selectSpectralUnits.getValue();
-
         instrument.spectralRange = "";
 
@@ -395 +388 @@
         instrument.samplingRatio.secondValue = "";
 
-
-       var observation = new Object();
-       observation.date = this.calendarConverter.parse( $( "#iobservation_date" ).val() );
-       observation.observatory = observatory;
-
+        var observation = new Object();
+        observation.date = this.calendarConverter.parse( $( "#iobservation_date" ).val() );
+        observation.observatory = observatory;
         observation.los = los;
         observation.instrument = instrument;
@@ -406 +397 @@
         // ATMOSPHERE
         var atmosphere = new Object();
-
         atmosphere.reference = new Object();
         atmosphere.reference.firstValue = this.selectClimatoReferences.getValues();

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

@@ -70 +70 @@
      * @throws WebException
      */
-    @ControllerMethod(jsonResult = true, userMandatory = true)
+    @ControllerMethod(jsonResult = true, userMandatory = true, defaultView = VIEW_INDEX)
     public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) // TODO rajouter parametre USER
             throws WebException
     {
-        String toto="lmml";
+        String toto = "lmml";
 
         if( null == javaTapas )

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

@@ -66 +66 @@
         {
             final String webInfPath = getServletContext().getRealPath( "WEB-INF" );
-            return WebHelper.getProperty( webInfPath, property );
+            return WebHelper.getProperty( webInfPath + "/classes/", WebHelper.PROPERTIES_FILE, property );
         }
         catch( IOException e )
@@ -72 +72 @@
             throw new WebException( WebException.WebCode.ERROR_TO_READ_FILE_PROPERTIES, e );
         }
+    }
+
+    /**
+     * This method return the text from the files messages**.properties
+     *
+     * @param code
+     * @return
+     */
+    public String getMessage( @NotNull final String code )
+    {
+        final String webInfPath = getServletContext().getRealPath( "WEB-INF" );
+        return WebHelper.getMessage( webInfPath, code );
     }
 
@@ -85 +97 @@
 
             request.setCharacterEncoding( UTF8Charset.getEncoding() );
+//            String message = getMessage( "bo.fulltitle" );
 
             // Get method to call
@@ -132 +145 @@
             }
 
-            if (methodDescription.isUserMandatory()) {
+            if( methodDescription.isUserMandatory() )
+            {
                 final User user = (User) request.getSession().getAttribute( "SES_USER" );
-
                 if( null == user )
                     return new ModelAndView( defaultView, "errors", "login.error.unknown" );
                 else
                     params[params.length - 1] = user;
-
             }
 

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

@@ -8 +8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.context.MessageSource;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import javax.servlet.ServletOutputStream;
@@ -106 +108 @@
         {
             final String webInfPath = request.getSession().getServletContext().getRealPath( "WEB-INF" );
-            return getProperty( webInfPath, property );
+            return getProperty( webInfPath + "/classes/", PROPERTIES_FILE, property );
         }
         catch( IOException e )
@@ -115 +117 @@
 
     /**
-     * Returns the property writed in the properties file
+     * Returns the property writed in a properties file
      *
-     * @param webInfPath
-     * @param property
-     * @return
+     * @param pathFile
+     * @param fileName
+     * @param property @return
      * @throws IOException
      */
-    public static String getProperty( @NotNull final String webInfPath, @NotNull final String property )
+    public static String getProperty( @NotNull final String pathFile, final String fileName, @NotNull final String property )
             throws IOException
     {
         final Properties prop = new Properties();
-        prop.load( new FileInputStream( webInfPath + "/classes/" + PROPERTIES_FILE ) );
+        prop.load( new FileInputStream( pathFile + fileName ) );
         return prop.getProperty( property );
     }
 
-    private static final Log LOGGER = LogFactory.getLog( WebHelper.class );
+    /**
+     * This method return the text from the files messages**.properties
+     *
+     * @param code
+     * @return
+     */
+    public static String getMessage( @NotNull final String webInfPath, @NotNull final String code )
+    {
+        final MessageSource resources = new ClassPathXmlApplicationContext( webInfPath + "/classes/servlet-context.xml" );
+        final String message = resources.getMessage( code, null, "Default", null );
+        return message;
+    }
 
     public static final int STATUS_CODE_SERVICE_EXCEPTION = 500;
+    public static final String PROPERTIES_FILE = "tapas.properties";
+
+    private static final Log LOGGER = LogFactory.getLog( WebHelper.class );
     private static final String CONTENT_TYPE_TEXT_JSON = "text/javascript;charset=" + UTF8Charset.getEncoding();
-    private static final String PROPERTIES_FILE = "tapas.properties";
 }