dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25570
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12721: Rename validationRule subtype monitoring to surveillance
------------------------------------------------------------
revno: 12721
committer: dhis2-c <dhis2@xxxxxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2013-10-16 08:39:47 -0400
message:
Rename validationRule subtype monitoring to surveillance
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.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/javascript/expressionBuilder.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js
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/validationRule.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/ValidationRule.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2013-10-08 19:10:40 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2013-10-16 12:39:47 +0000
@@ -68,7 +68,7 @@
public static final String IMPORTANCE_LOW = "low";
public static final String RULE_TYPE_VALIDATION = "validation";
- public static final String RULE_TYPE_MONITORING = "monitoring";
+ public static final String RULE_TYPE_SURVEILLANCE = "surveillance";
public static final String TYPE_STATISTICAL = "statistical";
public static final String TYPE_ABSOLUTE = "absolute";
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java 2013-10-14 20:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java 2013-10-16 12:39:47 +0000
@@ -190,7 +190,7 @@
for ( ValidationRule rule : rules )
{
- if ( ValidationRule.RULE_TYPE_MONITORING.equals( rule.getRuleType() ) )
+ if ( ValidationRule.RULE_TYPE_SURVEILLANCE.equals( rule.getRuleType() ) )
{
if ( rule.getOrganisationUnitLevel() == null )
{
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java 2013-10-15 12:12:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java 2013-10-16 12:39:47 +0000
@@ -73,7 +73,7 @@
{
ValidationRunContext context = ValidationRunContext.getNewValidationRunContext( sources, periods, rules,
constantService.getConstantMap(), ValidationRunType.ALERT, lastAlertRun,
- expressionService, periodService, dataValueService);
+ expressionService, periodService, dataValueService );
int threadPoolSize = getThreadPoolSize( context );
ExecutorService executor = Executors.newFixedThreadPool( threadPoolSize );
=== 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-15 13:08:04 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java 2013-10-16 12:39:47 +0000
@@ -280,7 +280,7 @@
for ( ValidationRule rule : rules )
{
- if ( ValidationRule.RULE_TYPE_MONITORING.equals( rule.getRuleType() )
+ if ( ValidationRule.RULE_TYPE_SURVEILLANCE.equals( rule.getRuleType() )
&& rule.getCurrentDataElements() != null )
{
recursiveCurrentDataElements.addAll( rule.getCurrentDataElements() );
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2013-10-14 12:24:56 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2013-10-16 12:39:47 +0000
@@ -807,7 +807,7 @@
validationRule.setName( "MonitoringRule" + uniqueCharacter );
validationRule.setDescription( "Description" + uniqueCharacter );
validationRule.setType( ValidationRule.TYPE_ABSOLUTE );
- validationRule.setRuleType( ValidationRule.RULE_TYPE_MONITORING );
+ validationRule.setRuleType( ValidationRule.RULE_TYPE_SURVEILLANCE );
validationRule.setOperator( operator );
validationRule.setLeftSide( leftSide );
validationRule.setRightSide( rightSide );
=== 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-13 18:35:46 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties 2013-10-16 12:39:47 +0000
@@ -140,7 +140,7 @@
low=Low
rule_type=Rule type
validation=Validation
-monitoring=Monitoring
+surveillance=Surveillance
organisation_unit_level=Organisation unit level
select_level=Select level
sequential_sample_count=Sequential sample count
=== 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-13 18:58:45 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm 2013-10-16 12:39:47 +0000
@@ -28,7 +28,7 @@
<td>
<select type="text" id="ruleType" name="ruleType" onchange="changeRuleType()">
<option value="validation" selected="selected">$i18n.getString( "validation" )</option>
- <option value="monitoring">$i18n.getString( "monitoring" )</option>
+ <option value="surveillance">$i18n.getString( "surveillance" )</option>
</select>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js 2013-10-13 19:55:59 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js 2013-10-16 12:39:47 +0000
@@ -70,7 +70,7 @@
var periodType = getFieldValue( "periodTypeName" );
var ruleType = getFieldValue( "ruleType" );
- var periodTypeAllowAverage = ( ruleType && ruleType == "monitoring" ) ? true : false;
+ var periodTypeAllowAverage = ( ruleType && ruleType == "surveillance" ) ? true : false;
dataDictionary.loadOperands( "#expression-container select[id=dataElementId]",
{usePaging: true, key: key, periodType: periodType, periodTypeAllowAverage: periodTypeAllowAverage } );
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js 2013-10-08 19:10:40 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js 2013-10-16 12:39:47 +0000
@@ -12,7 +12,7 @@
var ruleType = json.validationRule.ruleType;
setText( 'ruleTypeField', i18nalizeRuleType( ruleType ) );
- if ( ruleType == 'monitoring' )
+ if ( ruleType == 'surveillance' )
{
var organisationUnitLevel = string( json.validationRule.organisationUnitLevel );
setText( 'organisationUnitLevelField', organisationUnitLevel ? organisationUnitLevel : '[' + i18n_none + ']' );
@@ -81,9 +81,9 @@
{
return i18n_validation;
}
- else if ( ruleType == "monitoring" )
+ else if ( ruleType == "surveillance" )
{
- return i18n_monitoring;
+ return i18n_surveillance;
}
return null;
=== 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-13 18:58:45 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm 2013-10-16 12:39:47 +0000
@@ -38,12 +38,12 @@
<td>
<select type="text" id="ruleType" name="ruleType" onchange="changeRuleType()" disabled="disabled">
<option value="validation" #if( $validationRule.ruleType == 'validation' ) selected #end>$encoder.htmlEncode( $i18n.getString( "validation" ) )</option>
- <option value="monitoring" #if( $validationRule.ruleType == 'monitoring' ) selected #end>$encoder.htmlEncode( $i18n.getString( "monitoring" ) )</option>
+ <option value="surveillance" #if( $validationRule.ruleType == 'surveillance' ) selected #end>$encoder.htmlEncode( $i18n.getString( "surveillance" ) )</option>
</select>
<img title="$i18n.getString( 'clear_expression' )" onclick="clearRuleExpression()" src="../images/edit-clear.png" style="width: 20px; cursor:pointer;" />
</td>
</tr>
- <tr id="organisationUnitLevelTR" #if( $!validationRule.ruleType != 'monitoring' ) style="display:none;" #end>
+ <tr id="organisationUnitLevelTR" #if( $!validationRule.ruleType != 'surveillance' ) style="display:none;" #end>
<td><label for="organisationUnitLevel">$i18n.getString( "organisation_unit_level" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select type="text" id="organisationUnitLevel" name="organisationUnitLevel">
@@ -63,19 +63,19 @@
<img title="$i18n.getString( 'clear_expression' )" onclick="clearRuleExpression()" src="../images/edit-clear.png" style="width: 20px; cursor:pointer;" />
</td>
</tr>
- <tr id="sequentialSampleCountTR" #if( $!validationRule.ruleType != 'monitoring' ) style='display:none;' #end>
+ <tr id="sequentialSampleCountTR" #if( $!validationRule.ruleType != 'surveillance' ) style='display:none;' #end>
<td><label for="sequentialSampleCount">$i18n.getString( "sequential_sample_count" )</label></td>
<td><input type="text" id="sequentialSampleCount" name="sequentialSampleCount" value="$!validationRule.sequentialSampleCount"></td>
</tr>
- <tr id="annualSampleCountTR" #if( $!validationRule.ruleType != 'monitoring' ) style='display:none;' #end">
+ <tr id="annualSampleCountTR" #if( $!validationRule.ruleType != 'surveillance' ) style='display:none;' #end">
<td><label for="annualSampleCount">$i18n.getString( "annual_sample_count" )</label></td>
<td><input type="text" id="annualSampleCount" name="annualSampleCount" value="$!validationRule.annualSampleCount"></td>
</tr>
- <tr id="highOutliersTR" #if( $!validationRule.ruleType != 'monitoring' ) style='display:none;' #end>
+ <tr id="highOutliersTR" #if( $!validationRule.ruleType != 'surveillance' ) style='display:none;' #end>
<td><label for="highOutliers">$i18n.getString( "high_outliers" )</label></td>
<td><input type="text" id="highOutliers" name="highOutliers" value="$!validationRule.highOutliers"></td>
</tr>
- <tr id="lowOutliersTR" #if( $!validationRule.ruleType != 'monitoring' ) style='display:none;' #end>
+ <tr id="lowOutliersTR" #if( $!validationRule.ruleType != 'surveillance' ) style='display:none;' #end>
<td><label for="lowOutliers">$i18n.getString( "low_outliers" )</label></td>
<td><input type="text" id="lowOutliers" name="lowOutliers" value="$!validationRule.lowOutliers"></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2013-10-13 16:15:28 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2013-10-16 12:39:47 +0000
@@ -31,7 +31,7 @@
var i18n_low = '$encoder.jsEscape( $i18n.getString( "low" ) , "'")';
var i18n_validation = '$encoder.jsEscape( $i18n.getString( "validation" ) , "'")';
- var i18n_monitoring = '$encoder.jsEscape( $i18n.getString( "monitoring" ) , "'")';
+ var i18n_surveillance = '$encoder.jsEscape( $i18n.getString( "surveillance" ) , "'")';
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_validation_rule" ) , "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
