=== modified file 'local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml' --- local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2011-01-20 14:53:49 +0000 +++ local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2011-03-01 09:42:21 +0000 @@ -737,28 +737,17 @@ - - - - - - - - - - - - - - - + + + + === modified file 'local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties' --- local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties 2011-01-13 09:39:35 +0000 +++ local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties 2011-03-01 09:42:21 +0000 @@ -30,14 +30,14 @@ dataanalyser = Data Analyser graphical_analysis = Graphical Analysis dataelements_wise = DataElement Wise -dataelements_wise_graphical_analyser = Data Elements wise Graphical Analyser +dataelements_wise_graphical_analyser = Data Elementwise Graphical Analyser periodType = Period Type year = Year period = Period ga_orgUnitGroups = OrgUnitGroups ga_aggregated_data = Aggregated Data indicator_wise = Indicator Wise -indicator_wise_graphical_analyser = Indicator Wise Graphical Analyser +indicator_wise_graphical_analyser = Indicatorwise Graphical Analyser ga_available_indicatorList = Available Indicator List ga_selected_IndicatorList = Selected Indicator List #------Annual Analysis------------------------# === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm 2010-09-28 07:10:26 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm 2011-03-01 09:42:21 +0000 @@ -1,146 +1,136 @@ - - - - Graphical Analyser - Annual - - - -

$i18n.getString( "aa_annual_analyser" )

-
- ##

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- $i18n.getString( "ga_data_elements" ) - - $i18n.getString( "ga_indicators" ) -

- $i18n.getString( "ga_filter_by_degroup" ) - -		- $i18n.getString( "ga_filter_by_indicatorgroup" ) - -

$i18n.getString( "ga_available_delist" ) - - - -		- $i18n.getString( "ga_available_indicatorlist" ) - - - -


- $i18n.getString( "aa_annual_periods" ) - -		- $i18n.getString( "aa_months" ) - -

- $i18n.getString( "aa_orgunit" ) : - -		- - - -

- - \ No newline at end of file + + +

$i18n.getString( "aa_annual_analyser" )

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ $i18n.getString( "ga_data_elements" ) + + $i18n.getString( "ga_indicators" ) +

+ $i18n.getString( "ga_filter_by_degroup" ) + +		+ $i18n.getString( "ga_filter_by_indicatorgroup" ) + +

$i18n.getString( "ga_available_delist" ) + + + +		+ $i18n.getString( "ga_available_indicatorlist" ) + + + +


+ $i18n.getString( "aa_annual_periods" ) + +		+ $i18n.getString( "aa_months" ) + +

+ $i18n.getString( "aa_orgunit" ) : + +		+ + +

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm 2010-09-20 12:49:15 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm 2011-03-01 09:42:21 +0000 @@ -6,117 +6,65 @@ // Global Variables var selCategory = ""; var selFacility = ""; - var ouName=""; - var dsName=""; - var sDateIndex=0; - var eDateIndex=0; - var sDate=""; - var eDate=""; - var curPeriodType=""; + var ouName = ""; + var dsName = ""; + var sDateIndex = 0; + var eDateIndex = 0; + var sDate = ""; + var eDate = ""; + var curPeriodType = ""; -

DataStatus Form

- - - - - - - - - - - - - - - - - - - - - - - +

- - - - - - - - - - - - - - - - - - -

- $i18n.getString( "ds_dataset_list" ) : - -

- $i18n.getString( "ga_facilityby" ) - -		- - -

- $i18n.getString( "ga_from" ) - -	- $i18n.getString( "ga_to" ) - -

- - - - - - - -

- Include Zero -

- $i18n.getString( "ga_orgunit" )
- -

- - - -

-

- -

- - - -

+ + + +

+ $i18n.getString( "ds_dataset_list" ) :
+ +

+ $i18n.getString( "ga_facilityby" )
+ +
+ +
+

+

+

+

+ +

+ Include Zero +

+ $i18n.getString( "ga_orgunit" )
+ +

+ $i18n.getString( "ga_from" )
+ +

+ $i18n.getString( "ga_to" )
+ +

\ No newline at end of file + \ No newline at end of file === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm 2010-12-29 07:47:36 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm 2011-03-01 09:42:21 +0000 @@ -1,30 +1,22 @@ -

