dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31104
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15818: Complete data set registration, added attribute option combo to primary key
------------------------------------------------------------
revno: 15818
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-06-23 21:13:26 +0200
message:
Complete data set registration, added attribute option combo to primary key
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandlerTest.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.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/dataset/CompleteDataSetRegistration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2014-06-23 19:13:26 +0000
@@ -32,9 +32,11 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.ImportableObject;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
@@ -59,6 +61,8 @@
private OrganisationUnit source;
+ private DataElementCategoryOptionCombo attributeOptionCombo;
+
private Date date;
private String storedBy;
@@ -73,11 +77,13 @@
{
}
- public CompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source, Date date, String storedBy )
+ public CompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source,
+ DataElementCategoryOptionCombo attributeOptionCombo, Date date, String storedBy )
{
this.dataSet = dataSet;
this.period = period;
this.source = source;
+ this.attributeOptionCombo = attributeOptionCombo;
this.date = date;
this.storedBy = storedBy;
}
@@ -93,9 +99,10 @@
int result = 1;
- result = prime * result + ((dataSet == null) ? 0 : dataSet.hashCode());
- result = prime * result + ((period == null) ? 0 : period.hashCode());
- result = prime * result + ((source == null) ? 0 : source.hashCode());
+ result = prime * result + ( ( dataSet == null ) ? 0 : dataSet.hashCode() );
+ result = prime * result + ( ( period == null ) ? 0 : period.hashCode() );
+ result = prime * result + ( ( source == null ) ? 0 : source.hashCode() );
+ result = prime * result + ( ( attributeOptionCombo == null ) ? 0 : attributeOptionCombo.hashCode() );
return result;
}
@@ -156,13 +163,25 @@
return false;
}
+ if ( attributeOptionCombo == null )
+ {
+ if ( other.attributeOptionCombo != null )
+ {
+ return false;
+ }
+ }
+ else if ( !attributeOptionCombo.equals( other.attributeOptionCombo ) )
+ {
+ return false;
+ }
+
return true;
}
@Override
public String toString()
{
- String toString = "[" + dataSet + ", " + period + ", " + source + ", " + date + "]";
+ String toString = "[" + dataSet + ", " + period + ", " + source + ", " + attributeOptionCombo + ", " + date + "]";
return toString;
}
@@ -202,7 +221,7 @@
this.period = period;
}
- @JsonProperty( value = "organisationUnit" )
+ @JsonProperty(value = "organisationUnit")
@JsonSerialize(as = BaseIdentifiableObject.class)
@JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public OrganisationUnit getSource()
@@ -215,6 +234,18 @@
this.source = source;
}
+ @JsonSerialize(as = BaseIdentifiableObject.class)
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ public DataElementCategoryOptionCombo getAttributeOptionCombo()
+ {
+ return attributeOptionCombo;
+ }
+
+ public void setAttributeOptionCombo( DataElementCategoryOptionCombo attributeOptionCombo )
+ {
+ this.attributeOptionCombo = attributeOptionCombo;
+ }
+
@JsonProperty
@JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Date getDate()
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java 2014-06-23 19:13:26 +0000
@@ -32,6 +32,7 @@
import java.util.Date;
import org.apache.commons.collections.CollectionUtils;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.message.MessageService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
@@ -62,6 +63,13 @@
{
this.messageService = messageService;
}
+
+ private DataElementCategoryService categoryService;
+
+ public void setCategoryService( DataElementCategoryService categoryService )
+ {
+ this.categoryService = categoryService;
+ }
// -------------------------------------------------------------------------
// CompleteDataSetRegistrationService
@@ -69,6 +77,11 @@
public void saveCompleteDataSetRegistration( CompleteDataSetRegistration registration )
{
+ if ( registration.getAttributeOptionCombo() == null )
+ {
+ registration.setAttributeOptionCombo( categoryService.getDefaultDataElementCategoryOptionCombo() );
+ }
+
completeDataSetRegistrationStore.saveCompleteDataSetRegistration( registration );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-06-17 13:24:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-06-23 19:13:26 +0000
@@ -723,6 +723,7 @@
executeSql( "UPDATE validationrulegroup SET alertbyorgunits=false WHERE alertbyorgunits IS NULL" );
upgradeDataValuesWithAttributeOptionCombo();
+ upgradeCompleteDataSetRegistrationsWithAttributeOptionCombo();
upgradeMapViewsToAnalyticalObject();
upgradeTranslations();
@@ -737,7 +738,7 @@
if ( no >= 5 )
{
- return; // attributeoptioncomboid already part of datavalue pkey
+ return; // attributeoptioncomboid already part of pkey
}
int optionComboId = getDefaultOptionCombo();
@@ -747,8 +748,7 @@
executeSql( "alter table datavalue drop constraint datavalue_pkey;" );
executeSql( "alter table datavalue add column attributeoptioncomboid integer;" );
- executeSql( "update datavalue set attributeoptioncomboid = " + optionComboId
- + " where attributeoptioncomboid is null;" );
+ executeSql( "update datavalue set attributeoptioncomboid = " + optionComboId + " where attributeoptioncomboid is null;" );
executeSql( "alter table datavalue alter column attributeoptioncomboid set not null;" );
executeSql( "alter table datavalue add constraint fk_datavalue_attributeoptioncomboid foreign key (attributeoptioncomboid) references categoryoptioncombo (categoryoptioncomboid) match simple;" );
executeSql( "alter table datavalue add constraint datavalue_pkey primary key(dataelementid, periodid, sourceid, categoryoptioncomboid, attributeoptioncomboid);" );
@@ -759,6 +759,29 @@
log.info( "Data value table upgraded with attributeoptioncomboid column" );
}
+ private void upgradeCompleteDataSetRegistrationsWithAttributeOptionCombo()
+ {
+ final String sql = statementBuilder.getNumberOfColumnsInPrimaryKey( "completedatasetregistration" );
+
+ Integer no = statementManager.getHolder().queryForInteger( sql );
+
+ if ( no >= 4 )
+ {
+ return; // attributeoptioncomboid already part of pkey
+ }
+
+ int optionComboId = getDefaultOptionCombo();
+
+ executeSql( "alter table completedatasetregistration drop constraint completedatasetregistration_pkey" );
+ executeSql( "alter table completedatasetregistration add column attributeoptioncomboid integer;" );
+ executeSql( "update completedatasetregistration set attributeoptioncomboid = " + optionComboId + " where attributeoptioncomboid is null;" );
+ executeSql( "alter table completedatasetregistration alter column attributeoptioncomboid set not null;" );
+ executeSql( "alter table completedatasetregistration add constraint fk_completedatasetregistration_attributeoptioncomboid foreign key (attributeoptioncomboid) references categoryoptioncombo (categoryoptioncomboid) match simple;" );
+ executeSql( "alter table completedatasetregistration add constraint completedatasetregistration_pkey primary key(datasetid, periodid, sourceid, attributeoptioncomboid);" );
+
+ log.info( "Complete data set registration table upgraded with attributeoptioncomboid column" );
+ }
+
private void upgradeMapViewsToAnalyticalObject()
{
executeSql( "insert into mapview_dataelements ( mapviewid, sort_order, dataelementid ) select mapviewid, 0, dataelementid from mapview where dataelementid is not null" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-06-17 09:59:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-06-23 19:13:26 +0000
@@ -477,6 +477,7 @@
class="org.hisp.dhis.dataset.DefaultCompleteDataSetRegistrationService">
<property name="completeDataSetRegistrationStore" ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore" />
<property name="messageService" ref="org.hisp.dhis.message.MessageService" />
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
</bean>
<bean id="org.hisp.dhis.dataset.SectionService" class="org.hisp.dhis.dataset.DefaultSectionService">
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2014-06-23 19:13:26 +0000
@@ -13,6 +13,8 @@
foreign-key="fk_datasetcompleteregistration_periodid" />
<key-many-to-one name="source" class="org.hisp.dhis.organisationunit.OrganisationUnit" column="sourceid"
foreign-key="fk_completedatasetregistration_organisationunitid" />
+ <key-many-to-one name="attributeOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="attributeoptioncomboid"
+ foreign-key="fk_completedatasetregistration_attributeoptioncomboid" />
</composite-id>
<property name="date" column="date" type="timestamp" />
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java 2014-03-24 22:27:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java 2014-06-23 19:13:26 +0000
@@ -38,6 +38,8 @@
import java.util.Date;
import org.hisp.dhis.DhisSpringTest;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.MonthlyPeriodType;
@@ -82,6 +84,8 @@
private Date deadlineB;
private Date tooLateA;
private Date tooLateB;
+
+ private DataElementCategoryOptionCombo optionCombo;
// -------------------------------------------------------------------------
// Fixture
@@ -98,6 +102,8 @@
organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
+ categoryService = (DataElementCategoryService) getBean( DataElementCategoryService.ID );
+
sourceA = createOrganisationUnit( 'A' );
sourceB = createOrganisationUnit( 'B' );
sourceC = createOrganisationUnit( 'C' );
@@ -126,6 +132,8 @@
dataSetService.addDataSet( dataSetA );
dataSetService.addDataSet( dataSetB );
dataSetService.addDataSet( dataSetC );
+
+ optionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
onTimeA = getDate( 2000, 1, 10 );
onTimeB = getDate( 2000, 2, 10 );
@@ -142,8 +150,8 @@
@Test
public void testSaveGet()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
@@ -155,8 +163,8 @@
@Test
public void testDelete()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
@@ -178,8 +186,8 @@
@Test
public void testGetAll()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
@@ -194,14 +202,14 @@
@Test
public void testGetDataSetsSourcesPeriods()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, new Date(), "" );
- registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, new Date(), "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
- registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, new Date(), "" );
- registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, new Date(), "" );
- registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, new Date(), "" );
- registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, optionCombo, new Date(), "" );
+ registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, optionCombo, new Date(), "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
@@ -237,19 +245,19 @@
@Test
public void testGetDataSetSourcesPeriod()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, new Date(), "" );
- registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, new Date(), "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
- registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, new Date(), "" );
- registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, new Date(), "" );
- registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, new Date(), "" );
- registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, optionCombo, new Date(), "" );
+ registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, optionCombo, new Date(), "" );
- registrationI = new CompleteDataSetRegistration( dataSetA, periodA, sourceC, new Date(), "" );
- registrationJ = new CompleteDataSetRegistration( dataSetB, periodA, sourceC, new Date(), "" );
- registrationK = new CompleteDataSetRegistration( dataSetA, periodB, sourceC, new Date(), "" );
- registrationL = new CompleteDataSetRegistration( dataSetB, periodB, sourceC, new Date(), "" );
+ registrationI = new CompleteDataSetRegistration( dataSetA, periodA, sourceC, optionCombo, new Date(), "" );
+ registrationJ = new CompleteDataSetRegistration( dataSetB, periodA, sourceC, optionCombo, new Date(), "" );
+ registrationK = new CompleteDataSetRegistration( dataSetA, periodB, sourceC, optionCombo, new Date(), "" );
+ registrationL = new CompleteDataSetRegistration( dataSetB, periodB, sourceC, optionCombo, new Date(), "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
@@ -281,19 +289,19 @@
@Test
public void testGetDataSetSourcesPeriodDate()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, onTimeA, "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, onTimeA, "" );
- registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, onTimeB, "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, onTimeB, "" );
- registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, tooLateA, "" );
- registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, tooLateA, "" );
- registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, tooLateB, "" );
- registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, tooLateB, "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, onTimeA, "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, onTimeA, "" );
+ registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, onTimeB, "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, onTimeB, "" );
+ registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, optionCombo, tooLateA, "" );
+ registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, optionCombo, tooLateA, "" );
+ registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, optionCombo, tooLateB, "" );
+ registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, optionCombo, tooLateB, "" );
- registrationI = new CompleteDataSetRegistration( dataSetA, periodA, sourceC, onTimeA, "" );
- registrationJ = new CompleteDataSetRegistration( dataSetB, periodA, sourceC, onTimeA, "" );
- registrationK = new CompleteDataSetRegistration( dataSetA, periodB, sourceC, onTimeB, "" );
- registrationL = new CompleteDataSetRegistration( dataSetB, periodB, sourceC, onTimeB, "" );
+ registrationI = new CompleteDataSetRegistration( dataSetA, periodA, sourceC, optionCombo, onTimeA, "" );
+ registrationJ = new CompleteDataSetRegistration( dataSetB, periodA, sourceC, optionCombo, onTimeA, "" );
+ registrationK = new CompleteDataSetRegistration( dataSetA, periodB, sourceC, optionCombo, onTimeB, "" );
+ registrationL = new CompleteDataSetRegistration( dataSetB, periodB, sourceC, optionCombo, onTimeB, "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
@@ -325,10 +333,10 @@
@Test
public void testDeleteByDataSet()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, onTimeA, "" );
- registrationB = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, onTimeA, "" );
- registrationC = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, onTimeA, "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, onTimeA, "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, onTimeA, "" );
+ registrationB = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, onTimeA, "" );
+ registrationC = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, onTimeA, "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, onTimeA, "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java 2014-03-24 22:27:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java 2014-06-23 19:13:26 +0000
@@ -38,6 +38,8 @@
import java.util.Date;
import org.hisp.dhis.DhisSpringTest;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.MonthlyPeriodType;
@@ -77,6 +79,8 @@
private Date deadlineA;
private Date tooLateA;
private Date tooLateB;
+
+ private DataElementCategoryOptionCombo optionCombo;
// -------------------------------------------------------------------------
// Fixture
@@ -92,6 +96,8 @@
periodService = (PeriodService) getBean( PeriodService.ID );
organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
+
+ categoryService = (DataElementCategoryService) getBean( DataElementCategoryService.ID );
dataSetA = createDataSet( 'A', new MonthlyPeriodType() );
dataSetB = createDataSet( 'B', new MonthlyPeriodType() );
@@ -110,7 +116,9 @@
organisationUnitService.addOrganisationUnit( sourceA );
organisationUnitService.addOrganisationUnit( sourceB );
-
+
+ optionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
+
onTimeA = getDate( 2000, 1, 10 );
onTimeB = getDate( 2000, 2, 10 );
deadlineA = getDate( 2000, 1, 15 );
@@ -125,8 +133,8 @@
@Test
public void testSaveGet()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
registrationStore.saveCompleteDataSetRegistration( registrationA );
registrationStore.saveCompleteDataSetRegistration( registrationB );
@@ -138,8 +146,8 @@
@Test
public void testDelete()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
registrationStore.saveCompleteDataSetRegistration( registrationA );
registrationStore.saveCompleteDataSetRegistration( registrationB );
@@ -161,8 +169,8 @@
@Test
public void testGetAll()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
registrationStore.saveCompleteDataSetRegistration( registrationA );
registrationStore.saveCompleteDataSetRegistration( registrationB );
@@ -177,14 +185,14 @@
@Test
public void testGetDataSetsSourcesPeriods()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, new Date(), "" );
- registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, new Date(), "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
- registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, new Date(), "" );
- registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, new Date(), "" );
- registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, new Date(), "" );
- registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, optionCombo, new Date(), "" );
+ registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, optionCombo, new Date(), "" );
registrationStore.saveCompleteDataSetRegistration( registrationA );
registrationStore.saveCompleteDataSetRegistration( registrationB );
@@ -220,14 +228,14 @@
@Test
public void testGetDataSetSourcesPeriod()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, new Date(), "" );
- registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, new Date(), "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
- registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, new Date(), "" );
- registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, new Date(), "" );
- registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, new Date(), "" );
- registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, new Date(), "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, new Date(), "" );
+ registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, new Date(), "" );
+ registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, optionCombo, new Date(), "" );
+ registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, optionCombo, new Date(), "" );
+ registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, optionCombo, new Date(), "" );
registrationStore.saveCompleteDataSetRegistration( registrationA );
registrationStore.saveCompleteDataSetRegistration( registrationB );
@@ -255,14 +263,14 @@
@Test
public void testGetDataSetSourcesPeriodDate()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, onTimeA, "" );
- registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, tooLateA, "" );
- registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, onTimeB, "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, tooLateB, "" );
- registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, tooLateA, "" );
- registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, onTimeA, "" );
- registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, tooLateB, "" );
- registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, onTimeB, "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, onTimeA, "" );
+ registrationB = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, tooLateA, "" );
+ registrationC = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, onTimeB, "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, tooLateB, "" );
+ registrationE = new CompleteDataSetRegistration( dataSetA, periodA, sourceB, optionCombo, tooLateA, "" );
+ registrationF = new CompleteDataSetRegistration( dataSetB, periodA, sourceB, optionCombo, onTimeA, "" );
+ registrationG = new CompleteDataSetRegistration( dataSetA, periodB, sourceB, optionCombo, tooLateB, "" );
+ registrationH = new CompleteDataSetRegistration( dataSetB, periodB, sourceB, optionCombo, onTimeB, "" );
registrationStore.saveCompleteDataSetRegistration( registrationA );
registrationStore.saveCompleteDataSetRegistration( registrationB );
@@ -289,10 +297,10 @@
@Test
public void testDeleteByDataSet()
{
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, onTimeA, "" );
- registrationB = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, onTimeA, "" );
- registrationC = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, onTimeA, "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, onTimeA, "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, optionCombo, onTimeA, "" );
+ registrationB = new CompleteDataSetRegistration( dataSetA, periodB, sourceA, optionCombo, onTimeA, "" );
+ registrationC = new CompleteDataSetRegistration( dataSetB, periodA, sourceA, optionCombo, onTimeA, "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, optionCombo, onTimeA, "" );
registrationStore.saveCompleteDataSetRegistration( registrationA );
registrationStore.saveCompleteDataSetRegistration( registrationB );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-06-23 11:10:21 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-06-23 19:13:26 +0000
@@ -427,6 +427,8 @@
OrganisationUnit outerOrgUnit;
+ DataElementCategoryOptionCombo fallbackCategoryOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
+
if ( orgUnitIdScheme.equals( IdentifiableProperty.UUID ) )
{
outerOrgUnit = dataValueSet.getOrgUnit() == null ? null : organisationUnitService.getOrganisationUnitByUuid( dataValueSet.getOrgUnit() );
@@ -439,15 +441,13 @@
if ( dataSet != null && completeDate != null )
{
notifier.notify( id, "Completing data set" );
- handleComplete( dataSet, completeDate, outerOrgUnit, outerPeriod, summary );
+ handleComplete( dataSet, completeDate, outerPeriod, outerOrgUnit, fallbackCategoryOptionCombo, summary ); //TODO
}
else
{
summary.setDataSetComplete( Boolean.FALSE.toString() );
}
- DataElementCategoryOptionCombo fallbackCategoryOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
-
String currentUser = currentUserService.getCurrentUsername();
BatchHandler<DataValue> batchHandler = batchHandlerFactory.createBatchHandler( DataValueBatchHandler.class ).init();
@@ -591,7 +591,8 @@
// Supportive methods
//--------------------------------------------------------------------------
- private void handleComplete( DataSet dataSet, Date completeDate, OrganisationUnit orgUnit, Period period, ImportSummary summary )
+ private void handleComplete( DataSet dataSet, Date completeDate, Period period, OrganisationUnit orgUnit,
+ DataElementCategoryOptionCombo attributeOptionCombo, ImportSummary summary )
{
if ( orgUnit == null )
{
@@ -620,7 +621,7 @@
}
else
{
- CompleteDataSetRegistration registration = new CompleteDataSetRegistration( dataSet, period, orgUnit, completeDate, username );
+ CompleteDataSetRegistration registration = new CompleteDataSetRegistration( dataSet, period, orgUnit, attributeOptionCombo, completeDate, username );
registrationService.saveCompleteDataSetRegistration( registration );
}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java 2014-06-23 19:13:26 +0000
@@ -150,12 +150,12 @@
@Test
public void testExportDataSetCompleteness()
{
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, null, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitC, null, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitB, null, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, null, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodC, unitA, null, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodC, unitC, null, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, null, null, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitC, null, null, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitB, null, null, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, null, null, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodC, unitA, null, null, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodC, unitC, null, null, "" ) );
completenessEngine.exportDataSetCompleteness( getIdentifiers( DataSet.class, dataSets ),
getIdentifiers( Period.class, periods ), getIdentifiers( OrganisationUnit.class, units ), null );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java 2014-06-23 19:13:26 +0000
@@ -275,17 +275,17 @@
dataSetService.addDataSet( dataSetB );
dataSetService.addDataSet( dataSetC );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitA, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, tooLateB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitD, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitA, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, null, tooLateB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitD, null, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitA, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitC, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodB, unitB, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitA, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitC, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodB, unitB, null, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitC, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodB, unitA, tooLateB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitC, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodB, unitA, null, tooLateB, "" ) );
Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
@@ -321,17 +321,17 @@
dataSetService.addDataSet( dataSetB );
dataSetService.addDataSet( dataSetC );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitA, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitD, tooLateA, "" ) );
-
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitA, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitB, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitC, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodB, unitC, tooLateB, "" ) );
-
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitA, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitB, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitA, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, null, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitD, null, tooLateA, "" ) );
+
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitA, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitB, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitC, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodB, unitC, null, tooLateB, "" ) );
+
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitA, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitB, null, onTimeA, "" ) );
Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
@@ -363,15 +363,15 @@
dataSetService.addDataSet( dataSetA );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitC, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitC, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, null, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, tooLateB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, null, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, null, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, null, tooLateB, "" ) );
Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
@@ -402,17 +402,17 @@
dataSetService.addDataSet( dataSetB );
dataSetService.addDataSet( dataSetC );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitA, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, tooLateB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitD, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitA, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitB, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitA, null, tooLateB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitD, null, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitA, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitC, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodB, unitB, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitA, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodA, unitC, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetB, periodB, unitB, null, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitC, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodB, unitA, tooLateB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitC, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodB, unitA, null, tooLateB, "" ) );
groupIds.clear();
groupIds.add( groupA.getId() );
@@ -448,13 +448,13 @@
dataSetIdA = dataSetService.addDataSet( dataSetA );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, null, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, null, onTimeA, "" ) );
Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdsA, dataSetIdA, null );
@@ -482,13 +482,13 @@
dataSetIdA = dataSetService.addDataSet( dataSetA );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitH, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitH, null, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitH, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, null, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, null, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitH, null, onTimeB, "" ) );
Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdsA, dataSetIdA, null );
@@ -517,15 +517,15 @@
dataSetIdA = dataSetService.addDataSet( dataSetA );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitH, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitH, null, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, tooLateB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, onTimeB, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitH, tooLateB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, null, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, null, tooLateB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, null, onTimeB, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitH, null, tooLateB, "" ) );
Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdsA, dataSetIdA, null );
@@ -554,13 +554,13 @@
dataSetIdA = dataSetService.addDataSet( dataSetA );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitE, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitF, null, tooLateA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodA, unitG, null, tooLateA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, onTimeA, "" ) );
- registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitE, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, null, onTimeA, "" ) );
+ registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, null, onTimeA, "" ) );
groupIds.clear();
groupIds.add( groupC.getId() );
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandlerTest.java'
--- dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandlerTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandlerTest.java 2014-06-23 19:13:26 +0000
@@ -39,6 +39,8 @@
import org.amplecode.quick.BatchHandler;
import org.amplecode.quick.BatchHandlerFactory;
import org.hisp.dhis.DhisTest;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataset.CompleteDataSetRegistration;
import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
import org.hisp.dhis.dataset.DataSet;
@@ -71,6 +73,8 @@
private OrganisationUnit unitA;
+ private DataElementCategoryOptionCombo optionCombo;
+
private Date dateA;
private Date dateB;
@@ -90,6 +94,7 @@
periodService = (PeriodService) getBean( PeriodService.ID );
organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
completeDataSetRegistrationService = (CompleteDataSetRegistrationService) getBean( CompleteDataSetRegistrationService.ID );
+ categoryService = (DataElementCategoryService) getBean( DataElementCategoryService.ID );
batchHandler = batchHandlerFactory.createBatchHandler( CompleteDataSetRegistrationBatchHandler.class );
@@ -109,13 +114,15 @@
organisationUnitService.addOrganisationUnit( unitA );
+ optionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
+
dateA = getDate( 2000, 1, 15 );
dateB = getDate( 2000, 2, 15 );
- registrationA = new CompleteDataSetRegistration( dataSetA, periodA, unitA, dateA, "" );
- registrationB = new CompleteDataSetRegistration( dataSetA, periodB, unitA, dateB, "" );
- registrationC = new CompleteDataSetRegistration( dataSetB, periodA, unitA, dateA, "" );
- registrationD = new CompleteDataSetRegistration( dataSetB, periodB, unitA, dateB, "" );
+ registrationA = new CompleteDataSetRegistration( dataSetA, periodA, unitA, optionCombo, dateA, "" );
+ registrationB = new CompleteDataSetRegistration( dataSetA, periodB, unitA, optionCombo, dateB, "" );
+ registrationC = new CompleteDataSetRegistration( dataSetB, periodA, unitA, optionCombo, dateA, "" );
+ registrationD = new CompleteDataSetRegistration( dataSetB, periodB, unitA, optionCombo, dateB, "" );
batchHandler.init();
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java 2014-06-23 19:13:26 +0000
@@ -63,6 +63,7 @@
statementBuilder.setIdentifierColumn( "datasetid" );
statementBuilder.setIdentifierColumn( "periodid" );
statementBuilder.setIdentifierColumn( "sourceid" );
+ statementBuilder.setIdentifierColumn( "attributeoptioncomboid" );
}
@Override
@@ -71,6 +72,7 @@
statementBuilder.setIdentifierValue( registration.getDataSet().getId() );
statementBuilder.setIdentifierValue( registration.getPeriod().getId() );
statementBuilder.setIdentifierValue( registration.getSource().getId() );
+ statementBuilder.setIdentifierValue( registration.getAttributeOptionCombo().getId() );
}
protected void setUniqueColumns()
@@ -78,6 +80,7 @@
statementBuilder.setUniqueColumn( "datasetid" );
statementBuilder.setUniqueColumn( "periodid" );
statementBuilder.setUniqueColumn( "sourceid" );
+ statementBuilder.setUniqueColumn( "attributeoptioncomboid" );
}
protected void setUniqueValues( CompleteDataSetRegistration registration )
@@ -85,6 +88,7 @@
statementBuilder.setUniqueValue( registration.getDataSet().getId() );
statementBuilder.setUniqueValue( registration.getPeriod().getId() );
statementBuilder.setUniqueValue( registration.getSource().getId() );
+ statementBuilder.setUniqueValue( registration.getAttributeOptionCombo().getId() );
}
protected void setColumns()
@@ -92,6 +96,7 @@
statementBuilder.setColumn( "datasetid" );
statementBuilder.setColumn( "periodid" );
statementBuilder.setColumn( "sourceid" );
+ statementBuilder.setColumn( "attributeoptioncomboid" );
statementBuilder.setColumn( "date" );
}
@@ -100,6 +105,7 @@
statementBuilder.setValue( registration.getDataSet().getId() );
statementBuilder.setValue( registration.getPeriod().getId() );
statementBuilder.setValue( registration.getSource().getId() );
+ statementBuilder.setValue( registration.getAttributeOptionCombo().getId() );
statementBuilder.setValue( registration.getDate() );
}
}
