dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4994
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-21 13:50:59 +0700
message:
  Exception when click Validation button without selecting anything.
modified:
  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/style/patient.css


--
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/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2011-10-14 04:25:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2011-10-21 06:50:59 +0000
@@ -11,6 +11,8 @@
 	
 	if ( programId == 0 )
 	{
+		disable('completeBtn');
+		disable('validationBtn');
 		return;
 	}
 	jQuery.postJSON( "loadProgramStages.action",
@@ -43,15 +45,20 @@
 			history += '</table>';
 			setInnerHTML( 'currentSelection', history );
 			jQuery('#dataRecordingSelectDiv select[name=programId] option')
+			
 			var singleEvent = jQuery('#dataRecordingSelectDiv [name=programId] option:selected').attr('singleevent');
 			if(singleEvent=='true')
 			{
 				byId('programStageId').selectedIndex = 1;
 				disable('programStageId');
 				loadDataEntry();
+				enable('completeBtn');
+				enable('validationBtn');
 			}
 			else
 			{
+				disable('completeBtn');
+				disable('validationBtn');
 				enable('programStageId');
 			}
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2011-10-21 06:22:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2011-10-21 06:50:59 +0000
@@ -57,7 +57,3 @@
 {
 	width: 130px;
 }
-
-.border {
-	border:1px solid #ff0000;
-}
\ No newline at end of file