dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14394
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-03-25 16:41:30 +0700
message:
  Fixed bug - The message showed unrollment-successfully when to complete a program.
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/activityPlanRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listTrackedEntityInstance.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipTrackedEntityInstances.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceRegistrationList.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	2014-03-17 06:27:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2014-03-25 09:41:30 +0000
@@ -677,4 +677,7 @@
 relationship_description = Relationship description
 this_tracked_entity_instance_could_not_be_enrolled_please_check_validation_criteria = This tracked entity instance could not be enrolled please check validation criteria
 tracked_entity = Tracked entity
-adding_tracked_entity_instance_failed = Adding tracked entity instance failed
\ No newline at end of file
+adding_tracked_entity_instance_failed = Adding tracked entity instance failed
+complete_success = The program is completed successfully
+program_active_success = The program is active successfully
+program_cancelled_success = The program is cancelled successfully
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2014-03-25 09:41:30 +0000
@@ -19,7 +19,7 @@
 			
 			#if( $auth.hasAccess( "dhis-web-caseentry", "accessAttributes" ) )
 				#foreach( $programAttribute in $program.programAttributes )
-					#if($programAttribute.displayedInList=='true')
+					#if($programAttribute.displayInList=='true')
 						<th id="attributeName">$encoder.htmlEncode($programAttribute.attribute.displayName)</th>
 					#end
 				#end
@@ -57,7 +57,7 @@
 			
 			#if( $auth.hasAccess( "dhis-web-caseentry", "accessAttributes" ) )
 				#foreach( $programAttribute in $program.programAttributes )
-					#if($programAttribute.displayedInList=='true')
+					#if($programAttribute.displayInList=='true')
 						<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )">
 							#foreach( $attributeValue in $entityInstance.attributeValues)
 								#if($!attributeValue.attribute.id==$programAttribute.attribute.id)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2014-02-08 15:19:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2014-03-25 09:41:30 +0000
@@ -29,7 +29,7 @@
 			<th>#</th>
 			<th>$i18n.getString('date_scheduled')</th>
 			#foreach( $programAttribute in $program.programAttributes )
-				#if($programAttribute.displayedInList=='true')
+				#if($programAttribute.displayInList=='true')
 					 $programAttribute.attribute.displayName
 				#end
 			#end
@@ -57,7 +57,7 @@
 			
 			#if( $auth.hasAccess( "dhis-web-caseentry", "accessAttributes" ) )
 				#foreach( $programAttribute in $program.programAttributes )
-					#if($programAttribute.displayedInList=='true')
+					#if($programAttribute.displayInList=='true')
 						<td><a href="javascript:isDashboard=false;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )">
 							#foreach( $attributeValue in $entityInstance.attributeValues)
 								#if($!attributeValue.attribute.id==$programAttribute.attribute.id)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-02-26 15:09:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-03-25 09:41:30 +0000
@@ -1256,7 +1256,15 @@
 				// disable remove event icons
 				$('[id=tab-3]').find('img').parent().removeAttr("href");
 			
-				showSuccessMessage( i18n_unenrol_success );
+				if( status==1){
+					showSuccessMessage( i18n_complete_success );
+				}
+				else if( status==2){
+					showSuccessMessage( i18n_program_cancelled_success );
+				}
+				else{
+					showSuccessMessage( i18n_program_active_success );
+				}
 			}
 		});
 	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listTrackedEntityInstance.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listTrackedEntityInstance.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listTrackedEntityInstance.vm	2014-03-25 09:41:30 +0000
@@ -28,7 +28,7 @@
           <col width="30"/>
 			#if($program)
 				#foreach( $programAttribute in $program.attributes )
-					#if($programAttribute.displayedInList=='true')
+					#if($programAttribute.displayInList=='true')
 						<col/>
 					#end
 				#end
@@ -48,7 +48,7 @@
 				<th>#</th>
 				#if($program)
 					#foreach( $attribute in $program.attributes )
-						#if($attribute.displayedInList=='true')
+						#if($attribute.displayInList=='true')
 							<th id="attributeName">$encoder.htmlEncode($attribute.attribute.displayName)</th>
 						#end
 					#end
@@ -76,7 +76,7 @@
 				</td>
 				#if($program)
 					#foreach( $programAttribute in $program.attributes )
-						#if($programAttribute.displayedInList=='true')
+						#if($programAttribute.displayInList=='true')
 							#set($value='')
 							<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )">
 								#foreach( $attributeValue in $entityInstance.attributeValues)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2014-03-25 09:41:30 +0000
@@ -24,7 +24,7 @@
 			<th>$i18n.getString('risk')</th>
 			
 			#foreach( $programAttribute in $program.attributes )
