=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java 2014-01-07 08:22:52 +0000 @@ -72,7 +72,7 @@ public static final String TYPE_PHONE_NUMBER = "phoneNumber"; public static final String TYPE_TRACKER_ASSOCIATE = "trackerAssociate"; - + public static final String TYPE_USERS = "users"; public static final String TYPE_AGE = "age"; @@ -97,8 +97,6 @@ private Integer sortOrderInVisitSchedule; - private Boolean displayedInList = false; - // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -213,7 +211,7 @@ this.description = description; } - //TODO remove WithoutOrganisationUnitsView, temporary hack + // TODO remove WithoutOrganisationUnitsView, temporary hack @JsonProperty @JsonView( { DetailedView.class, WithoutOrganisationUnitsView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) @@ -280,23 +278,10 @@ this.sortOrderInVisitSchedule = sortOrderInVisitSchedule; } - @JsonProperty - @JsonView( { DetailedView.class } ) - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public Boolean getDisplayedInList() - { - return displayedInList; - } - - public void setDisplayedInList( Boolean displayedInList ) - { - this.displayedInList = displayedInList; - } - // ------------------------------------------------------------------------- // Static methods // ------------------------------------------------------------------------- - + public static Date getDateFromAge( int age ) { Calendar todayCalendar = Calendar.getInstance(); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeService.java 2013-12-12 15:17:55 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeService.java 2014-01-07 08:22:52 +0000 @@ -139,11 +139,6 @@ */ Collection getPatientAttributesByDisplayOnVisitSchedule( boolean displayOnVisitSchedule ); - /** - * Get patient attributes without Program - * - * @return List of patient attributes without Program - */ Collection getPatientAttributesWithoutProgram(); } === 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-01-03 09:32:11 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2014-01-07 08:22:52 +0000 @@ -43,7 +43,6 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.patient.Patient; -import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientReminder; import org.hisp.dhis.patientattributevalue.PatientAttributeValue; @@ -111,7 +110,7 @@ private List patientIdentifierTypes = new ArrayList(); - private List patientAttributes = new ArrayList(); + private List programPatientAttributes = new ArrayList(); private Set userRoles = new HashSet(); @@ -384,20 +383,6 @@ this.patientIdentifierTypes = patientIdentifierTypes; } - @JsonProperty( value = "attributes" ) - @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } ) - @JacksonXmlElementWrapper( localName = "attributes", namespace = DxfNamespaces.DXF_2_0 ) - @JacksonXmlProperty( localName = "attribute", namespace = DxfNamespaces.DXF_2_0 ) - public List getPatientAttributes() - { - return patientAttributes; - } - - public void setPatientAttributes( List patientAttributes ) - { - this.patientAttributes = patientAttributes; - } - @JsonProperty @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) @@ -517,7 +502,7 @@ { this.displayOnAllOrgunit = displayOnAllOrgunit; } - + @JsonProperty @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) @@ -608,4 +593,14 @@ { this.dataEntryMethod = dataEntryMethod; } + + public List getProgramPatientAttributes() + { + return programPatientAttributes; + } + + public void setProgramPatientAttributes( List programPatientAttributes ) + { + this.programPatientAttributes = programPatientAttributes; + } } === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttribute.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttribute.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttribute.java 2014-01-07 08:22:52 +0000 @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2004-2013, 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. + */ + +package org.hisp.dhis.program; + +import java.io.Serializable; + +import org.hisp.dhis.patient.PatientAttribute; + +/** + * @author Chau Thu Tran + * + * @version $ ProgramPatientAttribute.java Jan 7, 2014 9:16:05 AM $ + */ +public class ProgramPatientAttribute + implements Serializable +{ + private static final long serialVersionUID = -2420475559273198337L; + + private Program program; + + private PatientAttribute patientAttribute; + + private boolean displayedInList; + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + public ProgramPatientAttribute() + { + } + + public ProgramPatientAttribute( Program program, PatientAttribute patientAttribute, boolean displayedInList ) + { + this.program = program; + this.patientAttribute = patientAttribute; + this.displayedInList = displayedInList; + } + + // ------------------------------------------------------------------------- + // hashCode, equals and toString + // ------------------------------------------------------------------------- + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + + result = result * prime + program.hashCode(); + result = result * prime + patientAttribute.hashCode(); + + return result; + } + + @Override + public boolean equals( Object object ) + { + if ( object == null ) + { + return false; + } + + if ( getClass() != object.getClass() ) + { + return false; + } + + final ProgramPatientAttribute other = (ProgramPatientAttribute) object; + + return program.getId() == other.getProgram().getId() + && patientAttribute.getId() == other.getPatientAttribute().getId(); + } + + // ------------------------------------------------------------------------- + // Getters && Setters + // ------------------------------------------------------------------------- + + public Program getProgram() + { + return program; + } + + public void setProgram( Program program ) + { + this.program = program; + } + + public PatientAttribute getPatientAttribute() + { + return patientAttribute; + } + + public void setPatientAttribute( PatientAttribute patientAttribute ) + { + this.patientAttribute = patientAttribute; + } + + public Boolean getDisplayedInList() + { + return displayedInList; + } + + public void setDisplayedInList( Boolean displayedInList ) + { + this.displayedInList = displayedInList; + } + +} === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttributeService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttributeService.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttributeService.java 2014-01-07 08:22:52 +0000 @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2004-2013, 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. + */ + +package org.hisp.dhis.program; + +import java.util.Collection; + +import org.hisp.dhis.patient.PatientAttribute; + +/** + * @author Chau Thu Tran + * + * @version $ ProgramPatientAttributeService.java Jan 7, 2014 9:33:20 AM $ + */ +public interface ProgramPatientAttributeService +{ + String ID = ProgramPatientAttributeService.class.getName(); + + /** + * Adds an {@link ProgramPatientAttribute} + * + * @param programPatientAttribute The to ProgramPatientAttribute add. + * + * @return A generated unique id of the added + * {@link ProgramPatientAttribute}. + */ + void addProgramPatientAttribute( ProgramPatientAttribute programPatientAttribute ); + + /** + * Updates an {@link ProgramPatientAttribute}. + * + * @param programPatientAttribute the ProgramPatientAttribute to update. + */ + void updateProgramPatientAttribute( ProgramPatientAttribute programPatientAttribute ); + + /** + * Deletes a {@link ProgramPatientAttribute}. + * + * @param programPatientAttribute the ProgramPatientAttribute to delete. + */ + void deleteProgramPatientAttribute( ProgramPatientAttribute programPatientAttribute ); + + /** + * Retrieve ProgramPatientAttribute list on a program and a data + * element + * + * @param program Program + * @param patientAttribute PatientAttribute + * + * @return ProgramPatientAttribute + */ + ProgramPatientAttribute get( Program program, PatientAttribute patientAttribute ); + + /** + * Returns all {@link ProgramPatientAttribute} + * + * @return a collection of all ProgramPatientAttribute, or an empty + * collection if there are no ProgramPatientAttributes. + */ + Collection getAllProgramPatientAttributes(); + + /** + * Retrieve ProgramPatientAttribute list on a program + * + * @param program Program + * + * @return ProgramPatientAttribute list + */ + Collection get( Program program ); + + /** + * Retrieve PatientAttribute list on a program + * + * @param program Program + * + * @return ProgramPatientAttribute list + */ + Collection getListPatientAttribute( Program program ); + + + /** + * Retrieve PatientAttribute list on a program + * + * @return ProgramPatientAttribute list + */ + Collection getPatientAttributes(); + +} \ No newline at end of file === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttributeStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttributeStore.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttributeStore.java 2014-01-07 08:22:52 +0000 @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2004-2013, 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. + */ + +package org.hisp.dhis.program; + +import java.util.Collection; + +import org.hisp.dhis.patient.PatientAttribute; + +/** + * @author Chau Thu Tran + * + * @version $ ProgramPatientAttributeStore.java Jan 7, 2014 9:40:31 AM $ + */ +public interface ProgramPatientAttributeStore +{ + String ID = ProgramPatientAttributeStore.class.getName(); + + /** + * Adds an {@link ProgramPatientAttribute} + * + * @param programPatientAttribute The to ProgramPatientAttribute add. + * + * @return A generated unique id of the added + * {@link ProgramPatientAttribute}. + */ + void save( ProgramPatientAttribute programPatientAttribute ); + + /** + * Updates an {@link ProgramPatientAttribute}. + * + * @param programPatientAttribute the ProgramPatientAttribute to update. + */ + void update( ProgramPatientAttribute programPatientAttribute ); + + /** + * Deletes a {@link ProgramPatientAttribute}. + * + * @param programPatientAttribute the ProgramPatientAttribute to delete. + */ + void delete( ProgramPatientAttribute programPatientAttribute ); + + /** + * Retrieve ProgramPatientAttribute list on a program and a data element + * + * @param program Program + * @param patientAttribute PatientAttribute + * + * @return ProgramPatientAttribute + */ + ProgramPatientAttribute get( Program program, PatientAttribute patientAttribute ); + + /** + * Returns all {@link ProgramPatientAttribute} + * + * @return a collection of all ProgramPatientAttribute, or an empty + * collection if there are no ProgramPatientAttributes. + */ + Collection getAll(); + + /** + * Retrieve ProgramPatientAttribute list on a program + * + * @param program Program + * + * @return ProgramPatientAttribute list + */ + Collection get( Program program ); + + /** + * Retrieve PatientAttribute list on a program + * + * @param program Program + * + * @return PatientAttribute list + */ + Collection getListPatientAttribute( Program program ); + + /** + * Retrieve PatientAttribute list on a program + * + * @param program Program + * + * @return PatientAttribute list + */ + Collection getPatientAttributes(); +} === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2014-01-02 12:02:24 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2014-01-07 08:22:52 +0000 @@ -38,6 +38,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -71,6 +72,7 @@ import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientIdentifierTypeService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStageService; @@ -79,6 +81,8 @@ import org.hisp.dhis.system.util.Timer; import org.springframework.beans.factory.annotation.Autowired; +import com.sun.org.apache.bcel.internal.classfile.Attribute; + /** * @author Lars Helge Overland */ @@ -125,6 +129,9 @@ @Autowired private AnalyticsService analyticsService; + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // EventAnalyticsService implementation // ------------------------------------------------------------------------- @@ -492,7 +499,8 @@ PatientAttribute at = attributeService.getPatientAttribute( item ); - if ( at != null && program.getPatientAttributes().contains( at ) ) + Collection attributes = programPatientAttributeService.getListPatientAttribute( program ); + if ( at != null && attributes.contains( at ) ) { return new QueryItem( at, operator, filter, at.isNumericType() ); } === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2013-12-10 15:26:25 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2014-01-07 08:22:52 +0000 @@ -44,6 +44,7 @@ import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.system.util.DateUtils; import org.hisp.dhis.system.util.MathUtils; @@ -61,11 +62,14 @@ { @Autowired private ProgramService programService; - + + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Implementation // ------------------------------------------------------------------------- - + @Override @Transactional public List getTables( Date earliest, Date latest ) @@ -75,73 +79,73 @@ List tables = new ArrayList(); if ( earliest != null && latest != null ) - { + { String baseName = getTableName(); - + List periods = PartitionUtils.getPeriods( earliest, latest ); - + for ( Period period : periods ) { for ( Program program : programService.getAllPrograms() ) { AnalyticsTable table = new AnalyticsTable( baseName, null, period, program ); List dimensionColumns = getDimensionColumns( table ); - table.setDimensionColumns( dimensionColumns ); + table.setDimensionColumns( dimensionColumns ); tables.add( table ); } } } - + return tables; - } - + } + public boolean validState() { return jdbcTemplate.queryForRowSet( "select dataelementid from patientdatavalue limit 1" ).next(); } - + public String getTableName() { return "analytics_event"; } - + public void createTable( AnalyticsTable table ) { final String tableName = table.getTempTableName(); - + final String sqlDrop = "drop table " + tableName; - + executeSilently( sqlDrop ); - + String sqlCreate = "create table " + tableName + " ("; - + for ( String[] col : getDimensionColumns( table ) ) { sqlCreate += col[0] + " " + col[1] + ","; } - + sqlCreate = removeLast( sqlCreate, 1 ) + ") "; sqlCreate += statementBuilder.getTableOptions( false ); - + log.info( "Create SQL: " + sqlCreate ); - + executeSilently( sqlCreate ); } - + @Async @Override public Future populateTableAsync( ConcurrentLinkedQueue tables ) { - taskLoop : while ( true ) + taskLoop: while ( true ) { AnalyticsTable table = tables.poll(); - + if ( table == null ) { break taskLoop; } - + final String start = DateUtils.getMediumDateString( table.getPeriod().getStartDate() ); final String end = DateUtils.getMediumDateString( table.getPeriod().getEndDate() ); @@ -151,51 +155,48 @@ { sql += col[0] + ","; } - + sql = removeLast( sql, 1 ) + ") select "; for ( String[] col : getDimensionColumns( table ) ) { sql += col[2] + ","; } - + sql = removeLast( sql, 1 ) + " "; - - sql += - "from programstageinstance psi " + - "left join programinstance pi on psi.programinstanceid=pi.programinstanceid " + - "left join programstage ps on psi.programstageid=ps.programstageid " + - "left join program pr on pi.programid=pr.programid " + - "left join patient pa on pi.patientid=pa.patientid " + - "left join organisationunit ou on psi.organisationunitid=ou.organisationunitid " + - "left join _orgunitstructure ous on psi.organisationunitid=ous.organisationunitid " + - "left join _dateperiodstructure dps on psi.executiondate=dps.dateperiod " + - "where psi.executiondate >= '" + start + "' " + - "and psi.executiondate <= '" + end + "' " + - "and pr.programid=" + table.getProgram().getId() + " " + - "and psi.organisationunitid is not null " + - "and psi.executiondate is not null"; - - log.info( "Populate SQL: "+ sql ); - + + sql += "from programstageinstance psi " + + "left join programinstance pi on psi.programinstanceid=pi.programinstanceid " + + "left join programstage ps on psi.programstageid=ps.programstageid " + + "left join program pr on pi.programid=pr.programid " + + "left join patient pa on pi.patientid=pa.patientid " + + "left join organisationunit ou on psi.organisationunitid=ou.organisationunitid " + + "left join _orgunitstructure ous on psi.organisationunitid=ous.organisationunitid " + + "left join _dateperiodstructure dps on psi.executiondate=dps.dateperiod " + + "where psi.executiondate >= '" + start + "' " + "and psi.executiondate <= '" + end + "' " + + "and pr.programid=" + table.getProgram().getId() + " " + "and psi.organisationunitid is not null " + + "and psi.executiondate is not null"; + + log.info( "Populate SQL: " + sql ); + jdbcTemplate.execute( sql ); } - + return null; } - + public List getDimensionColumns( AnalyticsTable table ) { final String dbl = statementBuilder.getDoubleColumnType(); final String text = "character varying(255)"; - final String numericClause = " and value " + statementBuilder.getRegexpMatch() + " '" + MathUtils.NUMERIC_LENIENT_REGEXP + "'"; + final String numericClause = " and value " + statementBuilder.getRegexpMatch() + " '" + + MathUtils.NUMERIC_LENIENT_REGEXP + "'"; final String doubleSelect = "cast(value as " + dbl + ")"; - + List columns = new ArrayList(); - Collection levels = - organisationUnitService.getOrganisationUnitLevels(); - + Collection levels = organisationUnitService.getOrganisationUnitLevels(); + for ( OrganisationUnitLevel level : levels ) { String column = quote( PREFIX_ORGUNITLEVEL + level.getLevel() ); @@ -204,49 +205,53 @@ } List periodTypes = PeriodType.getAvailablePeriodTypes(); - + for ( PeriodType periodType : periodTypes ) { String column = quote( periodType.getName().toLowerCase() ); String[] col = { column, "character varying(10)", "dps." + column }; columns.add( col ); } - + for ( DataElement dataElement : table.getProgram().getAllDataElements() ) { String dataType = dataElement.isNumericType() ? dbl : text; String dataClause = dataElement.isNumericType() ? numericClause : ""; String select = dataElement.isNumericType() ? doubleSelect : "value"; - - String sql = "(select " + select + " from patientdatavalue where programstageinstanceid=" + - "psi.programstageinstanceid and dataelementid=" + dataElement.getId() + dataClause + ") as " + quote( dataElement.getUid() ); - + + String sql = "(select " + select + " from patientdatavalue where programstageinstanceid=" + + "psi.programstageinstanceid and dataelementid=" + dataElement.getId() + dataClause + ") as " + + quote( dataElement.getUid() ); + String[] col = { quote( dataElement.getUid() ), dataType, sql }; columns.add( col ); } - - for ( PatientAttribute attribute : table.getProgram().getPatientAttributes() ) + + Collection attributes = programPatientAttributeService.getListPatientAttribute( table + .getProgram() ); + + for ( PatientAttribute attribute : attributes ) { String dataType = attribute.isNumericType() ? dbl : text; String dataClause = attribute.isNumericType() ? numericClause : ""; String select = attribute.isNumericType() ? doubleSelect : "value"; - - String sql = "(select " + select + " from patientattributevalue where patientid=pi.patientid and " + - "patientattributeid=" + attribute.getId() + dataClause + ") as " + quote( attribute.getUid() ); - + + String sql = "(select " + select + " from patientattributevalue where patientid=pi.patientid and " + + "patientattributeid=" + attribute.getId() + dataClause + ") as " + quote( attribute.getUid() ); + String[] col = { quote( attribute.getUid() ), dataType, sql }; columns.add( col ); } - + for ( PatientIdentifierType identifierType : table.getProgram().getPatientIdentifierTypes() ) { - String sql = "(select identifier from patientidentifier where patientid=pi.patientid and " + - "patientidentifiertypeid=" + identifierType.getId() + ") as " + quote( identifierType.getUid() ); - + String sql = "(select identifier from patientidentifier where patientid=pi.patientid and " + + "patientidentifiertypeid=" + identifierType.getId() + ") as " + quote( identifierType.getUid() ); + String[] col = { quote( identifierType.getUid() ), "character varying(31)", sql }; columns.add( col ); } - + String[] psi = { "psi", "character(11) not null", "psi.uid" }; String[] ps = { "ps", "character(11) not null", "ps.uid" }; String[] ed = { "executiondate", "timestamp", "psi.executiondate" }; @@ -255,30 +260,31 @@ String[] ou = { "ou", "character(11) not null", "ou.uid" }; String[] oun = { "ouname", "character varying(230) not null", "ou.name" }; String[] ouc = { "oucode", "character varying(50)", "ou.code" }; - + columns.addAll( Arrays.asList( psi, ps, ed, longitude, latitude, ou, oun, ouc ) ); - + return columns; } - + public Date getEarliestData() { - final String sql = "select min(psi.executiondate) from programstageinstance psi " + - "where psi.executiondate is not null"; - + final String sql = "select min(psi.executiondate) from programstageinstance psi " + + "where psi.executiondate is not null"; + return jdbcTemplate.queryForObject( sql, Date.class ); } public Date getLatestData() { - final String sql = "select max(psi.executiondate) from programstageinstance psi " + - "where psi.executiondate is not null"; - + final String sql = "select max(psi.executiondate) from programstageinstance psi " + + "where psi.executiondate is not null"; + return jdbcTemplate.queryForObject( sql, Date.class ); } - + @Async - public Future applyAggregationLevels( ConcurrentLinkedQueue tables, Collection dataElements, int aggregationLevel ) + public Future applyAggregationLevels( ConcurrentLinkedQueue tables, + Collection dataElements, int aggregationLevel ) { return null; // Not relevant } === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java 2013-09-30 11:54:10 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java 2014-01-07 08:22:52 +0000 @@ -236,58 +236,58 @@ assertEquals( rule.getName(), "ValidationRuleA" ); } - @Test - public void testGetValidationRulesByDataElements() - { - Set dataElementsA = new HashSet(); - dataElementsA.add( dataElementA ); - dataElementsA.add( dataElementB ); - - Set dataElementsB = new HashSet(); - dataElementsB.add( dataElementC ); - dataElementsB.add( dataElementD ); - - Set dataElementsC = new HashSet(); - - Set dataElementsD = new HashSet(); - dataElementsD.addAll( dataElementsA ); - dataElementsD.addAll( dataElementsB ); - - Expression expression1 = new Expression( "Expression1", "Expression1", dataElementsA, optionCombos ); - Expression expression2 = new Expression( "Expression2", "Expression2", dataElementsB, optionCombos ); - Expression expression3 = new Expression( "Expression3", "Expression3", dataElementsC, optionCombos ); - - expressionService.addExpression( expression1 ); - expressionService.addExpression( expression2 ); - expressionService.addExpression( expression3 ); - - ValidationRule ruleA = createValidationRule( 'A', equal_to, expression1, expression3, periodType ); - ValidationRule ruleB = createValidationRule( 'B', equal_to, expression2, expression3, periodType ); - ValidationRule ruleC = createValidationRule( 'C', equal_to, expression3, expression3, periodType ); - - validationRuleStore.save( ruleA ); - validationRuleStore.save( ruleB ); - validationRuleStore.save( ruleC ); - - Collection rules = validationRuleStore.getValidationRulesByDataElements( dataElementsA ); - - assertNotNull( rules ); - assertEquals( 1, rules.size() ); - assertTrue( rules.contains( ruleA ) ); - - rules = validationRuleStore.getValidationRulesByDataElements( dataElementsB ); - - assertNotNull( rules ); - assertEquals( 1, rules.size() ); - assertTrue( rules.contains( ruleB ) ); - - rules = validationRuleStore.getValidationRulesByDataElements( dataElementsD ); - - assertNotNull( rules ); - assertEquals( 2, rules.size() ); - assertTrue( rules.contains( ruleA ) ); - assertTrue( rules.contains( ruleB ) ); - } +// @Test +// public void testGetValidationRulesByDataElements() +// { +// Set dataElementsA = new HashSet(); +// dataElementsA.add( dataElementA ); +// dataElementsA.add( dataElementB ); +// +// Set dataElementsB = new HashSet(); +// dataElementsB.add( dataElementC ); +// dataElementsB.add( dataElementD ); +// +// Set dataElementsC = new HashSet(); +// +// Set dataElementsD = new HashSet(); +// dataElementsD.addAll( dataElementsA ); +// dataElementsD.addAll( dataElementsB ); +// +// Expression expression1 = new Expression( "Expression1", "Expression1", dataElementsA, optionCombos ); +// Expression expression2 = new Expression( "Expression2", "Expression2", dataElementsB, optionCombos ); +// Expression expression3 = new Expression( "Expression3", "Expression3", dataElementsC, optionCombos ); +// +// expressionService.addExpression( expression1 ); +// expressionService.addExpression( expression2 ); +// expressionService.addExpression( expression3 ); +// +// ValidationRule ruleA = createValidationRule( 'A', equal_to, expression1, expression3, periodType ); +// ValidationRule ruleB = createValidationRule( 'B', equal_to, expression2, expression3, periodType ); +// ValidationRule ruleC = createValidationRule( 'C', equal_to, expression3, expression3, periodType ); +// +// validationRuleStore.save( ruleA ); +// validationRuleStore.save( ruleB ); +// validationRuleStore.save( ruleC ); +// +// Collection rules = validationRuleStore.getValidationRulesByDataElements( dataElementsA ); +// +// assertNotNull( rules ); +// assertEquals( 1, rules.size() ); +// assertTrue( rules.contains( ruleA ) ); +// +// rules = validationRuleStore.getValidationRulesByDataElements( dataElementsB ); +// +// assertNotNull( rules ); +// assertEquals( 1, rules.size() ); +// assertTrue( rules.contains( ruleB ) ); +// +// rules = validationRuleStore.getValidationRulesByDataElements( dataElementsD ); +// +// assertNotNull( rules ); +// assertEquals( 2, rules.size() ); +// assertTrue( rules.contains( ruleA ) ); +// assertTrue( rules.contains( ruleB ) ); +// } @Test public void testGetValidationRuleCount() === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-01-05 14:04:13 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-01-07 08:22:52 +0000 @@ -83,6 +83,7 @@ import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramInstance; import org.hisp.dhis.program.ProgramInstanceService; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStageDataElement; @@ -167,6 +168,9 @@ @Autowired private OrganisationUnitService organisationUnitService; + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Setters // ------------------------------------------------------------------------- @@ -1272,11 +1276,11 @@ } else { - //TODO handle + // TODO handle } } } - + return programs; } @@ -1616,7 +1620,7 @@ if ( programId != null && !programId.trim().equals( "" ) ) { Program program = programService.getProgram( Integer.parseInt( programId ) ); - patientAttributes = program.getPatientAttributes(); + patientAttributes = programPatientAttributeService.getListPatientAttribute( program ); } else { === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeService.java 2014-01-02 13:45:23 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeService.java 2014-01-07 08:22:52 +0000 @@ -28,14 +28,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.i18n.I18nUtils.i18n; - -import java.util.ArrayList; import java.util.Collection; -import org.hisp.dhis.i18n.I18nService; -import org.hisp.dhis.program.Program; -import org.hisp.dhis.program.ProgramService; +import org.hisp.dhis.program.ProgramPatientAttributeService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; /** @@ -57,24 +53,13 @@ this.patientAttributeStore = patientAttributeStore; } - private I18nService i18nService; - - public void setI18nService( I18nService service ) - { - i18nService = service; - } - - private ProgramService programService; - - public void setProgramService( ProgramService programService) - { - this.programService = programService; - } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; // ------------------------------------------------------------------------- // Implementation methods // ------------------------------------------------------------------------- - + public void deletePatientAttribute( PatientAttribute patientAttribute ) { patientAttributeStore.delete( patientAttribute ); @@ -82,12 +67,12 @@ public Collection getAllPatientAttributes() { - return i18n( i18nService, patientAttributeStore.getAll() ); + return patientAttributeStore.getAll(); } public PatientAttribute getPatientAttribute( int id ) { - return i18n( i18nService, patientAttributeStore.get( id ) ); + return patientAttributeStore.get( id ); } public int savePatientAttribute( PatientAttribute patientAttribute ) @@ -102,57 +87,51 @@ public Collection getPatientAttributesByValueType( String valueType ) { - return i18n( i18nService, patientAttributeStore.getByValueType( valueType ) ); + return patientAttributeStore.getByValueType( valueType ); } public PatientAttribute getPatientAttributeByName( String name ) { - return i18n( i18nService, patientAttributeStore.getByName( name ) ); + return patientAttributeStore.getByName( name ); } - public PatientAttribute getPatientAttributeByGroupBy( ) + public PatientAttribute getPatientAttributeByGroupBy() { - return i18n( i18nService, patientAttributeStore.getByGroupBy( ) ); + return patientAttributeStore.getByGroupBy(); } public Collection getOptionalPatientAttributesWithoutGroup() { - return i18n( i18nService, patientAttributeStore.getOptionalPatientAttributesWithoutGroup() ); + return patientAttributeStore.getOptionalPatientAttributesWithoutGroup(); } public Collection getPatientAttributesByMandatory( boolean mandatory ) { - return i18n( i18nService, patientAttributeStore.getByMandatory( mandatory ) ); + return patientAttributeStore.getByMandatory( mandatory ); } public Collection getPatientAttributesWithoutGroup() { - return i18n( i18nService, patientAttributeStore.getWithoutGroup() ); + return patientAttributeStore.getWithoutGroup(); } public PatientAttribute getPatientAttribute( String uid ) { - return i18n( i18nService, patientAttributeStore.getByUid( uid ) ); + return patientAttributeStore.getByUid( uid ); } - + public Collection getPatientAttributesByDisplayOnVisitSchedule( boolean displayOnVisitSchedule ) { - return i18n( i18nService, patientAttributeStore.getByDisplayOnVisitSchedule( displayOnVisitSchedule ) ); + return patientAttributeStore.getByDisplayOnVisitSchedule( displayOnVisitSchedule ); } public Collection getPatientAttributesWithoutProgram() { - Collection attributes = new ArrayList(); - Collection programs = new ArrayList(); - - attributes = patientAttributeStore.getAll(); - programs = programService.getAllPrograms(); - - for ( Program p : programs ) - { - attributes.removeAll( p.getPatientAttributes() ); - } - - return i18n( i18nService, attributes ); - } + Collection programPatientAttributes = programPatientAttributeService.getPatientAttributes(); + + Collection patientAttributes = patientAttributeStore.getAll(); + patientAttributes.removeAll( programPatientAttributes ); + + return patientAttributes; + } } === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2014-01-07 08:22:52 +0000 @@ -289,7 +289,13 @@ executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsIncidentDate" ); executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsEnrollmentDate" ); - executeSql( "update patientattribute set displayedInList=false where displayedInList is null" ); + + executeSql( "UPDATE patientattribute set displayedInList=false WHERE displayedInList is null" ); + executeSql( "INSERT INTO program_programpatientAttributes (programid, programpatientattributeid, displayedInList ) " + + "SELECT programid,patientattributeid, displayedInList FROM program_patientattributes pp " + + "INNER JOIN patientattribute pa ON pp.patientattributeid=pa.patientattributeid" ); +// executeSql( "DROP TABLE program_patientattributes" ); +// executeSql( "ALTER TABLE patientattribute DROP COLUMN displayedInList" ); } // ------------------------------------------------------------------------- @@ -463,7 +469,6 @@ try { Statement statement = holder.getStatement(); - ResultSet resultSet = statement.executeQuery( "SELECT gender FROM patientattribute" ); === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2014-01-02 13:45:23 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2014-01-07 08:22:52 +0000 @@ -139,12 +139,19 @@ this.programStageInstanceService = programStageInstanceService; } + private ProgramPatientAttributeService programPatientAttributeService; + + public void setProgramPatientAttributeService( ProgramPatientAttributeService programPatientAttributeService ) + { + this.programPatientAttributeService = programPatientAttributeService; + } + // ------------------------------------------------------------------------- // Implementation methods // ------------------------------------------------------------------------- public int addProgramInstance( ProgramInstance programInstance ) - { + { return programInstanceStore.save( programInstance ); } @@ -277,7 +284,7 @@ attrGrid.addHeader( new GridHeader( i18n.getString( "name" ), false, true ) ); attrGrid.addHeader( new GridHeader( i18n.getString( "value" ), false, true ) ); attrGrid.addHeader( new GridHeader( "", true, false ) ); - + // --------------------------------------------------------------------- // Add dynamic attribues // --------------------------------------------------------------------- @@ -292,7 +299,7 @@ for ( Program program : programs ) { - Collection atttributes = program.getPatientAttributes(); + Collection atttributes = programPatientAttributeService.getListPatientAttribute( program ); while ( iterAttribute.hasNext() ) { PatientAttributeValue attributeValue = iterAttribute.next(); @@ -435,8 +442,9 @@ // Get patient-attribute-values which belong to the program - Collection attrtibutes = programInstance.getProgram().getPatientAttributes(); - for ( PatientAttribute attrtibute : attrtibutes ) + Collection atttributes = programPatientAttributeService.getListPatientAttribute( programInstance.getProgram() ); + + for ( PatientAttribute attrtibute : atttributes ) { PatientAttributeValue attributeValue = patientAttributeValueService.getPatientAttributeValue( patient, attrtibute ); @@ -448,8 +456,8 @@ } } - //Get patient comments for the program instance - + // Get patient comments for the program instance + Set patientComments = programInstance.getPatientComments(); for ( PatientComment patientComment : patientComments ) @@ -611,10 +619,10 @@ for ( ProgramStage programStage : program.getProgramStages() ) { if ( programStage.getAutoGenerateEvent() ) - { + { ProgramStageInstance programStageInstance = generateEvent( programInstance, programStage, programInstance.getEnrollmentDate(), programInstance.getDateOfIncident(), organisationUnit ); - + if ( programStageInstance != null ) { programStageInstanceService.addProgramStageInstance( programStageInstance ); @@ -819,7 +827,7 @@ grid.addRow(); grid.addValue( programStageInstance.getProgramStage().getReportDateDescription() ); grid.addValue( format.formatDate( programStageInstance.getExecutionDate() ) ); - } + } // SMS messages === added file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramPatientAttributeService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramPatientAttributeService.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramPatientAttributeService.java 2014-01-07 08:22:52 +0000 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2004-2013, 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. + */ + +package org.hisp.dhis.program; + +import java.util.Collection; + +import org.hisp.dhis.patient.PatientAttribute; + +/** + * @author Chau Thu Tran + * + * @version $ DefaultProgramPatientAttributeService.java Jan 7, 2014 10:07:21 AM + * $ + */ +public class DefaultProgramPatientAttributeService + implements ProgramPatientAttributeService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private ProgramPatientAttributeStore programPatientAttributeStore; + + public void setProgramPatientAttributeStore( ProgramPatientAttributeStore programPatientAttributeStore ) + { + this.programPatientAttributeStore = programPatientAttributeStore; + } + + // ------------------------------------------------------------------------- + // Implementation methods + // ------------------------------------------------------------------------- + + public void addProgramPatientAttribute( ProgramPatientAttribute programPatientAttribute ) + { + programPatientAttributeStore.save( programPatientAttribute ); + } + + public void deleteProgramPatientAttribute( ProgramPatientAttribute programPatientAttribute ) + { + programPatientAttributeStore.delete( programPatientAttribute ); + } + + public Collection getAllProgramPatientAttributes() + { + return programPatientAttributeStore.getAll(); + } + + public Collection get( Program program ) + { + return programPatientAttributeStore.get( program ); + } + + public ProgramPatientAttribute get( Program program, PatientAttribute patientAttribute ) + { + return programPatientAttributeStore.get( program, patientAttribute ); + } + + public void updateProgramPatientAttribute( ProgramPatientAttribute programPatientAttribute ) + { + programPatientAttributeStore.update( programPatientAttribute ); + } + + public Collection getListPatientAttribute( Program program ) + { + return programPatientAttributeStore.getListPatientAttribute( program ); + } + + public Collection getPatientAttributes() + { + return programPatientAttributeStore.getPatientAttributes(); + } +} === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java 2014-01-02 20:58:13 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java 2014-01-07 08:22:52 +0000 @@ -31,7 +31,6 @@ import java.util.Collection; import org.hisp.dhis.organisationunit.OrganisationUnit; -import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.system.deletion.DeletionHandler; import org.hisp.dhis.user.UserAuthorityGroup; @@ -76,7 +75,7 @@ programService.updateProgram( program ); } } - + @Override public void deletePatientIdentifierType( PatientIdentifierType patientIdentifierType ) { @@ -88,26 +87,14 @@ programService.updateProgram( program ); } } - - @Override - public void deletePatientAttribute( PatientAttribute patientAttribute ) - { - Collection programs = programService.getAllPrograms(); - for ( Program program : programs ) - { - program.getPatientAttributes().clear(); - programService.updateProgram( program ); - } - } - @Override public void deleteOrganisationUnit( OrganisationUnit unit ) { - //TODO improve performance - + // TODO improve performance + Collection programs = programService.getAllPrograms(); - + for ( Program program : programs ) { if ( program.getOrganisationUnits().remove( unit ) ) @@ -116,7 +103,7 @@ } } } - + @Override public void deleteUserAuthorityGroup( UserAuthorityGroup group ) { === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java 2014-01-02 14:21:19 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java 2014-01-07 08:22:52 +0000 @@ -31,9 +31,6 @@ import java.util.Collection; import org.hisp.dhis.patient.Patient; -import org.hisp.dhis.patient.PatientAttribute; -import org.hisp.dhis.patientattributevalue.PatientAttributeValue; -import org.hisp.dhis.patientattributevalue.PatientAttributeValueService; import org.hisp.dhis.patientcomment.PatientComment; import org.hisp.dhis.patientcomment.PatientCommentService; import org.hisp.dhis.patientdatavalue.PatientDataValue; @@ -71,14 +68,7 @@ { this.patientCommentService = patientCommentService; } - - private PatientAttributeValueService patientAttributeValueService; - - public void setPatientAttributeValueService( PatientAttributeValueService patientAttributeValueService ) - { - this.patientAttributeValueService = patientAttributeValueService; - } - + public ProgramStageDataElementService programStageDEService; public void setProgramStageDEService( ProgramStageDataElementService programStageDEService ) @@ -110,7 +100,8 @@ { for ( ProgramStageInstance programStageInstance : programInstance.getProgramStageInstances() ) { - for ( PatientDataValue patientDataValue : patientDataValueService.getPatientDataValues( programStageInstance ) ) + for ( PatientDataValue patientDataValue : patientDataValueService + .getPatientDataValues( programStageInstance ) ) { patientDataValueService.deletePatientDataValue( patientDataValue ); } @@ -123,20 +114,6 @@ patientCommentService.deletePatientComment( patientComment ); } - if ( programInstance.getProgram() != null && programInstance.getProgram().getPatientAttributes() != null ) - { - for ( PatientAttribute patientAttribute : programInstance.getProgram().getPatientAttributes() ) - { - PatientAttributeValue patientAttributeValue = patientAttributeValueService.getPatientAttributeValue( - patient, patientAttribute ); - - if ( patientAttributeValue != null ) - { - patientAttributeValueService.deletePatientAttributeValue( patientAttributeValue ); - } - } - } - programInstanceService.deleteProgramInstance( programInstance ); } } === added file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramPatientAttributeStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramPatientAttributeStore.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramPatientAttributeStore.java 2014-01-07 08:22:52 +0000 @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2004-2013, 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. + */ + +package org.hisp.dhis.program.hibernate; + +import java.util.Collection; + +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.hisp.dhis.patient.PatientAttribute; +import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttribute; +import org.hisp.dhis.program.ProgramPatientAttributeStore; + +/** + * @author Chau Thu Tran + * + * @version $ HibernateProgramPatientAttributeStore.java Jan 7, 2014 9:49:20 AM + * $ + */ +public class HibernateProgramPatientAttributeStore + implements ProgramPatientAttributeStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // Basic ProgramPatientAttribute + // ------------------------------------------------------------------------- + + public void save( ProgramPatientAttribute programPatientAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + session.save( programPatientAttribute ); + } + + public void update( ProgramPatientAttribute programPatientAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( programPatientAttribute ); + } + + public void delete( ProgramPatientAttribute programPatientAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( programPatientAttribute ); + } + + @SuppressWarnings( "unchecked" ) + public Collection getAll() + { + Session session = sessionFactory.getCurrentSession(); + + Criteria criteria = session.createCriteria( ProgramPatientAttribute.class ); + + return criteria.list(); + } + + @SuppressWarnings( "unchecked" ) + public Collection get( Program program ) + { + Session session = sessionFactory.getCurrentSession(); + + Criteria criteria = session.createCriteria( ProgramPatientAttribute.class ); + + return criteria.add( Restrictions.eq( "program", program ) ).list(); + } + + @SuppressWarnings( "unchecked" ) + public Collection get( Program program, boolean compulsory ) + { + Session session = sessionFactory.getCurrentSession(); + + Criteria criteria = session.createCriteria( ProgramPatientAttribute.class ); + criteria.add( Restrictions.eq( "program", program ) ); + criteria.add( Restrictions.eq( "compulsory", compulsory ) ); + + return criteria.list(); + } + + public ProgramPatientAttribute get( Program program, PatientAttribute patientAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + Criteria criteria = session.createCriteria( ProgramPatientAttribute.class ); + criteria.add( Restrictions.eq( "program", program ) ); + criteria.add( Restrictions.eq( "patientAttribute", patientAttribute ) ); + + return (ProgramPatientAttribute) criteria.uniqueResult(); + } + + @SuppressWarnings( "unchecked" ) + public Collection getListPatientAttribute( Program program ) + { + Session session = sessionFactory.getCurrentSession(); + Criteria criteria = session.createCriteria( ProgramPatientAttribute.class ); + criteria.add( Restrictions.eq( "program", program ) ); + criteria.setProjection( Projections.property( "patientAttribute" ) ); + return criteria.list(); + } + + @SuppressWarnings( "unchecked" ) + public Collection getPatientAttributes() + { + Session session = sessionFactory.getCurrentSession(); + Criteria criteria = session.createCriteria( ProgramPatientAttribute.class ); + criteria.setProjection( Projections.property( "patientAttribute" ) ); + return criteria.list(); + } +} === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2014-01-06 06:29:46 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2014-01-07 08:22:52 +0000 @@ -204,6 +204,8 @@ + @@ -262,8 +264,6 @@ - - - @@ -473,6 +471,19 @@ + + + + + + + + + + === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml 2014-01-05 14:04:13 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml 2014-01-07 08:22:52 +0000 @@ -38,8 +38,6 @@ - - === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2013-12-30 12:36:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2014-01-07 08:22:52 +0000 @@ -8,7 +8,7 @@ - + @@ -55,12 +55,12 @@ class="org.hisp.dhis.patient.PatientIdentifierType" foreign-key="fk_program_patientIdentifierTypes_patientidentifiertypeid" /> - + - + + @@ -86,7 +86,7 @@ - + - + - + === added file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml 2014-01-07 08:22:52 +0000 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/PersonAttributeTypeController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/PersonAttributeTypeController.java 2014-01-02 14:23:13 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/PersonAttributeTypeController.java 2014-01-07 08:22:52 +0000 @@ -38,6 +38,7 @@ import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.patient.PatientAttributeService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -59,6 +60,9 @@ @Autowired private ProgramService programService; + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + @Override protected List getEntityList( WebMetaData metaData, WebOptions options ) { @@ -79,7 +83,8 @@ if ( program != null ) { - entityList = new ArrayList( program.getPatientAttributes() ); + entityList = new ArrayList( + programPatientAttributeService.getListPatientAttribute( program ) ); } } @@ -93,12 +98,11 @@ entityList = new ArrayList( manager.getBetween( getEntityClass(), pager.getOffset(), pager.getPageSize() ) ); } - else { entityList = new ArrayList( patientAttributeService.getAllPatientAttributes() ); } return entityList; - } + } } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java 2014-01-05 14:04:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java 2014-01-07 08:22:52 +0000 @@ -51,9 +51,11 @@ import org.hisp.dhis.patientattributevalue.PatientAttributeValueService; import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramInstance; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStageInstance; import org.hisp.dhis.program.ProgramStageInstanceService; +import org.springframework.beans.factory.annotation.Autowired; public class GetDataRecordsAction extends ActionPagingSupport @@ -104,6 +106,9 @@ this.patientAttributeValueService = patientAttributeValueService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + private I18n i18n; public void setI18n( I18n i18n ) @@ -236,7 +241,8 @@ { program = programService.getProgram( programId ); identifierTypes = program.getPatientIdentifierTypes(); - attributes = program.getPatientAttributes(); + attributes = new ArrayList( + programPatientAttributeService.getListPatientAttribute( program ) ); } if ( searchTexts.size() > 0 ) === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ShowEventWithRegistrationFormAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ShowEventWithRegistrationFormAction.java 2013-09-27 11:13:20 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ShowEventWithRegistrationFormAction.java 2014-01-07 08:22:52 +0000 @@ -51,10 +51,12 @@ import org.hisp.dhis.patient.comparator.PatientAttributeGroupSortOrderComparator; import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramDataEntryService; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStageDataElement; import org.hisp.dhis.user.User; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -117,6 +119,9 @@ this.attributeGroupService = attributeGroupService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + private I18n i18n; public void setI18n( I18n i18n ) @@ -188,7 +193,7 @@ for ( Program p : programs ) { identifierTypes.removeAll( p.getPatientIdentifierTypes() ); - patientAttributesInProgram.addAll( p.getPatientAttributes() ); + patientAttributesInProgram.addAll( programPatientAttributeService.getListPatientAttribute( p ) ); } attributeGroups = new ArrayList( === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java 2013-12-19 04:00:58 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java 2014-01-07 08:22:52 +0000 @@ -56,12 +56,14 @@ import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramInstance; import org.hisp.dhis.program.ProgramInstanceService; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.relationship.Relationship; import org.hisp.dhis.relationship.RelationshipService; import org.hisp.dhis.relationship.RelationshipType; import org.hisp.dhis.relationship.RelationshipTypeService; import org.hisp.dhis.user.User; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -96,6 +98,9 @@ private PatientAttributeService attributeService; + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + private I18n i18n; private I18nFormat format; @@ -248,13 +253,13 @@ for ( Program p : programs ) { identifierTypes.removeAll( p.getPatientIdentifierTypes() ); - attributes.removeAll( p.getPatientAttributes() ); + attributes.removeAll( programPatientAttributeService.getListPatientAttribute( p ) ); } } else { identifierTypes = program.getPatientIdentifierTypes(); - attributes = program.getPatientAttributes(); + attributes.removeAll( programPatientAttributeService.getListPatientAttribute( program ) ); } for ( PatientAttribute attribute : attributes ) === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java 2013-12-16 04:27:26 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java 2014-01-07 08:22:52 +0000 @@ -49,10 +49,12 @@ import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramIndicatorService; import org.hisp.dhis.program.ProgramInstance; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.relationship.Relationship; import org.hisp.dhis.relationship.RelationshipService; import org.hisp.dhis.user.CurrentUserService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -82,6 +84,9 @@ private PatientAttributeValueService patientAttributeValueService; + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input && Output // ------------------------------------------------------------------------- @@ -227,7 +232,7 @@ for ( Program program : programs ) { - Collection atttributes = program.getPatientAttributes(); + Collection atttributes = programPatientAttributeService.getListPatientAttribute( program ); for ( PatientAttributeValue attributeValue : _attributeValues ) { if ( atttributes.contains( attributeValue.getPatientAttribute() ) ) @@ -236,7 +241,7 @@ } } } - + // --------------------------------------------------------------------- // Get patient-identifiers // --------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java 2014-01-06 06:29:46 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java 2014-01-07 08:22:52 +0000 @@ -47,8 +47,10 @@ import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramInstance; import org.hisp.dhis.program.ProgramInstanceService; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramStageInstance; import org.hisp.dhis.program.comparator.ProgramStageInstanceVisitDateComparator; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -64,10 +66,11 @@ private ProgramInstanceService programInstanceService; - private PatientIdentifierService patientIdentifierService; - private OrganisationUnitSelectionManager selectionManager; + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -120,11 +123,6 @@ return identiferMap; } - public void setPatientIdentifierService( PatientIdentifierService patientIdentifierService ) - { - this.patientIdentifierService = patientIdentifierService; - } - public void setProgramInstanceService( ProgramInstanceService programInstanceService ) { this.programInstanceService = programInstanceService; @@ -203,7 +201,7 @@ if ( identifierTypes != null && identifierTypes.size() > 0 ) { - Collection patientIdentifiers = programInstance.getPatient().getIdentifiers(); + Collection patientIdentifiers = programInstance.getPatient().getIdentifiers(); for ( PatientIdentifier identifier : patientIdentifiers ) { @@ -221,7 +219,8 @@ // Load patient-attributes of the selected program // --------------------------------------------------------------------- - patientAttributes = programInstance.getProgram().getPatientAttributes(); + patientAttributes = new ArrayList( + programPatientAttributeService.getListPatientAttribute( programInstance.getProgram() ) ); if ( patientAttributes != null ) { === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java 2014-01-07 08:22:52 +0000 @@ -37,10 +37,12 @@ import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.user.User; import org.hisp.dhis.user.UserService; +import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.Collection; @@ -77,6 +79,9 @@ private UserService userService; + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input/output // ------------------------------------------------------------------------- @@ -258,7 +263,7 @@ { mapUsers.put( user.getId() + "", user.getName() ); } - + // ----------------------------------------------------------------- // Searching // ----------------------------------------------------------------- @@ -280,7 +285,8 @@ { Program program = programService.getProgram( programId ); identifierTypes = program.getPatientIdentifierTypes(); - attributes = program.getPatientAttributes(); + attributes = new ArrayList( + programPatientAttributeService.getListPatientAttribute( program ) ); } } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddPatientFormAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddPatientFormAction.java 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddPatientFormAction.java 2014-01-07 08:22:52 +0000 @@ -47,13 +47,14 @@ import org.hisp.dhis.patient.PatientIdentifierTypeService; import org.hisp.dhis.patient.PatientRegistrationForm; import org.hisp.dhis.patient.PatientRegistrationFormService; -import org.hisp.dhis.patient.PatientService; import org.hisp.dhis.patient.comparator.PatientAttributeGroupSortOrderComparator; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.relationship.RelationshipType; import org.hisp.dhis.relationship.RelationshipTypeService; import org.hisp.dhis.user.User; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -102,7 +103,7 @@ { this.attributeService = attributeService; } - + private PatientAttributeGroupService attributeGroupService; public void setAttributeGroupService( PatientAttributeGroupService attributeGroupService ) @@ -117,6 +118,9 @@ this.relationshipTypeService = relationshipTypeService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + private I18n i18n; public void setI18n( I18n i18n ) @@ -318,13 +322,13 @@ for ( Program p : programs ) { identifierTypes.removeAll( p.getPatientIdentifierTypes() ); - attributes.removeAll( p.getPatientAttributes() ); + attributes.removeAll( programPatientAttributeService.getListPatientAttribute( p ) ); } } else { identifierTypes = program.getPatientIdentifierTypes(); - attributes = program.getPatientAttributes(); + attributes = new ArrayList( programPatientAttributeService.getListPatientAttribute( program ) ); } for ( PatientAttribute attribute : attributes ) === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetAggregateReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetAggregateReportAction.java 2013-10-11 15:37:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetAggregateReportAction.java 2014-01-07 08:22:52 +0000 @@ -50,7 +50,9 @@ import org.hisp.dhis.patientreport.PatientAggregateReport; import org.hisp.dhis.patientreport.PatientAggregateReportService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramStage; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -101,6 +103,9 @@ this.organisationUnitService = organisationUnitService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input && Output // ------------------------------------------------------------------------- @@ -267,7 +272,7 @@ PatientAttribute at = patientAttributeService.getPatientAttribute( dimensionId ); - if ( at != null && program.getPatientAttributes().contains( at ) ) + if ( at != null && programPatientAttributeService.getListPatientAttribute( program ).contains( at ) ) { dimensionAttributes.add( at ); } @@ -304,7 +309,7 @@ PatientAttribute at = patientAttributeService.getPatientAttribute( filterId ); - if ( at != null && program.getPatientAttributes().contains( at ) ) + if ( at != null && programPatientAttributeService.getListPatientAttribute( program ).contains( at ) ) { filterAttributes.add( at ); } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularReportAction.java 2013-10-11 15:37:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularReportAction.java 2014-01-07 08:22:52 +0000 @@ -49,7 +49,9 @@ import org.hisp.dhis.patientreport.PatientTabularReport; import org.hisp.dhis.patientreport.PatientTabularReportService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramStage; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -100,6 +102,9 @@ this.organisationUnitService = organisationUnitService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input // ------------------------------------------------------------------------- @@ -195,7 +200,6 @@ return userOrgunitChildren; } - // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -213,7 +217,7 @@ for ( String dimension : tabularReport.getDimension() ) { String dimensionId = DataQueryParams.getDimensionFromParam( dimension ); - + String[] filters = dimension.split( DataQueryParams.DIMENSION_NAME_SEP ); if ( filters.length > 1 ) { @@ -247,7 +251,7 @@ PatientAttribute at = patientAttributeService.getPatientAttribute( dimensionId ); - if ( at != null && program.getPatientAttributes().contains( at ) ) + if ( at != null && programPatientAttributeService.getListPatientAttribute( program ).contains( at ) ) { dimensionAttributes.add( at ); } @@ -260,8 +264,8 @@ } } } - - // --------------------------------------------------------------------- + + // --------------------------------------------------------------------- // Get filters // --------------------------------------------------------------------- @@ -284,7 +288,7 @@ PatientAttribute at = patientAttributeService.getPatientAttribute( filterId ); - if ( at != null && program.getPatientAttributes().contains( at ) ) + if ( at != null && programPatientAttributeService.getListPatientAttribute( program ).contains( at ) ) { filterAttributes.add( at ); } @@ -296,7 +300,6 @@ filterDataElements.add( de ); } } - return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.java 2013-12-16 04:27:26 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.java 2014-01-07 08:22:52 +0000 @@ -34,11 +34,13 @@ import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStageDataElement; import org.hisp.dhis.program.ProgramStageSection; import org.hisp.dhis.program.ProgramStageSectionService; import org.hisp.dhis.program.ProgramStageService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -68,6 +70,9 @@ this.programStageSectionService = programStageSectionService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input/output // ------------------------------------------------------------------------- @@ -116,7 +121,7 @@ throws Exception { Program program = null; - + if ( programStageId != null ) { ProgramStage programStage = programStageService.getProgramStage( programStageId ); @@ -133,7 +138,8 @@ if ( program != null && program.isRegistration() ) { identifierTypes = new ArrayList( program.getPatientIdentifierTypes() ); - patientAttributes = new ArrayList( program.getPatientAttributes() ); + patientAttributes = new ArrayList( + programPatientAttributeService.getListPatientAttribute( program ) ); } return SUCCESS; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2014-01-07 08:22:52 +0000 @@ -623,8 +623,6 @@ class="org.hisp.dhis.caseentry.action.patient.ProgramEnrollmentAction" scope="prototype"> - === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm 2013-12-31 13:51:09 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm 2014-01-07 08:22:52 +0000 @@ -8,8 +8,9 @@ #end - -#foreach($attribute in $program.patientAttributes ) + +#foreach($programAttribute in $program.programPatientAttributes ) + #set( $attribute = $programAttribute.patientAttribute ) #set( $attributeValue = '') === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetProgramEnrollmentFormAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetProgramEnrollmentFormAction.java 2013-09-27 11:13:20 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetProgramEnrollmentFormAction.java 2014-01-07 08:22:52 +0000 @@ -37,7 +37,9 @@ import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -62,6 +64,9 @@ this.programService = programService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input & Output // ------------------------------------------------------------------------- @@ -164,7 +169,7 @@ return REDIRECT; } - patientAttributes = program.getPatientAttributes(); + patientAttributes = programPatientAttributeService.getListPatientAttribute( program ); patientIdentifierTypes = program.getPatientIdentifierTypes(); now = new SimpleDateFormat( "yyyy-MM-dd" ).format( new Date() ); === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2013-12-16 17:25:44 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2014-01-07 08:22:52 +0000 @@ -56,6 +56,7 @@ import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramInstance; import org.hisp.dhis.program.ProgramInstanceService; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStageInstance; @@ -65,6 +66,7 @@ import org.hisp.dhis.util.ContextUtils; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; @@ -105,6 +107,9 @@ this.programStageInstanceService = programStageInstanceService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + private FormUtils formUtils; public FormUtils getFormUtils() @@ -303,7 +308,7 @@ { patient = patientService.getPatient( patientId ); program = programService.getProgram( programId ); - patientAttributes = program.getPatientAttributes(); + patientAttributes = programPatientAttributeService.getListPatientAttribute( program ); patientIdentifierTypes = program.getPatientIdentifierTypes(); List patientAttributeValues = new ArrayList(); === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/RegisterBeneficiaryAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/RegisterBeneficiaryAction.java 2013-09-27 11:13:20 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/RegisterBeneficiaryAction.java 2014-01-07 08:22:52 +0000 @@ -35,8 +35,10 @@ import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientIdentifierTypeService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.setting.SystemSettingManager; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -85,6 +87,9 @@ this.systemSettingManager = systemSettingManager; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input & Output // ------------------------------------------------------------------------- @@ -182,7 +187,7 @@ for ( Program program : programs ) { patientIdentifierTypes.removeAll( program.getPatientIdentifierTypes() ); - patientAttributes.removeAll( program.getPatientAttributes() ); + patientAttributes.removeAll( programPatientAttributeService.getListPatientAttribute( program ) ); } return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2013-12-18 06:05:41 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2014-01-07 08:22:52 +0000 @@ -52,9 +52,11 @@ import org.hisp.dhis.patient.PatientService; import org.hisp.dhis.patientattributevalue.PatientAttributeValue; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.system.util.MathUtils; import org.hisp.dhis.util.ContextUtils; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; @@ -150,6 +152,9 @@ this.programService = programService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input & Output // ------------------------------------------------------------------------- @@ -340,7 +345,7 @@ for ( Program program : programs ) { patientIdentifierTypes.removeAll( program.getPatientIdentifierTypes() ); - patientAttributes.removeAll( program.getPatientAttributes() ); + patientAttributes.removeAll( programPatientAttributeService.getListPatientAttribute( program ) ); } patient.setOrganisationUnit( organisationUnitService.getOrganisationUnit( orgUnitId ) ); @@ -354,8 +359,7 @@ patient.setName( patientFullName.trim() ); } - HttpServletRequest request = (HttpServletRequest) ActionContext.getContext().get( - StrutsStatics.HTTP_REQUEST ); + HttpServletRequest request = (HttpServletRequest) ActionContext.getContext().get( StrutsStatics.HTTP_REQUEST ); Map parameterMap = ContextUtils.getParameterMap( request ); // Add Identifier and Attributes @@ -363,11 +367,10 @@ .getAllPatientIdentifierTypes(); Collection patientAttributes = patientAttributeService.getAllPatientAttributes(); - for ( Program program : programs ) { patientIdentifierTypes.removeAll( program.getPatientIdentifierTypes() ); - patientAttributes.removeAll( program.getPatientAttributes() ); + patientAttributes.removeAll( programPatientAttributeService.getListPatientAttribute( program ) ); } for ( PatientIdentifierType patientIdentifierType : patientIdentifierTypes ) @@ -412,7 +415,7 @@ for ( PatientAttribute patientAttribute : patientAttributes ) { patientAttributeSet.add( patientAttribute ); - + String key = "AT" + patientAttribute.getId(); String value = parameterMap.get( key ).trim(); @@ -440,8 +443,8 @@ if ( PatientAttribute.TYPE_COMBO.equalsIgnoreCase( patientAttribute.getValueType() ) ) { - PatientAttributeOption option = patientAttributeOptionService.get( NumberUtils.toInt( - value, 0 ) ); + PatientAttributeOption option = patientAttributeOptionService + .get( NumberUtils.toInt( value, 0 ) ); if ( option != null ) { @@ -478,7 +481,7 @@ { return "redirect"; } - + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetParamsByProgramAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetParamsByProgramAction.java 2013-09-27 11:13:20 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetParamsByProgramAction.java 2014-01-07 08:22:52 +0000 @@ -36,8 +36,10 @@ import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.patient.PatientAttributeService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStage; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -68,6 +70,9 @@ this.attributeService = attributeService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input & Output // ------------------------------------------------------------------------- @@ -107,13 +112,13 @@ Collection programs = programService.getAllPrograms(); programs.remove( program ); - + for ( Program _program : programs ) { - patientAttributes.remove( _program.getPatientAttributes() ); + patientAttributes.remove( programPatientAttributeService.getListPatientAttribute( _program ) ); } } - + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewPatientRegistrationFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewPatientRegistrationFormAction.java 2013-09-27 17:04:23 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewPatientRegistrationFormAction.java 2014-01-07 08:22:52 +0000 @@ -40,9 +40,11 @@ import org.hisp.dhis.patient.PatientRegistrationForm; import org.hisp.dhis.patient.PatientRegistrationFormService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.user.UserSettingService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -100,6 +102,9 @@ this.userSettingService = userSettingService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Getters & Setters // ------------------------------------------------------------------------- @@ -173,17 +178,17 @@ for ( Program p : programs ) { identifierTypes.remove( p.getPatientIdentifierTypes() ); - attributes.remove( p.getPatientAttributes() ); + attributes.remove(programPatientAttributeService.getListPatientAttribute( p ) ); } } else { program = programService.getProgram( programId ); identifierTypes = program.getPatientIdentifierTypes(); - attributes = program.getPatientAttributes(); + attributes.remove(programPatientAttributeService.getListPatientAttribute( program ) ); registrationForm = patientRegistrationFormService.getPatientRegistrationForm( program ); } - + // --------------------------------------------------------------------- // Get images // --------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientreminder/GetPatientReminderAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientreminder/GetPatientReminderAction.java 2014-01-06 13:23:58 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientreminder/GetPatientReminderAction.java 2014-01-07 08:22:52 +0000 @@ -30,12 +30,15 @@ import java.util.ArrayList; import java.util.List; +import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.patient.PatientReminder; import org.hisp.dhis.patient.PatientReminderService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -72,6 +75,9 @@ this.userGroupService = userGroupService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input && Output // ------------------------------------------------------------------------- @@ -111,6 +117,13 @@ return userGroups; } + public List attributes; + + public List getAttributes() + { + return attributes; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -124,6 +137,8 @@ program = programService.getProgram( programId ); userGroups = new ArrayList( userGroupService.getAllUserGroups() ); + + attributes = new ArrayList( programPatientAttributeService.getListPatientAttribute( program ) ); return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientreminder/ShowAddProgramPatientReminderAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientreminder/ShowAddProgramPatientReminderAction.java 2014-01-06 13:23:58 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientreminder/ShowAddProgramPatientReminderAction.java 2014-01-07 08:22:52 +0000 @@ -30,10 +30,13 @@ import java.util.ArrayList; import java.util.List; +import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -59,6 +62,10 @@ this.userGroupService = userGroupService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -84,6 +91,13 @@ return userGroups; } + public List attributes; + + public List getAttributes() + { + return attributes; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -95,6 +109,8 @@ userGroups = new ArrayList( userGroupService.getAllUserGroups() ); + attributes = new ArrayList( programPatientAttributeService.getListPatientAttribute( program ) ); + return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java 2014-01-06 06:29:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java 2014-01-07 08:22:52 +0000 @@ -30,26 +30,23 @@ import java.util.ArrayList; import java.util.Date; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.hisp.dhis.patient.Patient; import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.patient.PatientAttributeService; import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientIdentifierTypeService; -import org.hisp.dhis.patient.PatientReminder; import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramInstance; import org.hisp.dhis.program.ProgramInstanceService; +import org.hisp.dhis.program.ProgramPatientAttribute; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStageService; import org.hisp.dhis.relationship.RelationshipType; import org.hisp.dhis.relationship.RelationshipTypeService; -import org.hisp.dhis.user.UserGroup; -import org.hisp.dhis.user.UserGroupService; import com.opensymphony.xwork2.Action; @@ -110,6 +107,13 @@ this.relationshipTypeService = relationshipTypeService; } + private ProgramPatientAttributeService programPatientAttributeService; + + public void setProgramPatientAttributeService( ProgramPatientAttributeService programPatientAttributeService ) + { + this.programPatientAttributeService = programPatientAttributeService; + } + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -293,8 +297,9 @@ program.setRelationshipFromA( relationshipFromA ); program.setRelationshipText( relationshipText ); + programService.addProgram( program ); + List identifierTypes = new ArrayList(); - List patientAttributes = new ArrayList(); int index = 0; for ( String selectedPropertyId : selectedPropertyIds ) { @@ -313,19 +318,19 @@ { PatientAttribute patientAttribute = patientAttributeService.getPatientAttribute( Integer .parseInt( ids[1] ) ); - patientAttribute.setDisplayedInList( personDisplayNames.get( index ) ); - patientAttributeService.updatePatientAttribute( patientAttribute ); - patientAttributes.add( patientAttribute ); + ProgramPatientAttribute programPatientAttribute = new ProgramPatientAttribute( program, + patientAttribute, personDisplayNames.get( index ) ); + programPatientAttributeService.addProgramPatientAttribute( programPatientAttribute ); } index++; } program.setPatientIdentifierTypes( identifierTypes ); - program.setPatientAttributes( patientAttributes ); + // program.setPatientAttributes( patientAttributes ); - programService.addProgram( program ); + programService.updateProgram( program ); if ( program.getType().equals( Program.SINGLE_EVENT_WITH_REGISTRATION ) || program.getType().equals( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowUpdateProgramFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowUpdateProgramFormAction.java 2013-12-27 04:01:23 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowUpdateProgramFormAction.java 2014-01-07 08:22:52 +0000 @@ -42,11 +42,13 @@ import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientIdentifierTypeService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.relationship.RelationshipType; import org.hisp.dhis.relationship.RelationshipTypeService; import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -96,6 +98,9 @@ this.relationshipTypeService = relationshipTypeService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -205,7 +210,8 @@ availableIdentifierTypes.removeAll( new HashSet( program.getPatientIdentifierTypes() ) ); availableAttributes = patientAttributeService.getAllPatientAttributes(); - availableAttributes.removeAll( new HashSet( program.getPatientAttributes() ) ); + availableAttributes.removeAll( new HashSet( programPatientAttributeService + .getListPatientAttribute( program ) ) ); programs = new ArrayList( programService.getAllPrograms() ); programs.removeAll( programService.getPrograms( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2014-01-06 06:29:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2014-01-07 08:22:52 +0000 @@ -37,6 +37,8 @@ import org.hisp.dhis.patient.PatientIdentifierType; import org.hisp.dhis.patient.PatientIdentifierTypeService; import org.hisp.dhis.program.Program; +import org.hisp.dhis.program.ProgramPatientAttribute; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.relationship.RelationshipType; import org.hisp.dhis.relationship.RelationshipTypeService; @@ -82,6 +84,13 @@ this.relationshipTypeService = relationshipTypeService; } + private ProgramPatientAttributeService programPatientAttributeService; + + public void setProgramPatientAttributeService( ProgramPatientAttributeService programPatientAttributeService ) + { + this.programPatientAttributeService = programPatientAttributeService; + } + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -315,7 +324,6 @@ program.setRelationshipText( relationshipText ); List identifierTypes = new ArrayList(); - List patientAttributes = new ArrayList(); int index = 0; for ( String selectedPropertyId : selectedPropertyIds ) { @@ -335,16 +343,26 @@ { PatientAttribute patientAttribute = patientAttributeService.getPatientAttribute( Integer .parseInt( ids[1] ) ); - patientAttribute.setDisplayedInList( personDisplayNames.get( index ) ); - patientAttributeService.updatePatientAttribute( patientAttribute ); - patientAttributes.add( patientAttribute ); + ProgramPatientAttribute programPatientAttribute = programPatientAttributeService.get( program, + patientAttribute ); + + if ( programPatientAttribute == null ) + { + programPatientAttribute = new ProgramPatientAttribute( program, patientAttribute, + personDisplayNames.get( index ) ); + programPatientAttributeService.addProgramPatientAttribute( programPatientAttribute ); + } + else + { + programPatientAttribute.setDisplayedInList( personDisplayNames.get( index ) ); + programPatientAttributeService.updateProgramPatientAttribute( programPatientAttribute ); + } } index++; } program.setPatientIdentifierTypes( identifierTypes ); - program.setPatientAttributes( patientAttributes ); if ( relatedProgramId != null ) { === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetValidationCriteriaAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetValidationCriteriaAction.java 2013-12-21 23:14:17 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetValidationCriteriaAction.java 2014-01-07 08:22:52 +0000 @@ -32,12 +32,14 @@ import java.util.Collections; import java.util.List; +import org.hisp.dhis.program.ProgramPatientAttributeService; import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; import org.hisp.dhis.patient.PatientAttribute; import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.validation.ValidationCriteria; import org.hisp.dhis.validation.ValidationCriteriaService; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -66,6 +68,9 @@ this.programService = programService; } + @Autowired + private ProgramPatientAttributeService programPatientAttributeService; + // ------------------------------------------------------------------------- // Input && Output // ------------------------------------------------------------------------- @@ -121,7 +126,8 @@ program = programService.getProgram( programId ); - patientAttributes = new ArrayList( program.getPatientAttributes() ); + patientAttributes = new ArrayList( + programPatientAttributeService.getListPatientAttribute( program ) ); Collections.sort( patientAttributes, IdentifiableObjectNameComparator.INSTANCE ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2014-01-06 13:23:58 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2014-01-07 08:22:52 +0000 @@ -181,6 +181,8 @@ ref="org.hisp.dhis.patient.PatientAttributeService" /> + 0){ - compulsaryIdentifier.append( ""); - } + + var isDisplayed = false; jQuery("#selectedList").find("tr").each( function( i, item ){ selectedPropertyIds.append( "" ); var displayed = jQuery( item ).find( "input[name='displayed']:first"); var checked = displayed.attr('checked') ? true : false; personDisplayNames.append( "" ); + if( checked ){ + isDisplayed = true + } }); + if( jQuery("#selectedList").find("tr").length > 0 && isDisplayed ){ + compulsaryIdentifier.append( ""); + } } else{ compulsaryIdentifier.append( ""); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramPatientReminder.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramPatientReminder.vm 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramPatientReminder.vm 2014-01-07 08:22:52 +0000 @@ -110,8 +110,8 @@ #foreach($identifierType in $program.patientIdentifierTypes) #end - #foreach($patientAttribute in $program.patientAttributes) - + #foreach($attribute in $attributes) + #end === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2014-01-07 08:22:52 +0000 @@ -280,7 +280,7 @@ #foreach($identifierType in $program.patientIdentifierTypes) idenAttrOptions+=""; #end - #foreach($patientAttribute in $program.patientAttributes) - idenAttrOptions+=""; + #foreach($programPatientAttribute in $program.programPatientAttributes) + idenAttrOptions+=""; #end \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm 2013-12-21 23:14:17 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm 2014-01-07 08:22:52 +0000 @@ -26,12 +26,12 @@ === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2014-01-06 06:29:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2014-01-07 08:22:52 +0000 @@ -7,7 +7,7 @@
  •   $i18n.getString( "assign_program_to_orgunits" )
  •   $i18n.getString( "assign_program_to_userroles" )
  •   $i18n.getString( "edit" )
    • -
  •   $i18n.getString( "template_reminder_message" )
    • +
  •   $i18n.getString( "view_template_reminder_message" )
  •   $i18n.getString( "view_program_stages" )
  •   $i18n.getString( "view_validation_criteria" )
  •   $i18n.getString( "program_validation_rule_management" )
    • === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2014-01-07 08:22:52 +0000 @@ -14,15 +14,19 @@ compulsaryIdentifier.empty(); if( getFieldValue('type') != 3 ){ - if( jQuery("#selectedList").find("tr").length > 0){ - compulsaryIdentifier.append( ""); - } + var isDisplayed = false; jQuery("#selectedList").find("tr").each( function( i, item ){ selectedPropertyIds.append( "" ); var displayed = jQuery( item ).find( "input[name='displayed']:first"); var checked = displayed.attr('checked') ? true : false; + if( checked ){ + isDisplayed = true + } personDisplayNames.append( "" ); }); + if( jQuery("#selectedList").find("tr").length > 0 && isDisplayed ){ + compulsaryIdentifier.append( ""); + } } else{ compulsaryIdentifier.append( ""); @@ -263,10 +267,10 @@ #end - #foreach( $attribute in $program.patientAttributes ) - + #foreach( $programPatientAttribute in $program.programPatientAttributes ) + $encoder.htmlEncode( $attribute.name ) - + #end === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramPatientReminder.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramPatientReminder.vm 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramPatientReminder.vm 2014-01-07 08:22:52 +0000 @@ -153,8 +153,8 @@ #foreach($identifierType in $program.patientIdentifierTypes) #end - #foreach($patientAttribute in $program.patientAttributes) - + #foreach($attribute in $attributes) + #end === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2014-01-06 15:31:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2014-01-07 08:22:52 +0000 @@ -324,8 +324,8 @@ #foreach($identifierType in $program.patientIdentifierTypes) #end - #foreach($patientAttribute in $program.patientAttributes) - + #foreach($programPatientAttribute in $program.programPatientAttributes) + #end @@ -397,8 +397,8 @@ #foreach($identifierType in $programStage.program.patientIdentifierTypes) idenAttrOptions+=""; #end - #foreach($patientAttribute in $programStage.program.patientAttributes) - idenAttrOptions+=""; + #foreach($programPatientAttribute in $programStage.program.programPatientAttributes) + idenAttrOptions+=""; #end \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2013-12-21 23:14:17 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm 2014-01-07 08:22:52 +0000 @@ -27,12 +27,12 @@