dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16509
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6290: Reomve popup from local/in
------------------------------------------------------------
revno: 6290
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-03-19 11:37:21 +0530
message:
Reomve popup from local/in
modified:
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalysisDataAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetWeeklyPeriodAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataElementAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartIndicatorAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownOrgUnitToPeriodChartIndicatorResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartDataElementResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartIndicatorResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/sa/action/GenerateChartSurveyAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/tr/action/GenerateTargetAnalysisDataAction.java
local/in/dhis-web-dashboard/src/main/resources/struts.xml
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntrySummaryStatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseDataStatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/aa.js
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/ds.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js
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/nr.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tr.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReporterFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationSatusResult.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalysisDataAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalysisDataAction.java 2010-12-29 16:17:28 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalysisDataAction.java 2012-03-19 06:07:21 +0000
@@ -301,7 +301,10 @@
{
return selectedIndicatorId;
}
-
+ // -------------------------------------------------------------------------
+ // Action Implementation
+ // -------------------------------------------------------------------------
+
public String execute() throws Exception
{
dataList = new ArrayList<List<Double>>();
@@ -321,6 +324,13 @@
numDataElement = new String();
denumDataElement = new String();
+
+ System.out.println( "availableIndicators= " + availableIndicators + ",,,availableDataElements= " + availableDataElements + "ouIDTB= " + ouIDTB );
+ System.out.println( "annualPeriodsListCB= " + annualPeriodsListCB + ",,,,---monthlyPeriodsListCB= " + monthlyPeriodsListCB );
+ System.out.println( "riRadio= " + riRadio );
+
+
+
//selectedIndicator = new Indicator();
//selectedIndicator = indicatorService.getIndicator( availableIndicators );
//selectedIndicatorId = selectedIndicator.getId();
@@ -336,7 +346,7 @@
// for numeratorDataElement,denominatorDataElement
numDataElement = expressionService.getExpressionDescription( selectedIndicator.getNumerator());
denumDataElement = expressionService.getExpressionDescription( selectedIndicator.getDenominator());
-
+
}
else
{
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetWeeklyPeriodAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetWeeklyPeriodAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetWeeklyPeriodAction.java 2012-03-19 06:07:21 +0000
@@ -151,7 +151,7 @@
// System.out.println( "Period size : " + periods.size());
for ( Period period : periods )
{
- String tempPeriodName = simpleDateFormat1.format( period.getStartDate() ) + " To " + simpleDateFormat2.format( period.getEndDate() );
+ String tempPeriodName = simpleDateFormat1.format( period.getStartDate() ) + "To" + simpleDateFormat2.format( period.getEndDate() );
// System.out.println( "tempPeriodName : " + tempPeriodName );
weeklyPeriodList.add( tempPeriodName );
// System.out.println( "weekly period is : " + weeklyPeriodList );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java 2012-03-19 06:07:21 +0000
@@ -90,19 +90,19 @@
{
this.selectedDataSets = selectedDataSets;
}
-
+ /*
private String includeZeros;
public void setIncludeZeros( String includeZeros )
{
this.includeZeros = includeZeros;
}
-
+
public String getIncludeZeros()
{
return includeZeros;
}
-
+ */
private String selectedButton;
public void setselectedButton( String selectedButton )
@@ -249,7 +249,12 @@
public String execute() throws Exception
{
statementManager.initialise();
-
+ /*
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+ */
ouMapDataElement = new HashMap<OrganisationUnit, List<DataElement>>();
ouMapComment = new HashMap<OrganisationUnit, List<String>>();
comments = new ArrayList<String>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java 2012-03-19 06:07:21 +0000
@@ -36,6 +36,7 @@
public class GenerateDataStatusDataSetWiseResultAction implements Action
{
+ private final String SUMMARYSTATUSVARIABLE = "Summarystatusvariable";
// ---------------------------------------------------------------
// Dependencies
// ---------------------------------------------------------------
@@ -275,8 +276,13 @@
periodNameList = new ArrayList<String>();
//dataViewName = "";
+
+ Constant constant = constantService.getConstantByName( SUMMARYSTATUSVARIABLE );
+ constName = constant.getName();
+ constValue = constant.getValue();
+
constants = new ArrayList<Constant>( constantService.getAllConstants());
-
+ /*
for( Constant constant : constants )
{
//String name = constant.getName();
@@ -288,6 +294,15 @@
break;
}
}
+ */
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+
+ System.out.println( "periodTypeId= " + periodTypeId + "----facilityLB= " + facilityLB + "----orgUnitListCB= " + orgUnitListCB );
+ System.out.println( "sDateLB= " + sDateLB + "-----eDateLB= " + eDateLB + "-----includeZeros= " + includeZeros );
+
ouMapForChildDSAssociation = new HashMap<OrganisationUnit, Integer>();
ouMapForColor = new HashMap<OrganisationUnit, Integer>();
orgUnitCount = 0;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java 2012-03-19 06:07:21 +0000
@@ -376,6 +376,13 @@
maxOULevel = 1;
minOULevel = organisationUnitService.getNumberOfOrganisationalLevels();
+
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+
+
if ( immChildOption != null && immChildOption.equalsIgnoreCase( "yes" ) )
{
System.out.println( "Inside Drill Down" );
@@ -387,7 +394,11 @@
selectedDataSets = new ArrayList<String>();
selectedDataSets.add( dsId );
}
-
+
+ System.out.println( "selectedDataSets= " + selectedDataSets + "---,orgUnitListCB= " + orgUnitListCB + "---,,,,includeZeros= " + includeZeros );
+ System.out.println( "sDateLB= " + sDateLB + "---,eDateLB= " + eDateLB + ",,------facilityLB= " + facilityLB );
+
+
// DataSet Related Info
dataSetList = new ArrayList<DataSet>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java 2012-03-19 06:07:21 +0000
@@ -414,7 +414,12 @@
maxOULevel = 1;
minOULevel = organisationUnitService.getNumberOfOrganisationalLevels();
-
+
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+
if ( immChildOption != null && immChildOption.equalsIgnoreCase( "yes" ) )
{
orgUnitListCB = new ArrayList<String>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java 2012-03-19 06:07:21 +0000
@@ -236,7 +236,7 @@
{
this.dsId = dsId;
}
-
+ /*
private String includeZeros;
public void setIncludeZeros( String includeZeros )
@@ -248,7 +248,7 @@
{
return includeZeros;
}
-
+ */
private String selectedButton;
public void setselectedButton( String selectedButton )
@@ -380,7 +380,12 @@
results = new ArrayList<Integer>();
maxOULevel = 1;
minOULevel = organisationUnitService.getNumberOfOrganisationalLevels();
-
+ /*
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+ */
if ( immChildOption != null && immChildOption.equalsIgnoreCase( "yes" ) )
{
orgUnitListCB = new ArrayList<String>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java 2012-03-19 06:07:21 +0000
@@ -35,6 +35,7 @@
public class GenerateSummaryDataStatusResultAction
implements Action
{
+ private final String SUMMARYSTATUSVARIABLE = "Summarystatusvariable";
// ---------------------------------------------------------------
// Dependencies
// ---------------------------------------------------------------
@@ -304,6 +305,12 @@
// Intialization
+ Constant constant = constantService.getConstantByName( SUMMARYSTATUSVARIABLE );
+ constName = constant.getName();
+ constValue = constant.getValue();
+
+
+ /*
constants = new ArrayList<Constant>( constantService.getAllConstants());
for( Constant constant : constants )
@@ -317,6 +324,7 @@
break;
}
}
+ */
System.out.println( "------Constant Name is : ---- " + constName + ",------ Constant Value is : " + constValue );
tempOuMapResult = new HashMap<String, Double>();
ouMapForChildDSAssociation = new HashMap<OrganisationUnit, Integer>();
@@ -326,7 +334,12 @@
ouMapSummaryStatusResult = new HashMap<OrganisationUnit, List<Integer>>();
maxOULevel = 1;
minOULevel = organisationUnitService.getNumberOfOrganisationalLevels();
-
+
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+
if ( immChildOption != null && immChildOption.equalsIgnoreCase( "yes" ) )
{
orgUnitListCB = new ArrayList<String>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java 2012-03-19 06:07:21 +0000
@@ -179,7 +179,8 @@
{
this.dsId = dsId;
}
-
+
+ /*
private String includeZeros;
public void setIncludeZeros( String includeZeros )
@@ -191,7 +192,7 @@
{
return includeZeros;
}
-
+ */
private String ouId;
public void setOuId( String ouId )
@@ -304,7 +305,12 @@
results = new ArrayList<Integer>();
maxOULevel = 1;
minOULevel = organisationUnitService.getNumberOfOrganisationalLevels();
-
+ /*
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+ */
if ( immChildOption != null && immChildOption.equalsIgnoreCase( "yes" ) )
{
orgUnitListCB = new ArrayList<String>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java 2012-03-19 06:07:21 +0000
@@ -352,7 +352,12 @@
results = new ArrayList<Integer>();
maxOULevel = 1;
minOULevel = organisationUnitService.getNumberOfOrganisationalLevels();
-
+
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+
// DataSet Related Info
dataSetList = new ArrayList<DataSet>();
deInfo = "-1";
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java 2012-03-19 06:07:21 +0000
@@ -286,6 +286,11 @@
System.out.println( "immChildOption : " + immChildOption + ", Ou Id is : " + ouId + ", DS id is : " + dsId );
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+
if ( immChildOption != null && immChildOption.equalsIgnoreCase( "yes" ) )
{
System.out.println( "Inside Drill Down" );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java 2012-03-19 06:07:21 +0000
@@ -301,6 +301,11 @@
ouPeriodMapForPercentageResult = new HashMap<String, Integer>();// Map for percentage Results
ouMapForChildDSAssociation = new HashMap<OrganisationUnit, Integer>();
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
+
if ( immChildOption != null && immChildOption.equalsIgnoreCase( "yes" ) )
{
System.out.println( "Inside Drill Down" );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataElementAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataElementAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataElementAction.java 2012-03-19 06:07:21 +0000
@@ -183,7 +183,9 @@
// Input
// -------------------------------------------------------------------------
- private List<String> selectedDataElements;
+ //private List<String> selectedDataElements;
+
+ List<String> selectedDataElements = new ArrayList<String>();
public void setSelectedDataElements( List<String> selectedDataElements )
{
@@ -283,7 +285,8 @@
this.yearLB = yearLB;
}
- private List<String> periodLB;
+ List<String> periodLB = new ArrayList<String>();
+ //private List<String> periodLB;
public void setPeriodLB( List<String> periodLB )
{
@@ -373,7 +376,13 @@
selectedValues = new ArrayList<String>();
selectedStatus = new ArrayList<String>();
selectedDrillDownData = new ArrayList<String>();
-
+
+
+ if( aggDataCB.equalsIgnoreCase( "false" ))
+ {
+ aggDataCB = null;
+ }
+
aggChecked = "";
if ( aggDataCB != null )
@@ -384,14 +393,22 @@
{
aggChecked = "0";
}
- /*
+
+ System.out.println( orgUnitListCB );
+
+
System.out.println( ougGroupSetCB );
if( ougGroupSetCB.equalsIgnoreCase( "false" ))
{
ougGroupSetCB = null;
}
- */
+
+ System.out.println( "selectedDataElements= " + selectedDataElements + "orgUnitGroupList= " + orgUnitGroupList + "orgUnitListCB= " + orgUnitListCB );
+ System.out.println( "yearLB= " + yearLB + "periodLB= " + periodLB + "deSelection= " + deSelection );
+ System.out.println( "categoryLB= " + categoryLB + "periodTypeLB= " + periodTypeLB + "ougGroupSetCB= " + ougGroupSetCB );
+ System.out.println( "aggDataCB= " + aggDataCB );
+
// ----------------------------------------------------------------------
// Period Info
// ----------------------------------------------------------------------
@@ -415,9 +432,16 @@
int periodCount = 0;
for ( String periodStr : periodLB )
{
- startD = periodStr.split( "To" )[0].trim();
- endD = periodStr.split( "To" )[1].trim();
-
+ //startD = periodStr.split( "To" )[0].trim();
+ //endD = periodStr.split( "To" )[1].trim();
+
+ String startWeekDate = periodStr.split( "To" )[0] ; //for start week
+ String endWeekDate = periodStr.split( "To" )[1] ; //for end week
+
+ startD = startWeekDate.trim();
+ endD = endWeekDate.trim();
+
+
if ( periodCount == periodLB.size() - 1 )
{
drillDownPeriodStartDate += startD;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartIndicatorAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartIndicatorAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartIndicatorAction.java 2012-03-19 06:07:21 +0000
@@ -374,6 +374,16 @@
aggChecked = "0";
}
+ if( aggDataCB.equalsIgnoreCase( "false" ))
+ {
+ aggDataCB = null;
+ }
+
+ if( ougGroupSetCB.equalsIgnoreCase( "false" ))
+ {
+ ougGroupSetCB = null;
+ }
+
// int flag = 0;
// selOUList = new ArrayList<OrganisationUnit>();
@@ -710,13 +720,13 @@
System.out.println( "Chart Generation Start Time is : \t" + new Date() );
indicatorChartResult = generateChartDataPeriodWise( selStartPeriodList, selEndPeriodList, periodNames, indicatorList, selOUList.iterator().next() );
-
+ /*
for( String drillDown : selectedDrillDownData )
{
System.out.println( "drill Down value is :" + drillDown );
System.out.println( "---------");
}
-
+ */
// dataElementChartResult.getSeries()
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownOrgUnitToPeriodChartIndicatorResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownOrgUnitToPeriodChartIndicatorResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownOrgUnitToPeriodChartIndicatorResultAction.java 2012-03-19 06:07:21 +0000
@@ -293,7 +293,7 @@
//String drillDownData = orgUnit.getId() + ":"+ dataElement.getId() + ":"+ decoc.getId() + ":" + periodType + ":" + tempStartDate + ":" + tempEndDate + ":" + deSelection + ":" + aggDataCB;
- System.out.println( selStartPeriodList + ":" + selEndPeriodList + ":" + periodNames + ":" + periodTypeLB + ":" + indicatorList+ ":" + selectedOrgUnit + ":" + aggDataCB );
+ //System.out.println( selStartPeriodList + ":" + selEndPeriodList + ":" + periodNames + ":" + periodTypeLB + ":" + indicatorList+ ":" + selectedOrgUnit + ":" + aggDataCB );
// System.out.println( selStartPeriodList.size() + ":" + selEndPeriodList.size() );
System.out.println( "Chart Generation Start Time is for drillDown: \t" + new Date() );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartDataElementResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartDataElementResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartDataElementResultAction.java 2012-03-19 06:07:21 +0000
@@ -281,7 +281,7 @@
for( OrganisationUnit orgChild : childOrgUnitList )
{
String drillDownData = orgChild.getId() + ":" + "0" + ":" + dataElement.getId() + ":"+ categoryCombo.getId() + ":" + periodTypeLB + ":" + drillDownPeriodStartDate + ":" + drillDownPeriodEndDate + ":" + drillDownPeriodNames + ":" + deSelection + ":" + aggDataCB;
- System.out.println(drillDownData);
+ //System.out.println(drillDownData);
selectedDrillDownData.add( drillDownData );
}
}
@@ -297,7 +297,7 @@
for( OrganisationUnit orgChild : selectedOUGroupMemberList )
{
String drillDownData = orgChild.getId() + ":" + selectedOrgUnitGroup.getId() + ":" + dataElement.getId() + ":"+ categoryCombo.getId() + ":" + periodTypeLB + ":" + drillDownPeriodStartDate + ":" + drillDownPeriodEndDate + ":" + drillDownPeriodNames + ":" + deSelection + ":" + aggDataCB;
- System.out.println(drillDownData);
+ //System.out.println(drillDownData);
selectedDrillDownData.add( drillDownData );
}
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartIndicatorResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartIndicatorResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownPeriodToOrgChildChartIndicatorResultAction.java 2012-03-19 06:07:21 +0000
@@ -305,7 +305,7 @@
//String drillDownData = orgUnit.getId() + ":"+ dataElement.getId() + ":"+ decoc.getId() + ":" + periodType + ":" + tempStartDate + ":" + tempEndDate + ":" + deSelection + ":" + aggDataCB;
- System.out.println( selStartPeriodList + ":" + selEndPeriodList + ":" + periodTypeLB + ":" + indicatorList+ ":" + selectedOrgUnit + ":" + aggDataCB );
+ //System.out.println( selStartPeriodList + ":" + selEndPeriodList + ":" + periodTypeLB + ":" + indicatorList+ ":" + selectedOrgUnit + ":" + aggDataCB );
System.out.println( "Chart Generation Start Time is for drillDown: \t" + new Date() );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java 2012-03-19 06:07:21 +0000
@@ -330,6 +330,14 @@
System.out.println( "Null Report Generation Start Time is : " + new Date() );
simpleDateFormat = new SimpleDateFormat( "MMM y" );
+ if( ouSelCB.equalsIgnoreCase( "false" ))
+ {
+ ouSelCB = null;
+ }
+ if( includeZeros.equalsIgnoreCase( "false" ))
+ {
+ includeZeros = null;
+ }
nullReportResult = new HashMap<OrganisationUnit, Map<Period, List<DataElement>>>();
selOUList = new ArrayList<OrganisationUnit>();
ouChildCountMap = new HashMap<OrganisationUnit, Integer>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/sa/action/GenerateChartSurveyAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/sa/action/GenerateChartSurveyAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/sa/action/GenerateChartSurveyAction.java 2012-03-19 06:07:21 +0000
@@ -325,7 +325,9 @@
return denumDataElement;
}
-
+ // -------------------------------------------------------------------------
+ // Action Implementation
+ // -------------------------------------------------------------------------
public String execute()throws Exception
{
@@ -362,6 +364,8 @@
surveyList = new ArrayList<Survey>( surveyService.getSurveysByIndicator( selectedIndicator ) );
+ System.out.println( "availableIndicators= " + availableIndicators + ",,,ouIDTB= " + ouIDTB + "----sDateLB= " + sDateLB );
+ System.out.println( "eDateLB= " + eDateLB );
// Map<OrganisationUnitGroup, List<OrganisationUnit>> orgUnitGroupMap = new HashMap<OrganisationUnitGroup, List<OrganisationUnit>>();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/tr/action/GenerateTargetAnalysisDataAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/tr/action/GenerateTargetAnalysisDataAction.java 2011-04-15 11:34:10 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/tr/action/GenerateTargetAnalysisDataAction.java 2012-03-19 06:07:21 +0000
@@ -193,7 +193,10 @@
String yAxis_Title;
Double data1[][];
Double data2[][];
-
+
+ // -------------------------------------------------------------------------
+ // Action Implementation
+ // -------------------------------------------------------------------------
public String execute()
throws Exception
{
@@ -203,7 +206,12 @@
// OrgUnit Related Info
selectedOrgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
-
+
+
+ if( ougGroupSetCB.equalsIgnoreCase( "false" ))
+ {
+ ougGroupSetCB = null;
+ }
// Service Related Info
String[] partsOfDEandOptionCombo = availableDataElements.split(":");
selectedDataElement = dataElementService.getDataElement( Integer.parseInt( partsOfDEandOptionCombo[0] ) );
=== modified file 'local/in/dhis-web-dashboard/src/main/resources/struts.xml'
--- local/in/dhis-web-dashboard/src/main/resources/struts.xml 2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/struts.xml 2012-03-19 06:07:21 +0000
@@ -47,22 +47,25 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForGADataElement.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/db.js,javascript/ga.js,javascript/hashtable.js,javascript/date.js,javascript/gadataelement.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/db.js,javascript/ga.js,javascript/hashtable.js,javascript/date.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="generateChartDataElement"
class="org.hisp.dhis.dataanalyser.ga.action.charts.GenerateChartDataElementAction">
- <result name="success" type="velocity">/popup.vm</result>
- <!--<result name="success" type="velocity">/content.vm</result>-->
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm</result>-->
<param name="page">/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm</param>
-
<!--<result name="success" type="velocity">/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm</result>-->
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
- <interceptor-ref name="organisationUnitTreeStack"/>
+ <!--<interceptor-ref name="organisationUnitTreeStack"/>-->
</action>
+
+
<!-- for Chart data -->
<action name="generateChart1"
class="org.hisp.dhis.dataanalyser.ga.action.charts.GenerateChartAction1">
@@ -93,24 +96,26 @@
<!-- DrillDown periodToOrgUnit Child/GroupMember dataElements -->
<action name="generatedrillDownPeriodToOrgChildChartDataElement"
class="org.hisp.dhis.dataanalyser.ga.action.charts.GenerateDrillDownPeriodToOrgChildChartDataElementResultAction">
- <result name="success" type="velocity">/popup.vm</result>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
<param name="page">
/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
- <interceptor-ref name="organisationUnitTreeStack"/>
+ <!--<interceptor-ref name="organisationUnitTreeStack"/>-->
</action>
<!-- DrillDown OrgUnitToPeriod Child/GroupMember dataElements -->
<action name="generatedrillDownOurUnitToPeriodChartDataElement"
class="org.hisp.dhis.dataanalyser.ga.action.charts.GenerateDrillDownOrgUnitToPeriodChartDataElementResultAction">
- <result name="success" type="velocity">/popup.vm</result>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
<param name="page">
/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
- <interceptor-ref name="organisationUnitTreeStack"/>
+ <!--<interceptor-ref name="organisationUnitTreeStack"/>-->
</action>
<!-- GraphicalAnalyser DataElements end -->
@@ -123,28 +128,27 @@
/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm</param>
<param name="menu">
/dhis-web-dashboard/menuWithTreeForGAIndicator.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,javascript/db.js,javascript/ga.js,javascript/hashtable.js,javascript/date.js,javascript/gadataelement.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/db.js,javascript/ga.js,javascript/hashtable.js,javascript/date.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="generateChartIndicator"
class="org.hisp.dhis.dataanalyser.ga.action.charts.GenerateChartIndicatorAction">
- <result name="success" type="velocity">/popup.vm</result>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm</param>
<!--<result name="success" type="velocity">/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm</result>-->
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
- <interceptor-ref name="organisationUnitTreeStack"/>
+ <!--<interceptor-ref name="organisationUnitTreeStack"/>-->
</action>
<!-- sorting Indiacator data -->
<action name="getSortedIndicatorData"
class="org.hisp.dhis.dataanalyser.action.GetSortedIndicatorDataAction">
- <result name="success" type="velocity-xml">
- /dhis-web-dashboard/responseSortedData.vm</result>
+ <result name="success" type="velocity-xml">/dhis-web-dashboard/responseSortedData.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -161,25 +165,25 @@
<!-- DrillDown periodToOrgUnit Child/GroupMember Indicator -->
<action name="generateDrillDownPeriodToOrgChildChartIndicator"
class="org.hisp.dhis.dataanalyser.ga.action.charts.GenerateDrillDownPeriodToOrgChildChartIndicatorResultAction">
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">
- /dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
- <interceptor-ref name="organisationUnitTreeStack"/>
+ <!--<interceptor-ref name="organisationUnitTreeStack"/>-->
</action>
<!-- DrillDown OrgUnitToPeriod Child/GroupMember Indicator -->
<action name="generatedrillDownOugUnitToPeriodChartIndicator"
class="org.hisp.dhis.dataanalyser.ga.action.charts.GenerateDrillDownOrgUnitToPeriodChartIndicatorResultAction">
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">
- /dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js,javascript/gadataelement.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
- <interceptor-ref name="organisationUnitTreeStack"/>
+ <!--<interceptor-ref name="organisationUnitTreeStack"/>-->
</action>
<!-- GraphicalAnalyser Indicators end -->
@@ -188,11 +192,9 @@
<action name="graphicalAnalyser"
class="org.hisp.dhis.dataanalyser.ga.action.GenerateGraphicalAnalyserFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">
- /dhis-web-dashboard/graphicalAnalysisFront.vm</param>
+ <param name="page">/dhis-web-dashboard/graphicalAnalysisFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForGA.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,javascript/db.js,javascript/ga.js,javascript/hashtable.js,javascript/date.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/db.js,javascript/ga.js,javascript/hashtable.js,javascript/date.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
@@ -202,7 +204,7 @@
<result name="success" type="velocity">
/dhis-web-dashboard/graphicalAnalysisResult.vm</result>
<param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js</param>
+ ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
@@ -252,21 +254,20 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/annualAnalysisFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForTTA.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/util/lists.js,javascript/db.js,javascript/aa.js,javascript/hashtable.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/util/lists.js,javascript/db.js,javascript/aa.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="generateAnnualData"
class="org.hisp.dhis.dataanalyser.aa.action.GenerateAnnualAnalysisDataAction">
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">
- /dhis-web-dashboard/annualAnalysisResult.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,javascript/ga.js,javascript/hashtable.js</param>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/annualAnalysisResult.vm</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/ga.js,javascript/hashtable.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/aa.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
- <interceptor-ref name="organisationUnitTreeStack"/>
+ <!--<interceptor-ref name="organisationUnitTreeStack"/>-->
</action>
<!-- Export Annual data to Excel -->
@@ -288,7 +289,7 @@
<param name="page">/dhis-web-dashboard/motionChartForm.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForMC.vm</param>
<param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/mc.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js</param>
+ ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/mc.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
@@ -306,13 +307,12 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/surveyAnalysisFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForSA.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/db.js,javascript/aa.js,javascript/hashtable.js,javascript/date.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/db.js,javascript/aa.js,javascript/hashtable.js,javascript/date.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
- <!-- <action name="viewSurveyAnalysisResult"
+ <!--<action name="viewSurveyAnalysisResult"
class="org.hisp.dhis.dataanalyser.sa.action.GenerateSurveyAnalysisDataAction">
<result name="success" type="velocity">
/dhis-web-dashboard/surveyAnalysisResult.vm</result>
@@ -323,15 +323,15 @@
<action name="generateChartSurvey"
class="org.hisp.dhis.dataanalyser.sa.action.GenerateChartSurveyAction">
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">
- /dhis-web-dashboard/surveyAnalysisResult.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js</param>
+ <result name="success" type="velocity">/content.vm</result>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <param name="page">/dhis-web-dashboard/surveyAnalysisResult.vm</param>
+ <!--<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ga.js,javascript/hashtable.js</param>-->
+ <param name="javascripts">../dhis-web-commons/javascripts/lists.js,javascript/ga.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
- <!-- <action name="viewSurveyAnalysisResult"
+ <!--<action name="viewSurveyAnalysisResult"
class="org.hisp.dhis.dataanalyser.sa.action.GenerateChartSurveyAction">
<result name="success" type="velocity">/dhis-web-dashboard/surveyAnalysisResult.vm</result>
<param name="javascripts">
@@ -357,26 +357,24 @@
class="org.hisp.dhis.dataanalyser.tr.action.GenerateTargetAnalysisFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/targetAnalysisFront.vm</param>
- <param name="menu">
- /dhis-web-dashboard/menuWithTreeForTarget.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ta.js,javascript/db.js,javascript/tr.js,javascript/hashtable.js,javascript/date.js</param>
+ <param name="menu">/dhis-web-dashboard/menuWithTreeForTarget.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ta.js,javascript/db.js,javascript/tr.js,javascript/hashtable.js,javascript/date.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="getOrgUnitName"
class="org.hisp.dhis.dataanalyser.action.GetOrgUnitNameAction">
- <result name="success" type="velocity-xml">
+ <result name="success" type="velocity-json">
/dhis-web-dashboard/responseOrgUnitName.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
<action name="generateChartDeTarget"
class="org.hisp.dhis.dataanalyser.tr.action.GenerateTargetAnalysisDataAction">
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">
- /dhis-web-dashboard/deTargetAnalysisResult.vm</param>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/deTargetAnalysisResult.vm</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
@@ -397,8 +395,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/viewCommentFront.vm</param>
<param name="menu">/dhis-web-dashboard/menu.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/oust/oust.js,../dhis-web-commons/ouwt/ouwt.js,javascript/vc.js</param>
+ <param name="javascripts">../dhis-web-commons/oust/oust.js,../dhis-web-commons/ouwt/ouwt.js,javascript/vc.js</param>
</action>
<action name="viewCommentResult"
@@ -406,8 +403,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/viewCommentResult.vm</param>
<param name="menu">/dhis-web-dashboard/menu.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/oust/oust.js,../dhis-web-commons/ouwt/ouwt.js,javascript/vc.js</param>
+ <param name="javascripts">../dhis-web-commons/oust/oust.js,../dhis-web-commons/ouwt/ouwt.js,javascript/vc.js</param>
</action>
<action name="exportValidationResult"
@@ -424,18 +420,18 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/dataStatusFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForDS.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ds.js,javascript/db.js,javascript/date.js,javascript/hashtable.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ds.js,javascript/db.js,javascript/date.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="dataStatusResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateDataStatusResultAction">
- <result name="success" type="velocity">/popup.vm</result>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <!--<param name="success">/dhis-web-dashboard/dataStatusResult.vm</param>-->
<param name="page">/dhis-web-dashboard/dataStatusResult.vm</param>
- <param name="javascripts">
- javascript/ds.js,javascript/hashtable.js</param>
+ <param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
@@ -443,10 +439,8 @@
<action name="nullReportResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateNullReportResultAction">
<result name="success" type="velocity">/content.vm</result>
- <param name="page">
- /dhis-web-dashboard/nullReportDataEntryStatusResult.vm</param>
- <param name="javascripts">
- javascript/ds.js,javascript/hashtable.js</param>
+ <param name="page">/dhis-web-dashboard/nullReportDataEntryStatusResult.vm</param>
+ <param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
@@ -454,29 +448,25 @@
<action name="dataStatusDataSetWiseForm"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateDataStatusDataSetWiseFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">
- /dhis-web-dashboard/dataStatusDataSetWiseFront.vm</param>
- <param name="menu">
- /dhis-web-dashboard/menuWithTreeForDSDataSetWise.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ds.js,javascript/db.js,javascript/date.js,javascript/hashtable.js</param>
+ <param name="page">/dhis-web-dashboard/dataStatusDataSetWiseFront.vm</param>
+ <param name="menu">/dhis-web-dashboard/menuWithTreeForDSDataSetWise.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ds.js,javascript/db.js,javascript/date.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="dataStatusDataSetWiseResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateDataStatusDataSetWiseResultAction">
- <result name="success" type="velocity">
- /dhis-web-dashboard/dataStatusDataSetWiseResult.vm</result>
- <param name="javascripts">
- javascript/ds.js,javascript/hashtable.js</param>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/dataStatusDataSetWiseResult.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/dataStatusDataSetWiseResult.vm</param>
+ <param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
<action name="getPeriodsForDataSetWise"
class="org.hisp.dhis.dataanalyser.ds.action.GetPeriodsForDataSetWiseAction">
- <result name="success" type="velocity-xml">
- /dhis-web-dashboard/responsePeriodForDataSetWise.vm</result>
+ <result name="success" type="velocity-xml">/dhis-web-dashboard/responsePeriodForDataSetWise.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -484,7 +474,10 @@
<action name="commentResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateCommentResultAction">
- <result name="success" type="velocity">/dhis-web-dashboard/commentResult.vm</result>
+ <result name="success" type="velocity">/content.vm</result>
+ <!--<param name="success">/dhis-web-dashboard/dataStatusResult.vm</param>-->
+ <param name="page">/dhis-web-dashboard/commentResult.vm</param>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/commentResult.vm</result>-->
<param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
@@ -566,35 +559,37 @@
<action name="summaryStatusResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateSummaryDataStatusResultAction">
- <result name="success" type="velocity">
- /dhis-web-dashboard/summarySatusResult.vm</result>
- <param name="javascripts">
- javascript/ds.js,javascript/hashtable.js</param>
+ <result name="success" type="velocity">/content.vm</result>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/summarySatusResult.vm</result>-->
+ <param name="page">/dhis-web-dashboard/summarySatusResult.vm</param>
+ <param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
<action name="groupWiseDataStatusResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateGroupWiseDataStatusResultAction">
- <result name="success" type="velocity">/dhis-web-dashboard/groupWiseDataStatusResult.vm</result>
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/groupWiseDataStatusResult.vm</param>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/groupWiseDataStatusResult.vm</result>-->
<param name="javascripts">javascript/ds.js,javascript/hashtable.js,javascript/date.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
<action name="validationStatusResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateValidationStatusResultAction">
- <result name="success" type="velocity">
- /dhis-web-dashboard/validationSatusResult.vm</result>
- <param name="javascripts">
- javascript/ds.js,javascript/hashtable.js</param>
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/validationSatusResult.vm</param>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/validationSatusResult.vm</result>-->
+ <param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
<action name="lastUpdatedDataSetResult"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateLastUpdatedDataSetResultAction">
- <result name="success" type="velocity">
- /dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm</result>
- <param name="javascripts">
- javascript/ds.js,javascript/hashtable.js</param>
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm</param>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm</result>-->
+ <param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
@@ -614,8 +609,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/commentsFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForDS.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ds.js,javascript/db.js,javascript/hashtable.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ds.js,javascript/db.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
@@ -625,22 +619,19 @@
<action name="dataStatusOrgnisationunitGroupSetWiseForm"
class="org.hisp.dhis.dataanalyser.ds.orgunitgroupsetwise.action.GenerateDataStatusOrgnisationunitGroupSetWiseFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">
- /dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseFront.vm</param>
- <param name="menu">
- /dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ds.js,javascript/db.js,javascript/date.js,javascript/hashtable.js</param>
+ <param name="page">/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseFront.vm</param>
+ <param name="menu">/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ds.js,javascript/db.js,javascript/date.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="dataStatusOrgnisationunitGroupSetWiseResult"
class="org.hisp.dhis.dataanalyser.ds.orgunitgroupsetwise.action.GenerateDataStatusOrgnisationunitGroupSetWiseResultAction">
- <result name="success" type="velocity">
- /dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseResult.vm</result>
- <param name="javascripts">
- javascript/ds.js,javascript/hashtable.js</param>
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseResult.vm</param>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseResult.vm</result>-->
+ <param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
@@ -660,8 +651,7 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/commentsFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForDS.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/ds.js,javascript/db.js,javascript/hashtable.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/ds.js,javascript/db.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
@@ -673,18 +663,17 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard/nullReporterFront.vm</param>
<param name="menu">/dhis-web-dashboard/menuWithTreeForNR.vm</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/lists/lists.js,javascript/db.js,javascript/nr.js,javascript/date.js,javascript/hashtable.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/lists.js,javascript/db.js,javascript/nr.js,javascript/date.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
<interceptor-ref name="organisationUnitTreeStack"/>
</action>
<action name="NullReporterResult"
class="org.hisp.dhis.dataanalyser.nr.action.GenerateNullReporterResultAction">
- <result name="success" type="velocity">
- /dhis-web-dashboard/nullReporterResult.vm</result>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,javascript/nr.js,javascript/hashtable.js</param>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/nullReporterResult.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dashboard/nullReporterResult.vm</param>
+ <param name="javascripts">javascript/nr.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
</action>
<!--
@@ -978,7 +967,9 @@
<!-- Data Entry Status Result -->
<action name="dataEntryStatusResult"
class="org.hisp.dhis.dataanalyser.dsMart.action.GenerateDataEntryStatusResultAction">
- <result name="success" type="velocity">/popup.vm</result>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/dataEntryStatusResult.vm</result>-->
<param name="page">/dhis-web-dashboard/dataEntryStatusResult.vm</param>
<param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
@@ -987,7 +978,9 @@
<!-- Data Entry Summary Status Result -->
<action name="dataEntrySummaryStatusResult"
class="org.hisp.dhis.dataanalyser.dsMart.action.GenerateDataEntrySummaryStatusResultAction">
- <result name="success" type="velocity">/popup.vm</result>
+ <!--<result name="success" type="velocity">/popup.vm</result>-->
+ <result name="success" type="velocity">/content.vm</result>
+ <!--<result name="success" type="velocity">/dhis-web-dashboard/dataEntrySummaryStatusResult.vm</result>-->
<param name="page">/dhis-web-dashboard/dataEntrySummaryStatusResult.vm</param>
<param name="javascripts">javascript/ds.js,javascript/hashtable.js</param>
<param name="stylesheets">css/StylesForTags.css</param>
=== 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 2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm 2012-03-19 06:07:21 +0000
@@ -11,7 +11,8 @@
<h3>$i18n.getString( "aa_annual_analyser" )</h3>
<hr /><br />
-<form id="ChartGenerationForm" name="ChartGenerationForm" method="post" target="chartWindow1">
+<!--<form id="ChartGenerationForm" name="ChartGenerationForm" method="post" target="chartWindow1">-->
+<form id="ChartGenerationForm" name="ChartGenerationForm">
<table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
<colgroup>
<col width="325">
@@ -48,7 +49,7 @@
<td class="NormalB"> </td>
<td class="NormalB">
$i18n.getString( "ga_filter_by_indicatorgroup" )<br />
- <select id="indicatorGroupId" name="indicatorGroupId" style="width:325px" onchange="getIndicators()">
+ <select id="indicatorGroupId" name="indicatorGroupId" style="width:325px" onchange="getIndicatorsForAnnual()">
<option value="$ALL">[ Select IndicatorGroup / All ]</option>
#foreach ( $group in $indicatorGroups )
<option value="$group.id" title="$group.name">$group.name</option>
@@ -137,3 +138,4 @@
</tr>
</table>
</form>
+<div id="contentDiv"></div>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisResult.vm 2010-12-29 07:47:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisResult.vm 2012-03-19 06:07:21 +0000
@@ -58,7 +58,14 @@
{
var chartTypeOptionList = document.getElementById("chartTypeOption");
var chartTypeOptionValue = chartTypeOptionList.options[ chartTypeOptionList.selectedIndex ].value;
- iframeForChart.location.href = "generateChart.action?currentChart="+chartTypeOptionValue;
+
+ var tempSRC = "generateChart.action?currentChart=" + chartTypeOptionValue;
+
+ //document.getElementById('iframeForChart').src = null;
+ document.getElementById('iframeForChart').src = tempSRC;
+
+
+ //iframeForChart.location.href = "generateChart.action?currentChart="+chartTypeOptionValue;
}
//for export into excel
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm 2012-03-19 06:07:21 +0000
@@ -18,12 +18,45 @@
//alert("inside include zero : " + immChildOption );
// var urlForImmChild = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
//alert( urlForImmChild );
+
+ /*
evt.target.href = "dataEntryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ */
+ var url = "dataEntryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
+
}
else
{
- alert("inside include zero null");
+ //alert("inside include zero null");
+ /*
evt.target.href = "dataEntryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ */
+ var url = "dataEntryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
}
}
function exportDataStatusResultToWorkBook()
@@ -92,8 +125,7 @@
</tr>
</table>
</div>
-
- <br><br>
+ <br>
<div align="left" class="NormalB">DataSet : $dataSetName ( $totalDataElementCount )</div>
<table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse" width="100%">
<tr class="TableHeadingCellStyles" align="center">
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntrySummaryStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntrySummaryStatusResult.vm 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntrySummaryStatusResult.vm 2012-03-19 06:07:21 +0000
@@ -18,12 +18,44 @@
//alert("inside include zero : " + immChildOption );
// var urlForImmChild = "dataEntrySummaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
//alert( urlForImmChild );
+ /*
evt.target.href = "dataEntrySummaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ */
+ var url = "dataEntrySummaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
}
else
{
- alert("inside include zero null");
+ //alert("inside include zero null");
+ /*
evt.target.href = "dataEntrySummaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ */
+ var url = "dataEntrySummaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
+
}
}
function exportDataStatusResultToWorkBook()
@@ -81,7 +113,7 @@
</tr>
</table>
</div>
- <br><br>
+ <br>
<div align="left" class="NormalB">DataSet : $dataSetName ( $totalDataElementCount )</div>
<table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse" width="100%">
<tr class="TableHeadingCellStyles" align="center">
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseFront.vm 2011-11-15 09:05:27 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseFront.vm 2012-03-19 06:07:21 +0000
@@ -18,7 +18,8 @@
<h3>$i18n.getString( "dsform_datasetwise" )</h3>
<hr />
-<form id="ChartGenerationDataSetWiseForm" name="ChartGenerationDataSetWiseForm" action="dataStatusDataSetWiseResult.action" onsubmit="return formValidationsDataStatusDataSetWise()" method="get" target="chartWindow1">
+<!--<form id="ChartGenerationDataSetWiseForm" name="ChartGenerationDataSetWiseForm" action="dataStatusDataSetWiseResult.action" onsubmit="return formValidationsDataStatusDataSetWise()" method="get" target="chartWindow1">-->
+<form id="ChartGenerationDataSetWiseForm" name="ChartGenerationDataSetWiseForm">
<table align="center" style="border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="80%" border="0">
<tr>
<td class="NormalB">
@@ -50,13 +51,14 @@
<select name="orgUnitListCB" id="orgUnitListCB" multiple style="width:200px;height:100px" ondblclick="remOUDataSetWiseFunction()">
</select>
<br/><br/>
- <input type="submit" name="ViewSummary" value="View DataSummary" style="width:200px" />
+ <!--<input type="submit" name="ViewSummary" value="View DataSummary" style="width:200px" />-->
+ <input type="button" name="ViewSummary" value="View DataSummary" style="width:200px" onClick="javascript:formValidationsDataStatusDataSetWise()">
</td>
</tr>
</table>
<input type="hidden" name="selectedButton" id="selectedButton"/>
</form>
-
+<div id="contentDiv"></div>
<script>
//getdSetPeriods();
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseResult.vm 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseResult.vm 2012-03-19 06:07:21 +0000
@@ -1,7 +1,7 @@
<html>
<head>
- <title>SummaryStatus Result</title>
+ <title>Summary Status Result</title>
<link type="text/css" rel="stylesheet" media="screen" href="css/StylesForTags.css">
<script>
var startDate = "$sDateLB";
=== 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 2011-11-22 07:20:09 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm 2012-03-19 06:07:21 +0000
@@ -18,7 +18,8 @@
<h3>DataStatus Form</h3>
<hr />
-<form id="ChartGenerationForm" name="ChartGenerationForm" method="get" target="chartWindow1">
+<!--<form id="ChartGenerationForm" name="ChartGenerationForm" method="get" target="chartWindow1">-->
+<form id="ChartGenerationForm" name="ChartGenerationForm">
<table align="center" style="border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="80%" border="0">
<tr>
<td class="NormalB">
@@ -66,7 +67,7 @@
</table>
<input type="hidden" name="selectedButton" id="selectedButton"/>
</form>
-
+<div id="contentDiv"></div>
<script>
getdSetPeriods();
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseFront.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseFront.vm 2012-03-19 06:07:21 +0000
@@ -27,7 +27,8 @@
<body onload = "getdSetPeriods()">
<h1> $i18n.getString( "DataStatus Orgnisationunit Group Set Wise Form" ) </h1>
<hr />
-<form id="ChartGenerationForm" name="ChartGenerationForm" action="dataStatusOrgnisationunitGroupSetWiseResult.action" method="post" onsubmit="return formValidationsForOUwiseDataStatus()" target="chartWindow1">
+<!--<form id="ChartGenerationForm" name="ChartGenerationForm" action="dataStatusOrgnisationunitGroupSetWiseResult.action" method="post" onsubmit="return formValidationsForOUwiseDataStatus()" target="chartWindow1">-->
+<form id="ChartGenerationForm" name="ChartGenerationForm">
<table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
<tr>
<td class="NormalB" width="325"> </td>
@@ -107,11 +108,14 @@
<td> </td>
</tr>
<tr>
- <td align="center" colspan="4"><input type="submit" name="ViewStatus" value="ViewStatus" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" >
+ <td align="center" colspan="4">
+ <!--<input type="submit" name="ViewStatus" value="ViewStatus" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" >-->
+ <input type="button" name="ViewStatus" value="ViewStatus" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:formValidationsForOUwiseDataStatus()">
</td>
</tr>
</table>
</form>
+<div id="contentDiv"></div>
<script>
getOrgUnitGroups();
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseResult.vm 2010-08-31 11:27:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusOrgnisationunitGroupSetWiseResult.vm 2012-03-19 06:07:21 +0000
@@ -53,7 +53,7 @@
</div>
#foreach($selectedOrgUnitGroup in $orgUnitGroupList)
- <br><br>
+ <br>
<div align="left" class="NormalB">$i18n.getString( "organisation_unit_group" ) : $selectedOrgUnitGroup.getName()</div>
<table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse" width="100%">
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm 2012-03-19 06:07:21 +0000
@@ -19,12 +19,46 @@
//alert("inside include zero : " + immChildOption );
//var urlForImmChild = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
//alert( urlForImmChild );
+ /*
evt.target.href = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ */
+ var url = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
+
}
else
{
- alert("inside include zero null");
+ //alert("inside include zero null");
+ /*
evt.target.href = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ */
+ var url = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
+
}
}
function exportDataStatusResultToWorkBook()
@@ -89,8 +123,7 @@
</tr>
</table>
</div>
-
- <br><br>
+ <br>
<div align="left" class="NormalB">DataSet : $selDataSet.name ( $dataSetMemberCount1 )</div>
<table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse" width="100%">
<tr class="TableHeadingCellStyles" align="center">
=== 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 2012-01-10 10:35:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm 2012-03-19 06:07:21 +0000
@@ -80,8 +80,8 @@
<h3>$i18n.getString( "dataelements_wise_graphical_analyser" )</h3>
<hr />
-
-<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartDataElement.action" method="post" onSubmit="return formValidationsDataElement()" target="chartWindowDataElement">
+<!--<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartDataElement.action" method="post" onSubmit="return formValidationsDataElement()" target="chartWindowDataElement">-->
+<form id="ChartGenerationForm" name="ChartGenerationForm">
<table style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" border=0>
<tr>
<td class="NormalB">$i18n.getString( "ga_filter_by_degroup" )<br>
@@ -213,17 +213,18 @@
<td class="NormalB" align="center">
<table>
<tr>
- <td><input type="submit" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width:150px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewChart')"></td>
+ <td><input type="button" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width:150px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewChart')"></td>
<td> </td>
- <td align="right"><input type="submit" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width:175px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewSummary')"></td>
+ <td align="right"><input type="button" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width:175px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewSummary')"></td>
<input type="hidden" name="selectedButton" id="selectedButton">
+ <input type="hidden" name="validation" id="validation" value="dataelement">
</tr>
</table>
</td>
</tr>
</table>
</form>
-
+<div id="contentDiv"></div>
<script>
getPeriods();
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm 2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm 2012-03-19 06:07:21 +0000
@@ -1,5 +1,5 @@
-<script>
+<script language="javascript">
function drillDownResult(evt, selVal )
{
@@ -38,7 +38,23 @@
//alert( orgUnitId + "," + dataElementId + "," + categoryCombo + "," + periodTypeName + "," + startDate + "," + endDate + "," + year + "," + month );
+
+ /*
+
evt.target.href = "generatedrillDownPeriodToOrgChildChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ */
+
+ var url = "generatedrillDownPeriodToOrgChildChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Period to Org Child',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
//evt.target.href = "generatedrillDownPeriodToChildChartDataElement.action?orgUnitListCB="+orgUnitId+"&periodTypeLB="+periodTypeName+"&selStartPeriodList="+startDate+"&selectedDataElements="+ dataElementId + "&categoryLB=children";
}
@@ -87,8 +103,26 @@
// alert( ouRadioVal );
//if( ouRadioVal == "periodWiseDrillDown" )
//{
- evt.target.href = "generatedrillDownOurUnitToPeriodChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
- //}
+
+ /*
+ evt.target.href = "generatedrillDownOurUnitToPeriodChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ */
+
+ var url = "generatedrillDownOurUnitToPeriodChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Org Unit to Period',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
+ //}
//else
//{
//evt.target.href = "generatedrillDownPeriodToOrgChildChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton;
@@ -137,7 +171,24 @@
//alert( ouRadioVal );
//if( ouRadioVal == "periodWiseDrillDown" )
//{
- evt.target.href = "generatedrillDownOurUnitToPeriodChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+
+ /*
+ evt.target.href = "generatedrillDownOurUnitToPeriodChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ */
+
+ var url = "generatedrillDownOurUnitToPeriodChartDataElement.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Org Unit Group to Period',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
//}
//else
//{
@@ -157,7 +208,6 @@
function chartTypeOptionChange(evt)
{
-
var chartTypeOptionList = document.getElementById("chartTypeOption");
var chartTypeOptionValue = chartTypeOptionList.options[ chartTypeOptionList.selectedIndex ].value;
@@ -169,8 +219,16 @@
var chartDisplayOptionValue = chartDisplayOptionList.options[ chartDisplayOptionList.selectedIndex ].value;
// alert(chartDisplayOptionValue);
+
+
+ var tempSRC = "generateChart1.action?currentChart="+chartTypeOptionValue + "&chartDisplayOption=" + chartDisplayOptionValue;
+
+ //document.getElementById('iframeForChart').src = null;
+ document.getElementById('iframeForChart').src = tempSRC;
+
+ //document.getElementById("iframeForChart").location.src = "tempSRC";
- iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
+ //iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
}
@@ -178,18 +236,24 @@
function chartDisplayOptionChange(evt)
{
-
var chartTypeOptionList = document.getElementById("chartTypeOption");
var chartTypeOptionValue = chartTypeOptionList.options[ chartTypeOptionList.selectedIndex ].value;
var chartDisplayOptionList = document.getElementById("chartDisplayOption");
var chartDisplayOptionValue = chartDisplayOptionList.options[ chartDisplayOptionList.selectedIndex ].value;
-
- // iframeForChart.location.href = "generateChart1.action?currentChart="+chartNamesToView[chartType][indexForChart]+"&chartDisplayOption="+chartDisplayOptionValue;
-
- iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
+
+
+ //iframeForChart.location.href = "generateChart1.action?currentChart="+chartNamesToView[chartType][indexForChart]+"&chartDisplayOption="+chartDisplayOptionValue;
+ //alert( iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue);
+
+
+ var tempSRC = "generateChart1.action?currentChart="+chartTypeOptionValue + "&chartDisplayOption=" + chartDisplayOptionValue;
+ document.getElementById('iframeForChart').src = tempSRC;
+
+ // iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
//getSortedList(chartDisplayOptionValue);
+
getSortedListDataElement(chartDisplayOptionValue);
}
@@ -387,6 +451,6 @@
#end
</div>
<textarea id="testId" rows="10" cols="70" style="display:none"> </textarea>
-</form>
+<!--</form>-->
\ 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 2012-01-10 10:35:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm 2012-03-19 06:07:21 +0000
@@ -81,7 +81,8 @@
<h3>$i18n.getString( "indicator_wise_graphical_analyser" )</h3>
<hr />
-<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartIndicator.action" method="post" onSubmit="return formValidationsIndicator()" target="chartWindowIndicator">
+<!--<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartIndicator.action" method="post" onSubmit="return formValidationsIndicator()" target="chartWindowIndicator">-->
+<form id="ChartGenerationForm" name="ChartGenerationForm">
<table style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" border=0>
<tr>
<td class="NormalB">$i18n.getString( "ga_filter_by_indicatorgroup" )<br>
@@ -202,17 +203,18 @@
<td class="NormalB" align="center">
<table>
<tr>
- <td><input type="submit" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width:150px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewChart')"></td>
+ <td><input type="button" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width:150px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewChart')"></td>
<td> </td>
- <td align="right"><input type="submit" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width:175px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewSummary')" /></td>
+ <td align="right"><input type="button" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width:175px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewSummary')" /></td>
<input type="hidden" name="selectedButton" id="selectedButton">
+ <input type="hidden" name="validation" id="validation" value="indicator">
</tr>
</table>
</td>
</tr>
</table>
</form>
-
+<div id="contentDiv"></div>
<script>
getPeriods();
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm 2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorResult.vm 2012-03-19 06:07:21 +0000
@@ -34,7 +34,25 @@
// alert( orgUnitId + "," + orgUnitGroupId + "," + indicatorId + "," + periodTypeName + "," + startDate + "," + endDate + "," + drillDownPeriodName + "," + aggDataCB );
+ /*
evt.target.href = "generateDrillDownPeriodToOrgChildChartIndicator.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ */
+
+ var url = "generateDrillDownPeriodToOrgChildChartIndicator.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Period to Org Child',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
+
}
// method called when view by children or random and Group not check , and view by children and Group checked
@@ -64,7 +82,22 @@
// alert( orgUnitId + "," + orgUnitGroupId + "," + indicatorId + "," + periodTypeName + "," + startDate + "," + endDate + "," + drillDownPeriodName + "," + aggDataCB );
+ /*
evt.target.href = "generatedrillDownOugUnitToPeriodChartIndicator.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ */
+
+ var url = "generatedrillDownOugUnitToPeriodChartIndicator.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Org Unit to Period',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
}
// method called when view by selected and Group checked
@@ -93,7 +126,25 @@
//alert( aggDataCB );
//alert( orgUnitId + "," + orgUnitGroupId + "," + indicatorId + "," + periodTypeName + "," + startDate + "," + endDate + "," + drillDownPeriodName + "," + aggDataCB );
+
+ /*
evt.target.href = "generatedrillDownOugUnitToPeriodChartIndicator.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ */
+
+ var url = "generatedrillDownOugUnitToPeriodChartIndicator.action?selDrillDownData="+selDrillDownData + "&selectedButton=" + selectedButton + "&categoryLB=" + viewBy + "&aggDataCB=" + aggDataCB;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Org Unit Group to Period',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
}
@@ -103,7 +154,6 @@
function chartTypeOptionChange(evt)
{
-
var chartTypeOptionList = document.getElementById("chartTypeOption");
var chartTypeOptionValue = chartTypeOptionList.options[ chartTypeOptionList.selectedIndex ].value;
@@ -115,8 +165,13 @@
var chartDisplayOptionValue = chartDisplayOptionList.options[ chartDisplayOptionList.selectedIndex ].value;
// alert(chartDisplayOptionValue);
-
- iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
+
+
+ var tempSRC = "generateChart1.action?currentChart="+chartTypeOptionValue + "&chartDisplayOption=" + chartDisplayOptionValue;
+ document.getElementById('iframeForChart').src = tempSRC;
+
+
+ //iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
}
@@ -133,7 +188,13 @@
// alert(chartDisplayOptionValue);
// iframeForChart.location.href = "generateChart1.action?currentChart="+chartNamesToView[chartType][indexForChart]+"&chartDisplayOption="+chartDisplayOptionValue;
- iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
+
+ var tempSRC = "generateChart1.action?currentChart="+chartTypeOptionValue + "&chartDisplayOption=" + chartDisplayOptionValue;
+ document.getElementById('iframeForChart').src = tempSRC;
+
+
+
+ //iframeForChart.location.href = "generateChart1.action?currentChart="+chartTypeOptionValue+"&chartDisplayOption="+chartDisplayOptionValue;
//getSortedList(chartDisplayOptionValue);
getSortedListIndicator(chartDisplayOptionValue);
@@ -236,8 +297,8 @@
<td class="NormalB"><a id="exportExcelAnchor1" name="exportExcelAnchor1" href="#" onclick="javascript:exportToExcelFunction1('no')" target="_blank">Export To Excel</a></td>
<td class="NormalB"> <!--<font face="Arial, Helvetica, sans-serif" color="#000000">-->
<select id="chartTypeOption" name="chartTypeOption" onchange="chartTypeOptionChange(event)">
- <option value="Vertical3DBarChart">Select Chart Type</option>
<option value="Vertical3DBarChart">Vertical 3D BarChart</option>
+ <!--<option value="Vertical3DBarChart">Vertical 3D BarChart</option>-->
<option value="Horizontal3DBarChart">Horizontal 3D BarChart</option>
<option value="LineChart">Line Chart</option>
<option value="LineAndBarChart">Line And BarChart</option>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseDataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseDataStatusResult.vm 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseDataStatusResult.vm 2012-03-19 06:07:21 +0000
@@ -7,6 +7,7 @@
var startDate = "$sDateLB";
var endDate = "$eDateLB";
var dsType = "$selectedButton";
+ var includeZeros = "$includeZeros";
function getImmChildInfo(evt, dsId, selOrgUnit)
{
@@ -16,11 +17,43 @@
if( document.getElementById('includeZeros').checked )
{
+ /*
evt.target.href = "groupWiseDataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ */
+ //alert("inside include zero : " + immChildOption );
+ var url = "groupWiseDataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ //alert( url );
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
}
else
{
+ alert("inside include zero null");
+ /*
evt.target.href = "groupWiseDataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ */
+ var url = "groupWiseDataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
}
}
@@ -68,7 +101,7 @@
#set($count2 = 0)
##foreach($dataElementGroup in $dataElementGroups)
#foreach( $dataElementGroup in $sections )
- <br><br>
+ <br>
#set( $deGroupCount = $deMapGroupCount.get($dataElementGroup) )
#set( $ouMapDeCount = $ouGroupMapDeMapCount.get($dataElementGroup) )
<div align="left" class="NormalB">Data Element Group : $dataElementGroup.name ( $!deGroupCount )</div>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/aa.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/aa.js 2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/aa.js 2012-03-19 06:07:21 +0000
@@ -13,7 +13,8 @@
document.ChartGenerationForm.dataElementGroupId.disabled = false;
document.ChartGenerationForm.availableDataElements.disabled = false;
document.ChartGenerationForm.selectedDataElements.disabled = false;
- }// if block end
+ }
+ // if block end
else
{
document.ChartGenerationForm.indicatorGroupId.disabled = false;
@@ -23,27 +24,79 @@
document.ChartGenerationForm.dataElementGroupId.disabled = true;
document.ChartGenerationForm.availableDataElements.disabled = true;
document.ChartGenerationForm.selectedDataElements.disabled = true;
- }// else end
-}// function riradioSelection end
+ }
+ // else end
+}
+ // function riradioSelection end
function selButtonFunction( selButton )
-{
+{
+ var riRadioButtonValue = $( "input[name='riRadio']:checked" ).val();
+
if( formValidations() )
{
- if(selButton == "SurveyAnalysis")
+ if(selButton == "SurveyAnalysis")
{
- document.ChartGenerationForm.action = "viewSurveyAnalysisResult.action";
+ document.ChartGenerationForm.action = "viewSurveyAnalysisResult.action";
document.ChartGenerationForm.submit();
}
+ else if ( selButton == "AnnualAnalysis" )
+ {
+ generateAnnualChart( riRadioButtonValue );
+
+ //document.ChartGenerationForm.action = "generateAnnualData.action";
+ //document.ChartGenerationForm.submit();
+ }
else
- {
- document.ChartGenerationForm.action = "generateAnnualData.action";
- document.ChartGenerationForm.submit();
+ {
+ //alert( riRadioButtonValue + "--" + selButton );
}
}
}
-
+
+function generateAnnualChart( riRadioButtonValue )
+{
+ var url = "generateAnnualData.action?" + getParamsStringBySelected( 'annualPeriodsListCB', 'annualPeriodsListCB' )+ "&" + getParamsStringBySelected( 'monthlyPeriodsListCB', 'monthlyPeriodsListCB' );
+
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ ouIDTB : getFieldValue( 'ouIDTB' ),
+ availableIndicators : getFieldValue( 'availableIndicators' ),
+ availableDataElements : getFieldValue( 'availableDataElements' ),
+ riRadio : riRadioButtonValue,
+ //aggDataCB : isChecked( 'aggDataCB' ),
+ } ).dialog( {
+ title: 'Annual Graphical Analysis',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
+function getParamsStringBySelected( elementId, param )
+{
+ //alert( "getParamsStringBySelected" );
+ var result = "";
+ var list = jQuery( "#" + elementId ).children( ":selected" );
+
+ list.each( function( i, item ){
+
+ //result += param + "=" + item.value + "&";
+ result += param + "=" + item.value;
+ result += ( i < list.length - 1 ) ? "&" : "";
+
+ });
+
+ //result = result.substring( 0, list.length - 1 );
+ //alert( result );
+ return result;
+}
+
//Anaul Analysis Form Validations
function formValidations()
{
@@ -59,15 +112,20 @@
else if(selriRadioButton == "indicatorsRadio" && availIndListIndex < 0) {alert("Please Select Indicator");return false;}
else if(annualPeriodListIndex < 0) {alert("Please Select Year(s)");return false;}
else if(monthlyPeriodListIndex < 0) {alert("Please Select Month(s)");return false;}
-
+
+ /*
var sWidth = 850;
var sHeight = 650;
var LeftPosition=(screen.width)?(screen.width-sWidth)/2:100;
var TopPosition=(screen.height)?(screen.height-sHeight)/2:100;
window.open('','chartWindow1','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
+
+ */
return true;
-} // formValidations Function End
+
+}
+// formValidations Function End
//Survey Analysis Form Validations
function formValidationsForSurvey()
@@ -89,6 +147,8 @@
else if(eDateIndex < 0) {alert("Please Select Ending Period");return false;}
else if(sDate > eDate) {alert("Starting Date is Greater");return false;}
+
+ /*
var sWidth = 850;
var sHeight = 650;
var LeftPosition=(screen.width)?(screen.width-sWidth)/2:100;
@@ -96,5 +156,42 @@
window.open('','chartWindow1','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
return true;
-} // formValidations Function End
-
+ */
+
+ generateChartSurvey();
+
+}
+
+// formValidations Function End
+
+
+function generateChartSurvey()
+{
+
+ var url = "generateChartSurvey.action";
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ ouIDTB : getFieldValue( 'ouIDTB' ),
+ availableIndicators : getFieldValue( 'availableIndicators' ),
+ sDateLB : getFieldValue( 'sDateLB' ),
+ eDateLB : getFieldValue( 'eDateLB' ),
+ } ).dialog( {
+ title: 'Survey Graphical Analysis',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
=== 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 2012-02-17 07:00:23 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js 2012-03-19 06:07:21 +0000
@@ -301,6 +301,7 @@
if ( dataSetSectionId != null )
{
+ lockScreen();
$.post("getDataElements.action",
{
id:dataSetSectionId
@@ -425,7 +426,27 @@
}
//document.getElementById( "availableIndicatorsFilter" ).value = "";
//document.getElementById( "availableIndicatorsFilter" ).disabled = false;
-
+ lockScreen();
+ $.post("getIndicators.action",
+ {
+ id:indicatorGroupId
+ },
+ function (data)
+ {
+ getIndicatorsReceived(data);
+ },'xml');
+ }
+}
+
+
+function getIndicatorsForAnnual()
+{
+ var indicatorGroupList = document.getElementById( "indicatorGroupId" );
+ var indicatorGroupId = indicatorGroupList.options[ indicatorGroupList.selectedIndex ].value;
+
+ if ( indicatorGroupId != null )
+ {
+ lockScreen();
$.post("getIndicators.action",
{
id:indicatorGroupId
@@ -451,6 +472,7 @@
request.setCallbackSuccess(getIndicatorsReceived);
request.send(url);
*/
+ lockScreen();
$.post("getIndicators.action",
{
id : indicatorGroupId,
@@ -487,7 +509,7 @@
availableIndicators.add( option, null );
}
}
-
+ unLockScreen();
// If the list of available indicators is empty, an empty placeholder will be added
//addOptionPlaceHolder( availableIndicators );
}
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js 2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js 2012-03-19 06:07:21 +0000
@@ -82,15 +82,27 @@
var dataEntryStatus = document.getElementById("usingDataEntryStatus").checked;
if ( dataEntryStatus == true )
{
+
+ var url = "dataEntrySummaryStatusResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+ /*
document.ChartGenerationForm.action = "dataEntrySummaryStatusResult.action";
document.ChartGenerationForm.submit();
+ */
}
else
{
//document.getElementById("facilityLB").options[1].selected = true;
+ var url = "summaryStatusResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+
+ /*
document.ChartGenerationForm.action = "summaryStatusResult.action";
document.ChartGenerationForm.submit();
+ */
}
}
@@ -103,11 +115,16 @@
else if(summary == "GroupWiseStatus")
{
- document.ChartGenerationForm.action = "groupWiseDataStatusResult.action";
+ var url = "groupWiseDataStatusResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+ /*
+ document.ChartGenerationForm.action = "groupWiseDataStatusResult.action";
document.ChartGenerationForm.submit();
+ */
}
- //for Mobile Group wise data status
+ //for Mobile Group wise data status
else if(summary == "GroupWiseMobileStatus")
{
document.ChartGenerationForm.action = "groupWiseMobileDataStatusResult.action";
@@ -117,8 +134,13 @@
else if(summary == "ValidationStatus")
{
+ var url = "validationStatusResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+ /*
document.ChartGenerationForm.action = "validationStatusResult.action";
document.ChartGenerationForm.submit();
+ */
}
// for Mobile Validation Status
else if(summary == "ValidationMobileStatus")
@@ -128,22 +150,36 @@
}
else if(summary == "LastUpdatedStatus")
{
+
+ var url = "lastUpdatedDataSetResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+ /*
document.ChartGenerationForm.action = "lastUpdatedDataSetResult.action";
document.ChartGenerationForm.submit();
+ */
}
//for view Comment
else if(summary == "ViewComment")
{
+
+ var url = "commentResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+
+ /*
document.ChartGenerationForm.action = "commentResult.action";
document.ChartGenerationForm.submit();
+ */
}
- // for Mobile Last Updated Status
+
+ // for Mobile Last Updated Status
else if(summary == "LastUpdatedMobileStatus")
{
document.ChartGenerationForm.action = "lastUpdatedMobileDataSetResult.action";
document.ChartGenerationForm.submit();
}
- // for Mobile dataStatus result
+ // for Mobile dataStatus result
else if(summary == "MobileDataStatus")
{
@@ -167,13 +203,25 @@
//alert( dataEntryStatus );
if ( dataEntryStatus == true )
{
+
+ var url = "dataEntryStatusResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+ /*
document.ChartGenerationForm.action = "dataEntryStatusResult.action";
document.ChartGenerationForm.submit();
+ */
}
else
- {
- document.ChartGenerationForm.action = "dataStatusResult.action";
- document.ChartGenerationForm.submit();
+ {
+
+ var url = "dataStatusResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ generateDataStatusResult( url );
+
+ //document.ChartGenerationForm.action = "dataStatusResult.action";
+ //document.ChartGenerationForm.submit();
+ //generateDataStatusResult();
}
}
@@ -181,6 +229,58 @@
}
+function generateDataStatusResult( url )
+{
+ //var url = "dataStatusResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ selectedDataSets : getFieldValue( 'selectedDataSets' ),
+ facilityLB : getFieldValue( 'facilityLB' ),
+ sDateLB : getFieldValue( 'sDateLB' ),
+ eDateLB : getFieldValue( 'eDateLB' ),
+ includeZeros : isChecked( 'includeZeros' ),
+ //usingDataEntryStatus : isChecked( 'usingDataEntryStatus' ),
+ //selectedButton : tempselectedButtonDE,
+ } ).dialog( {
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
+function getParamsStringBySelected( elementId, param )
+{
+ //alert( "getParamsStringBySelected" );
+ var result = "";
+ var list = jQuery( "#" + elementId ).children( ":selected" );
+
+ list.each( function( i, item ){
+
+ //result += param + "=" + item.value + "&";
+ result += param + "=" + item.value;
+ result += ( i < list.length - 1 ) ? "&" : "";
+
+ });
+
+ //result = result.substring( 0, list.length - 1 );
+ //alert( result );
+ return result;
+}
+
// DataStatus Form Validations
function formValidationsForDataStatus()
{
@@ -217,18 +317,19 @@
{
document.ChartGenerationForm.orgUnitListCB.options[k].selected = true;
}
-
+ /*
var sWidth = 850;
var sHeight = 650;
var LeftPosition=(screen.width)?(screen.width-sWidth)/2:100;
var TopPosition=(screen.height)?(screen.height-sHeight)/2:100;
window.open('','chartWindow1','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
-
+ */
return true;
-} // formValidations Function End
+}
+// formValidations Function End
//DataStatus Form Validations
@@ -264,7 +365,7 @@
alert("Please Select OrganisationUnit"); return false;
}
- /*
+ /*
var k=0;
for(k=0;k<selOUListIndex;k++)
@@ -272,6 +373,7 @@
document.ChartGenerationForm.orgUnitListCB.options[k].selected = true;
}
*/
+ /*
var sWidth = 850;
var sHeight = 650;
var LeftPosition=(screen.width)?(screen.width-sWidth)/2:100;
@@ -280,9 +382,48 @@
window.open('','chartWindow1','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
return true;
+ */
+ generateDataStatusOrgnisationunitGroupSetWiseResult();
}
-// formValidations Function End
+// formValidations Function End
+
+
+
+function generateDataStatusOrgnisationunitGroupSetWiseResult()
+{
+ var url = "dataStatusOrgnisationunitGroupSetWiseResult.action?" + getParamsStringBySelected( 'orgUnitListCB', 'orgUnitListCB' );
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ selectedDataSets : getFieldValue( 'selectedDataSets' ),
+ orgUnitGroupSetListCB : getFieldValue( 'orgUnitGroupSetListCB' ),
+ sDateLB : getFieldValue( 'sDateLB' ),
+ eDateLB : getFieldValue( 'eDateLB' ),
+ includeZeros : isChecked( 'includeZeros' ),
+ ouIDTB : getFieldValue( 'ouIDTB' ),
+ //usingDataEntryStatus : isChecked( 'usingDataEntryStatus' ),
+ //selectedButton : tempselectedButtonDE,
+ } ).dialog( {
+ title: 'OrgUnit Group wise DataStatus Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
// Getting corresponding Period List for Datasets.
function getdSetPeriods()
@@ -434,7 +575,6 @@
$("#eDateLB").append("<option value='"+ id +"'>" + periodName + "</option>");
}
}
-
//DataStatus Data set wise Form Validations
function formValidationsDataStatusDataSetWise()
{
@@ -475,25 +615,63 @@
alert("Please Select OrganisationUnit(s)"); return false;
}
-
+ /*
var k=0;
for(k=0;k<selOUListIndex;k++)
{
document.ChartGenerationDataSetWiseForm.orgUnitListCB.options[k].selected = true;
}
-
+
var sWidth = 850;
var sHeight = 650;
var LeftPosition=(screen.width)?(screen.width-sWidth)/2:100;
var TopPosition=(screen.height)?(screen.height-sHeight)/2:100;
window.open('','chartWindow1','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
-
+
return true;
-
-}
+ */
+
+ generateDataStatusDataSetWiseResult();
+
+}
+
//DataStatus Data set wise Form Validations
+
+function generateDataStatusDataSetWiseResult()
+{
+ var url = "dataStatusDataSetWiseResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' );
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ periodTypeId : getFieldValue( 'periodTypeId' ),
+ facilityLB : getFieldValue( 'facilityLB' ),
+ sDateLB : getFieldValue( 'sDateLB' ),
+ eDateLB : getFieldValue( 'eDateLB' ),
+ includeZeros : isChecked( 'includeZeros' ),
+ //usingDataEntryStatus : isChecked( 'usingDataEntryStatus' ),
+ //selectedButton : tempselectedButtonDE,
+ } ).dialog( {
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
//Facility ListBox Change Function
function facilityChangeDataSetWiseFunction(evt)
{
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js 2012-02-17 07:00:23 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js 2012-03-19 06:07:21 +0000
@@ -109,14 +109,24 @@
document.ChartGenerationForm.aggDataCB.checked = true;
document.ChartGenerationForm.aggDataCB.disabled = true;
- }// else end
-}// function riradioSelection end
+ }
+ // else end
+}
+// function riradioSelection end
// Selected Button (ie ViewSummary or ViewChart) Function
+
+var tempselectedButtonIN ="";
function selButtonFunction(selButton)
{
document.ChartGenerationForm.selectedButton.value = selButton;
-}// selButtonFunction end
+ tempselectedButtonIN = selButton;
+
+ formValidationsIndicator();
+
+}
+
+// selButtonFunction end
//Graphical Analysis Form Validations
=== 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 2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js 2012-03-19 06:07:21 +0000
@@ -109,7 +109,7 @@
}
else if( periodTypeId == weeklyPeriodTypeName )
{
- getRegularPeriodYear();
+ //getRegularPeriodYear();
if( yearLB.selectedIndex < 0 )
{
@@ -237,8 +237,23 @@
option.title = weeklyPeriodName;
periodList.add( option, null );
}
-}
+}
+/*
+function trim(str) {
+ return str.replace(/^\s+|\s+$/g,'');
+}
+function trim(str) {
+ while (str.substring(0, 1) == '') {
+ str = str.substring(1, str.length);
+ }
+ while (str.substring(str.length - 1, str.length) == '') {
+ str = str.substring(0, str.length - 1);
+ }
+ //alert( str );
+ return str;
+}
+*/
//get Financial Year calling
function getFinacialYear()
@@ -402,11 +417,19 @@
*/
// Selected Button (ie ViewSummary or ViewChart) Function
+var tempselectedButtonDE ="";
function selButtonFunction1(selButton)
{
document.ChartGenerationForm.selectedButton.value = selButton;
+ tempselectedButtonDE = selButton;
+
+ formValidationsDataElement();
+
+
}
- // selButtonFunction end
+
+
+// selButtonFunction end
//Graphical Analysis Form Validations
@@ -475,7 +498,8 @@
return false;
}
}
-
+
+ /*
if( selDEListSize > 0 )
{
for(k=0;k<document.ChartGenerationForm.selectedDataElements.options.length;k++)
@@ -499,8 +523,128 @@
window.open('','chartWindowDataElement','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
return true;
+ */
+
+ generateChartDataElement();
}
- // formValidations Function DataElements End
+
+// formValidations Function DataElements End
+
+
+function generateChartDataElement()
+{
+
+ var url = "generateChartDataElement.action?" + getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ + getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&" + getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ + getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&" + getParamsStringBySelected( 'periodLB', 'periodLB' ) ;
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ deSelection : getFieldValue( 'deSelection' ),
+ categoryLB : getFieldValue( 'categoryLB' ),
+ periodTypeLB : getFieldValue( 'periodTypeLB' ),
+ ougGroupSetCB : isChecked( 'ougGroupSetCB' ),
+ aggDataCB : isChecked( 'aggDataCB' ),
+ selectedButton : tempselectedButtonDE,
+ } ).dialog( {
+ title: 'Data Element Wise Graphical Analysis',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
+function getParamsStringBySelected( elementId, param )
+{
+ //alert( "getParamsStringBySelected" );
+ var result = "";
+ var list = jQuery( "#" + elementId ).children( ":selected" );
+
+ list.each( function( i, item ){
+
+ //result += param + "=" + item.value + "&";
+ result += param + "=" + item.value;
+ result += ( i < list.length - 1 ) ? "&" : "";
+
+ });
+
+ //result = result.substring( 0, list.length - 1 );
+ //alert( result );
+ return result;
+}
+
+/*
+
+function generateChartDataElement()
+{
+
+ var yearLBString = "";
+ var listYearLB = jQuery( "select[id=yearLB] option:selected" );
+ listYearLB.each( function( i, item ){
+ yearLBString += "yearLB=" + item.value;
+ yearLBString += ( i < listYearLB.length - 1 ) ? "&" : "";
+ });
+
+ var periodLBString = "";
+ var listPeriodLB = jQuery( "select[id=periodLB] option:selected" );
+ listPeriodLB.each( function( i, item ){
+ periodLBString += "periodLB=" + item.value;
+ periodLBString += ( i < listPeriodLB.length - 1 ) ? "&" : "";
+ });
+
+
+
+ var listValue = "";
+
+ // Clear the list
+ var availableList = document.getElementById( 'availableList' );
+
+ availableList.options.length = 0;
+
+ for ( var i = 0; i < selectedList.options.length; ++i)
+ {
+ listValue+='&selectedIndicators=' + selectedList.options[i].value;
+ }
+
+jQuery( "#contentDiv" ).load('generateChartDataElement.action?' +
+ getQueryStringFromList ('selectedDataElements') + "&"
+ + getQueryStringFromList ('orgUnitListCB') + "&"
+ + getQueryStringFromList ('orgUnitGroupList') + "&"
+ + yearLBString + "&" + periodLBString,
+ {
+ dataElementGroupId: jQuery('select[id=dataElementGroupId ] option:selected').val(),
+ deSelection: jQuery('select[id=deSelection ] option:selected').val(),
+ periodTypeLB : jQuery('select[id=periodTypeLB ] option:selected').val(),
+ categoryLB : jQuery('select[id=categoryLB ] option:selected').val(),
+ ougGroupSetCB : isChecked( 'ougGroupSetCB' ),
+ aggDataCB : isChecked( 'aggDataCB' ),
+ //selectedDataElements:
+ } ).dialog({
+ title: "Load jQuery.diaglog insteads of popup window",
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 1000
+ });
+
+}
+
+*/
+
//Graphical Analysis Form Validation Indicators
function formValidationsIndicator()
@@ -569,6 +713,7 @@
}
}
+ /*
if( selIndicatorsListSize > 0 )
{
for(k=0;k<document.ChartGenerationForm.selectedIndicators.options.length;k++)
@@ -593,7 +738,46 @@
window.open('','chartWindowIndicator','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
return true;
+ */
+ generateChartIndicator();
}
+
+
+function generateChartIndicator()
+{
+
+ var url = "generateChartIndicator.action?" + getParamString( 'selectedIndicators', 'selectedIndicators' ) + "&"
+ + getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&" + getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ + getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&" + getParamsStringBySelected( 'periodLB', 'periodLB' ) ;
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ categoryLB : getFieldValue( 'categoryLB' ),
+ periodTypeLB : getFieldValue( 'periodTypeLB' ),
+ ougGroupSetCB : isChecked( 'ougGroupSetCB' ),
+ aggDataCB : isChecked( 'aggDataCB' ),
+ selectedButton : tempselectedButtonIN,
+ } ).dialog( {
+ title: 'Indicator Wise Graphical Analysis',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
+
// formValidations Function Indicators End
@@ -632,6 +816,7 @@
//alert( flag );
}
}
+
//filter available data elements list
function filterAvailableDataElements()
{
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/nr.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/nr.js 2012-02-03 12:11:18 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/nr.js 2012-03-19 06:07:21 +0000
@@ -184,7 +184,7 @@
if( ouSelCB.checked)
{
- if(orgUnitListCB.options.length <=0 ) { alert( "Please select OrgUnit(s)" ); return false; }
+ if(orgUnitListCB.options.length <=0 ) { alert( "Please select OrgUnit(s)" ); return false; }
}
else if( orgUnitLevelCB.selectedIndex < 0 ) { alert( "Please select OrgUnitLevel" ); return false; }
@@ -192,6 +192,7 @@
if(sDateIndex < 0) {alert("Please Select Starting Period");return false;}
else if(eDateIndex < 0) {alert("Please Select Ending Period");return false;}
else if(sDate > eDate) {alert("Starting Date is Greater");return false;}
+
//else if(selDEListSize <=0 ) {alert("Please Select Data elements");return false;}
/*
for(k=0;k<document.ChartGenerationForm.selectedDataElements.options.length;k++)
@@ -200,6 +201,8 @@
}
// for l
*/
+
+ /*
for(k = 0; k < orgUnitListCB.options.length; k++)
{
orgUnitListCB.options[k].selected = true;
@@ -212,7 +215,64 @@
window.open('','chartWindow1','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
return true;
-} // formValidations Function End
+ */
+
+ generateNullReporterResult();
+}
+
+function generateNullReporterResult()
+{
+
+ var url = "NullReporterResult.action?" + getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&" + getParamsStringBySelected( 'orgUnitLevelCB', 'orgUnitLevelCB' );
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ selectedDataSet : getFieldValue( 'selectedDataSet' ),
+ sDateLB : getFieldValue( 'sDateLB' ),
+ eDateLB : getFieldValue( 'eDateLB' ),
+ includeZeros : isChecked( 'includeZeros' ),
+ ouSelCB : isChecked( 'ouSelCB' ),
+ } ).dialog( {
+ title: 'Null Report',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
+function getParamsStringBySelected( elementId, param )
+{
+ //alert( "getParamsStringBySelected" );
+ var result = "";
+ var list = jQuery( "#" + elementId ).children( ":selected" );
+
+ list.each( function( i, item ){
+
+ //result += param + "=" + item.value + "&";
+ result += param + "=" + item.value;
+ result += ( i < list.length - 1 ) ? "&" : "";
+
+ });
+
+ //result = result.substring( 0, list.length - 1 );
+ //alert( result );
+ return result;
+}
+
+
+// formValidations Function End
//Getting corresponding Period List for Data Sets Null reporter.
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tr.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tr.js 2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tr.js 2012-03-19 06:07:21 +0000
@@ -36,6 +36,7 @@
if ( dataSetSectionId != null )
{
+ lockScreen();
$.post("getDataElementsForTA.action",
{
id:dataSetSectionId,
@@ -67,7 +68,7 @@
option.title = dataElementName;
availableDataElements.add(option, null);
}
-
+ unLockScreen();
}
// getDataElementsReceived end
@@ -131,6 +132,7 @@
o.style.visibility = 'hidden';
}
+
//formValidationsForDeTarget Function Start
function formValidationsForDeTarget()
{
@@ -140,6 +142,8 @@
//var selOUListLength = document.ChartGenerationForm.orgUnitListCB.options.length;//alert(selOUListLength);
var orgUnitGroupListCB = document.getElementById("orgUnitGroupList");
+ var deTargettempSelButton = tempSelButton;
+
sDateIndex = document.getElementById("sDateLB").selectedIndex;
eDateIndex = document.getElementById("eDateLB").selectedIndex;
sDateTxt = document.getElementById("sDateLB").options[sDateIndex].text;
@@ -147,8 +151,6 @@
eDateTxt = document.getElementById("eDateLB").options[eDateIndex].text;
eDate = formatDate(new Date(getDateFromFormat(eDateTxt,"MMM-y")),"yyyy-MM-dd");
-
-
if(avlDEListSize <= 0 ){alert( "Please Select DataElement" );return false;}
else if(sDateIndex < 0) {alert("Please Select Starting Period");return false;}
else if(eDateIndex < 0) {alert("Please Select Ending Period");return false;}
@@ -161,7 +163,7 @@
return false;
}
-
+ /*
var sWidth = 850;
var sHeight = 650;
var LeftPosition=(screen.width)?(screen.width-sWidth)/2:100;
@@ -170,6 +172,66 @@
window.open('','chartWindow1','width=' + sWidth + ', height=' + sHeight + ', ' + 'left=' + LeftPosition + ', top=' + TopPosition + ', ' + 'location=no, menubar=no, ' + 'status=no, toolbar=no, scrollbars=yes, resizable=yes');
return true;
+ */
+ generateChartDeTarget( deTargettempSelButton );
}
-// formValidationsForDeTarget Function End
\ No newline at end of file
+
+// formValidationsForDeTarget Function End
+
+
+
+function generateChartDeTarget( deTargettempSelButton )
+{
+
+ var url = "generateChartDeTarget.action?" + getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' );
+
+ /*
+ var url = "generateChartDataElement.action?";
+ url += getParamString( 'selectedDataElements', 'selectedDataElements' ) + "&"
+ url += getParamsStringBySelected( 'orgUnitGroupList', 'orgUnitGroupList' )+ "&"
+ url += getParamString( 'orgUnitListCB', 'orgUnitListCB' )+ "&"
+ url += getParamsStringBySelected( 'yearLB', 'yearLB' )+ "&"
+ url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
+ */
+ //alert(url);
+ jQuery( "#contentDiv" ).load( url,
+ {
+ ouIDTB : getFieldValue( 'ouIDTB' ),
+ sDateLB : getFieldValue( 'sDateLB' ),
+ eDateLB : getFieldValue( 'eDateLB' ),
+ availableDataElements : getFieldValue( 'availableDataElements' ),
+ ougGroupSetCB : isChecked( 'ougGroupSetCB' ),
+ selButton : deTargettempSelButton,
+ } ).dialog( {
+ title: 'DataElement Target Graphical Analysis',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity:0.1 },
+ width: 1000,
+ height: 800
+ } );
+}
+
+function getParamsStringBySelected( elementId, param )
+{
+ //alert( "getParamsStringBySelected" );
+ var result = "";
+ var list = jQuery( "#" + elementId ).children( ":selected" );
+
+ list.each( function( i, item ){
+
+ //result += param + "=" + item.value + "&";
+ result += param + "=" + item.value;
+ result += ( i < list.length - 1 ) ? "&" : "";
+
+ });
+
+ //result = result.substring( 0, list.length - 1 );
+ alert( result );
+ return result;
+}
+
+
+
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm 2012-03-19 06:07:21 +0000
@@ -14,9 +14,24 @@
{
immChildOption = "yes";
-
- evt.target.href = "lastUpdatedDataSetResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
-
+ /*
+ evt.target.href = "lastUpdatedDataSetResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ */
+ var url = "lastUpdatedDataSetResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
+
}
function exportDataStatusResultToWorkBook()
=== 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 2011-03-01 09:42:21 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm 2012-03-19 06:07:21 +0000
@@ -11,7 +11,7 @@
<script type="text/javascript">
- selection.setListenerFunction( orgUnitHasBeenSelected );
+ //selection.setListenerFunction( orgUnitHasBeenSelected );
function orgUnitHasBeenSelected( orgUnitIds )
{
@@ -24,6 +24,7 @@
getOUDeatilsForGADataElements( orgUnitIds );
}
}
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReporterFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReporterFront.vm 2011-05-18 11:12:17 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReporterFront.vm 2012-03-19 06:07:21 +0000
@@ -22,7 +22,8 @@
<body>
<h1>$i18n.getString( "nr_null_reporter" )</h1>
<hr />
- <form id="ChartGenerationForm" name="ChartGenerationForm" action="NullReporterResult.action" method="post" onsubmit="return formValidations()" target="chartWindow1">
+ <!--<form id="ChartGenerationForm" name="ChartGenerationForm" action="NullReporterResult.action" method="post" onsubmit="return formValidations()" target="chartWindow1">-->
+ <form id="ChartGenerationForm" name="ChartGenerationForm">
<table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
<colgroup>
<col width="325">
@@ -93,7 +94,10 @@
<td class="NormalB">
<table>
<tr>
- <td class="NormalB"><input type="submit" name="View Null Reporter" value="$i18n.getString( 'nr_viewnullreporter' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000"> </td>
+ <td class="NormalB">
+ <!--<input type="submit" name="View Null Reporter" value="$i18n.getString( 'nr_viewnullreporter' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000">-->
+ <input type="button" name="View Null Reporter" value="$i18n.getString( 'nr_viewnullreporter' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:formValidations()">
+ </td>
</tr>
</table>
@@ -106,6 +110,7 @@
</tr>
</table>
</form>
+<div id="contentDiv"></div>
</body>
</body>
</html>
=== 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 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm 2012-03-19 06:07:21 +0000
@@ -7,6 +7,7 @@
var startDate = "$sDateLB";
var endDate = "$eDateLB";
var dsType = "$selectedButton";
+ var includeZeros = "$includeZeros";
function getImmChildInfo(evt, dsId, selOrgUnit)
{
@@ -14,11 +15,44 @@
if( document.getElementById('includeZeros').checked )
{
+ /*
evt.target.href = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ */
+
+ var url = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
}
else
{
+ /*
evt.target.href = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ */
+
+ var url = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
+
+
}
}
@@ -54,10 +88,7 @@
</tr>
</table>
</div>
-
-
- <br><br>
-
+ <br>
<div align="left" class="NormalB">DataSet : $selDataSet.name</div>
<table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse" width="100%">
<tr class="TableHeadingCellStyles" align="center">
=== 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-03-01 09:42:21 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm 2012-03-19 06:07:21 +0000
@@ -1,7 +1,8 @@
<h3>Survey Analyser</h3>
<hr /><br />
-<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartSurvey.action" method="post" onsubmit="return formValidationsForSurvey()" target="chartWindow1">
+<!--<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartSurvey.action" method="post" onsubmit="return formValidationsForSurvey()" target="chartWindow1">-->
+<form id="ChartGenerationForm" name="ChartGenerationForm">
<table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="100%" border=0>
<tr>
<td class="NormalB">
@@ -84,7 +85,8 @@
</td>
<td class="NormalB" style="width:25px;"> </td>
<td class="NormalB">
- <br /><input type="submit" name="SurveyAnalysis" value="SurveyAnalysis" style="width:150px;height:25px; font-family:Arial; font-weight:bold; color:#000000;" >
+ <br /><input type="button" name="SurveyAnalysis" value="SurveyAnalysis" style="width:175px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:formValidationsForSurvey()">
+ <!--<input type="submit" name="SurveyAnalysis" value="SurveyAnalysis" style="width:150px;height:25px; font-family:Arial; font-weight:bold; color:#000000;" >-->
</td>
</tr>
</table>
@@ -93,3 +95,4 @@
<input type="hidden" name="ouIDTB" id="ouIDTB" />
</table>
</form>
+<div id="contentDiv"></div>
\ No newline at end of file
=== 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-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm 2012-03-19 06:07:21 +0000
@@ -2,7 +2,7 @@
<script>
var orgUnitGroupIds = new Array();
var orgUnitGroupNames = new Array();
-
+ var tempSelButton = "";
#set( $count1 = 0 );
#foreach( $orgUnitGroup in $orgUnitGroups )
orgUnitGroupIds[$count1] = $orgUnitGroup.id;
@@ -14,7 +14,8 @@
<h3>Target Analysis Form</h3>
<hr /><br/>
-<form id="targetAnalysisForm" name="targetAnalysisForm" action="generateChartDeTarget.action" method="post" onsubmit="return formValidationsForDeTarget()" target="chartWindow1">
+<!--<form id="targetAnalysisForm" name="targetAnalysisForm" action="generateChartDeTarget.action" method="post" onsubmit="return formValidationsForDeTarget()" target="chartWindow1">-->
+<form id="targetAnalysisForm" name="targetAnalysisForm">
<table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="100%" border=0>
<tr>
<td class="NormalB">
@@ -63,7 +64,8 @@
<tr>
<td class="NormalB">
<input type="checkbox" id="ougGroupSetCB" name="ougGroupSetCB" onChange="getOrgUnitGroupsDataElements()" disabled="true">$i18n.getString( "ga_orgUnitGroups" )<br>
- <select name="orgUnitGroupList" id="orgUnitGroupList" size="8" onChange="selectSingleOptionOrgUnitGroup()" style="width: 170px;" disabled="true">
+ <!--<select name="orgUnitGroupList" id="orgUnitGroupList" size="8" onChange="selectSingleOptionOrgUnitGroup()" style="width: 170px;" disabled="true">-->
+ <select name="orgUnitGroupList" id="orgUnitGroupList" size="8" style="width: 170px;" disabled="true">
</select>
</td>
<td style="width:30px"> </td>
@@ -95,11 +97,13 @@
<tr>
<td>
<input type="hidden" name="selButton" id="selButton" />
- <input type="submit" id="ViewChart" name="ViewChart" value="$i18n.getString( 'viewchart' )" style="width:170px;height:25px;font-family:Arial;font-weight:bold;color:#000000" onclick="setButtonName('VIEWCHART')">
+ <input type="button" id="ViewChart" name="ViewChart" value="$i18n.getString( 'viewchart' )" style="width:170px;height:25px;font-family:Arial;font-weight:bold;color:#000000" onclick="setButtonName('VIEWCHART')">
+ <!--<input type="submit" id="ViewChart" name="ViewChart" value="$i18n.getString( 'viewchart' )" style="width:170px;height:25px;font-family:Arial;font-weight:bold;color:#000000" onclick="setButtonName('VIEWCHART')">-->
</td>
<td class="NormalB"> </td>
<td>
- <input type="submit" id="ViewCumulativeChart" name="ViewChart" value="$i18n.getString( 'view_cumulativechart' )" style="width:150px;height:25px; font-family:Arial; font-weight:bold; color:#000000" onclick="setButtonName('VIEWCCHART')">
+ <input type="button" id="ViewCumulativeChart" name="ViewChart" value="$i18n.getString( 'view_cumulativechart' )" style="width:150px;height:25px; font-family:Arial; font-weight:bold; color:#000000" onclick="setButtonName('VIEWCCHART')">
+ <!--<input type="submit" id="ViewCumulativeChart" name="ViewChart" value="$i18n.getString( 'view_cumulativechart' )" style="width:150px;height:25px; font-family:Arial; font-weight:bold; color:#000000" onclick="setButtonName('VIEWCCHART')">-->
</td>
</tr>
</table>
@@ -107,10 +111,12 @@
</tr>
</table>
</form>
-
+<div id="contentDiv"></div>
<script>
function setButtonName( selButton )
{
document.getElementById("selButton").value = selButton;
+ tempSelButton = selButton;
+ formValidationsForDeTarget();
}
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationSatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationSatusResult.vm 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationSatusResult.vm 2012-03-19 06:07:21 +0000
@@ -9,7 +9,21 @@
function getImmChildInfo(evt, dsId, selOrgUnit)
{
immChildOption = "yes";
+ /*
evt.target.href = "validationStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ */
+ var url = "validationStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord">' ).load(url).dialog({
+ title: 'Data Entry Status Result',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 1000,
+ height: 800
+ });
+
}
function exportDataStatusResultToWorkBook()
