=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2012-04-24 08:02:39 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2012-04-26 18:32:46 +0000 @@ -1478,8 +1478,6 @@ return regex.test( value ); } -// Recommended in using this method -// which same as name one from Ext function isNumber( value ) { var regex = /^[+-]?\d+(\.\d+)?([eE][+-]?\d+)?$/; @@ -1503,7 +1501,12 @@ function getRandomNumber() { - return Math.floor( 1000000 * Math.random() ); + return Math.floor( 100000000 * Math.random() ); +} + +function getDC() +{ + return "_dc=" + getRandomNumber(); } /** === removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/statistics/GetStatisticsChartAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/statistics/GetStatisticsChartAction.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/statistics/GetStatisticsChartAction.java 1970-01-01 00:00:00 +0000 @@ -1,108 +0,0 @@ -package org.hisp.dhis.dataadmin.action.statistics; - -/* - * Copyright (c) 2004-2012, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.HashMap; -import java.util.Map; - -import org.hisp.dhis.chart.ChartService; -import org.hisp.dhis.common.Objects; -import org.hisp.dhis.i18n.I18n; -import org.hisp.dhis.statistics.StatisticsProvider; -import org.jfree.chart.JFreeChart; -import org.jfree.chart.axis.CategoryLabelPositions; -import org.jfree.chart.plot.PlotOrientation; - -import com.opensymphony.xwork2.Action; - -/** - * @author Lars Helge Overland - * @version $Id$ - */ -public class GetStatisticsChartAction - implements Action -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private StatisticsProvider statisticsProvider; - - public void setStatisticsProvider( StatisticsProvider statisticsProvider ) - { - this.statisticsProvider = statisticsProvider; - } - - private ChartService chartService; - - public void setChartService( ChartService chartService ) - { - this.chartService = chartService; - } - - private I18n i18n; - - public void setI18n( I18n i18n ) - { - this.i18n = i18n; - } - - // ------------------------------------------------------------------------- - // Output - // ------------------------------------------------------------------------- - - private JFreeChart chart; - - public JFreeChart getChart() - { - return chart; - } - - // ------------------------------------------------------------------------- - // Action implemenation - // ------------------------------------------------------------------------- - - public String execute() - { - Map counts = statisticsProvider.getObjectCounts(); - - Map categoryValues = new HashMap(); - - categoryValues.put( i18n.getString( "data_elements" ), Double.valueOf( counts.get( Objects.DATAELEMENT ) ) ); - categoryValues.put( i18n.getString( "indicators" ), Double.valueOf( counts.get( Objects.INDICATOR ) ) ); - categoryValues.put( i18n.getString( "data_sets" ), Double.valueOf( counts.get( Objects.DATASET ) ) ); - categoryValues.put( i18n.getString( "organisation_units" ), Double.valueOf( counts.get( Objects.SOURCE ) ) ); - categoryValues.put( i18n.getString( "periods" ), Double.valueOf( counts.get( Objects.PERIOD ) ) ); - - chart = chartService.getJFreeChart( i18n.getString( "number_of_objects" ), - PlotOrientation.HORIZONTAL, CategoryLabelPositions.STANDARD, categoryValues ); - - return SUCCESS; - } -} - === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2012-04-04 10:48:27 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2012-04-26 18:32:46 +0000 @@ -57,13 +57,6 @@ - - - - - - - /main.vm + + /main.vm /dhis-web-maintenance-dataadmin/viewStatistics.vm /dhis-web-maintenance-dataadmin/menu.vm - F_PERFORM_MAINTENANCE + javascript/statistics.js + F_PERFORM_MAINTENANCE - - - 420 - 220 - + + /dhis-web-maintenance-dataadmin/responseStatistics.vm F_PERFORM_MAINTENANCE === added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/statistics.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/statistics.js 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/statistics.js 2012-04-26 18:32:46 +0000 @@ -0,0 +1,10 @@ + +$( document ).ready( function() +{ + showLoader(); + + $( '#contentDiv' ).load( 'getStatistics.action?' + getDC(), function() + { + hideLoader(); + } ); +} ); === added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm 2012-04-26 18:32:46 +0000 @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
$i18n.getString( "object_type" )$i18n.getString( "number" )
$i18n.getString( "data_elements" )$objects.getValue( "DATAELEMENT" )
$i18n.getString( "data_element_groups" )$objects.getValue( "DATAELEMENTGROUP" )
$i18n.getString( "indicator_types" )$objects.getValue( "INDICATORTYPE" )
$i18n.getString( "indicators" )$objects.getValue( "INDICATOR" )
$i18n.getString( "indicator_groups" )$objects.getValue( "INDICATORGROUP" )
$i18n.getString( "data_sets" )$objects.getValue( "DATASET" )
$i18n.getString( "data_dictionaries" )$objects.getValue( "DATADICTIONARY" )
$i18n.getString( "organisation_units" )$objects.getValue( "SOURCE" )
$i18n.getString( "validation_rules" )$objects.getValue( "VALIDATIONRULE" )
$i18n.getString( "periods" )$objects.getValue( "PERIOD" )
$i18n.getString( "users" )$objects.getValue( "USER" )
$i18n.getString( "data_values" )$objects.getValue( "DATAVALUE" )
$i18n.getString( "aggregated_data_values" )$objects.getValue( "AGGREGATEDDATAVALUE" )
$i18n.getString( "aggregated_indicator_values" )$objects.getValue( "AGGREGATEDINDICATORVALUE" )
$i18n.getString( "aggregated_org_unit_data_values" )$objects.getValue( "AGGREGATEDORGUNITDATAVALUE" )
$i18n.getString( "aggregated_org_unit_indicator_values" )$objects.getValue( "AGGREGATEDORGUNITINDICATORVALUE" )
$i18n.getString( "aggregated_data_set_completeness" )$objects.getValue( "AGGREGATEDDATASETCOMPLETENESS" )
+ + + + + + + + + + + + + + + + + + + + + + + + + +
$i18n.getString( "users_logged_in" )$i18n.getString( "number" )
$i18n.getString( "today" )$activeUsers.get( 0 )
$i18n.getString( "yesterday" )$activeUsers.get( 1 )
$i18n.getString( "last_7_days" )$activeUsers.get( 7 )
$i18n.getString( "last_30_days" )$activeUsers.get( 30 )
+ + + + + + + + + + + + + + + + + + + + + + + + + +
$i18n.getString( "data_values" )$i18n.getString( "number" )
$i18n.getString( "today" )$dataValueCount.get( 0 )
$i18n.getString( "yesterday" )$dataValueCount.get( 1 )
$i18n.getString( "last_7_days" )$dataValueCount.get( 7 )
$i18n.getString( "last_30_days" )$dataValueCount.get( 30 )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm 2012-04-23 14:11:27 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm 2012-04-26 18:32:46 +0000 @@ -1,134 +1,6 @@

