dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15092
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5314: Minor fix
------------------------------------------------------------
revno: 5314
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-12-06 20:12:08 +0100
message:
Minor fix
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitDataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitIndicatorValueBatchHandler.java
--
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 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java 2011-12-03 16:15:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java 2011-12-06 19:12:08 +0000
@@ -53,7 +53,7 @@
private int organisationUnitId;
- private int organisationUnitGroupId;
+ private int groupId;
private int level;
@@ -183,14 +183,14 @@
this.organisationUnitId = organisationUnitId;
}
- public int getOrganisationUnitGroupId()
+ public int getGroupId()
{
- return organisationUnitGroupId;
+ return groupId;
}
- public void setOrganisationUnitGroupId( int organisationUnitGroupId )
+ public void setGroupId( int groupId )
{
- this.organisationUnitGroupId = organisationUnitGroupId;
+ this.groupId = groupId;
}
public int getPeriodId()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java 2011-12-03 16:15:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java 2011-12-06 19:12:08 +0000
@@ -51,7 +51,7 @@
private int organisationUnitId;
- private int organisationUnitGroupId;
+ private int groupId;
private int level;
@@ -231,14 +231,14 @@
this.organisationUnitId = organisationUnitId;
}
- public int getOrganisationUnitGroupId()
+ public int getGroupId()
{
- return organisationUnitGroupId;
+ return groupId;
}
- public void setOrganisationUnitGroupId( int organisationUnitGroupId )
+ public void setGroupId( int groupId )
{
- this.organisationUnitGroupId = organisationUnitGroupId;
+ this.groupId = groupId;
}
public int getPeriodId()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java 2011-12-03 16:15:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java 2011-12-06 19:12:08 +0000
@@ -40,7 +40,7 @@
int getOrganisationUnitId();
- int getOrganisationUnitGroupId();
+ int getGroupId();
double getValue();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java 2011-12-03 16:15:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java 2011-12-06 19:12:08 +0000
@@ -55,7 +55,7 @@
private int organisationUnitId;
- private int organisationUnitGroupId;
+ private int groupId;
// -------------------------------------------------------------------------
// Properties 2
@@ -251,14 +251,14 @@
this.organisationUnitId = organisationUnitId;
}
- public int getOrganisationUnitGroupId()
+ public int getGroupId()
{
- return organisationUnitGroupId;
+ return groupId;
}
- public void setOrganisationUnitGroupId( int organisationUnitGroupId )
+ public void setGroupId( int groupId )
{
- this.organisationUnitGroupId = organisationUnitGroupId;
+ this.groupId = groupId;
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitDataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitDataValueBatchHandler.java 2011-12-03 16:15:03 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitDataValueBatchHandler.java 2011-12-06 19:12:08 +0000
@@ -68,7 +68,7 @@
statementBuilder.setUniqueValue( value.getDataElementId() );
statementBuilder.setUniqueValue( value.getPeriodId() );
statementBuilder.setUniqueValue( value.getOrganisationUnitId() );
- statementBuilder.setUniqueValue( value.getOrganisationUnitGroupId() );
+ statementBuilder.setUniqueValue( value.getGroupId() );
}
protected void setColumns()
@@ -90,7 +90,7 @@
statementBuilder.setValue( value.getPeriodId() );
statementBuilder.setValue( value.getPeriodTypeId() );
statementBuilder.setValue( value.getOrganisationUnitId() );
- statementBuilder.setValue( value.getOrganisationUnitGroupId() );
+ statementBuilder.setValue( value.getGroupId() );
statementBuilder.setValue( value.getLevel() );
statementBuilder.setValue( value.getValue() );
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitIndicatorValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitIndicatorValueBatchHandler.java 2011-12-03 16:15:03 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitIndicatorValueBatchHandler.java 2011-12-06 19:12:08 +0000
@@ -68,7 +68,7 @@
statementBuilder.setUniqueValue( value.getIndicatorId() );
statementBuilder.setUniqueValue( value.getPeriodId() );
statementBuilder.setUniqueValue( value.getOrganisationUnitId() );
- statementBuilder.setUniqueValue( value.getOrganisationUnitGroupId() );
+ statementBuilder.setUniqueValue( value.getGroupId() );
}
protected void setColumns()
@@ -92,7 +92,7 @@
statementBuilder.setValue( value.getPeriodId() );
statementBuilder.setValue( value.getPeriodTypeId() );
statementBuilder.setValue( value.getOrganisationUnitId() );
- statementBuilder.setValue( value.getOrganisationUnitGroupId() );
+ statementBuilder.setValue( value.getGroupId() );
statementBuilder.setValue( value.getLevel() );
statementBuilder.setValue( value.getAnnualized() );
statementBuilder.setValue( value.getFactor() );
