Changeset 301

Timestamp:

12/14/11 17:20:45 (13 years ago)

Author:

vmipsl

Message:

evo MGI 009 _ affichage des dates pour les plate-formes mobiles

Location:

ether_megapoli/trunk/web

Files:

• data/plateform.jsp (modified) (5 diffs)
• resources/css/megapoli.css (modified) (1 diff)
• src/ApplicationResources.properties (modified) (1 diff)
• src/ApplicationResources_en.properties (modified) (1 diff)
• src/com/ether/ControllerData.java (modified) (3 diffs)

ether_megapoli/trunk/web/data/plateform.jsp

@@ -10 +10 @@
     <tiles:put name="insertJsOrJsp" type="string">
         <ether:htmlJs jsFile="classesForJQuery/Loading"/>
+        <ether:htmlJs jsFile="calendar/anytime"/>
     </tiles:put>
 
@@ -32 +33 @@
         <div id="containerMobilePlateforms" class="plateformElement"></div>
 
-        <BR/>
-
         <div id="messages"><bean:message key="data.access.plat.fixe"/>&nbsp;:</div>
         <div id="containerFixePlateforms" class="plateformElement"></div>
@@ -48 +47 @@
             interfaceTexts["data.access.plat2"] = '<bean:message key="data.access.plat2" arg0=""/>';
             interfaceTexts["data.access.plat2.s"] = '<bean:message key="data.access.plat2" arg0="s"/>';
+            interfaceTexts["app.measure.dates"] = '<bean:message key="app.measure.dates"/>';
 
             var InterfacePlateform = Class.create( {
 
-                initialize: function( nbPlateforms, jSonPlateforms )
+                initialize: function( nbPlateforms, jSonPlateforms, mapPlateforms )
                 {
                     this.numberPlateforms = nbPlateforms || false;
                     this.jSonPlateforms = jSonPlateforms || null;
+                    this.mapPlateforms = mapPlateforms || false;
                     this.containerMobilePlateforms = $( "#containerMobilePlateforms" );
                     this.containerFixePlateforms = $( "#containerFixePlateforms" );
@@ -90 +91 @@
                     jQuery.each( this.jSonPlateforms, jQuery.proxy( function( i, item )
                     {
+                        var divMainPlateform = $( document.createElement( "div" ) );
+                        divMainPlateform.addClass( "containerElement_main_plateform" );
+
                         var divPlateform = $( document.createElement( "div" ) );
                         divPlateform.html( item.name );
                         divPlateform.addClass( "containerElement containerElement_plateform" );
                         divPlateform.bind( "click", item, this.onSelectPlateform );
+
                         if( "MOBILE" == item.type )
                         {
                             numberMobilePlateforms++;
-                            this.containerMobilePlateforms.append( divPlateform );
+                            this.containerMobilePlateforms.append( divMainPlateform );
+                            divMainPlateform.append( divPlateform );
+
+                            var divPlateformDates = $( document.createElement( "div" ) );
+                            var dateString = interfaceTexts["app.measure.dates"] + " :<BR/>";
+                            jQuery.each( this.mapPlateforms[item.id], function( j, itemDate )
+                            {
+                                dateString += "&nbsp;" + formatDate( new Date( itemDate.time ), "%Y-%m-%d" );
+                                if( 9 > j % 10 )
+                                    dateString += "&nbsp;&nbsp;&nbsp;";
+                                else
+                                    dateString += "&nbsp;<BR/>";
+                            } );
+                            divPlateformDates.html( dateString );
+                            divPlateformDates.addClass( "containerElement_plateform_dates" );
+                            divMainPlateform.append( divPlateformDates );
+
+                            divPlateform.mouseover( function( e )
+                            {
+                                divPlateformDates.toggle();
+                            } );
+
+                            divPlateform.mouseout( function( e )
+                            {
+                                divPlateformDates.toggle();
+                            } );
+
                         }
                         else
                         {
                             numberFixePlateforms++;
-                            this.containerFixePlateforms.append( divPlateform );
+                            this.containerFixePlateforms.append( divMainPlateform );
+                            divMainPlateform.append( divPlateform );
                         }
                     }, this ) );
@@ -129 +161 @@
             } );
 
-            new InterfacePlateform( ${nbPlateforms}, ${plateforms} );
+            new InterfacePlateform( ${nbPlateforms}, ${plateforms}, ${mapPlateforms} );
         </script>
 

ether_megapoli/trunk/web/resources/css/megapoli.css

@@ -202 +202 @@
 .containerElement_plateform {
     width: 84px;
+    float: left;
+}
+
+#containerMobilePlateforms .containerElement_main_plateform .containerElement_plateform:hover {
+    -moz-border-radius: 4px 0 0 4px;
+    -webkit-border-radius: 4px 0 0 4px;
+}
+
+.containerElement_plateform_dates {
+    display: none;
+    -moz-border-radius: 0 4px 4px 4px;
+    -webkit-border-radius: 0 4px 4px 4px;
+    background: #70739C;
+    color: white;
+    float: left;
+}
+
+.containerElement_main_plateform {
+    float: left;
+    width: 900px;
+}
+
+#containerMobilePlateforms {
+    padding-bottom: 117px;
 }
 

ether_megapoli/trunk/web/src/ApplicationResources.properties

@@ -453 +453 @@
 app.coordinator=Coordinateur
 app.technician=Technicien
+app.measure.dates=Dates de mesures
 
 data.visualization.general.text=Dans cette zone, vous pouvez visualiser en ligne les donn\u00E9es disponibles. Plusieurs types de visualisations vous sont propos\u00E9s :<ul><li>un param\u00E8tre pour un site</li><li>un param\u00E8tre pour plusieurs sites</li><li>diff\u00E9rents param\u00E8tre pour un site</li><li>des visualisations en 2D</li></ul>

ether_megapoli/trunk/web/src/ApplicationResources_en.properties

@@ -454 +454 @@
 app.coordinator=Coordinator
 app.technician=Technician
+app.measure.dates=Measures dates
 
 data.visualization.general.text=In this area you can visualize available data with the following types of visualization : <ul><li>one parameter by plateform</li><li>one parameter by many plateforms</li><li>differents parameters by plateform</li><li>2D visualizations</li></ul>

ether_megapoli/trunk/web/src/com/ether/ControllerData.java

@@ -62 +62 @@
     {
         final List<Plateforme> plateforms = getEtherService().getAllPlateforms();
+        final Map<Integer, List<Date>> map = new HashMap<Integer, List<Date>>( plateforms.size() );
 
         for( final Plateforme plateform : plateforms )
@@ -67 +68 @@
             if( "MOBILE".equals( plateform.getTypePlateforme().getTypePlateformeNom() ) )
             {
-                List<Date> dates = getEtherService().getAllMeasureDateByPlateformId( plateform.getPlateformeId() );
-                final String bob = "bib";
+                final List<Date> dates = getEtherService().getAllMeasureDateByPlateformId( plateform.getPlateformeId() );
+                map.put( plateform.getPlateformeId(), dates );
             }
         }
@@ -75 +76 @@
         result.put( "nbPlateforms", plateforms.size() );
         result.put( "plateforms", getJsonHelper().toJSON( plateforms ) );
+        result.put( "mapPlateforms", map );
         return result;
     }