$i18n.getString( "data_statistics" ) #openHelp( "dataStatistics" )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$i18n.getString( "object_type" )$i18n.getString( "number" )
$i18n.getString( "data_elements" )$objects.getValue( "DATAELEMENT" )
$i18n.getString( "data_element_groups" )$objects.getValue( "DATAELEMENTGROUP" )
$i18n.getString( "indicator_types" )$objects.getValue( "INDICATORTYPE" )
$i18n.getString( "indicators" )$objects.getValue( "INDICATOR" )
$i18n.getString( "indicator_groups" )$objects.getValue( "INDICATORGROUP" )
$i18n.getString( "data_sets" )$objects.getValue( "DATASET" )
$i18n.getString( "data_dictionaries" )$objects.getValue( "DATADICTIONARY" )
$i18n.getString( "organisation_units" )$objects.getValue( "SOURCE" )
$i18n.getString( "validation_rules" )$objects.getValue( "VALIDATIONRULE" )
$i18n.getString( "periods" )$objects.getValue( "PERIOD" )
$i18n.getString( "users" )$objects.getValue( "USER" )
$i18n.getString( "data_values" )$objects.getValue( "DATAVALUE" )
$i18n.getString( "aggregated_data_values" )$objects.getValue( "AGGREGATEDDATAVALUE" )
$i18n.getString( "aggregated_indicator_values" )$objects.getValue( "AGGREGATEDINDICATORVALUE" )
$i18n.getString( "aggregated_org_unit_data_values" )$objects.getValue( "AGGREGATEDORGUNITDATAVALUE" )
$i18n.getString( "aggregated_org_unit_indicator_values" )$objects.getValue( "AGGREGATEDORGUNITINDICATORVALUE" )
$i18n.getString( "aggregated_data_set_completeness" )$objects.getValue( "AGGREGATEDDATASETCOMPLETENESS" )
- - - - - - - - - - - - - - - - - - - - - - - - - -
$i18n.getString( "users_logged_in" )$i18n.getString( "number" )
$i18n.getString( "today" )$activeUsers.get( 0 )
$i18n.getString( "yesterday" )$activeUsers.get( 1 )
$i18n.getString( "last_7_days" )$activeUsers.get( 7 )
$i18n.getString( "last_30_days" )$activeUsers.get( 30 )
- - - - - - - - - - - - - - - - - - - - - - - - - -
$i18n.getString( "data_values" )$i18n.getString( "number" )
$i18n.getString( "today" )$dataValueCount.get( 0 )
$i18n.getString( "yesterday" )$dataValueCount.get( 1 )
$i18n.getString( "last_7_days" )$dataValueCount.get( 7 )
$i18n.getString( "last_30_days" )$dataValueCount.get( 30 )
- -

