dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31822
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16246: Use List for program-stages in Program object
------------------------------------------------------------
revno: 16246
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-07-26 21:38:39 +0700
message:
Use List for program-stages in Program object
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/GetProgramStageListAction.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/EnrollmentServiceTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/RemoveDataEntryFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/SaveProgramStageSortOrderAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.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 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2014-07-12 18:15:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2014-07-26 14:38:39 +0000
@@ -28,12 +28,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.IdentifiableObject;
@@ -50,11 +50,12 @@
import org.hisp.dhis.user.UserAuthorityGroup;
import org.hisp.dhis.validation.ValidationCriteria;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
/**
* @author Abyot Asalefew
@@ -82,7 +83,7 @@
private Set<OrganisationUnit> organisationUnits = new HashSet<OrganisationUnit>();
@Scanned
- private Set<ProgramStage> programStages = new HashSet<ProgramStage>(); //TODO use List?
+ private List<ProgramStage> programStages = new ArrayList<ProgramStage>();
@Scanned
private Set<ValidationCriteria> validationCriteria = new HashSet<ValidationCriteria>();
@@ -263,12 +264,12 @@
@JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )
@JacksonXmlElementWrapper( localName = "programStages", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "programStage", namespace = DxfNamespaces.DXF_2_0 )
- public Set<ProgramStage> getProgramStages()
+ public List<ProgramStage> getProgramStages()
{
return programStages;
}
- public void setProgramStages( Set<ProgramStage> programStages )
+ public void setProgramStages( List<ProgramStage> programStages )
{
this.programStages = programStages;
}
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java 2014-07-13 13:53:40 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java 2014-07-26 14:38:39 +0000
@@ -32,6 +32,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -133,11 +134,14 @@
attributeService.addTrackedEntityAttribute( atA );
attributeService.addTrackedEntityAttribute( atB );
+
+ prA = createProgram( 'A', new ArrayList<ProgramStage>(), asSet( atA, atB ), asSet( ouA, ouB ) );
+ programService.addProgram( prA );
+
psA = createProgramStage( 'A', asSet( deA, deB ) );
+ prA.getProgramStages().add( psA );
+
programStageService.saveProgramStage( psA );
-
- prA = createProgram( 'A', asSet( psA ), asSet( atA, atB ), asSet( ouA, ouB ) );
- programService.addProgram( prA );
programStageDataElementService.addProgramStageDataElement( new ProgramStageDataElement( psA, deA, false ) );
programStageDataElementService.addProgramStageDataElement( new ProgramStageDataElement( psA, deB, false ) );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/EnrollmentServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/EnrollmentServiceTest.java 2014-03-26 14:01:14 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/EnrollmentServiceTest.java 2014-07-26 14:38:39 +0000
@@ -31,6 +31,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -121,7 +122,7 @@
programStage.setGeneratedByEnrollmentDate( true );
manager.save( programStage );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programA.setType( Program.SINGLE_EVENT_WITH_REGISTRATION );
manager.save( programA );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java 2014-06-17 15:55:23 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java 2014-07-26 14:38:39 +0000
@@ -49,6 +49,7 @@
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -93,7 +94,7 @@
programStageA = createProgramStage( 'A', 0 );
identifiableObjectManager.save( programStageA );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programA.setType( Program.SINGLE_EVENT_WITHOUT_REGISTRATION );
identifiableObjectManager.save( programA );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2014-04-19 12:01:55 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2014-07-26 14:38:39 +0000
@@ -53,6 +53,7 @@
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -154,7 +155,7 @@
identifiableObjectManager.save( programStageA );
identifiableObjectManager.save( programStageB );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programA.setType( Program.MULTIPLE_EVENTS_WITH_REGISTRATION );
identifiableObjectManager.save( programA );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java 2014-04-18 10:14:28 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java 2014-07-26 14:38:39 +0000
@@ -32,6 +32,7 @@
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThat;
+import java.util.ArrayList;
import java.util.HashSet;
import org.hamcrest.CoreMatchers;
@@ -131,7 +132,7 @@
programStageA = createProgramStage( 'A', 0 );
identifiableObjectManager.save( programStageA );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programA.setType( Program.SINGLE_EVENT_WITH_REGISTRATION );
identifiableObjectManager.save( programA );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java 2014-03-26 14:01:14 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,6 +33,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import java.util.ArrayList;
import java.util.HashSet;
import org.hisp.dhis.DhisSpringTest;
@@ -100,7 +101,7 @@
femaleA.setTrackedEntity( trackedEntity );
femaleB.setTrackedEntity( trackedEntity );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
manager.save( organisationUnitA );
manager.save( organisationUnitB );
manager.save( maleA );
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java 2014-06-16 05:13:31 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,9 +33,11 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -234,7 +236,7 @@
// Program && Program stages
// ---------------------------------------------------------------------
- program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
int programId = programService.addProgram( program );
ProgramStage stageA = new ProgramStage( "Stage-A", program );
@@ -243,7 +245,7 @@
ProgramStage stageB = new ProgramStage( "Stage-B", program );
stageBId = programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java 2014-06-16 05:13:31 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java 2014-07-26 14:38:39 +0000
@@ -31,9 +31,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -231,7 +233,7 @@
// Program && Program stages
// ---------------------------------------------------------------------
- program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
int programId = programService.addProgram( program );
ProgramStage stageA = new ProgramStage( "Stage-A", program );
@@ -240,7 +242,7 @@
ProgramStage stageB = new ProgramStage( "Stage-B", program );
stageBId = programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java 2014-07-26 14:38:39 +0000
@@ -28,7 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.Set;
+import java.util.List;
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataentryform.DataEntryFormService;
@@ -79,7 +79,7 @@
{
boolean flag = false;
- Set<ProgramStage> programStages = programStage.getProgram().getProgramStages();
+ List<ProgramStage> programStages = programStage.getProgram().getProgramStages();
programStages.remove( programStage );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-07-10 11:59:42 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-07-26 14:38:39 +0000
@@ -76,7 +76,7 @@
@Autowired
private StatementBuilder statementBuilder;
-
+
@Autowired
private DataElementCategoryService categoryService;
@@ -262,39 +262,41 @@
executeSql( "update datavalue set storedby='aggregated_from_tracker' where storedby='DHIS-System'" );
executeSql( "ALTER TABLE trackedentityattribute DROP COLUMN groupBy" );
-
+
executeSql( "update trackedentityattribute set valuetype='string' where valuetype='combo' and optionsetid is null" );
executeSql( "UPDATE trackedentityattribute SET valuetype='string' WHERE valuetype='localId';" );
executeSql( "UPDATE trackedentityattribute SET valuetype='number' WHERE valuetype='age'" );
-
- executeSql( "DROP TABLE orgunitgroupprograms" );
-
+
+ executeSql( "DROP TABLE orgunitgroupprograms" );
+
executeSql( "UPDATE trackedentityattribute SET valuetype='optionSet' WHERE valuetype='combo'" );
-
+
updateAggregateQueryBuilder();
-
+
executeSql( "UPDATE trackedentityaudit SET accessedmodule='tracked_entity_instance_dashboard' WHERE accessedmodule='instance_dashboard' or accessedmodule='patient_dashboard'" );
-
-
+
executeSql( "UPDATE programstageinstance SET status=1 WHERE completed=true" );
executeSql( "ALTER TABLE programstageinstance DROP COLUMN completed" );
-
+
executeSql( "update program_attributes set mandatory = false where mandatory is null;" );
-
+
int attributeoptioncomboid = categoryService.getDefaultDataElementCategoryOptionCombo().getId();
- executeSql( "update datavalue set attributeoptioncomboid=" + attributeoptioncomboid + " where storedby='aggregated_from_tracker' or comment='aggregated_from_tracker'" );
+ executeSql( "update datavalue set attributeoptioncomboid=" + attributeoptioncomboid
+ + " where storedby='aggregated_from_tracker' or comment='aggregated_from_tracker'" );
executeSql( "update trackedentityattribute set confidential = false where confidential is null;" );
-
+
executeSql( "update programstage_dataelements set allowfuturedate = allowdateinfuture where allowfuturedate is null" );
executeSql( "update programstage_dataelements set allowfuturedate = false where allowfuturedate is null" );
executeSql( "ALTER TABLE programstage_dataelements DROP COLUMN allowdateinfuture" );
-
+
executeSql( "update program_attributes set allowfuturedate = allowdateinfuture where allowfuturedate is null" );
executeSql( "update program_attributes set allowfuturedate = false where allowfuturedate is null" );
executeSql( "ALTER TABLE program_attributes DROP COLUMN allowdateinfuture" );
executeSql( "UPDATE program_attributes SET allowFutureDate='false' WHERE allowFutureDate is null" );
+
+ updateProgramStageList();
}
// -------------------------------------------------------------------------
@@ -314,7 +316,7 @@
if ( resultSet.next() )
{
int id = resultSet.getInt( "trackedentityattributeid" );
-
+
String source = "PC:DATE@executionDate#-DATE@birthDate#";
String target = CaseAggregationCondition.OBJECT_TRACKED_ENTITY_ATTRIBUTE
+ CaseAggregationCondition.SEPARATOR_OBJECT + id + ".visit";
@@ -429,7 +431,47 @@
+ " (SELECT trackedentityid FROM trackedentity where name='Person') where trackedentityid is null" );
}
}
-
+
+ private void updateProgramStageList()
+ {
+ int count = jdbcTemplate.queryForInt( "select count(*) from programstage where sort_order is null" );
+ if ( count > 0 )
+ {
+ StatementHolder holder = statementManager.getHolder();
+
+ try
+ {
+ Statement statement = holder.getStatement();
+
+ ResultSet resultSet = statement
+ .executeQuery( "SELECT programstageid, programid, minDaysFromStart FROM programstage order by programid, minDaysFromStart" );
+
+ int index = 1;
+ int programId = 0;
+ while ( resultSet.next() )
+ {
+ if ( programId != resultSet.getInt( "programid" ) )
+ {
+ programId = resultSet.getInt( "programid" );
+ index = 1;
+ }
+
+ executeSql( "UPDATE programStage SET sort_order=" + index + " WHERE programstageid="
+ + resultSet.getInt( "programstageid" ) );
+ index++;
+ }
+ }
+ catch ( Exception ex )
+ {
+ log.debug( ex );
+ }
+ finally
+ {
+ holder.close();
+ }
+ }
+ }
+
private int executeSql( String sql )
{
try
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2014-07-12 18:15:50 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2014-07-26 14:38:39 +0000
@@ -25,10 +25,11 @@
<property name="dateOfIncidentDescription" type="text" />
- <set name="programStages" order-by="mindaysfromstart" cascade="all">
- <key column="programid" />
- <one-to-many class="org.hisp.dhis.program.ProgramStage" />
- </set>
+ <list name="programStages">
+ <key column="programid" />
+ <list-index column="sort_order" base="1" />
+ <one-to-many class="org.hisp.dhis.program.ProgramStage" />
+ </list>
<set name="organisationUnits" table="program_organisationunits">
<key column="programid" foreign-key="fk_program_organisationunits_programid" />
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java 2014-07-26 14:38:39 +0000
@@ -30,7 +30,9 @@
import static org.junit.Assert.assertEquals;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -89,7 +91,7 @@
DataEntryForm dataEntryFormA = new DataEntryForm( "DataEntryForm-A" );
dataEntryFormService.addDataEntryForm( dataEntryFormA );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -99,7 +101,7 @@
ProgramStage stageB = new ProgramStage( "B", program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java 2014-07-26 14:38:39 +0000
@@ -32,11 +32,11 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.dataelement.DataElement;
@@ -109,7 +109,7 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
ProgramStage stageA = new ProgramStage( "StageA", program );
@@ -118,7 +118,7 @@
ProgramStage stageB = new ProgramStage( "StageB", program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java 2014-03-26 14:01:14 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,12 +33,12 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
-import java.util.HashSet;
+import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -102,7 +102,7 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programA );
ProgramStage stageA = new ProgramStage( "StageA", programA );
@@ -111,13 +111,13 @@
ProgramStage stageB = new ProgramStage( "StageB", programA );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
programA.setProgramStages( programStages );
programService.updateProgram( programA );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnit );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programB );
TrackedEntityInstance entityInstance = createTrackedEntityInstance( 'A', organisationUnit );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorStoreTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramIndicatorStoreTest.java 2014-07-26 14:38:39 +0000
@@ -31,8 +31,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -88,7 +90,7 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programA );
ProgramStage stageA = new ProgramStage( "StageA", programA );
@@ -97,13 +99,13 @@
ProgramStage stageB = new ProgramStage( "StageB", programA );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
programA.setProgramStages( programStages );
programService.updateProgram( programA );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnit );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programB );
indicatorDate = new ProgramIndicator( "IndicatorA", "IndicatorDesA", ProgramIndicator.VALUE_TYPE_INT, "( "
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,10 +33,12 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -127,7 +129,7 @@
orgunitIds.add( idA );
orgunitIds.add( idB );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
TrackedEntityInstanceReminder reminderA = new TrackedEntityInstanceReminder( "A", 0,
"Test program message template", TrackedEntityInstanceReminder.ENROLLEMENT_DATE_TO_COMPARE,
@@ -151,16 +153,16 @@
ProgramStage stageB = new ProgramStage( "StageB", programA );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
programA.setProgramStages( programStages );
programService.updateProgram( programA );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnitA );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnitA );
programService.addProgram( programB );
- programC = createProgram( 'C', new HashSet<ProgramStage>(), organisationUnitA );
+ programC = createProgram( 'C', new ArrayList<ProgramStage>(), organisationUnitA );
programService.addProgram( programC );
entityInstanceA = createTrackedEntityInstance( 'A', organisationUnitA );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java 2014-07-26 14:38:39 +0000
@@ -31,10 +31,12 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -113,7 +115,7 @@
orgunitIds.add( idA );
orgunitIds.add( idB );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
TrackedEntityInstanceReminder reminderA = new TrackedEntityInstanceReminder( "A", 0,
"Test program message template", TrackedEntityInstanceReminder.ENROLLEMENT_DATE_TO_COMPARE,
@@ -137,16 +139,16 @@
ProgramStage stageB = new ProgramStage( "StageB", programA );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
programA.setProgramStages( programStages );
programService.updateProgram( programA );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnitA );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnitA );
programService.addProgram( programB );
- programC = createProgram( 'C', new HashSet<ProgramStage>(), organisationUnitA );
+ programC = createProgram( 'C', new ArrayList<ProgramStage>(), organisationUnitA );
programService.addProgram( programC );
entityInstanceA = createTrackedEntityInstance( 'A', organisationUnitA );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,6 +33,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -79,13 +80,13 @@
organisationUnitB = createOrganisationUnit( 'B' );
organisationUnitService.addOrganisationUnit( organisationUnitB );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programA.setUid( "UID-A" );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnitA );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnitA );
programB.setUid( "UID-B" );
- programC = createProgram( 'C', new HashSet<ProgramStage>(), organisationUnitB );
+ programC = createProgram( 'C', new ArrayList<ProgramStage>(), organisationUnitB );
programC.setUid( "UID-C" );
}
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,9 +33,9 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.dataelement.DataElement;
@@ -92,7 +92,7 @@
organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -102,7 +102,7 @@
stageB = new ProgramStage( "B", program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java 2014-07-26 14:38:39 +0000
@@ -33,9 +33,9 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.dataelement.DataElement;
@@ -92,7 +92,7 @@
organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -102,7 +102,7 @@
stageB = new ProgramStage( "B", program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java 2014-06-20 12:32:01 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,6 +33,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
@@ -183,7 +184,7 @@
/**
* Program A
*/
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programService.addProgram( programA );
stageA = new ProgramStage( "A", programA );
@@ -215,7 +216,7 @@
stageB.setReminders( reminders );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
programA.setProgramStages( programStages );
@@ -241,7 +242,7 @@
* Program B
*/
- Program programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnitB );
+ Program programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnitB );
programService.addProgram( programB );
stageC = new ProgramStage( "C", programB );
@@ -251,7 +252,7 @@
stageC.setIrregular( true );
programStageService.saveProgramStage( stageD );
- programStages = new HashSet<ProgramStage>();
+ programStages = new ArrayList<ProgramStage>();
programStages.add( stageC );
programStages.add( stageD );
programB.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java 2014-06-20 12:32:01 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java 2014-07-26 14:38:39 +0000
@@ -31,10 +31,12 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -152,7 +154,7 @@
/**
* Program A
*/
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programService.addProgram( programA );
stageA = new ProgramStage( "A", programA );
@@ -182,7 +184,7 @@
stageB.setReminders( reminders );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
programA.setProgramStages( programStages );
@@ -208,7 +210,7 @@
* Program B
*/
- Program programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnitB );
+ Program programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnitB );
programService.addProgram( programB );
stageC = new ProgramStage( "C", programB );
@@ -218,7 +220,7 @@
stageC.setIrregular( true );
programStageService.saveProgramStage( stageD );
- programStages = new HashSet<ProgramStage>();
+ programStages = new ArrayList<ProgramStage>();
programStages.add( stageC );
programStages.add( stageD );
programB.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java 2014-07-26 14:38:39 +0000
@@ -90,7 +90,7 @@
organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -115,7 +115,7 @@
stageB = new ProgramStage( "B", program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java 2014-07-26 14:38:39 +0000
@@ -88,7 +88,7 @@
organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -113,7 +113,7 @@
stageB = new ProgramStage( "B", program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java 2014-07-26 14:38:39 +0000
@@ -32,7 +32,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import java.util.HashSet;
+import java.util.ArrayList;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -69,7 +69,7 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java 2014-07-26 14:38:39 +0000
@@ -30,8 +30,8 @@
import static org.junit.Assert.assertEquals;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -68,7 +68,7 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -86,7 +86,7 @@
programStageStore.save( stageA );
programStageStore.save( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java 2014-07-26 14:38:39 +0000
@@ -31,8 +31,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -77,13 +77,13 @@
organisationUnitB = createOrganisationUnit( 'B' );
organisationUnitService.addOrganisationUnit( organisationUnitB );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnitA );
programA.setUid( "UID-A" );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnitA );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnitA );
programB.setUid( "UID-B" );
- programC = createProgram( 'C', new HashSet<ProgramStage>(), organisationUnitB );
+ programC = createProgram( 'C', new ArrayList<ProgramStage>(), organisationUnitB );
programC.setUid( "UID-C" );
}
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,9 +33,11 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -113,7 +115,7 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -122,7 +124,7 @@
stageB = new ProgramStage( "B", program );
int psIdB = programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java 2014-07-26 14:38:39 +0000
@@ -30,8 +30,8 @@
import static org.junit.Assert.assertTrue;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.dataelement.DataElement;
@@ -87,7 +87,7 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
stageA = new ProgramStage( "A", program );
@@ -96,7 +96,7 @@
stageB = new ProgramStage( "B", program );
int psIdB = programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java 2014-05-16 07:52:42 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java 2014-07-26 14:38:39 +0000
@@ -33,6 +33,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -92,10 +93,10 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programA );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnit );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programB );
DataEntryForm dataEntryFormA = new DataEntryForm( "DataEntryForm-A" );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java 2014-05-16 07:52:42 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java 2014-07-26 14:38:39 +0000
@@ -30,7 +30,7 @@
import static org.junit.Assert.assertEquals;
-import java.util.HashSet;
+import java.util.ArrayList;
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.dataentryform.DataEntryForm;
@@ -40,8 +40,6 @@
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramService;
import org.hisp.dhis.program.ProgramStage;
-import org.hisp.dhis.trackedentity.TrackedEntityForm;
-import org.hisp.dhis.trackedentity.TrackedEntityFormStore;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -88,10 +86,10 @@
OrganisationUnit organisationUnit = createOrganisationUnit( 'A' );
organisationUnitService.addOrganisationUnit( organisationUnit );
- programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ programA = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programA );
- programB = createProgram( 'B', new HashSet<ProgramStage>(), organisationUnit );
+ programB = createProgram( 'B', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( programB );
DataEntryForm dataEntryFormA = new DataEntryForm( "DataEntryForm-A" );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java 2014-04-25 11:14:08 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java 2014-07-26 14:38:39 +0000
@@ -31,8 +31,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -131,7 +133,7 @@
entityInstance = createTrackedEntityInstance( 'A', organisationUnit );
entityInstanceService.addTrackedEntityInstance( entityInstance );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
reminderA = new TrackedEntityInstanceReminder( "A", 0, "Test program message template",
TrackedEntityInstanceReminder.ENROLLEMENT_DATE_TO_COMPARE,
TrackedEntityInstanceReminder.SEND_TO_TRACKED_ENTITY_INSTANCE,
@@ -163,7 +165,7 @@
reminders.add( reminderB );
stageB.setReminders( reminders );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java 2014-07-26 14:38:39 +0000
@@ -46,10 +46,12 @@
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import static org.junit.Assert.*;
@@ -124,7 +126,7 @@
entityInstance = createTrackedEntityInstance( 'A', organisationUnit );
entityInstanceService.addTrackedEntityInstance( entityInstance );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
ProgramStage stageA = createProgramStage( 'A', 0 );
@@ -135,7 +137,7 @@
stageB.setProgram( program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java 2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java 2014-07-26 14:38:39 +0000
@@ -32,10 +32,12 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.DhisSpringTest;
@@ -127,7 +129,7 @@
entityInstance = createTrackedEntityInstance( 'A', organisationUnit );
entityInstanceService.addTrackedEntityInstance( entityInstance );
- Program program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ Program program = createProgram( 'A', new ArrayList<ProgramStage>(), organisationUnit );
programService.addProgram( program );
ProgramStage stageA = createProgramStage( 'A', 0 );
@@ -138,7 +140,7 @@
stageB.setProgram( program );
programStageService.saveProgramStage( stageB );
- Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ List<ProgramStage> programStages = new ArrayList<ProgramStage>();
programStages.add( stageA );
programStages.add( stageB );
program.setProgramStages( programStages );
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-07-17 12:43:25 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-07-26 14:38:39 +0000
@@ -1161,7 +1161,7 @@
return userGroup;
}
- public static Program createProgram( char uniqueCharacter, Set<ProgramStage> programStages,
+ public static Program createProgram( char uniqueCharacter, List<ProgramStage> programStages,
OrganisationUnit unit )
{
Set<OrganisationUnit> units = new HashSet<>();
@@ -1170,7 +1170,7 @@
return createProgram( uniqueCharacter, programStages, null, units );
}
- public static Program createProgram( char uniqueCharacter, Set<ProgramStage> programStages,
+ public static Program createProgram( char uniqueCharacter, List<ProgramStage> programStages,
Set<TrackedEntityAttribute> attributes, Set<OrganisationUnit> organisationUnits )
{
Program program = new Program();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/RemoveDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/RemoveDataEntryFormAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/RemoveDataEntryFormAction.java 2014-07-26 14:38:39 +0000
@@ -28,6 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.List;
import java.util.Set;
import org.hisp.dhis.dataentryform.DataEntryForm;
@@ -109,7 +110,7 @@
programId = currentProgram.getId();
- Set<ProgramStage> programStages = currentProgram.getProgramStages();
+ List<ProgramStage> programStages = currentProgram.getProgramStages();
for ( ProgramStage programStage : programStages )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java 2014-06-21 09:56:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java 2014-07-26 14:38:39 +0000
@@ -377,6 +377,8 @@
}
programStage.setReminders( reminders );
+ program.getProgramStages().add( programStage );
+
programStageService.saveProgramStage( programStage );
for ( int i = 0; i < this.selectedDataElementsValidator.size(); i++ )
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/GetProgramStageListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/GetProgramStageListAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/GetProgramStageListAction.java 1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-package org.hisp.dhis.trackedentity.action.programstage;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.program.ProgramStage;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Abyot Asalefew Gizaw
- * @version $Id$
- */
-public class GetProgramStageListAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ProgramService programService;
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- // -------------------------------------------------------------------------
- // Input/Output
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public Integer getId()
- {
- return id;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private List<ProgramStage> associations;
-
- public List<ProgramStage> getAssociations()
- {
- return associations;
- }
-
- public void setAssociations( List<ProgramStage> associations )
- {
- this.associations = associations;
- }
-
- private Program program;
-
- public Program getProgram()
- {
- return program;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- program = programService.getProgram( id );
-
- associations = new ArrayList<ProgramStage>( program.getProgramStages() );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/SaveProgramStageSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/SaveProgramStageSortOrderAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/SaveProgramStageSortOrderAction.java 2014-07-26 14:38:39 +0000
@@ -35,7 +35,6 @@
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramService;
import org.hisp.dhis.program.ProgramStage;
-import org.hisp.dhis.program.ProgramStageService;
import org.hisp.dhis.program.comparator.ProgramStageMinDaysComparator;
import com.opensymphony.xwork2.Action;
@@ -59,13 +58,6 @@
this.programService = programService;
}
- private ProgramStageService programStageService;
-
- public void setProgramStageService( ProgramStageService programStageService )
- {
- this.programStageService = programStageService;
- }
-
// -------------------------------------------------------------------------
// Input/Output
// -------------------------------------------------------------------------
@@ -89,11 +81,8 @@
{
List<ProgramStage> programStages = new ArrayList<ProgramStage>( program.getProgramStages() );
Collections.sort( programStages, new ProgramStageMinDaysComparator() );
-
- for ( ProgramStage programStage : programStages )
- {
- programStageService.updateProgramStage( programStage );
- }
+ program.setProgramStages(programStages);
+ programService.updateProgram( program );
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java 2014-06-21 09:56:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java 2014-07-26 14:38:39 +0000
@@ -372,7 +372,7 @@
reminders.add( reminder );
}
programStage.setReminders( reminders );
-
+
programStageService.updateProgramStage( programStage );
Set<ProgramStageDataElement> programStageDataElements = new HashSet<ProgramStageDataElement>(
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml 2014-06-04 09:39:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml 2014-07-26 14:38:39 +0000
@@ -285,13 +285,6 @@
</bean>
<bean
- id="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageListAction"
- class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageListAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
-
- <bean
id="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageAction"
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageAction"
scope="prototype">
@@ -310,7 +303,6 @@
id="org.hisp.dhis.trackedentity.action.programstage.SaveProgramStageSortOrderAction"
class="org.hisp.dhis.trackedentity.action.programstage.SaveProgramStageSortOrderAction"
scope="prototype">
- <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
</bean>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2014-06-04 09:39:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2014-07-26 14:38:39 +0000
@@ -284,7 +284,7 @@
<!-- ProgramStage -->
<action name="programStage"
- class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageListAction">
+ class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-program/programStage.vm</param>
<param name="menu">/dhis-web-maintenance-program/menu.vm</param>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm 2014-06-13 10:58:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm 2014-07-26 14:38:39 +0000
@@ -39,15 +39,15 @@
</thead>
<tbody id="list">
- #foreach( $association in $associations )
- <tr id="tr${association.id}" data-id="$!association.id" data-uid="$!association.uid" data-type="ProgramStage" data-name="$encoder.htmlEncode( $!association.displayName )"
- data-can-manage="$security.canManage( $association )"
- data-can-update="$security.canUpdate( $association )"
- data-can-delete="$security.canDelete( $association )"
- data-can-manage-template-message="#if($association.program.type!=3)true#{else}false#end"
+ #foreach( $programStage in $program.programStages )
+ <tr id="tr${programStage.id}" data-id="$!programStage.id" data-uid="$!programStage.uid" data-type="ProgramStage" data-name="$encoder.htmlEncode( $!programStage.displayName )"
+ data-can-manage="$security.canManage( $programStage )"
+ data-can-update="$security.canUpdate( $programStage )"
+ data-can-delete="$security.canDelete( $programStage )"
+ data-can-manage-template-message="#if($programStage.program.type!=3)true#{else}false#end"
data-can-remove="#if( $program.type=='1' )true#{else}false#end">
- <td>$encoder.htmlEncode( $!association.displayName )</td>
- <td>$encoder.htmlEncode( $!association.description )</td>
+ <td>$encoder.htmlEncode( $!programStage.displayName )</td>
+ <td>$encoder.htmlEncode( $!programStage.description )</td>
</tr>
#end
</tbody>