$i18n.getString( "dataelements_wise_graphical_analyser" )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

$i18n.getString( "ga_filter_by_degroup" )
- -

$i18n.getString( "compare_view" )
- -

$i18n.getString( "ga_available_delist" )
- -

-      -
-      -
-      -
-      -

$i18n.getString( "ga_selected_delist" )
- -

$i18n.getString( "ga_aggregated_data" )

- - - - - - -

$i18n.getString( "ga_viewby" )
- -
-
-

$i18n.getString( "periodType" )
- -
-
-

- - - - -

$i18n.getString( "ga_orgunit" )
- -

$i18n.getString( "ga_orgUnitGroups" )
- -

- - - - - - - - - - - - -

$i18n.getString( "year" ) - - - -		$i18n.getString( "period" ) - - - -
-		-

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

$i18n.getString( "ga_filter_by_degroup" )
+ +

$i18n.getString( "compare_view" )
+ +

$i18n.getString( "ga_available_delist" )
+ +

+
+
+
+      +

$i18n.getString( "ga_selected_delist" )
+ +

+ $i18n.getString( "ga_aggregated_data" ) +

+ + + + + + +

$i18n.getString( "ga_viewby" )
+ +

$i18n.getString( "periodType" )
+ +

+ + + + + +

$i18n.getString( "ga_orgunit" )
+ +

$i18n.getString( "ga_orgUnitGroups" )
+ +

+ + + + + + +

$i18n.getString( "year" )
+ +

$i18n.getString( "period" )
+ +

+ + + + + + + +

+ \ No newline at end of file === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm 2010-12-29 07:47:36 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm 2011-03-01 09:42:21 +0000 @@ -1,28 +1,22 @@ -

$i18n.getString( "indicator_wise_graphical_analyser" )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

$i18n.getString( "ga_filter_by_indicatorgroup" )
- -

$i18n.getString( "ga_available_indicatorList" )
- -

-      -
-      -
-      -
-      -

$i18n.getString( "ga_selected_IndicatorList" )
- -

$i18n.getString( "ga_aggregated_data" )

- - - - - - -

$i18n.getString( "ga_viewby" )
- -
-
-

$i18n.getString( "periodType" )
- -
-
-

- - - - -

$i18n.getString( "ga_orgunit" )
- -

$i18n.getString( "ga_orgUnitGroups" )
- -

- - - - - - - - - - - - -

$i18n.getString( "year" ) - - - -		$i18n.getString( "period" ) - - - -
-		-

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

$i18n.getString( "ga_filter_by_indicatorgroup" )
+ +

$i18n.getString( "ga_available_indicatorList" )
+ +

+
+
+
+      +

$i18n.getString( "ga_selected_IndicatorList" )
+ +

+ $i18n.getString( "ga_aggregated_data" ) +

+ + + + + + +

$i18n.getString( "ga_viewby" )
+ +

$i18n.getString( "periodType" )
+ +

+ + + + + +

$i18n.getString( "ga_orgunit" )
+ +

$i18n.getString( "ga_orgUnitGroups" )
+ +

+ + + + + + +

$i18n.getString( "year" )
+ +

$i18n.getString( "period" )
+ +

+ + + + + + + +