$i18n.getString( 'number_of_objects' )

+#parse( "dhis-web-commons/loader/loader.vm" ) + +
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js 2012-03-26 18:11:26 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js 2012-04-26 18:32:46 +0000 @@ -21,7 +21,7 @@ showLoader(); var url = "getDataCompleteness.action" + "?periodId=" + periodId + "&criteria=" + criteria + "&dataSetId=" - + dataSetId + "&type=html&r=" + getRandomNumber(); + + dataSetId + "&type=html&" + getDC(); $( "#contentDiv" ).load( url, function() { @@ -49,5 +49,5 @@ function getCompleteness( type ) { - window.location.href = "getDataCompleteness.action?type=" + type; + window.location.href = "getDataCompleteness.action?type=" + type + "&" + getDC(); } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/orgUnitDistribution.js' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/orgUnitDistribution.js 2012-03-18 22:44:02 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/orgUnitDistribution.js 2012-04-26 18:32:46 +0000 @@ -11,7 +11,7 @@ displayDiv( "loaderDiv", distributionDivs ); var groupSetId = $( "#groupSetId" ).val(); - var url = "getOrgUnitDistribution.action?groupSetId=" + groupSetId + "&type=html&r=" + getRandomNumber(); + var url = "getOrgUnitDistribution.action?groupSetId=" + groupSetId + "&type=html&" + getDC(); $( "#tableDiv" ).load( url, function() { displayDiv( "tableDiv", distributionDivs ); @@ -27,7 +27,7 @@ } var groupSetId = $( "#groupSetId" ).val(); - var url = "getOrgUnitDistribution.action?groupSetId=" + groupSetId + "&type=" + type + "&r=" + getRandomNumber(); + var url = "getOrgUnitDistribution.action?groupSetId=" + groupSetId + "&type=" + type + "&" + getDC(); window.location.href = url; } @@ -41,7 +41,7 @@ displayDiv( "chartDiv", distributionDivs ); $( "#chartImg" ).attr( "src", "../images/ajax-loader-circle.gif" ); var groupSetId = $( "#groupSetId" ).val(); - var source = "getOrgUnitDistributionChart.action?groupSetId=" + groupSetId + "&r=" + getRandomNumber(); + var source = "getOrgUnitDistributionChart.action?groupSetId=" + groupSetId + "&" + getDC(); $( "#chartImg" ).attr( "src", source ); }