Changeset 722 for ether_iasi

Timestamp:

01/17/13 18:23:32 (11 years ago)

Author:

cbipsl

Message:

Mise à jour interface quicklook

Location:

ether_iasi/trunk/web

Files:

• project/quicklook.jsp (modified) (1 diff)
• project/quicklook_script.jsp (modified) (10 diffs)
• src/com/ether/Controller.java (modified) (2 diffs)
• src/messages_en.properties (modified) (1 diff)
• src/messages_fr.properties (modified) (1 diff)

ether_iasi/trunk/web/project/quicklook.jsp

@@ -43 +43 @@
 
     <div class="containerTools">
-        <div id="containerTools"></div>
-        <div class="selectTools">
+        <div id="containerSelect"></div>
+        <div id="containerCalendar" class="selectTools">
             <spring:message code="label.date"/> :<br/>
             <input type="text" id="beginDate" size="10"/>

ether_iasi/trunk/web/project/quicklook_script.jsp

@@ -8 +8 @@
             /** *********** CONTAINERS *********** **/
             this.parent = $( "#pageWrapper" );
-            this.containerTools = $( "#containerTools" );
+            this.containerSelect = $( "#containerSelect" );
+            this.containerCalendar = $( "#containerCalendar" );
             this.containerQuickLookA = $( "#containerQuickLookA" );
             this.containerQuickLookB = $( "#containerQuickLookB" );
@@ -29 +30 @@
 
 
-            var quickLookButton = new Button( {id:"quickLookButton", value:"<spring:message code="label.quicklook.button"/>", parent:this.containerTools, className: "small", onClick:jQuery.proxy( this.onClickButton, this )} );
+            var quickLookButton = new Button( {id:"quickLookButton", value:"<spring:message code="label.quicklook.button"/>", parent:this.containerSelect, className: "small", onClick:jQuery.proxy( this.onClickQuicklook, this )} );
         },
 
@@ -37 +38 @@
             div.html( '<spring:message code="label.satellite"/> :' );
             div.addClass( "selectTools" );
-            this.containerTools.append( div );
+            this.containerSelect.append( div );
 
             var paramSelect = new Object();
@@ -54 +55 @@
             div.html( '<spring:message code="label.projection"/> :' );
             div.addClass( "selectTools" );
-            this.containerTools.append( div );
+            this.containerSelect.append( div );
 
             var paramSelect = new Object();
@@ -72 +73 @@
             div.html( '<spring:message code="label.species"/> :' );
             div.addClass( "selectTools" );
-            this.containerTools.append( div );
+            this.containerSelect.append( div );
 
             var paramSelect = new Object();
@@ -80 +81 @@
             this.selectSpecies.add( "CO", 'CO' );
             this.selectSpecies.add( "H2O",'H2O' );
-            this.selectSpecies.add( "TS",'Temp. Surf.' )
+            this.selectSpecies.add( "TS",'Temp. Surf.' );
             this.selectSpecies.selectFirst();
         },
@@ -98 +99 @@
             } );
 
-
-
-//        $( "#beginDate" ).val( this.firstDate );
-//        $( "#endDate" ).val( this.lastDate );
-//        this.beginDate = this.calendarConverter.parse( $( "#beginDate" ).val() ).getTime();
-//        this.endDate = this.calendarConverter.parse( $( "#endDate" ).val() ).getTime();
-
-//        this.clearCalendarButton = new Button( {value:interfaceTexts["visualization.button.clear"], parent:this.containerOptionCalendar, id:"button_clear_calendar", className:"small", onClick:jQuery.proxy( this.onClickClear, this )} );
+            this.clearCalendarButton = new Button( {value:'<spring:message code="label.clear"/>', parent:this.containerCalendar, id:"button_clear_calendar", className:"small", onClick:jQuery.proxy( this.onClickClear, this )} );
 
         },
@@ -113 +107 @@
         {
             $.ajax( {
-                url: "statistic?methodName=searchMainStatisticsByProject&name=" + this.selectedLogo.id,
+                url: "project?methodName=getQuicklookByValues&satellite="+ this.selectSatellites.getValue()+"&projection="+this.selectProjections.getValue()+"&species="+this.selectSpecies.getValue()+"&date="+this.beginDate,
                 success:jQuery.proxy( this.handleQuickLooksBySelectValues, this ),
                 error: jQuery.proxy( this.showErrors, this )
@@ -123 +117 @@
         handleQuickLooksBySelectValues: function( result )
         {
-//        this.displaySummary();
+
+            var plotName = jQuery.parseJSON( result ).plotNameResult;
+            this.containerQuickLookA.html(plotName);
         },
 
 
         // EVENTS ********************************************************
-        onClickButton: function()
+        onClickQuicklook: function()
         {
-            alert( "paf : " + this.selectProjections.getValue() + ",  " + this.selectSatellites.getValue() );
+            this.requestQuickLooksBySelectValues();
         },
 
@@ -136 +132 @@
         {
             this.beginDate = this.calendarConverter.parse( $( "#beginDate" ).val() ).getTime();
+        },
+
+        onClickClear: function()
+        {
+            $( "#beginDate" ).val( "" );
+            this.beginDate = false;
         },
 

ether_iasi/trunk/web/src/com/ether/Controller.java

@@ -12 +12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -45 +48 @@
     /** *********************************************************** **/
     /**
-     * Search main statistics for the selected project
      *
-     * @param projectName
+     * @param satellite
+     * @param projection
+     * @param species
+     * @param strDate
      * @return
-     * @throws ServiceException
+     * @throws WebException
      */
-    @ControllerMethod(jsonResult = true, loginMandatory = true)
-    public JSONObject searchMainStatisticsByProject( @Mandatory @ParamName(ParameterConstants.PARAMETER_NAME) final String projectName )
-            throws ServiceException
+    @ControllerMethod(jsonResult = true)
+    public JSONObject getQuicklookByValues( @Mandatory @ParamName("satellite") final String satellite,
+                                            @Mandatory @ParamName("projection") final String projection,
+                                            @Mandatory @ParamName("species") final String species,
+                                            @Mandatory @ParamName("date") final String strDate)
+            throws WebException
     {
-//        final List<Parametre> fullParametersByPlateform = getEtherService().getParametersByPlateformId( plateformId );
-//        final List<List<Parametre>> parametersByPlateform = getEtherService().manageMenusForParameterList( fullParametersByPlateform );
+        final Calendar calendar= Calendar.getInstance();
+        calendar.setTimeInMillis( Long.valueOf( strDate ) );
+        final Date date = calendar.getTime();
+        final String fmtDate=DateHelper.formatDate( date, "yyyyMMdd" ) ;
+        final String plotName="iasi_"+species+"_"+projection+"_"+fmtDate+"_"+satellite+".png";
+        final JSONObject result = new JSONObject();
+        result.put("plotNameResult",plotName );
+        return result;
 
-        final JSONObject result = new JSONObject();
-//        result.put( ParameterConstants.PARAMETER_PARAMETERS, getJsonHelper().toJSON( parametersByPlateform ) );
-        return result;
     }
 

ether_iasi/trunk/web/src/messages_en.properties

@@ -23 +23 @@
 label.daycalendar=Day
 label.quicklook.button=Get quicklook
+label.clear=Clear

ether_iasi/trunk/web/src/messages_fr.properties

@@ -24 +24 @@
 label.daycalendar=Jour
 label.quicklook.button=Go quicklook
+label.clear=Initialiser