+ \ No newline at end of file === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js 2010-12-29 07:47:36 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js 2011-03-01 09:42:21 +0000 @@ -1,36 +1,23 @@ +function getOUDeatilsForSurvey( orgUnitIds ) +{ + jQuery.postJSON("getOrgUnitName.action",{ + id : orgUnitIds[0] + }, function( json ){ + setFieldValue( "ouNameTB",json.organisationUnit.name ); + }); +} + + function getOUDeatilsForAA(orgUnitIds) { var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds; var request = new Request(); request.setResponseTypeXML( 'orgunit' ); request.setCallbackSuccess( getOUDetailsForAARecevied ); - request.send( url ); - - /* - - $.post("getOrgUnitDetails.action", - { - orgUnitId:orgUnitIds - }, - function (data) - { - getOUDetailsForAARecevied(data); - },'xml'); - */ + request.send( url ); } -/* -function getOUDetailsForNR(orgUnitIds) -{ - var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds; - - var request = new Request(); - request.setResponseTypeXML( 'orgunit' ); - request.setCallbackSuccess( getOUDetailsForNRRecevied ); - request.send( url ); -} -*/ function getOUDetailsForAARecevied(xmlObject) { var orgUnits = xmlObject.getElementsByTagName("orgunit"); @@ -43,50 +30,17 @@ document.ChartGenerationForm.ouNameTB.value = orgUnitName; } } -/* -function getOUDetailsForNRRecevied(xmlObject) -{ - var orgUnits = xmlObject.getElementsByTagName("orgunit"); - - for ( var i = 0; i < orgUnits.length; i++ ) - { - var id = orgUnits[ i ].getElementsByTagName("id")[0].firstChild.nodeValue; - var orgUnitName = orgUnits[ i ].getElementsByTagName("name")[0].firstChild.nodeValue; - - document.ChartGenerationForm.ouIDTB.value = id; - document.ChartGenerationForm.ouNameTB.value = orgUnitName; - } - -} -*/ function getOUDeatilsForGA(orgUnitIds) { - //document.getElementById( "ougGroupSetCB" ).disabled = false; - //document.getElementById( "orgUnitGroup" ).disabled = false; - - var request = new Request(); request.setResponseTypeXML( 'orgunit' ); request.setCallbackSuccess( getOUDetailsForGARecevied ); - //request.send( url ); var requestString = "getOrgUnitDetails.action"; var params = "orgUnitId=" + orgUnitIds+"&type=ta"; request.sendAsPost( params ); - request.send( requestString ); - - - /* - $.post("getOrgUnitDetails.action", - { - orgUnitId:orgUnitIds - }, - function (data) - { - getOUDetailsForGARecevied(data); - },'xml'); - */ + request.send( requestString ); } function getOUDetailsForGARecevied(xmlObject) @@ -125,6 +79,39 @@ } +function getOUDeatilsForDataStatus( orgUnitIds ) +{ + jQuery.postJSON("getOrgUnitName.action",{ + id : orgUnitIds[0] + }, function( json ){ + + var orgUnitId = json.organisationUnit.id; + var orgUnitName = json.organisationUnit.name; + var faciltyLB = document.getElementById("facilityLB"); + var facilityIndex = faciltyLB.selectedIndex; + var orgUnitListCB = document.getElementById("orgUnitListCB"); + + if( faciltyLB.options[facilityIndex].value == "children" ) + { + for( i = 0; i< orgUnitListCB.options.length; i++ ) + { + orgUnitListCB.options[0] = null; + } + orgUnitListCB.options[0] = new Option( orgUnitName, orgUnitId, false, false ); + } + else + { + for( i = 0; i < orgUnitListCB.options.length; i++ ) + { + if( orgUnitId == orgUnitListCB.options[i].value) return; + } + orgUnitListCB.options[orgUnitListCB.options.length] = new Option( orgUnitName, orgUnitId, false, false ); + } + + }); +} + + function getOUDetails(orgUnitIds) { var request = new Request(); @@ -135,17 +122,6 @@ var params = "orgUnitId=" + orgUnitIds; request.sendAsPost( params ); request.send( requestString ); - - /* - $.post("getOrgUnitDetails.action", - { - orgUnitId:orgUnitIds - }, - function (data) - { - getOUDetailsRecevied(data); - },'xml'); - */ } function getOUDetailsRecevied(xmlObject) @@ -171,8 +147,6 @@ } document.ChartGenerationForm.orgUnitListCB.options[0] = new Option(orgUnitName,id,false,false); } - - else { index = document.ChartGenerationForm.orgUnitListCB.options.length; @@ -187,8 +161,6 @@ } -//Depends on dhis-web-commons/lists/lists.js for List functionality - function getOrgUnitGroups() { var orgUnitGroupSetList = document.getElementById("orgUnitGroupSetListCB"); @@ -256,7 +228,6 @@ } }// getDataElements end -//Depends on dhis-web-commons/lists/lists.js for List functionality function getDataElementsWithOutOptionCombo() { var dataElementGroupList = document.getElementById("dataElementGroupId"); === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js 2010-12-29 07:47:36 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js 2011-03-01 09:42:21 +0000 @@ -1,88 +1,52 @@ function getOUDeatilsForGADataElements( orgUnitIds ) { - //alert( orgUnitIds ); document.getElementById( "ougGroupSetCB" ).disabled = false; document.getElementById( "orgUnitGroupList" ).disabled = false; - document.getElementById( "categoryLB" ).disabled = false; document.getElementById( "periodTypeLB" ).disabled = false; document.getElementById( "yearLB" ).disabled = false; document.getElementById( "periodLB" ).disabled = false; - - var request = new Request(); - request.setResponseTypeXML( 'orgunit' ); - request.setCallbackSuccess( getOUDetailsForGARecevied ); - request.send( 'getOrgUnitDetails.action?orgUnitId=' + orgUnitIds ); - - - /* - $.post("getOrgUnitDetails.action", - { - orgUnitId:orgUnitIds - }, - function (data) - { - getOUDetailsForGARecevied(data); - },'xml');*/ -} - -function getOUDetailsForGARecevied(xmlObject) -{ - var ouListCDId = document.getElementById( "orgUnitListCB" ); - var categoryIndex = document.ChartGenerationForm.categoryLB.selectedIndex; - - - var index = 0; - var i=0; - - var orgUnits = xmlObject.getElementsByTagName("orgunit"); - - for ( var i = 0; i < orgUnits.length; i++ ) - { - - //var currentOrgUnitName = ""; - //var currentOrgUnitId = ""; - var id = orgUnits[ i ].getElementsByTagName("id")[0].firstChild.nodeValue; - var orgUnitName = orgUnits[ i ].getElementsByTagName("name")[0].firstChild.nodeValue; - - - currentOrgUnitId = id; + + jQuery.postJSON("getOrgUnitName.action",{ + id : orgUnitIds[0] + }, function( json ){ + + var ouListCBId = document.getElementById( "orgUnitListCB" ); + var categoryLB = document.getElementById( "categoryLB"); + var categoryIndex = categoryLB.selectedIndex; + var index = 0; + var orgUnitId = json.organisationUnit.id; + var orgUnitName = json.organisationUnit.name; + + currentOrgUnitId = orgUnitId; currentOrgUnitName = orgUnitName; - // alert("orgUnit Id is : " + id + ", name is :" + orgUnitName ); - if(document.ChartGenerationForm.categoryLB.options[categoryIndex].value == "period" || document.ChartGenerationForm.categoryLB.options[categoryIndex].value == "children" ) + + if( categoryLB.options[categoryIndex].value == "period" || categoryLB.options[categoryIndex].value == "children" ) { - index = document.ChartGenerationForm.orgUnitListCB.options.length; - for(i=0;i$i18n.getString( "dataanalyser" ) +

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "ds_datastatus" )

