dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20201
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-09-17 15:19:09 +0700
message:
  Minor fixes
modified:
  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/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-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	2014-06-13 08:33:45 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js	2015-09-17 08:19:09 +0000
@@ -18,7 +18,7 @@
 		var ruleType = json.validationRule.ruleType;
 		setText( 'ruleTypeField', i18nalizeRuleType( ruleType ) );
 		
-		if ( ruleType == 'surveillance' ) 
+		if ( ruleType == 'SURVEILLANCE' )
 		{
 			var organisationUnitLevel = string( json.validationRule.organisationUnitLevel );
 			setText( 'organisationUnitLevelField', organisationUnitLevel ? organisationUnitLevel : '[' + i18n_none + ']' );
@@ -65,15 +65,15 @@
 
 function i18nalizeImportance ( importance )
 {
-	if ( importance == "high" )
+	if ( importance == "HIGH" )
 	{
 		return i18n_high;
 	}
-	else if ( importance == "medium" )
+	else if ( importance == "MEDIUM" )
 	{
 		return i18n_medium;
 	}
-	if ( importance == "low" )
+	if ( importance == "LOW" )
 	{
 		return i18n_low;
 	}
@@ -83,11 +83,11 @@
 
 function i18nalizeRuleType ( ruleType )
 {
-	if ( ruleType == "validation" )
+	if ( ruleType == "VALIDATION" )
 	{
 		return i18n_validation;
 	}
-	else if ( ruleType == "surveillance" )
+	else if ( ruleType == "SURVEILLANCE" )
 	{
 		return i18n_surveillance;
 	}

=== 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	2015-02-09 14:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm	2015-09-17 08:19:09 +0000
@@ -104,7 +104,7 @@
           #if( $showAttributeCombos )
               <td>#if($result.attributeOptionCombo.isDefault()=='false') $encoder.htmlEncode( $!result.attributeOptionCombo.name ) #end</td>
           #end
-		  <td>$encoder.htmlEncode( $i18n.getString( $!result.validationRule.importance ) )</td>
+		  <td>$encoder.htmlEncode( $i18n.getString( "$!result.validationRule.importance" ) )</td>
 		  <td>$encoder.htmlEncode( $!result.validationRule.getInstructionFallback() )</td>
 		  <td>$encoder.htmlEncode( $!result.leftsideValue )</td>
 		  <td style="text-align:center">$encoder.htmlEncode( $i18n.getString( $!result.validationRule.operator.mathematicalOperator ) )</td>