Changeset 691 for ether_statistics/web/project/statistics-script.jsp

Timestamp:

01/07/13 17:30:29 (12 years ago)

Author:

vmipsl

Message:

remove drag and drop
clean
select months

File:

• ether_statistics/web/project/statistics-script.jsp (modified) (11 diffs)

ether_statistics/web/project/statistics-script.jsp

@@ -33 +33 @@
             {id:"GEISA", img:"logo_geisa_50.jpg", top:"22px", left:"167.667px"},
             {id:"TAPAS", img:"logo_tapas_50.png", top:"58.3333px", left:"125px"},
-            {id:"OUTREACH", img:"logo_acomida_50.jpg", top:"-77.3333px", left:"225px"},
+            {id:"ACOMIDA", img:"logo_acomida_50.jpg", top:"-77.3333px", left:"225px"},
             {id:"OMER7A", img:"logo_omer7A_50.jpg", top:"22.6667px", left:"76.3334px"},
             {id:"GIRAFE", img:"logo_girafe_50.JPG", top:"-79.6667px", left:"192.333px"},
@@ -45 +45 @@
         this.bindButtons();
         this.createMenuLogo();
+        this.isMonthAndYearSelected = false;
 
         $( document ).ready( jQuery.proxy( function()
         {
-            $( ".containerToDrag" ).draggable();
             // Menu
             this.animateMenuLogos();
@@ -65 +65 @@
     bindButtons: function()
     {
-        $( "#home_button" ).bind( "dblclick", this.onClickHome );
-        $( "#language_button" ).bind( "dblclick", jQuery.proxy( this.onClickLanguage, this ) );
-        $( "#mail_button" ).bind( "dblclick", jQuery.proxy( this.onClickMail, this ) );
+        $( "#home_button" ).bind( "click", this.onClickHome );
+        $( "#language_button" ).bind( "click", jQuery.proxy( this.onClickLanguage, this ) );
+        $( "#mail_button" ).bind( "click", jQuery.proxy( this.onClickMail, this ) );
         $( "#help" ).bind( "click", jQuery.proxy( this.onClickHelp, this ) );
-        $( "#credits" ).bind( "dblclick", jQuery.proxy( this.onClickCredits, this ) );
-        $( "#mentions" ).bind( "dblclick", jQuery.proxy( this.onClickMentions, this ) );
+        $( "#credits" ).bind( "click", jQuery.proxy( this.onClickCredits, this ) );
+        $( "#mentions" ).bind( "click", jQuery.proxy( this.onClickMentions, this ) );
         $( "#login_button" ).bind( "click", jQuery.proxy( this.onClickLogin, this ) );
-        $( "#logout_button" ).bind( "dblclick", jQuery.proxy( this.onClickLogout, this ) );
+        $( "#logout_button" ).bind( "click", jQuery.proxy( this.onClickLogout, this ) );
     },
 
@@ -83 +83 @@
         {
             var divLogo = $( document.createElement( "div" ) );
-            divLogo.addClass( "divLogo containerToDrag" );
+            divLogo.addClass( "divLogo" );
             divLogo.attr( {id:logo.id, style:"position:absolute; top:" + initTop + "; left:" + initLeft} );
             divLogo.html( '<img id="img_' + logo.id + '"src="resources/images/' + logo.img + '" width="' + this.logoSizeSmall + 'px" height="' + this.logoSizeSmall + 'px"/>' );
@@ -95 +95 @@
             specificClass:"containerStatistics", specificTitleClass:"containerStatisticsTitle", specificContentClass:"containerStatisticsContent"} );
 
-        this.rightSlide = new DragSlide( {id:"right", parent:this.parent, width:"180", height:"320", top:"212px", left:"750px",
+        this.rightSlide = new DragSlide( {id:"right", parent:this.parent, width:"180", height:"325", top:"212px", left:"750px",
             specificClass:"containerStatistics", specificTitleClass:"containerStatisticsTitle", specificContentClass:"containerStatisticsContent"} );
 
@@ -121 +121 @@
             divLogo.addClass( "divLogo" );
             divLogo.attr( {id:logo.id} );
-            divLogo.html( '<img id="img_' + logo.id + '"src="resources/images/' + logo.img + '" width="' + this.logoSizeBigger + 'px" height="' + this.logoSizeBigger + 'px"/>' );
+            divLogo.html( '<img id="img_' + logo.id + '"src="resources/images/' + logo.img + '" width="' + this.logoSizeBigger + 'px" height="' + this.logoSizeBigger + 'px" title="' + logo.id + '"/>' );
             this.projectsSlide.getDivContent().append( divLogo );
         }, this ) );
         this.projectsSlide.hideContainerContent();
+    },
+
+    createSelectMonths: function()
+    {
+        var div = $( document.createElement( "div" ) );
+        div.addClass( "selectDates" );
+        this.middleSlide.getDivContent().append( div );
+
+        var paramSelect = new Object();
+        paramSelect.id = "selectMonths";
+        paramSelect.parent = div;
+        this.selectMonths = new Select( paramSelect );
+        this.selectMonths.add( 1, '<spring:message code="label.january"/>' );
+        this.selectMonths.add( 2, '<spring:message code="label.february"/>' );
+        this.selectMonths.add( 3, '<spring:message code="label.march"/>' );
+        this.selectMonths.add( 4, '<spring:message code="label.april"/>' );
+        this.selectMonths.add( 5, '<spring:message code="label.may"/>' );
+        this.selectMonths.add( 6, '<spring:message code="label.june"/>' );
+        this.selectMonths.add( 7, '<spring:message code="label.july"/>' );
+        this.selectMonths.add( 8, '<spring:message code="label.august"/>' );
+        this.selectMonths.add( 9, '<spring:message code="label.september"/>' );
+        this.selectMonths.add( 10, '<spring:message code="label.october"/>' );
+        this.selectMonths.add( 11, '<spring:message code="label.november"/>' );
+        this.selectMonths.add( 12, '<spring:message code="label.december"/>' );
+    },
+
+    createSelectYears: function()
+    {
+        var div = $( document.createElement( "div" ) );
+        div.addClass( "selectDates" );
+        this.middleSlide.getDivContent().append( div );
+
+        var paramSelect = new Object();
+        paramSelect.id = "selectYears";
+        paramSelect.parent = div;
+        this.selectYears = new Select( paramSelect );
+
+        var currentYear = (new Date()).getFullYear();
+        for( var i = 0; i < 5; i++ )
+            this.selectYears.add( currentYear - i, currentYear - i );
     },
 