-				#if($programAttribute.displayedInList=='true')
+				#if($programAttribute.displayInList=='true')
 					<th id="attributeName">$encoder.htmlEncode($programAttribute.attribute.displayName)</th>
 				#end
 			#end
@@ -52,7 +52,7 @@
 			</td>
 			
 			#foreach( $programAttribute in $program.attributes )
-				#if($programAttribute.displayedInList=='true')
+				#if($programAttribute.displayInList=='true')
 					#set($value='')
 					<td name='infor_$entityInstance.id' class='$class'><a href="javascript:isDashboard=false;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )">
 						#foreach( $attributeValue in $entityInstance.attributeValues)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipTrackedEntityInstances.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipTrackedEntityInstances.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipTrackedEntityInstances.vm	2014-03-25 09:41:30 +0000
@@ -24,7 +24,7 @@
 		<tr>
 			<th>#</th>
 			#foreach( $attributeValue in $entityInstance.attributeValues)
-				#if($attributeValue.attribute.displayedInList=='true')
+				#if($attributeValue.attribute.displayInList=='true')
 					<th>$!attributeValue.attribute.displayName</th>
 				#end
 			#end 
@@ -41,7 +41,7 @@
 			<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )">
 				<a>
 				#foreach( $attributeValue in $entityInstance.attributeValues)
-					#if($attributeValue.attribute.displayedInList=='true')
+					#if($attributeValue.attribute.displayInList=='true')
 						<td>$!attributeValue.value</td>
 					#end
 				#end 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm	2014-03-25 09:41:30 +0000
@@ -69,7 +69,10 @@
 	var i18n_select = '[' + '$encoder.jsEscape( $i18n.getString( "select" ), "'")' + ']';
 	var i18n_program_stages_history_plan = '$encoder.jsEscape( $i18n.getString( "program_stages_history_plan" ) , "'")';
 	var i18n_reenrollment_confirm_message = '$encoder.jsEscape( $i18n.getString( "reenrollment_confirm_message" ) , "'")';
-    
+    var i18n_complete_success = '$encoder.jsEscape( $i18n.getString( "complete_success" ) , "'")';
+	var i18n_program_active_success = '$encoder.jsEscape( $i18n.getString( "program_active_success" ) , "'")';
+	var i18n_program_cancelled_success = '$encoder.jsEscape( $i18n.getString( "program_cancelled_success" ) , "'")';
+
 	var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
 	var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
 	var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2014-03-25 09:41:30 +0000
@@ -113,7 +113,10 @@
     var i18n_value_must_unit_interval = '$encoder.jsEscape( $i18n.getString( "value_must_unit_interval" ) , "'")';
     var i18n_invalid_date =   '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")' + ".\n " 
 	var i18n_reenrollment_confirm_message = '$encoder.jsEscape( $i18n.getString( "reenrollment_confirm_message" ) , "'")';
-    
+    var i18n_complete_success = '$encoder.jsEscape( $i18n.getString( "complete_success" ) , "'")';
+	var i18n_program_active_success = '$encoder.jsEscape( $i18n.getString( "program_active_success" ) , "'")';
+	var i18n_program_cancelled_success = '$encoder.jsEscape( $i18n.getString( "program_cancelled_success" ) , "'")';
+
     var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
     var i18n_quit_confirm_message = '$encoder.jsEscape( $i18n.getString( "quit_confirm_message" ) , "'")';
     var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceRegistrationList.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceRegistrationList.vm	2014-03-25 09:41:30 +0000
@@ -36,7 +36,7 @@
           <col width="30"/>
 			#if($program)
 				#foreach( $programAttribute in $program.attributes )
-					#if($programAttribute.displayedInList=='true')
+					#if($programAttribute.displayInList=='true')
 						<col/>
 					#end
 				#end
@@ -56,7 +56,7 @@
 				<th>#</th>
 				#if($program)
 					#foreach( $programAttribute in $program.attributes )
-						#if($programAttribute.displayedInList=='true')
+						#if($programAttribute.displayInList=='true')
 							<th id="attributeName">$encoder.htmlEncode($programAttribute.attribute.displayName)</th>
 						#end
 					#end
@@ -85,7 +85,7 @@
 				#if($program)
 					#foreach( $programAttribute in $program.attributes )
 						#set($value="")
-						#if($programAttribute.displayedInList=='true')
+						#if($programAttribute.displayInList=='true')
 							<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )">
 								#foreach( $attributeValue in $entityInstance.attributeValues)
 									#if($!attributeValue.attribute.id==$programAttribute.attribute.id)