dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10233
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-03-15 11:08:40 +0700
message:
  ( Dashboard ) Not allow to delete events of a completed program.
modified:
  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/entry.js
  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/visitSchedule.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/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-03-11 07:46:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-03-15 04:08:40 +0000
@@ -1431,7 +1431,10 @@
 				jQuery("[id=tab-3] :input").datepicker("destroy");
 				jQuery("#completeProgram").attr('disabled', true);
 				jQuery("#incompleteProgram").attr('disabled', false);
-				
+								
+				// disable remove event icons
+				$('[id=tab-3]').find('img').parent().removeAttr("href");
+			
 				showSuccessMessage( i18n_unenrol_success );
 			}
 		});
@@ -1474,6 +1477,12 @@
 				jQuery("#incompleteProgram").attr('disabled', true);
 				jQuery("[id=tab-3] :input").datepicker("destroy");
 				
+				// enable remove event icons
+				$('[id=tab-3]').find('img').parent().each(function(){
+					var e = jQuery(this);
+					e.attr( 'href',e.attr("link") );
+				});
+				
 				showSuccessMessage( i18n_reenrol_success );
 			}
 		});

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-03-07 13:46:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-03-15 04:08:40 +0000
@@ -527,7 +527,7 @@
 					var eventBox = jQuery('#ps_' + getFieldValue('programStageInstanceId'));
 					eventBox.attr('status',1);
 					resetActiveEvent( eventBox.attr("pi") );
-			
+					
 					hideLoader();
 					
 					if( isCreateEvent ){

=== 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	2013-03-15 03:30:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2013-03-15 04:08:40 +0000
@@ -152,7 +152,7 @@
 			jQuery("[id=tab-3] :input").datepicker("destroy");
 			jQuery("#completeProgram").attr('disabled', true);
 			jQuery("#incompleteProgram").attr('disabled', false);
-			jQuery("img").removeAttr("onclick");
+			$('[id=tab-3]').find('img').parent().removeAttr("href");
 		#else
 			jQuery("#completeProgram").attr('disabled', false);
 			jQuery("#incompleteProgram").attr('disabled', true);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2013-03-15 03:30:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2013-03-15 04:08:40 +0000
@@ -92,7 +92,7 @@
 			</td>
 			#if( $auth.hasAccess( "dhis-web-caseentry", "removeCurrentEncounter" ) )
 			<td>
-				<a href="javascript:removeEvent($programStageInstance.id, false)" title='$i18n.getString( "remove" )'><img src="../images/delete.png" id='del_$programStageInstance.id' name='del_$programStageInstance.id' alt='$i18n.getString( "remove" )' #if( $status==1 ) class='hidden' #end></a>
+				<a href="javascript:removeEvent($programStageInstance.id, false)" link="javascript:removeEvent($programStageInstance.id, false)" title='$i18n.getString( "remove" )'><img src="../images/delete.png" id='del_$programStageInstance.id' name='del_$programStageInstance.id' alt='$i18n.getString( "remove" )' #if( $status==1 ) class='hidden' #end></a>
 			</td>
 			#end
 		</tr>