dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7873
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-08-07 17:05:02 +0700
message:
  Don't run validation rules in patient module.
modified:
  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/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties


--
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/caseentry/ValidateProgramInstanceAction.java'
--- 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
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ValidateProgramInstanceAction.java	2012-08-07 10:05:02 +0000
@@ -44,7 +44,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
 import org.hisp.dhis.caseentry.state.SelectedStateManager;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.i18n.I18n;
@@ -80,8 +79,6 @@
 
     private ProgramValidationService programValidationService;
 
-    private CaseAggregationConditionService aggregationConditionService;
-
     // -------------------------------------------------------------------------
     // Input
     // -------------------------------------------------------------------------
@@ -116,11 +113,6 @@
         this.format = format;
     }
 
-    public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
-    {
-        this.aggregationConditionService = aggregationConditionService;
-    }
-
     public Map<Integer, String> getLeftsideFormulaMap()
     {
         return leftsideFormulaMap;
@@ -266,8 +258,8 @@
 
             for ( ProgramValidation validation : programValidations )
             {
-                leftsideFormulaMap.put( validation.getId(), aggregationConditionService
-                    .getConditionDescription( validation.getLeftSide() ) );
+                leftsideFormulaMap.put( validation.getId(), programValidationService
+                    .getValidationDescription( validation.getLeftSide() ) );
 
                 if ( validation.getDateType() )
                 {
@@ -334,8 +326,8 @@
                 }
                 else
                 {
-                    rightsideFormulaMap.put( validation.getId(), aggregationConditionService
-                        .getConditionDescription( validation.getRightSide() ) );
+                    rightsideFormulaMap.put( validation.getId(), programValidationService
+                        .getValidationDescription( validation.getRightSide() ) );
                 }
             }
         }

=== 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	2012-08-07 05:43:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2012-08-07 10:05:02 +0000
@@ -395,8 +395,6 @@
 			ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
 		<property name="programValidationService"
 			ref="org.hisp.dhis.program.ProgramValidationService" />
-		<property name="aggregationConditionService"
-			ref="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
 	</bean>
 
 	<bean

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-08-07 08:14:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-08-07 10:05:02 +0000
@@ -253,4 +253,5 @@
 visit_selected_program_stage = Visited selected program stage
 intro_patient_aggregation_query_builder = Define formulas, expressions, rules for aggregation data from name-based to aggregation system
 show_incident_date = Show incident date
-display_date_of_incident = Display date of incident
\ No newline at end of file
+display_date_of_incident = Display date of incident
+patient_attribute_group_sort_order = Person attribute group sort order
\ No newline at end of file