dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7076
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-05-29 16:23:37 +0700
message:
  (patient) Show IdentifierTypes and Attributes tab if any into Enrollment form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-05-29 07:37:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-05-29 09:23:37 +0000
@@ -316,7 +316,9 @@
 reset = Reset
 no = No
 options = Options
-fullName = Full name
+firstName = First name
+middleName = Middle name
+lastName = Last name
 gender = Gender
 birthDate = Date of birth
 bloodGroup = Blood group

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2012-05-29 07:37:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2012-05-29 09:23:37 +0000
@@ -15,9 +15,10 @@
 	"patientProperties": [
 		#set( $fixedAttributes = ${tabularReport.fixedAttributes} )
 		#foreach( ${fixedAttribute} in $!{fixedAttributes} )
-			{
+			{	
+				#set( $attr = $i18n.getString($fixedAttribute) )
 				"id": "fixedAttr_${fixedAttribute}",
-				"name": "${fixedAttribute}"
+				"name": "$attr"
 			},
 		#end
 		#set( $identifiers = ${tabularReport.identifiers} )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-05-23 19:48:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-05-29 09:23:37 +0000
@@ -12,10 +12,10 @@
 	<!-- Enroll program TAB -->
 	<div id="tab-1">
 		<form id='programEnrollmentInforForm' name='programEnrollmentInforForm' action='#' method="POST" >
-			<input type='hidden' id='programId' name='programId' value='$programInstance.program.id'>
-			<input type='hidden' id='patientId' name='patientId' value='$programInstance.patient.id'>
-			<!-- IDENTIFIERS -->
-			#if( $identifierTypes || $noGroupAttributes || $attributeGroups )
+			#if( $identifierTypes.size() > 0 || $noGroupAttributes.size() > 0 || $attributeGroups.size() > 0 )
+				<input type='hidden' id='programId' name='programId' value='$programInstance.program.id'>
+				<input type='hidden' id='patientId' name='patientId' value='$programInstance.patient.id'>
+				<!-- IDENTIFIERS -->
 				<table class='mainPageTable' id='enrollmentInforDiv' name='enrollmentInforDiv' >
 					<col id="stageCol">    
 					<col id="entryCol">    
@@ -188,24 +188,21 @@
 	});
 
 	#if( $programInstance || $hasDataEntry == 'true')
-		
 		$('#tabs').tabs();
 		
-		#if( $identifierTypes && $noGroupAttributes && $attributeGroups )
-			$( "#tabs" ).tabs( "option", "selected", 1 );
-			$( "#tabs" ).tabs( "option", "disabled", [0] );
-		#end
-		
-		#if( $programInstance )
-		#else
-			$( "#tabs" ).tabs( "option", "selected", 2 );
-			$( "#tabs" ).tabs( "option", "disabled", [0,1] );
-		#end
-		
 		#if( $hasDataEntry == 'true' )
 			showSelectedDataRecoding( getFieldValue('patientId') );
 		#else
+			var disabled = $( ".selector" ).tabs( "option", "disabled" );
 			$( "#tabs" ).tabs( "option", "disabled", [2] );
+			$("#tabs").tabs("remove", 2);
+		#end
+		
+		#if( $identifierTypes.size() > 0 || $noGroupAttributes.size() > 0 || $attributeGroups.size() > 0 )
+			$( "#tabs" ).tabs( "option", "selected", 0 );
+		#else
+			$( "#tabs" ).tabs( "option", "selected", 1 );
+			$("#tabs").tabs("remove", 0);
 		#end
 	#end