dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7759
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-30 11:09:34 +0200
message:
  minor fix
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.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-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java	2012-07-30 08:50:53 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java	2012-07-30 09:09:34 +0000
@@ -272,7 +272,7 @@
 
         if ( this.patientFullName.trim().length() < 7 )
         {
-            validationMap.put( "fullName", "is_invalid_name" );
+            validationMap.put( "fullName", "is_invalid_name_length" );
         }
         else
         {

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-07-30 08:50:53 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-07-30 09:09:34 +0000
@@ -30,6 +30,7 @@
 is_invalid_positive_integer=is not a valid positive integer
 is_invalid_negative_integer=is not a valid negative integer
 is_invalid_name=is not a valid name
+is_invalid_name_length=needs to be 7 or more characters
 is_duplicate=person identifier number is duplicated
 warnings_and_errors=Warnings and errors
 validation_rule_violation_warnings=Validation Rule Violation Warnings

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm	2012-07-30 08:59:19 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm	2012-07-30 09:09:34 +0000
@@ -13,11 +13,13 @@
 <input type="hidden" name="orgUnitId" value="$orgUnitId"/>	
 	<p style="text-align: left;">
 		<label>$i18n.getString( "full_name" )</label>
+
 		#if( $validationMap.get( "fullName" ) )
            	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "fullName" ))</span>
      	#end
+
 		<input type="text" name="patientFullName" value="$!previousValues.get("fullName")" />
-		
+
 		<label>$i18n.getString( "gender" )</label>
 		<select name="gender">
 			<option value="M"
@@ -61,10 +63,10 @@
 		</select>
 
 		#if( $validationMap.get( "dob" ) )
-           	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "dob" ))</span>
+           	<span style="color: #990000;"> $i18n.getString($validationMap.get( "dob" ))</span>
      	#end
 		<input type="text" name="dateOfBirth" value="$!previousValues.get("dob")" />
-		
+
 		#foreach($patientIdentifierType in $patientIdentifierTypes)
 			#if(! $patientIdentifierType.program)
 				#set($key = "IDT${patientIdentifierType.id}")