Changeset 731

Timestamp:

01/18/13 17:21:45 (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) (4 diffs)
• resources/js/classesForJQuery/etherHelper.js (modified) (1 diff)
• src/com/ether/Controller.java (modified) (1 diff)

ether_iasi/trunk/web/project/quicklook.jsp

@@ -50 +50 @@
     </div>
 
-    <div id="containerQuickLookA" class="containerQuickLooks"><spring:message code="label.MetOpA"/></div>
+    <div id="containerQuickLookA" class="containerQuickLooks"><spring:message code="label.MetOpA"/>
+        <div id="containerResultA"></div>
 
-    <div id="containerQuickLookB" class="containerQuickLooks"><spring:message code="label.MetOpB"/></div>
+    </div>
+
+
+    <div id="containerQuickLookB" class="containerQuickLooks">
+        <div id="containerResultB"></div>
+    </div>
 
     <div id="errors"></div>

ether_iasi/trunk/web/project/quicklook_script.jsp

@@ -12 +12 @@
             this.containerQuickLookA = $( "#containerQuickLookA" );
             this.containerQuickLookB = $( "#containerQuickLookB" );
+            this.containerResultA = $( "#containerResultA" );
+            this.containerResultB = $( "#containerResultB" );
             this.containerErrors = $( "#errors" );
 
@@ -99 +101 @@
             } );
 
+            $( "#beginDate" ).val( formatDate( removeDaysToDate( new Date(), 1 ), "%Y-%m-%d" ));
+            this.beginDate = this.calendarConverter.parse( $( "#beginDate" ).val() ).getTime();
         },
 
@@ -116 +120 @@
         {
 
-            var plotName = jQuery.parseJSON( result ).plotNameResult;
-            this.containerQuickLookA.html(plotName);
+            var plotNameA = jQuery.parseJSON( result ).plotNameResultA;
+            var plotNameB = jQuery.parseJSON( result ).plotNameResultB;
+            if (plotNameA)
+//                this.containerResultA.html(plotNameA);
+                this.containerResultA.html("<img src='"+plotNameA+"' width='80px' height='80'>");
+             if (plotNameB)
+                this.containerResultB.html(plotNameB);
+
         },
 
@@ -124 +134 @@
         onClickQuicklook: function()
         {
+            this.containerResultA.empty();
+            this.containerResultB.empty();
             this.requestQuickLooksBySelectValues();
         },

ether_iasi/trunk/web/resources/js/classesForJQuery/etherHelper.js

@@ -78 +78 @@
 }
 
+  // This method add days to a date
+function removeDaysToDate( date, numberOfDays )
+{
+    var dayToMs = 24 * 60 * 60 * 1000;
+    var newDate = date.getTime() - numberOfDays * dayToMs;
+    return new Date( newDate );
+}
+
 // This method add hours to a date
 function addHoursToDate( date, numberOfHours )

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

@@ -72 +72 @@
         final Date date = calendar.getTime();
         final String fmtDate = DateHelper.formatDate( date, "yyyyMMdd" );
-        final String plotName = "iasi_" + species + "_" + projection + "_" + fmtDate + "_" + satellite + ".png";
+        String plotNameA = "";
+        String plotNameB = "";
+        if (satellite.equals( "metopa" ) || satellite.equals( "metopab" ))
+            plotNameA = "iasi_" + species + "_" + projection + "_" + fmtDate + "_" + satellite + ".png";
+        if (satellite.equals( "metopb" ) || satellite.equals( "metopab" ))
+            plotNameB = "iasi_" + species + "_" + projection + "_" + fmtDate + "_" + satellite + ".png";
+
         final JSONObject result = new JSONObject();
-        result.put( "plotNameResult", plotName );
+        result.put( "plotNameResultA", plotNameA );
+        result.put( "plotNameResultB", plotNameB );
         return result;