dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12196
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-09-23 14:25:48 +0700
message:
  Fixed bug - After enrolment to a stage without any auto-generated events.
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/patientDashboard.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties


--
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-09-17 09:47:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-09-23 07:25:48 +0000
@@ -683,7 +683,4 @@
 update_success = Update successfully
 send_message = Send message
 sms = SMS
-enrollment_date = Enrollment date
-add_relative = Add relative
-who_is_the_new_relative_to_the_existing_person = Who is the new relative to the existing person?
-program_for_new_relative_to_be_enrolled_in = Program for new relative to be enrolled in
\ No newline at end of file
+enrollment_date = Enrollment date
\ No newline at end of file

=== 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-09-23 03:15:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-09-23 07:25:48 +0000
@@ -123,21 +123,7 @@
 		<div class="contentProviderTable">
 			<table id='activeTB' name='activeTB' style='cursor:pointer;'>
 				#foreach( $programInstance in $activeProgramInstances )
-					#set($programStageInstance='')
-					#foreach ( $psi in $programInstance.programStageInstances )
-						#if( $psi.programStage.openAfterEnrollment=='true' && $psi.getStatus() != 1 && $psi.getStatus() != 5 )
-							#set($programStageInstance=$psi)
-						#end
-					#end
-					
-					#if($programStageInstance=='')
-						#foreach( $psi in $programInstance.programStageInstances )
-							#if ( $psi.getStatus() != 1 && $psi.getStatus() != 5  )
-								#set($programStageInstance=$psi)
-							#end
-						#end
-					#end
-
+				
 					#set($programStageInstance = $programInstance.getActiveProgramStageInstance())
 					#if( $!programStageInstance)
 						#set( $status = $programStageInstance.getEventStatus() )

=== 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-09-19 08:26:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-09-23 07:25:48 +0000
@@ -479,4 +479,7 @@
 radio_buttons = Radio buttons
 open_data_entry_form_after_enrolment  = Open data entry form after enrolment 
 report_date_to_use  = Report Date to use
-the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage = The properties to open data entry form after enrolment is active in the stage
\ No newline at end of file
+the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage = The properties to open data entry form after enrolment is active in the stage
+add_relative = Add relative
+who_is_the_new_relative_to_the_existing_person = Who is the new relative to the existing person?
+program_for_new_relative_to_be_enrolled_in = Program for new relative to be enrolled in
\ No newline at end of file