dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17004
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-10-08 13:09:10 +0200
message:
  Validation rule analysis, including name of validation rule in download
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ExportValidationResultAction.java


--
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-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ExportValidationResultAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ExportValidationResultAction.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ExportValidationResultAction.java	2014-10-08 11:09:10 +0000
@@ -140,13 +140,9 @@
 
         grid.addHeader( new GridHeader( i18n.getString( "source" ), false, true ) );
         grid.addHeader( new GridHeader( i18n.getString( "period" ), false, true ) );
+        grid.addHeader( new GridHeader( i18n.getString( "validation_rule" ), false, true ) );
         grid.addHeader( new GridHeader( i18n.getString( "importance" ), false, true ) );
         grid.addHeader( new GridHeader( i18n.getString( "rule_type" ), false, true ) );
-        grid.addHeader( new GridHeader( i18n.getString( "organisation_unit_level" ), false, true ) );
-        grid.addHeader( new GridHeader( i18n.getString( "sequential_sample_count" ), false, true ) );
-        grid.addHeader( new GridHeader( i18n.getString( "annual_sample_count" ), false, true ) );
-        grid.addHeader( new GridHeader( i18n.getString( "high_outliers" ), false, true ) );
-        grid.addHeader( new GridHeader( i18n.getString( "low_outliers" ), false, true ) );
         grid.addHeader( new GridHeader( i18n.getString( "left_side_description" ), false, true ) );
         grid.addHeader( new GridHeader( i18n.getString( "value" ), false, false ) );
         grid.addHeader( new GridHeader( i18n.getString( "operator" ), false, false ) );
@@ -161,13 +157,9 @@
             grid.addRow();
             grid.addValue( unit.getName() );
             grid.addValue( format.formatPeriod( period ) );
+            grid.addValue( validationResult.getValidationRule().getName() );
             grid.addValue( i18n.getString( validationResult.getValidationRule().getImportance() ) );
             grid.addValue( i18n.getString( validationResult.getValidationRule().getRuleType() ) );
-            grid.addValue( validationResult.getValidationRule().getOrganisationUnitLevel() );
-            grid.addValue( validationResult.getValidationRule().getSequentialSampleCount() );
-            grid.addValue( validationResult.getValidationRule().getAnnualSampleCount() );
-            grid.addValue( validationResult.getValidationRule().getHighOutliers() );
-            grid.addValue( validationResult.getValidationRule().getLowOutliers() );
             grid.addValue( validationResult.getValidationRule().getLeftSide().getDescription() ); //TODO lazy prone
             grid.addValue( String.valueOf( validationResult.getLeftsideValue() ) );
             grid.addValue( i18n.getString( validationResult.getValidationRule().getOperator().toString() ) );