dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16602
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6348: (patient) Donot run validation rule in data entry form.
------------------------------------------------------------
revno: 6348
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-03-22 21:17:16 +0700
message:
(patient) Donot run validation rule in data entry form.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java
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/patientdatavalue/DefaultPatientDataValueService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ValidateProgramInstanceAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java 2012-03-22 14:17:16 +0000
@@ -31,7 +31,6 @@
import java.util.Date;
import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.program.ProgramStageInstance;
@@ -53,9 +52,6 @@
int deletePatientDataValue( DataElement dataElement );
- PatientDataValue getPatientDataValue( ProgramStageInstance programStageInstance, DataElement dataElement,
- OrganisationUnit organisationUnit );
-
Collection<PatientDataValue> getPatientDataValues( ProgramStageInstance programStageInstance );
Collection<PatientDataValue> getPatientDataValues( ProgramStageInstance programStageInstance, Collection<DataElement> dataElement );
@@ -64,26 +60,6 @@
Collection<PatientDataValue> getPatientDataValues( DataElement dataElement );
- Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit );
-
- Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit,
- ProgramStageInstance programStageInstance );
-
- Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit,
- Collection<ProgramStageInstance> programStageInstances );
-
- Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit, DataElement dataElement );
-
- Collection<PatientDataValue> getPatientDataValues( boolean providedByAnotherFacility );
-
- Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit,
- boolean providedByAnotherFacility );
-
- Collection<PatientDataValue> getPatientDataValues( ProgramStageInstance programStageInstance,
- boolean providedByAnotherFacility );
-
- Collection<PatientDataValue> getPatientDataValues( DataElement dataElement, boolean providedByAnotherFacility );
-
Collection<PatientDataValue> getPatientDataValues( Patient patient, Collection<DataElement> dataElements,
Date startDate, Date endDate );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java 2012-03-22 14:17:16 +0000
@@ -32,7 +32,6 @@
import org.hisp.dhis.common.GenericStore;
import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.program.ProgramStageInstance;
@@ -50,9 +49,6 @@
int delete( ProgramStageInstance programStageInstance );
int delete( DataElement dataElement );
-
- PatientDataValue get( ProgramStageInstance programStageInstance, DataElement dataElement,
- OrganisationUnit organisationUnit );
Collection<PatientDataValue> get( ProgramStageInstance programStageInstance );
@@ -61,24 +57,6 @@
Collection<PatientDataValue> get( Collection<ProgramStageInstance> programStageInstances );
Collection<PatientDataValue> get( DataElement dataElement );
-
- Collection<PatientDataValue> get( OrganisationUnit organisationUnit );
-
- Collection<PatientDataValue> get( OrganisationUnit organisationUnit,
- ProgramStageInstance programStageInstance );
-
- Collection<PatientDataValue> get( OrganisationUnit organisationUnit,
- Collection<ProgramStageInstance> programStageInstances );
-
- Collection<PatientDataValue> get( OrganisationUnit organisationUnit, DataElement dataElement );
-
- Collection<PatientDataValue> get( boolean providedByAnotherFacility );
-
- Collection<PatientDataValue> get( OrganisationUnit organisationUnit, boolean providedByAnotherFacility );
-
- Collection<PatientDataValue> get( ProgramStageInstance programStageInstance, boolean providedByAnotherFacility );
-
- Collection<PatientDataValue> get( DataElement dataElement, boolean providedByAnotherFacility );
Collection<PatientDataValue> get( Patient patient, Collection<DataElement> dataElements, Date startDate, Date endDate );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java 2012-01-13 02:14:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java 2012-03-22 14:17:16 +0000
@@ -58,6 +58,6 @@
Collection<ProgramValidation> getProgramValidation( ProgramStageDataElement psdataElement );
- boolean runValidation( ProgramValidation validation, ProgramStageInstance programStageInstance, OrganisationUnit orgunit,
+ boolean runValidation( ProgramValidation validation, ProgramStageInstance programStageInstance,
I18nFormat format );
}
=== 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 2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2012-03-22 14:17:16 +0000
@@ -249,7 +249,7 @@
programStageInstance.setCompleted( true );
programStageInstanceService.updateProgramStageInstance( programStageInstance );
// Everything is fine, hence save
- saveDataValues( activityValue, programStageInstance, dataElementMap, unit );
+ saveDataValues( activityValue, programStageInstance, dataElementMap );
}
@@ -390,7 +390,7 @@
}
private void saveDataValues( ActivityValue activityValue, ProgramStageInstance programStageInstance,
- Map<Integer, DataElement> dataElementMap, OrganisationUnit orgUnit )
+ Map<Integer, DataElement> dataElementMap )
{
org.hisp.dhis.dataelement.DataElement dataElement;
String value;
@@ -410,8 +410,7 @@
}
dataElement = dataElementMap.get( dv.getId() );
- PatientDataValue dataValue = dataValueService.getPatientDataValue( programStageInstance, dataElement,
- orgUnit );
+ PatientDataValue dataValue = dataValueService.getPatientDataValue( programStageInstance, dataElement );
if ( dataValue == null )
{
=== 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 2012-03-15 09:25:30 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-03-22 14:17:16 +0000
@@ -96,7 +96,7 @@
ResultSet resultSet = statement
.executeQuery( "SELECT distinct programstageinstanceid, organisationunitid, providedByAnotherFacility FROM patientdatavalue" );
- resultSet.next();
+
while ( resultSet.next() )
{
executeSql( "UPDATE programstageinstance SET organisationunitid=" + resultSet.getInt( 2 )
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/DefaultPatientDataValueService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/DefaultPatientDataValueService.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/DefaultPatientDataValueService.java 2012-03-22 14:17:16 +0000
@@ -31,7 +31,6 @@
import java.util.Date;
import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.program.ProgramStageInstance;
import org.springframework.transaction.annotation.Transactional;
@@ -99,18 +98,21 @@
return patientDataValueStore.getAll();
}
- public PatientDataValue getPatientDataValue( ProgramStageInstance programStageInstance, DataElement dataElement,
- OrganisationUnit organisationUnit )
- {
- return patientDataValueStore.get( programStageInstance, dataElement, organisationUnit );
- }
+ // public PatientDataValue getPatientDataValue( ProgramStageInstance
+ // programStageInstance, DataElement dataElement,
+ // OrganisationUnit organisationUnit )
+ // {
+ // return patientDataValueStore.get( programStageInstance, dataElement,
+ // organisationUnit );
+ // }
public Collection<PatientDataValue> getPatientDataValues( ProgramStageInstance programStageInstance )
{
return patientDataValueStore.get( programStageInstance );
}
-
- public Collection<PatientDataValue> getPatientDataValues( ProgramStageInstance programStageInstance, Collection<DataElement> dataElements )
+
+ public Collection<PatientDataValue> getPatientDataValues( ProgramStageInstance programStageInstance,
+ Collection<DataElement> dataElements )
{
return patientDataValueStore.get( programStageInstance, dataElements );
}
@@ -125,50 +127,6 @@
return patientDataValueStore.get( dataElement );
}
- public Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit )
- {
- return patientDataValueStore.get( organisationUnit );
- }
-
- public Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit,
- ProgramStageInstance programStageInstance )
- {
- return patientDataValueStore.get( organisationUnit, programStageInstance );
- }
-
- public Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit,
- Collection<ProgramStageInstance> programStageInstances )
- {
- return patientDataValueStore.get( organisationUnit, programStageInstances );
- }
-
- public Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit, DataElement dataElement )
- {
- return patientDataValueStore.get( organisationUnit, dataElement );
- }
-
- public Collection<PatientDataValue> getPatientDataValues( boolean providedByAnotherFacility )
- {
- return patientDataValueStore.get( providedByAnotherFacility );
- }
-
- public Collection<PatientDataValue> getPatientDataValues( OrganisationUnit organisationUnit,
- boolean providedByAnotherFacility )
- {
- return patientDataValueStore.get( organisationUnit, providedByAnotherFacility );
- }
-
- public Collection<PatientDataValue> getPatientDataValues( ProgramStageInstance programStageInstance,
- boolean providedByAnotherFacility )
- {
- return patientDataValueStore.get( programStageInstance, providedByAnotherFacility );
- }
-
- public Collection<PatientDataValue> getPatientDataValues( DataElement dataElement, boolean providedByAnotherFacility )
- {
- return patientDataValueStore.get( dataElement, providedByAnotherFacility );
- }
-
public Collection<PatientDataValue> getPatientDataValues( Patient patient, Collection<DataElement> dataElements,
Date startDate, Date endDate )
{
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java 2012-03-22 14:17:16 +0000
@@ -35,11 +35,11 @@
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.hibernate.HibernateGenericStore;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patientdatavalue.PatientDataValue;
import org.hisp.dhis.patientdatavalue.PatientDataValueStore;
import org.hisp.dhis.program.ProgramStageInstance;
+
/**
* @author Abyot Asalefew Gizaw
* @version $Id$
@@ -67,13 +67,14 @@
return query.executeUpdate();
}
- public PatientDataValue get( ProgramStageInstance programStageInstance, DataElement dataElement,
- OrganisationUnit organisationUnit )
- {
- return (PatientDataValue) getCriteria( Restrictions.eq( "programStageInstance", programStageInstance ),
- Restrictions.eq( "dataElement", dataElement ), Restrictions.eq( "organisationUnit", organisationUnit ) )
- .uniqueResult();
- }
+// public PatientDataValue get( ProgramStageInstance programStageInstance, DataElement dataElement,
+// OrganisationUnit organisationUnit )
+// {
+// return (PatientDataValue) getCriteria( Restrictions.eq( "programStageInstance", programStageInstance ),
+// Restrictions.eq( "dataElement", dataElement ) )
+// .createAlias( "programStageInstance", "programStageInstance" ).add(
+// Restrictions.eq( "programStageInstance.organisationUnit", organisationUnit ) ).uniqueResult();
+// }
@SuppressWarnings( "unchecked" )
public Collection<PatientDataValue> get( ProgramStageInstance programStageInstance )
@@ -110,63 +111,6 @@
}
@SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( OrganisationUnit organisationUnit )
- {
- return getCriteria( Restrictions.eq( "organisationUnit", organisationUnit ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( OrganisationUnit organisationUnit,
- ProgramStageInstance programStageInstance )
- {
- return getCriteria( Restrictions.eq( "organisationUnit", organisationUnit ),
- Restrictions.eq( "programStageInstance", programStageInstance ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( OrganisationUnit organisationUnit,
- Collection<ProgramStageInstance> programStageInstances )
- {
- return getCriteria( Restrictions.eq( "organisationUnit", organisationUnit ),
- Restrictions.in( "programStageInstance", programStageInstances ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( OrganisationUnit organisationUnit, DataElement dataElement )
- {
- return getCriteria( Restrictions.eq( "organisationUnit", organisationUnit ),
- Restrictions.eq( "dataElement", dataElement ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( boolean providedByAnotherFacility )
- {
- return getCriteria( Restrictions.eq( "providedByAnotherFacility", providedByAnotherFacility ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( OrganisationUnit organisationUnit, boolean providedByAnotherFacility )
- {
- return getCriteria( Restrictions.eq( "organisationUnit", organisationUnit ),
- Restrictions.eq( "providedByAnotherFacility", providedByAnotherFacility ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( ProgramStageInstance programStageInstance,
- boolean providedByAnotherFacility )
- {
- return getCriteria( Restrictions.eq( "programStageInstance", programStageInstance ),
- Restrictions.eq( "providedByAnotherFacility", providedByAnotherFacility ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
- public Collection<PatientDataValue> get( DataElement dataElement, boolean providedByAnotherFacility )
- {
- return getCriteria( Restrictions.eq( "dataElement", dataElement ),
- Restrictions.eq( "providedByAnotherFacility", providedByAnotherFacility ) ).list();
- }
-
- @SuppressWarnings( "unchecked" )
public Collection<PatientDataValue> get( Patient patient, Collection<DataElement> dataElements, Date startDate,
Date endDate )
{
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java 2012-03-22 14:17:16 +0000
@@ -134,7 +134,7 @@
@Override
public boolean runValidation( ProgramValidation validation, ProgramStageInstance programStageInstance,
- OrganisationUnit orgunit, I18nFormat format )
+ I18nFormat format )
{
if ( !validation.getDateType() )
{
@@ -142,18 +142,18 @@
// parse left-expressions
// ---------------------------------------------------------------------
- boolean resultLeft = runExpression( validation.getLeftSide(), programStageInstance, orgunit );
+ boolean resultLeft = runExpression( validation.getLeftSide(), programStageInstance );
// ---------------------------------------------------------------------
// parse right-expressions
// ---------------------------------------------------------------------
- boolean resultRight = runExpression( validation.getRightSide(), programStageInstance, orgunit );
+ boolean resultRight = runExpression( validation.getRightSide(), programStageInstance );
return (resultLeft == resultRight);
}
- return runDateExpression( validation, programStageInstance, orgunit, format );
+ return runDateExpression( validation, programStageInstance, format );
}
public Collection<ProgramValidation> getProgramValidation( Program program )
@@ -192,8 +192,7 @@
// Supportive methods
// -------------------------------------------------------------------------
- private boolean runExpression( String expression, ProgramStageInstance programStageInstance,
- OrganisationUnit orgunit )
+ private boolean runExpression( String expression, ProgramStageInstance programStageInstance )
{
StringBuffer description = new StringBuffer();
@@ -205,7 +204,7 @@
{
String match = matcher.group();
- PatientDataValue dataValue = getPatientDataValue( match, programStageInstance, orgunit );
+ PatientDataValue dataValue = getPatientDataValue( match, programStageInstance );
if ( dataValue == null )
{
@@ -225,7 +224,7 @@
}
public boolean runDateExpression( ProgramValidation programValidation, ProgramStageInstance programStageInstance,
- OrganisationUnit orgunit, I18nFormat format )
+ I18nFormat format )
{
Pattern pattern = Pattern.compile( regExp );
@@ -235,7 +234,7 @@
{
String match = matcher.group();
- PatientDataValue dataValue = getPatientDataValue( match, programStageInstance, orgunit );
+ PatientDataValue dataValue = getPatientDataValue( match, programStageInstance );
if ( dataValue == null )
{
@@ -274,7 +273,7 @@
return true;
}
}
-
+
int rightValidation = Integer.parseInt( rightSide.substring( 0, index ) );
int daysValue = Integer.parseInt( rightSide.substring( index + 1, rightSide.length() ) );
@@ -336,8 +335,7 @@
// Supportive methods
// -------------------------------------------------------------------------
- private PatientDataValue getPatientDataValue( String match, ProgramStageInstance programStageInstance,
- OrganisationUnit orgunit )
+ private PatientDataValue getPatientDataValue( String match, ProgramStageInstance programStageInstance )
{
match = match.replaceAll( "[\\[\\]]", "" );
@@ -347,7 +345,7 @@
int dataElementId = Integer.parseInt( ids[1] );
DataElement dataElement = dataElementService.getDataElement( dataElementId );
- PatientDataValue dataValue = valueService.getPatientDataValue( programStageInstance, dataElement, orgunit );
+ PatientDataValue dataValue = valueService.getPatientDataValue( programStageInstance, dataElement );
return dataValue;
}
@@ -401,4 +399,5 @@
return programStages;
}
+
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ValidateProgramInstanceAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ValidateProgramInstanceAction.java 2012-01-15 14:53:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ValidateProgramInstanceAction.java 2012-03-22 14:17:16 +0000
@@ -27,15 +27,15 @@
package org.hisp.dhis.caseentry.action.caseentry;
+import static org.hisp.dhis.program.ProgramValidation.AFTER_CURRENT_DATE;
+import static org.hisp.dhis.program.ProgramValidation.AFTER_DUE_DATE;
import static org.hisp.dhis.program.ProgramValidation.AFTER_OR_EQUALS_TO_CURRENT_DATE;
+import static org.hisp.dhis.program.ProgramValidation.AFTER_OR_EQUALS_TO_DUE_DATE;
+import static org.hisp.dhis.program.ProgramValidation.BEFORE_CURRENT_DATE;
+import static org.hisp.dhis.program.ProgramValidation.BEFORE_DUE_DATE;
import static org.hisp.dhis.program.ProgramValidation.BEFORE_DUE_DATE_PLUS_OR_MINUS_MAX_DAYS;
import static org.hisp.dhis.program.ProgramValidation.BEFORE_OR_EQUALS_TO_CURRENT_DATE;
-import static org.hisp.dhis.program.ProgramValidation.BEFORE_CURRENT_DATE;
-import static org.hisp.dhis.program.ProgramValidation.AFTER_CURRENT_DATE;
-import static org.hisp.dhis.program.ProgramValidation.BEFORE_DUE_DATE;
import static org.hisp.dhis.program.ProgramValidation.BEFORE_OR_EQUALS_TO_DUE_DATE;
-import static org.hisp.dhis.program.ProgramValidation.AFTER_DUE_DATE;
-import static org.hisp.dhis.program.ProgramValidation.AFTER_OR_EQUALS_TO_DUE_DATE;
import java.util.ArrayList;
import java.util.Collection;
@@ -49,7 +49,6 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patientdatavalue.PatientDataValue;
import org.hisp.dhis.patientdatavalue.PatientDataValueService;
import org.hisp.dhis.program.ProgramInstance;
@@ -162,11 +161,6 @@
this.i18n = i18n;
}
- public SelectedStateManager getSelectedStateManager()
- {
- return selectedStateManager;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -183,8 +177,6 @@
// Get selected objects
// ---------------------------------------------------------------------
- OrganisationUnit organisationUnit = selectedStateManager.getSelectedOrganisationUnit();
-
ProgramStageInstance programStageInstance = selectedStateManager.getSelectedProgramStageInstance();
ProgramStage programStage = programStageInstance.getProgramStage();
@@ -199,7 +191,7 @@
{
DataElement dataElement = psDataElement.getDataElement();
- checkDataElementInMultiStage( programStageInstance, organisationUnit, dataElement );
+ checkDataElementInMultiStage( programStageInstance, dataElement );
}
// ---------------------------------------------------------------------
@@ -207,7 +199,7 @@
// ---------------------------------------------------------------------
runProgramValidation( programValidationService.getProgramValidation( programStageInstance.getProgramStage() ),
- programStageInstance, organisationUnit );
+ programStageInstance );
return SUCCESS;
}
@@ -225,7 +217,7 @@
**/
private void checkDataElementInMultiStage( ProgramStageInstance programStageInstance,
- OrganisationUnit organisationUnit, DataElement dataElement )
+ DataElement dataElement )
{
ProgramInstance programInstance = programStageInstance.getProgramInstance();
List<ProgramStage> stages = new ArrayList<ProgramStage>( programInstance.getProgram().getProgramStages() );
@@ -237,8 +229,7 @@
ProgramStage prevStage = stages.get( index - 1 );
ProgramStageInstance prevStageInstance = programStageInstanceService.getProgramStageInstance(
programInstance, prevStage );
- PatientDataValue prevValue = patientDataValueService.getPatientDataValue( prevStageInstance, dataElement,
- organisationUnit );
+ PatientDataValue prevValue = patientDataValueService.getPatientDataValue( prevStageInstance, dataElement );
if ( prevValue == null )
{
@@ -253,14 +244,13 @@
}
private void runProgramValidation( Collection<ProgramValidation> validations,
- ProgramStageInstance programStageInstance, OrganisationUnit orgunit )
+ ProgramStageInstance programStageInstance )
{
if ( validations != null )
{
for ( ProgramValidation validation : validations )
{
- boolean valid = programValidationService.runValidation( validation, programStageInstance, orgunit,
- format );
+ boolean valid = programValidationService.runValidation( validation, programStageInstance, format );
if ( !valid )
{
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-03-22 03:06:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-03-22 14:17:16 +0000
@@ -283,4 +283,5 @@
data_element = Data element
V=Verified
D=Declared
-A=Approximated
\ No newline at end of file
+A=Approximated
+some_data_element_not_exist = Some data element is not exist
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-03-05 04:22:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-03-22 14:17:16 +0000
@@ -42,8 +42,8 @@
<div id='entryForm' #if($!programStageInstance.executionDate) class='visible' #else class='hidden' #end>
##providedByAnotherFacility
<table class='entryScreen'>
- <tr #alternate( true ) >
- <td>
+ <tr>
+ <th>
#if($programStageInstance.programInstance.program.displayProvidedOtherFacility == 'true' )
#set( $id = $programStageInstance.programStage.id + '_facility' )
#if( $!programStageInstance.providedByAnotherFacility)
@@ -56,7 +56,7 @@
$i18n.getString( "provided_elsewhere" ) <input type="checkbox" id='$id' onclick="updateProvidingFacility();" #if($programStageInstance.completed) disabled="disabled" #end >
#end
#end
- </td>
+ </th>
</tr>
</table>