$i18n.getString( "ds_datastatus" )

$i18n.getString( "ds_datastatus" )

- -

$i18n.getString( "ds_regular" )

+ + +#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) + - - - - === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDSMobile.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDSMobile.vm 2010-12-08 07:24:10 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDSMobile.vm 2011-03-01 09:42:21 +0000 @@ -1,37 +1,27 @@ -

$i18n.getString( "dataanalyser" )

Data Status

Mobile Data Status

- -

$i18n.getString( "dataanalyser" )

Data Status

Mobile Data Status

-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - - - - - === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm 2010-12-08 07:24:10 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm 2011-03-01 09:42:21 +0000 @@ -1,38 +1,33 @@ -

$i18n.getString( "dataanalyser" )

$i18n.getString( "ga" )

$i18n.getString( "ga" )

$i18n.getString( "regular" )

- -

$i18n.getString( "regular" )

+ + #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm 2010-12-08 07:24:10 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm 2011-03-01 09:42:21 +0000 @@ -1,42 +1,29 @@ -

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "graphical_analysis" )

$i18n.getString( "graphical_analysis" )

$i18n.getString( "dataelements_wise" )

$i18n.getString( "dataelements_wise" )

- -

+ #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - + === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGAIndicator.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGAIndicator.vm 2010-12-23 07:23:23 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGAIndicator.vm 2011-03-01 09:42:21 +0000 @@ -1,37 +1,29 @@ -

$i18n.getString( "dataanalyser" )DashBoard

+ +

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "graphical_analysis" )

$i18n.getString( "graphical_analysis" )

