dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12725: Change validation rule 'violations' to 'alerts'

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 16 Oct 2013 13:41:41 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 12725
committer: dhis2-c <dhis2@xxxxxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2013-10-16 09:41:01 -0400
message:
  Change validation rule 'violations' to 'alerts'
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java
  dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.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/validation/ValidationRuleService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java	2013-10-14 20:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java	2013-10-16 13:41:01 +0000
@@ -44,8 +44,8 @@
 {
     String ID = ValidationRuleService.class.getName();
 
-    int MAX_INTERACTIVE_VIOLATIONS = 500;
-    int MAX_ALERT_VIOLATIONS = 100000;
+    int MAX_INTERACTIVE_ALERTS = 500;
+    int MAX_SCHEDULED_ALERTS = 100000;
 
     // -------------------------------------------------------------------------
     // ValidationRule business logic

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java	2013-10-16 12:39:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java	2013-10-16 13:41:01 +0000
@@ -93,7 +93,7 @@
     private void validateSource( OrganisationUnitExtended sourceX, ValidationRunContext context )
     {
         if ( context.getValidationResults().size() < ( ValidationRunType.INTERACTIVE == context.getRunType() ?
-            ValidationRuleService.MAX_INTERACTIVE_VIOLATIONS : ValidationRuleService.MAX_ALERT_VIOLATIONS) )
+            ValidationRuleService.MAX_INTERACTIVE_ALERTS : ValidationRuleService.MAX_SCHEDULED_ALERTS) )
         {
             for ( PeriodTypeExtended periodTypeX : context.getPeriodTypeExtendedMap().values() )
             {

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java	2013-10-08 19:10:40 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java	2013-10-16 13:41:01 +0000
@@ -180,7 +180,7 @@
                 .parseDate( startDate ), format.parseDate( endDate ), organisationUnits, group ) );
         }
 
-        maxExceeded = validationResults.size() > ValidationRuleService.MAX_INTERACTIVE_VIOLATIONS;
+        maxExceeded = validationResults.size() > ValidationRuleService.MAX_INTERACTIVE_ALERTS;
 
         Collections.sort( validationResults, new ValidationResultComparator() );
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2013-10-16 12:39:47 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2013-10-16 13:41:01 +0000
@@ -40,12 +40,11 @@
 edit_validation_rule= Edit validation rule
 validation_rule= Validation Rule
 run_validation= Run validation
-validation_violations= Validation violations
+validation_alerts= Validation alerts
 value= Value
 data_element= Data element
 organisation_unit= Organisation unit
 period= Period
-validation_violations= Validation violations
 source= Source
 done= Done
 validation=Validation
@@ -69,7 +68,7 @@
 available_validation_rules=Available validation rules
 edit_validation_rule_group=Edit validation rule group
 all_validation_rules= All validation rules
-validation_violations= Validation violations
+validation_alerts= Validation alerts
 validation_passed_successfully= Validation passed successfully
 outlier_analysis=Outlier Analysis
 from_date=From date
@@ -125,13 +124,13 @@
 get_report_as_xls=Download as Excel
 get_report_as_csv=Download as CSV
 get_report_as_pdf=Download as PDF
-max_values_exceeded=More than 500 values found, please fix the violations or narrow the search to see all
+max_values_exceeded=More than 500 values found, please narrow the search to see all
 specify_dataset=Please specify data sets
 analysing_please_wait=Analysing data, please wait
 skip_for_missing_values=Skip for missing values
 select_parameters=Select parameters
 compulsory_pair=Compulsory pair
-visible_in_validation_violations=visible in validation violations
+visible_in_validation_alerts=visible in validation alerts
 tip=Tip
 use=use
 importance=Importance

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm	2013-10-16 12:39:47 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm	2013-10-16 13:41:01 +0000
@@ -10,7 +10,7 @@
 		<td><input type="text" id="name" name="name"></td>
 	</tr>
 	<tr>
-		<td><label for="description">$i18n.getString( "description" ) ($i18n.getString( "visible_in_validation_violations" ))</label></td>
+		<td><label for="description">$i18n.getString( "description" ) ($i18n.getString( "visible_in_validation_alerts" ))</label></td>
 		<td><textarea name="description"></textarea></td>
 	</tr>
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm	2013-10-16 12:39:47 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm	2013-10-16 13:41:01 +0000
@@ -20,7 +20,7 @@
 		<td><input type="text" id="name" name="name" value="$!encoder.htmlEncode( $validationRule.name )"></td>
 	</tr>
 	<tr>
-		<td><label for="description">$i18n.getString( "description" ) ($i18n.getString( "visible_in_validation_violations" ))</label></td>
+		<td><label for="description">$i18n.getString( "description" ) ($i18n.getString( "visible_in_validation_alerts" ))</label></td>
 		<td><textarea name="description">$!encoder.htmlEncode( $validationRule.description )</textarea></td>
 	</tr>
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm	2013-10-15 14:22:12 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm	2013-10-16 13:41:01 +0000
@@ -27,7 +27,7 @@
 
 <input type="hidden" id="organisationUnitId" value="$!{organisationUnit.id}" />
 
-<h3>$i18n.getString( "validation_violations" ) - $encoder.htmlEncode( $!{organisationUnit.name} )</h3>
+<h3>$i18n.getString( "validation_alerts" ) - $encoder.htmlEncode( $!{organisationUnit.name} )</h3>
 
 <table>
 	<colgroup>