Changeset 432 for ether_ndacc

Timestamp:

03/22/12 15:13:39 (12 years ago)

Author:

rboipsl

Message:

clean

Location:

ether_ndacc/trunk

Files:

• .idea (added)
• .idea/.name (added)
• .idea/ant.xml (added)
• .idea/artifacts (added)
• .idea/artifacts/NDACC.xml (added)
• .idea/compiler.xml (added)
• .idea/copyright (added)
• .idea/copyright/profiles_settings.xml (added)
• .idea/encodings.xml (added)
• .idea/inspectionProfiles (added)
• .idea/inspectionProfiles/Project_Default.xml (added)
• .idea/inspectionProfiles/profiles_settings.xml (added)
• .idea/libraries (added)
• .idea/libraries/junit_4_8.xml (added)
• .idea/libraries/lib.xml (added)
• .idea/misc.xml (added)
• .idea/modules.xml (added)
• .idea/projectCodeStyle.xml (added)
• .idea/uiDesigner.xml (added)
• .idea/vcs.xml (added)
• .idea/webContexts.xml (added)
• common/Common.iml (added)
• common/implementation/com/ether/DateHelper.java (copied) (copied from tapas/common/implementation/com/ether/DateHelper.java) (2 diffs)
• ndacc.ipr (added)
• persistence/Persistence.iml (added)
• service/Service.iml (added)
• web/Web.iml (added)
• web/resources/images/1585_001.tif (deleted)
• web/resources/images/1612_001.tif (deleted)
• web/resources/images/dobson.jpg (added)
• web/resources/visu_old/ddu/lidar/aerosols (added)
• web/resources/visu_old/ddu/lidar/o3_strato (added)
• web/resources/visu_old/ohp/lidar/aerosols (added)
• web/resources/visu_old/ohp/lidar/o3_strato (added)
• web/src/com/ether/Controller.java (modified) (5 diffs)

ether_ndacc/trunk/common/implementation/com/ether/DateHelper.java

@@ -1 +1 @@
 package com.ether;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jetbrains.annotations.Nullable;
 
 import java.text.DateFormat;
@@ -7 +11 @@
 import java.util.Date;
 import java.util.Locale;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jetbrains.annotations.Nullable;
 
 /**

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

@@ -12 +12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -250 +251 @@
                 String rep = "";
                 String year = dateinf.substring( 0, 4 );
-                String month= dateinf.substring( 4, 6 );
+                String month = dateinf.substring( 4, 6 );
 
                 if( station.compareTo( "OHP" ) == 0 || station.compareTo( "ohp" ) == 0 )
@@ -258 +259 @@
                     if( year.compareTo( "1970" ) == 0 ) {
                             year = "2012";
-                            month = "01";
+                            month = DateHelper.formatDate(new Date(),"MM");
+
                     }
                 }
@@ -281 +283 @@
                 dateinf=year+month+"01";
                 final List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStationByType( instrument, dateinf, "yyyyMMdd", station, type );
-
+                String[] labelDates = new String[plotsList.size()];
+
+                for (int i=0 ; i<plotsList.size() ; i++) {
+                     labelDates[0]=plotsList.get( 0 ).substring(0,6);
+                }
 
                 //dateinf="02021980";
@@ -598 +604 @@
 
             List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStation( instrument, dateinf, "yyyyMMdd", station );
+            //List<String> plotsList = _plotService.getPlotsByDateByInstrumentByStation( instrument, dateinf, "yyyyMMdd", station );
 
             //dateinf="02021980";