------------------------------------------------------------
revno: 12810
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Wed 2013-10-23 20:10:11 +0200
message:
Person aggregaetion, fixed statement causing log warnings
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java 2013-10-23 12:24:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java 2013-10-23 18:10:11 +0000
@@ -44,7 +44,6 @@
import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientIdentifier;
-import org.hisp.dhis.patient.PatientIdentifierService;
import org.hisp.dhis.patient.PatientIdentifierType;
import org.hisp.dhis.patient.PatientIdentifierTypeService;
import org.hisp.dhis.patient.PatientService;
@@ -73,8 +72,6 @@
private PatientAttributeValueService patientAttributeValueService;
- private PatientIdentifierService patientIdentifierService;
-
private PatientIdentifierTypeService identifierTypeService;
private ProgramService programService;
@@ -285,11 +282,6 @@
this.identifierTypeService = identifierTypeService;
}
- public void setPatientIdentifierService( PatientIdentifierService patientIdentifierService )
- {
- this.patientIdentifierService = patientIdentifierService;
- }
-
public void setFormat( I18nFormat format )
{
this.format = format;
=== 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 2013-10-21 03:37:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2013-10-23 18:10:11 +0000
@@ -548,11 +548,8 @@
<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
<property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
<property name="patientAttributeValueService">
- <ref
- bean="org.hisp.dhis.patientattributevalue.PatientAttributeValueService" />
+ <ref bean="org.hisp.dhis.patientattributevalue.PatientAttributeValueService" />
</property>
- <property name="patientIdentifierService"
- ref="org.hisp.dhis.patient.PatientIdentifierService" />
<property name="identifierTypeService">
<ref bean="org.hisp.dhis.patient.PatientIdentifierTypeService" />
</property>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2013-06-07 08:22:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2013-10-23 18:10:11 +0000
@@ -8,7 +8,7 @@
#set($divIdx=0)
#set($hashValues=false)
#foreach( $grid in $grids )
- #if($grid.getRows().size() > 0)
+ #if(${grid.height} > 0)
#set($hashValues=true)
#set($divIdx=$divIdx+1)
<h3>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