$i18n.getString( "indicator_wise" )

$i18n.getString( "indicator_wise" )

- -

+ #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - + === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForNR.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForNR.vm 2010-12-08 07:24:10 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForNR.vm 2011-03-01 09:42:21 +0000 @@ -1,32 +1,29 @@ -

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "ds_datastatus" )

$i18n.getString( "ds_datastatus" )

$i18n.getString( "nr_null_reporter" )

- -

$i18n.getString( "nr_null_reporter" )

+ + #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - \ No newline at end of file === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm 2010-12-08 07:24:10 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm 2011-03-01 09:42:21 +0000 @@ -1,37 +1,34 @@ -

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "dataanalyser" )

+ +

Data Status

Data Status

OrganisationUnit Group Wise DatStatus

OrganisationUnit Groupwise DatStatus

- -

-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) - - + +#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) + === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm 2011-01-20 14:53:49 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm 2011-03-01 09:42:21 +0000 @@ -1,36 +1,32 @@ -

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "dataanalyser" )

+ +

Graphical Analysis

Graphical Analysis

Survey

- -

Survey

+ + #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTA.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTA.vm 2010-12-08 07:24:10 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTA.vm 2011-03-01 09:42:21 +0000 @@ -1,35 +1,30 @@ -

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "dataanalyser" )

+ +

Data Analysis

Data Analysis

Tabular Analysis

- -

Tabular Analysis

+ + #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTTA.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTTA.vm 2010-12-08 07:24:10 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTTA.vm 2011-03-01 09:42:21 +0000 @@ -1,34 +1,31 @@ -

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "ga" )

$i18n.getString( "ga" )

$i18n.getString( "ga_annual" )

- -

$i18n.getString( "ga_annual" )

+ + #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - - === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTarget.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTarget.vm 2011-01-17 06:56:53 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTarget.vm 2011-03-01 09:42:21 +0000 @@ -1,37 +1,31 @@ -

$i18n.getString( "dataanalyser" )

$i18n.getString( "graphical_analysis" )

$i18n.getString( "target" )

- -

- + +

$i18n.getString( "dataanalyser" )

+ +

$i18n.getString( "graphical_analysis" )

$i18n.getString( "target" )

+ #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) - + - - - - === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm 2010-06-04 11:50:05 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm 2011-03-01 09:42:21 +0000 @@ -1,40 +1,36 @@ - - SummaryStatus Result - - - - + function exportDataStatusResultToWorkBook() + { + document.getElementById('htmlCode').value = document.getElementById('formResult').innerHTML; + + return true; + } + + +

@@ -77,6 +73,7 @@ #foreach($chiildorgUnit in $orgUnitList) #set($count1 = $minOULevel) #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit)) + ##set( $curOrgUnitLevel = $chiildorgUnit.getLevel() ) #foreach($levelName in $levelNames) #if($count1 == $curOrgUnitLevel) === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm 2011-01-20 14:53:49 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm 2011-03-01 09:42:21 +0000 @@ -1,8 +1,8 @@ -

Survey Analyser

- +

$i18n.getString( "ga_filter_by_indicatorgroup" )
@@ -46,22 +46,19 @@ - - + + + @@ -77,19 +74,22 @@ - - + +

- $i18n.getString( "ga_from" ) - #foreach($period in $monthlyPeriods) #end		- $i18n.getString( "ga_to" ) - -		+ $i18n.getString( "aa_orgunit" ) : + +
- $i18n.getString( "aa_orgunit" ) : - -		+ $i18n.getString( "ga_to" ) + +		- - +

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm 2011-01-21 12:09:47 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm 2011-03-01 09:42:21 +0000 @@ -11,7 +11,7 @@ #end -

$i18n.getString( "aa_annual_analyser" )

$i18n.getString( "aa_annual_analyser" )

DataStatus Form

DataStatus Form

$i18n.getString( "dataelements_wise_graphical_analyser" )

$i18n.getString( "dataelements_wise_graphical_analyser" )

$i18n.getString( "indicator_wise_graphical_analyser" )

$i18n.getString( "indicator_wise_graphical_analyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )DashBoard

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

$i18n.getString( "dataanalyser" )

Survey Analyser

Survey Analyser

Target Analysis Form

Target Analysis Form