dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11553
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-08-01 14:29:25 +0700
message:
  Small changes in Person Dashboard
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/dataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.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	2013-08-01 03:48:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-08-01 07:29:25 +0000
@@ -670,4 +670,6 @@
 add_patient = Add person
 confirmation_delete_message =  Are you sure you want to delete this message ?
 recipients = Recipients
-scheduled = Scheduled
\ No newline at end of file
+scheduled = Scheduled
+event_registration = Event registration
+add_patient_related_the_selected_event = Add person related to the selected event
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-07-31 06:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-08-01 07:29:25 +0000
@@ -70,32 +70,7 @@
 			<td colspan='3' class='bold'>$key: $programIndicatorsMap.get($key)</td>
 		</tr>
 		#end
-		#if($programStage.relatedPatient=='true')
-		#foreach($patient in $programStageInstance.patients)
-		<tr>
-			<td onclick='showPatientDashboardForm($patient.id)'>
-				#set($value=$!patient.getFullName())
-				#foreach( $identifier in $patient.identifiers)
-					#if($!identifier.identifierType)
-						#set($value=$identifier.identifier)
-					#else
-						#set($systemId=$identifier.identifier)
-					#end
-				#end
-				#if($value=="")
-					#set($value=$systemId)
-				#end
-				
-				<a href='#'>$value</a>
-			</td>
-		</tr>
-		#end
-		<tr>
-			<td>
-				<a href='javascript:showAddRelationshipPatient( $programStageInstance.programInstance.patient.id, false, $programStageInstance.id );' id="relatedPatient_$!programStageInstance.id" >$i18n.getString("add_patient")</a>
-			</td>
-		</tr>
-		#end
+		
 	</table>
 	</table>
 	
@@ -134,8 +109,15 @@
 	var i18n_enter_values_for_longitude_and_latitude_fields = '$encoder.jsEscape( $i18n.getString( "enter_values_for_longitude_and_latitude_fields" ) , "'" )';
 	var i18n_enter_a_valid_number = '$encoder.jsEscape( $i18n.getString( "enter_a_valid_number" ) , "'" )';
 	var i18n_incomplete_confirm_message = '$encoder.jsEscape( $i18n.getString( "incomplete_confirm_message" ) , "'" )';
+	var i18n_add_patient_related_the_selected_event = '$encoder.jsEscape( $i18n.getString( " add_patient_related_the_selected_event" ) , "'" )';
 	
 	if(getFieldValue('completed')=='true' && getFieldValue('blockEntryForm')=='true'){
 		blockEntryForm();
 	}
+					
+	#if($programStage.relatedPatient=='true')
+		setInnerHTML('patientRelatedStageSpan',"&#8226; <a href='javascript:showAddRelationshipPatient( $programStageInstance.programInstance.patient.id, false, $programStageInstance.id );' id='relatedPatient_$!programStageInstance.id' >" + i18n_add_patient_related_the_selected_event + "</a>");
+	#else
+		setInnerHTML('patientRelatedStageSpan','<br>&nbsp;');
+	#end
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-07-31 06:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-08-01 07:29:25 +0000
@@ -15,7 +15,7 @@
 			&#8226; <a href="javascript:showUpdatePatientForm( '$patient.id', true );">$i18n.getString("edit_profile")</a>
 			#if( $auth.hasAccess( "dhis-web-caseentry", "getPatientLocation" ) )
 				&#8226; <a href="javascript:getPatientLocation( '$patient.id', true );">$i18n.getString("change_location")</a>
-			#end
+			#end<br>&nbsp;
 		</p>
 		<div class="contentProviderTable">
 			<table>
@@ -122,6 +122,7 @@
 			#if( $auth.hasAccess( "dhis-web-caseentry", "showProgramEnrollmentForm" ) )
 			&#8226; <a href='javascript:showProgramEnrollmentForm( "$patient.id" )'>$i18n.getString("enroll")</a>
 			#end
+			<br>&nbsp;
 		</p>
 		<div class="contentProviderTable">
 			<table id='activeTB' name='activeTB' style='cursor:pointer;'>
@@ -178,6 +179,7 @@
 			<a href='javascript:viewPersonProgram( "activeDiv","completedDiv" )'>$i18n.getString("active_programs")</a>
 			&#8226; $i18n.getString("completed_programs")
 			&#8226; <a href='javascript:showProgramEnrollmentForm( "$patient.id" )'>$i18n.getString("enroll")</a>
+			<br>&nbsp;
 		</p>
 		<div class="contentProviderTable">
 			<table id='completedTB' name='completedTB' style='cursor:pointer;'>
@@ -211,7 +213,9 @@
 			
 			#if( $auth.hasAccess( "dhis-web-caseentry", "showAddRelationshipPatient" ) )			
 				&#8226; <a href="javascript:showAddRelationshipPatient( '$patient.id', false, '' );">$i18n.getString("add_new_patient")</a>
+				<span id="patientRelatedStageSpan"><br>&nbsp;<span>
 			#end
+			
 		</p>
 		<div class="contentProviderTable">
 			<table>