Changeset 285 for ether_megapoli

Timestamp:

12/05/11 17:51:54 (12 years ago)

Author:

vmipsl

Message:

Login BO
visu sous-menus

Location:

ether_megapoli/trunk

Files:

• common/implementation/com/ether/MethodDescription.java (modified) (3 diffs)
• common/implementation/com/ether/annotation/ControllerMethod.java (modified) (2 diffs)
• web/backoffice/index.jsp (modified) (2 diffs)
• web/resources/js/classesForJQuery/etherClasses.js (modified) (8 diffs)
• web/resources/jsp/backofficeHead.jsp (modified) (1 diff)
• web/src/ApplicationResources_en.properties (modified) (1 diff)
• web/src/com/ether/ControllerBackoffice.java (modified) (1 diff)
• web/src/com/ether/ControllerVisualization.java (modified) (5 diffs)
• web/visualization/visu_parameter_by_pf-script.jsp (modified) (8 diffs)
• web/visualization/visu_parameter_by_pf.jsp (modified) (2 diffs)

ether_megapoli/trunk/common/implementation/com/ether/MethodDescription.java

@@ -15 +15 @@
         _method = method;
         _view = annotation.view();
+        _defaultView = annotation.defaultView();
         _isJsonResult = annotation.jsonResult();
         _isLoginMandatory = annotation.loginMandatory();
@@ -36 +37 @@
     {
         return _view;
+    }
+
+    @Nullable
+    public String getDefaultView()
+    {
+        return _defaultView;
+    }
+
+    public void setDefaultView( @Nullable final String defaultView )
+    {
+        _defaultView = defaultView;
     }
 
@@ -100 +112 @@
     @NotNull
     private String _view;
+    @Nullable
+    private String _defaultView;
     private Boolean _isJsonResult;
     @Nullable

ether_megapoli/trunk/common/implementation/com/ether/annotation/ControllerMethod.java

@@ -2 +2 @@
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.annotation.ElementType;
@@ -21 +22 @@
 
     boolean backofficeMethod() default false;
+
+    @Nullable String defaultView() default "";
 }

ether_megapoli/trunk/web/backoffice/index.jsp

@@ -2 +2 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <tiles:insert page="/resources/templates/templateBackoffice.jsp" flush="true">
@@ -20 +21 @@
             <img src="resources/images/engrenage.png"/>
         </center>
+
+        <c:if test="${not empty errors}">
+            <BR/><BR/><BR/><BR/>
+            <div id="errors"><bean:message key="${errors}"/></div>
+        </c:if>
+
     </tiles:put>
-
 </tiles:insert>

ether_megapoli/trunk/web/resources/js/classesForJQuery/etherClasses.js

@@ -9 +9 @@
         jQuery.each( jsonElements, jQuery.proxy( function( i, jsonElement )
         {
-//            if( jQuery.isArray( jsonElement ) && 1 < jsonElement.length )
-//                var subItems = new ListItem( jsonElement, new Object() );
-//            else
             this.addItem( jsonElement, objectParameter );
         }, this ) );
@@ -123 +120 @@
     },
 
+    getNameWithCode: function ()
+    {
+        if( jQuery.isArray( this.jsonElement ) )
+            return this.jsonElement[0].name + " (" + this.jsonElement[0].code + ")";
+        else
+            return this.jsonElement.name + " (" + this.jsonElement.code + ")";
+    },
+
     getContentType: function()
     {
@@ -135 +140 @@
             this.divContainer.addClass( classNameValue );
         if( jQuery.isArray( this.jsonElement ) && 1 < this.jsonElement.length )
-            this.divContainer.attr( {id:containerName + "_MENU_" + this.getId()} );
+            this.divContainer.attr( {id:containerName + "_MENU"} );
         else
             this.divContainer.attr( {id:containerName + "_" + this.getId()} );
@@ -224 +229 @@
 
             this.divHiddenElements = $( document.createElement( "div" ) );
-            this.divHiddenElements.attr( {id:"divMenu_content" + this.getId(), class:"divMenu_content" } );
+            this.divHiddenElements.attr( {class:"divMenu_content" } );
 
             jQuery.each( this.jsonElement, jQuery.proxy( function ( i, element )
@@ -232 +237 @@
                 divSubMenu_name.addClass( "parameter_menu_" + element.id );
                 divSubMenu_name.html( element.code );
-                divSubMenu_name.bind( 'click', {divContainer:this.divContainer, jsonElement:element}, this.onClickMenu );
+                divSubMenu_name.bind( 'click', {divContainer:this.divContainer, jsonElement:[element]}, this.onClickMenu );
                 this.divHiddenElements.append( divSubMenu_name );
             }, this ) );
@@ -248 +253 @@
                         $( "#divMenu_arrow_" + this.getId() ).removeClass( "deployed" );
                         this.divHiddenElements.animate( {height:"toggle"}, 100 );
-                    }, this )
-                    );
+                    }, this ) );
 
             divMenu_arrow.toggle(
@@ -261 +265 @@
                         $( "#divMenu_arrow_" + this.getId() ).removeClass( "deployed" );
                         this.divHiddenElements.animate( {width:"toggle"}, 100 );
-                    }, this )
-                    );
+                    }, this ) );
         }
         else
@@ -270 +273 @@
     onClickMenu: function( event )
     {
-        var jsonElement = event.data.jsonElement;
-        event.data = event.data.divContainer.item;
-        event.data.jsonElement = jsonElement;
+        event.data.divContainer.item.jsonElement = event.data.jsonElement;
     }
 

