dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16096
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-07-12 10:19:12 +0700
message:
  Fixed bug - Fields in TEI management form is disabled when to select a completed program in TEI Dashboard.
modified:
  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/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2014-06-12 07:02:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2014-07-12 03:19:12 +0000
@@ -169,9 +169,9 @@
 		#if( $programInstance.status==1)
 			jQuery("[id=tab-2] :input").prop('disabled', true);
 			jQuery("[id=tab-3] :input").prop('disabled', true);
+			jQuery("[id=tab-3] :input").datepicker("destroy");
 			jQuery("[id=tab-4] :input").prop('disabled', true);
 			jQuery("[id=tab-5] :input").prop('disabled', true);
-			jQuery("[id=tab-3] :input").datepicker("destroy");
 			jQuery("#completeProgram").attr('disabled', true);
 			jQuery("#incompleteProgram").attr('disabled', false);
 			$('[id=tab-3]').find('img').parent().removeAttr("href");
@@ -181,8 +181,6 @@
 			jQuery("#incompleteProgram").attr('disabled', true);
 		#end
 	});
-
-	$('#tabs').tabs();
 	
 	$("#tabs").tabs().on('tabsactivate', function (event, ui) {
 		if( ui.newPanel.selector == '#tab-3' ){

=== 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	2014-07-09 03:48:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2014-07-12 03:19:12 +0000
@@ -298,7 +298,7 @@
 		
 		jQuery("#incompleteProgram").attr('disabled', true);
 	#else
-		jQuery(":input").attr('disabled', true);
+		jQuery("[id=tab-3] :input").attr('disabled', true);
 		jQuery("#incompleteProgram").attr('disabled', false);
 		$('[id=tab-3]').find('img').parent().removeAttr("href");
 	#end