dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10943
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-05-23 09:30:53 +0700
message:
  Error when to open an active program in dashboard if all stages of the program are completed.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js


--
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/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-21 04:45:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-23 02:30:53 +0000
@@ -48,7 +48,7 @@
 		<tr id="filterDataSetSectionTr" class='coordinates1'>
 			<th class='coordinates1'><label for="filterDataSetSection">$i18n.getString( "filter_on_section" )</label></th>
 			<th colspan='3'>
-				<select id="filterDataSetSection" name="filterDataSetSection" onchange="filterOnSection()" style="width:430px;margin-left:10px;" >
+				<select id="filterDataSetSection" name="filterDataSetSection" onchange="filterOnSection()" style="width:430px;" >
 					<option value='all'>[$i18n.getString("show_all_sections")]</option>
 					#foreach( $section in $sections )
 						<option value='$section.id'>$encoder.htmlEncode( $section.displayName )</option>

=== 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-05-19 09:15:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-05-23 02:30:53 +0000
@@ -1682,13 +1682,17 @@
 				hideById('programInstanceDiv');
 				if( hasDataEntry=='true' || hasDataEntry==undefined ){
 					var programStageInstanceId = jQuery('.stage-object').attr('id').split('_')[1];
-					loadDataEntry( programStageInstanceId );
+					if( programStageInstanceId )
+					{
+						loadDataEntry( programStageInstanceId );
+					}
 				}
 			}
 			else{
 				showById('programInstanceDiv');
 				activeProgramInstanceDiv( programInstanceId );
 				if( activeProgramStageInstanceId != undefined 
+					&& activeProgramStageInstanceId!=false
 					&& ( hasDataEntry=='true' || hasDataEntry==undefined ))
 				{
 					loadDataEntry( activeProgramStageInstanceId );