ether_megapoli/trunk/web/resources/jsp/backofficeHead.jsp

@@ -59 +59 @@
         onClickHome: function()
         {
-            document.location.href = "backoffice?methodName=view";
+            document.location.href = "backoffice?methodName=home";
         },
 

ether_megapoli/trunk/web/src/ApplicationResources_en.properties

@@ -446 +446 @@
 app.dataProtocol.account=Your account is waiting for administrator validation. You will receive an email when it will be activated.
 app.dataProtocol.alreadyExist=This email is already used, you have to give another one
+app.unknown.login=Unknown login
+app.access.not.allowed=You are not authorized to access to backoffice
 
 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/ControllerBackoffice.java

@@ -30 +30 @@
         extends ControllerEther
 {
-    // TODO : mettre un pwd pour chaque méthode !!!
-
     /** *********************************************************** **/
     /** *********************** VIEWS ***************************** **/

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

@@ -17 +17 @@
 import org.jdom.output.XMLOutputter;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Required;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -70 +69 @@
             throws ServiceException
     {
-        final List<Plateforme> plateforms = _etherService.getAllPlateforms();
-        final Date firstDate = _etherService.getFirstDate();
-        final Date endDate = _etherService.getLastDate();
+        final List<Plateforme> plateforms = getEtherService().getAllPlateforms();
+        final Date firstDate = getEtherService().getFirstDate();
+        final Date endDate = getEtherService().getLastDate();
 
         final Map<String, Object> model = new HashMap<String, Object>();
@@ -90 +89 @@
             throws ServiceException, EtherException
     {
-        final List<Parametre> fullParametersByPlateform = _etherService.getParametersByPlateformId( plateformId );
+        final List<Parametre> fullParametersByPlateform = getEtherService().getParametersByPlateformId( plateformId );
         final List<List<Parametre>> parametersByPlateform = manageMenusForParameterList( fullParametersByPlateform );
 
@@ -274 +273 @@
     }
 
-    @Required
-    public void setEtherService( @NotNull final EtherService etherService )
-    {
-        _etherService = etherService;
-    }
-
     private static final Log LOGGER = LogFactory.getLog( ControllerVisualization.class );
 
@@ -289 +282 @@
     private static final String FORMAT_DEFAULT = "NASA-AMES";
     private static final String COMPRESSION_DEFAULT = "None";
-    private EtherService _etherService;
-}
+ }

ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp

@@ -18 +18 @@
         this.selectedPlateform = false;
         this.selectedParameter = false;
+        // This variable is needed to manage the subMenu id's
+        this.selectedParameterId = false;
         this.beginDate = false;
         this.endDate = false;
@@ -202 +204 @@
         if( this.selectedParameter )
             this.selectedParameter = false;
+        this.selectedParameterId = false;
 
         // Change axe's list select
@@ -223 +226 @@
     onSelectParameter: function( objParameter )
     {
-        if( this.selectedParameter && objParameter.getId() == this.selectedParameter.getId() )
+        if( this.selectedParameter && objParameter.getId() == this.selectedParameterId )
             return;
 
@@ -230 +233 @@
             this.selectedParameter.unselect();
 
+        this.selectedParameterId = objParameter.getId();
         this.selectedParameter = objParameter;
         this.selectedParameter.select();
 
         // Change title
-        $( "#textareaTitle" ).html( this.selectedPlateform.getName() + " - " + this.selectedParameter.getName() );
+        $( "#textareaTitle" ).html( this.selectedPlateform.getName() + " - " + this.selectedParameter.getNameWithCode() );
 
         // Update number and list of parameter to display
@@ -318 +322 @@
 
         $dialog.dialog( 'open' );
-//        return false;
     },
 
@@ -374 +377 @@
                 // INIT
                 this.selectPlots.clear();
-                this.selectParameters.empty();
+                this.selectParameters = $();
                 this.selectPlotsPlateformType = false;
 
@@ -416 +419 @@
                     this.selectPlots.select( plotValue, false );
                     this.selectPlotsPlateformType = this.selectedPlateform.jsonElement.type;
-//                    if( !isParameterAlreadySelected )
-                    this.selectParameters.push( this.selectedParameter.getId() );
+                    if( !isParameterAlreadySelected )
+                        this.selectParameters.push( this.selectedParameter.getId() );
 
                     this.numberParameterToDisplay = this.selectPlots.getSize();
@@ -436 +439 @@
         if( 1 <= this.numberParameterToDisplay && 1 <= this.selectPlots.getSize() )
         {
-            var index = 0;
-            this.selectPlots.arrayOptions.each( function( option )
+            this.selectPlots.arrayOptions.each( function( index, option )
             {
                 arrayPIdPId[index] = option.itemValue;
-                index++;
             } );
         }

ether_megapoli/trunk/web/visualization/visu_parameter_by_pf.jsp

@@ -61 +61 @@
             <div id="containerOptionTitle" class="span-5">
                 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.titleChoice"/></div>
-                <textarea id="textareaTitle" cols="25" rows="1"></textarea>
+                <textarea id="textareaTitle" cols="25" rows="3"></textarea>
             </div>
 
@@ -82 +82 @@
         </div>
 
-         ee${axeTypesForFixedPlateforms}rr
         <script type="text/javascript">
             var interfaceTexts = $A( "" );