dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4993
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-21 13:35:58 +0700
message:
  Hide the Beneficiary Identifiers and Other details headers if there is no identifiers or attributes in the system.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.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-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2011-09-27 04:24:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2011-10-21 06:35:58 +0000
@@ -108,20 +108,20 @@
 		<input type="checkbox" name="underAge" id="underAge" onclick="toggleUnderAge(this);" value="true"/>
 	</td>
 </tr>
-
 <!--IDENTIFIERS -->
-<tr><td colspan="2">&nbsp;</td></tr>	
-<tr><th colspan="2" class="heading-column">$i18n.getString( "patient_identifiers" )</th></tr>
-#foreach ($identifierType in $identifierTypes)
-<tr>
-	<td><label>$identifierType.name #if($identifierType.mandatory == true )<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>       
-		<td class="input-column">
-		<input type="text" style="width:28em" id="iden$identifierType.id" name="iden$identifierType.id" data="{related:$identifierType.related}" class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td>
-</tr>
+#if( $identifierTypes.size() > 0)
+	<tr><td colspan="2">&nbsp;</td></tr>	
+	<tr><th colspan="2" class="heading-column">$i18n.getString( "patient_identifiers" )</th></tr>
+	#foreach ($identifierType in $identifierTypes)
+	<tr>
+		<td><label>$identifierType.name #if($identifierType.mandatory == true )<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>       
+			<td class="input-column">
+			<input type="text" style="width:28em" id="iden$identifierType.id" name="iden$identifierType.id" data="{related:$identifierType.related}" class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td>
+	</tr>
+	#end
 #end
 
 <!-- ATTRIBUTES IN GROUPS -->
-
 #foreach ($attributeGroup in $attributeGroups )
 	<tr><td>&nbsp;</td></tr>
 	<tr><th colspan="2" class="heading-column">$attributeGroup.name</th></tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2011-10-21 06:22:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2011-10-21 06:35:58 +0000
@@ -174,18 +174,19 @@
 		</tr>
 	#end
 	
-	<!--IDENTIFIERS -->
-	<tr><th colspan="2" class="heading-column">$i18n.getString("patient_identifiers")</th></tr>
-	#foreach ($identifierType in $identifierTypes)
-	#set( $identifier = "" )
-	#set( $identifier = $identiferMap.get( $identifierType.id ) )
-	<tr>
-		<td><label for="bloodGroup">$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
-		<td class="input-column" ><input type="text" id="iden$identifierType.id" style="width:30em" name="iden$identifierType.id" value="$identifier" data="{related:$identifierType.related}" #if($identifierType.related && $patient.underAge) disabled="disabled" #end class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" style="width:30em" /></td>	
-	</tr>
+	#if( $identifierTypes.size() > 0)
+		<!--IDENTIFIERS -->
+		<tr><th colspan="2" class="heading-column">$i18n.getString("patient_identifiers")</th></tr>
+		#foreach ($identifierType in $identifierTypes)
+		#set( $identifier = "" )
+		#set( $identifier = $identiferMap.get( $identifierType.id ) )
+		<tr>
+			<td><label for="bloodGroup">$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+			<td class="input-column" ><input type="text" id="iden$identifierType.id" style="width:30em" name="iden$identifierType.id" value="$identifier" data="{related:$identifierType.related}" #if($identifierType.related && $patient.underAge) disabled="disabled" #end class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" style="width:30em" /></td>	
+		</tr>
+		#end
+		<tr><td>&nbsp;</td></tr>
 	#end
-	<tr><td>&nbsp;</td></tr>
-	
 	<!-- ATTRIBUTES IN GROUPS -->
 	
 	#foreach ($attributeGroup in $attributeGroups )