@@ -228 +268 @@
             if( "ADMINISTRATOR" == this.jSONUser.role )
             {
-                this.awstatsSlide = new DragSlide( {id:"awstats", parent:this.parent, width:"180", height:"25", top:"540px", left:"750px",
+                this.awstatsSlide = new DragSlide( {id:"awstats", parent:this.parent, width:"180", height:"25", top:"545px", left:"750px",
                     specificTitleClass:"containerStatisticsTitle", specificContentClass:"containerStatisticsContent",
                     title:'<spring:message code="label.awstats"/>&nbsp;&nbsp;', activeDbClick:"None"} );
-                this.awstatsSlide.getDivContainer().dblclick( jQuery.proxy( this.displayAwstatsStatistics, this ) );
+                this.awstatsSlide.getDivContainer().click( jQuery.proxy( this.displayAwstatsStatistics, this ) );
             }
 
@@ -334 +374 @@
     {
         this.isSelectedLogoEther = (this.selectedLogo == $( "#ETHER" )[0]);
+        this.isMonthAndYearSelected = false;
 
         if( this.jSONUser )
@@ -351 +392 @@
         printContent.addContent( this.middleSlide.getDivContainer().clone().animate( {'marginLeft' : "+=93px", 'width' : "667px"} ) );
         printContent.displayPrintPreview();
+    },
+
+    onClickGo: function()
+    {
+        var url = this[0];
+        var context = this[1];
+
+        $( "divAwstats" ).load( url + context.selectedLogo.id + "&month=" + context.selectMonths.getValue() + "&year=" + context.selectYears.getValue() );
     },
 
@@ -469 +518 @@
     bindLogos:function()
     {
-        $( '.divLogo' ).dblclick( jQuery.proxy( function( element )
+        $( '.divLogo' ).click( jQuery.proxy( function( element )
         {
             this.selectedLogo = element.currentTarget;
@@ -496 +545 @@
     changeMiddleSlide: function( title, url )
     {
+        var selectedMonth = this.selectMonths ? this.selectMonths.getValue() : false;
+        var selectedYear = this.selectYears ? this.selectYears.getValue() : false;
+
         this.middleSlide.setTitle( this.selectedLogo.id + ' : ' + title );
         this.middleSlide.getDivContent().empty();
 
-        this.middleSlide.getDivContent().load( url + this.selectedLogo.id );
+        // Button
+        new Button( {value:"<spring:message code="label.go"/>", parent:this.middleSlide.getDivContent(), className: "blue selectDates", onClick:jQuery.proxy( this.onClickGo, [url, this] )} );
+
+        // Years
+        this.createSelectYears();
+        if( !this.isMonthAndYearSelected )
+            this.selectYears.selectFirst( true );
+        else
+            this.selectYears.select( selectedYear );
+
+        // Months
+        this.createSelectMonths();
+        if( !this.isMonthAndYearSelected )
+        {
+            var currentMonth = (new Date()).getMonth() + 1;
+            this.selectMonths.select( currentMonth );
+        }
+        else
+            this.selectMonths.select( selectedMonth );
+
+        this.isMonthAndYearSelected = true;
+
+        var div = $( document.createElement( "div" ) );
+        div.attr( {id:"divAwstats"} );
+        div.addClass( "containerAwstats" );
+        this.middleSlide.getDivContent().append( div );
+
+        div.load( url + this.selectedLogo.id + "&month=" + this.selectMonths.getValue() + "&year=" + this.selectYears.getValue() );
     },