Changeset 429 for ether_ndacc

Timestamp:

03/21/12 16:30:43 (12 years ago)

Author:

rboipsl

Message:

ajout realtime ecc ohp 2

Location:

ether_ndacc/trunk/web

Files:

• data_ohp.jsp (modified) (1 diff)
• data_scorebysund.jsp (modified) (1 diff)
• src/com/ether/Controller.java (modified) (7 diffs)

ether_ndacc/trunk/web/data_ohp.jsp

@@ -232 +232 @@
 </td>
 
-<td class="orange" nowrap>
+<td class="orange" nowrap align=center>
     <a href="" title="Results" onclick="OuvrirFeuilleDynW ('instrument?methodName=selectEccRT&instrument=ECC&dateinf=19700101&station=OHP&type=rt#','700','650')">
-    <img border=1 src="resources/images/results.jpg" width="60px"></img>
+    <img border=1 src="resources/images/chrono.jpg" width="50px" height="40px"></img>
     </a>
 

ether_ndacc/trunk/web/data_scorebysund.jsp

@@ -108 +108 @@
 <br><i>pattern files : sctc[yy][mm].*</i></td>
     <td class="orange" align="center" width=11%>
-        <a href="" title="Results" onclick="OuvrirFeuilleDyn ('visus_saoz.jsp?station=sod')"><img border=1 src="resources/images/results.jpg" width="60px"></img></a>
+        <a href="" title="Results" onclick="OuvrirFeuilleDyn ('visus_saoz.jsp?station=sco')"><img border=1 src="resources/images/results.jpg" width="60px"></img></a>
     </td>
 

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

@@ -238 +238 @@
 
     @ControllerMethod(view = VIEW_ECC_RT)
-        public Map<String, Object> selectEccRT( @ParamName("dateinf") final String dateinf,
+        public Map<String, Object> selectEccRT( @ParamName("dateinf") String dateinf,
                                               @ParamName("station") String station,
                                               @ParamName("instrument") final String instrument,
@@ -247 +247 @@
             {
 
-                final List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStationByType( instrument, dateinf, "yyyyMMdd", station, type );
-
-                //dateinf="02021980";
-                //List<String> ListDates = _plotService.getLastDate(instrument);
-                final List<String> listeDates = _serviceTools.getListeDates();
+
                 String rep = "";
                 String year = dateinf.substring( 0, 4 );
+                String month= dateinf.substring( 4, 6 );
 
                 if( station.compareTo( "OHP" ) == 0 || station.compareTo( "ohp" ) == 0 )
@@ -259 +256 @@
                     rep = "./resources/visu/ohp/ecc";
                     station = "OHP";
-                    if( year.compareTo( "1970" ) == 0 ) year = "2012";
+                    if( year.compareTo( "1970" ) == 0 ) {
+                            year = "2012";
+                            month = "01";
+                    }
                 }
                 else if( station.compareTo( "LA REUNION" ) == 0 || station.compareTo( "reunion" ) == 0 )
@@ -278 +278 @@
                 }
 
+
+                dateinf=year+month+"01";
+                final List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStationByType( instrument, dateinf, "yyyyMMdd", station, type );
+
+
+                //dateinf="02021980";
+                //List<String> ListDates = _plotService.getLastDate(instrument);
+                final List<String> listeDates = _serviceTools.getListeDates();
                 final Map<String, Object> model = new HashMap<String, Object>();
+
                 model.put( "plotsList", plotsList );
                 model.put( "listeDates", listeDates );
                 model.put( "firstDate", dateinf );
-                final String month = dateinf.substring( 4, 6 );
+
                 model.put( "month", month );
                 model.put( "year", year );
                 model.put( "station", station );
+
+               // model.put( "dateinf", dateinf );
                 model.put( "rep", rep );
                 return model;
+
             }
             catch( ServiceException e )
@@ -464 +476 @@
         try
         {
-
-            List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStation( instrument, dateinf, "yyyyMMdd", station );
-
             //dateinf="02021980";
             //List<String> ListDates = _plotService.getLastDate(instrument);
-            final List<String> listeDates = _serviceTools.getListeDates();
             String rep = "";
             String year = dateinf.substring( 0, 4 );
@@ -482 +490 @@
                 dateinf = year + month + "03";
             }
+
+//            dateinf="20120101";
+            dateinf=year+month+"01";
+            List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStation( instrument, dateinf, "yyyyMMdd", station );
+            final List<String> listeDates = _serviceTools.getListeDates();
+
+            final Map<String, Object> model = new HashMap<String, Object>();
+
+            model.put( "plotsList", plotsList );
+
 
 
@@ -496 +514 @@
             mView.put( "station", station );
             mView.put( "rep", rep );
+
+
 
             return mView;