=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/status.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/status.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/status.vm 2013-02-05 14:51:56 +0000
@@ -2,7 +2,7 @@
$statusCode
#foreach($validation in $resultValidation)
- $validation.description
+ $validation.name
#end
$encoder.xmlEncode($message)
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm 2013-02-05 14:51:56 +0000
@@ -37,7 +37,7 @@
#set($rightsideValue = "NULL")
#if($result.rightsideValue) #set($rightsideValue = $result.rightsideValue ) #end
-
$encoder.htmlEncode( $result.programValidation.description ) |
+ $encoder.htmlEncode( $result.programValidation.name ) |
$!encoder.htmlEncode( $leftFormula ) $encoder.htmlEncode( $i18n.getString( $result.programValidation.operator.mathematicalOperator ) ) $!encoder.htmlEncode( $rightFormula ) |
$!encoder.htmlEncode( $result.programValidation.leftSide.description ) |
$leftsideValue |
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramValidation.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramValidation.vm 2012-11-12 07:21:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramValidation.vm 2013-02-05 14:51:56 +0000
@@ -1,7 +1,7 @@
{ "validation":
{
"id": "${validation.id}",
- "description": "$!encoder.htmlEncode( ${validation.description} )",
+ "description": "$!encoder.htmlEncode( ${validation.name} )",
"operator": "$!encoder.htmlEncode( ${validation.operator} )",
"leftSideDescription": "$!encoder.htmlEncode( ${validation.leftSide.description} )",
"leftSideExpression": "$!encoder.htmlEncode( ${validation.leftSide.expression} )",
=== 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 2013-02-02 10:34:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-02-05 14:51:56 +0000
@@ -343,4 +343,6 @@
confirm_delete_patient_registration_form = Are you sure you want to delete person registration form?
fixed_attributes = Fixed attributes
identifier_types = Identifier types
-attributes = Attributes
\ No newline at end of file
+attributes = Attributes
+left_side_expression = Left side expression
+right_side_expression = Right side expression:
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-01-30 09:38:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-02-05 14:51:56 +0000
@@ -18,7 +18,7 @@
|
-
+
|