dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8385
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-05 14:22:56 +0700
message:
  Don't update datavalues in single event with registration.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
  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/form.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.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/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-10-05 06:46:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-10-05 07:22:56 +0000
@@ -4,9 +4,7 @@
 </h3>
 
 <form id='dataRecordingSelectForm' name='dataRecordingSelectForm' method='post'>
-<div class="actions" style='margin-top:30px;' #if($program.type!=1) style='display:none;' #end>
-	<input type="button" class='stage-object' id="newEncounterBtn" value="$i18n.getString('create_new_event')" onClick="javascript: registerIrregularEncounter( getFieldValue('executionDate') );" disabled="disabled" >
-</div>
+
 <table class="mainPageTable" id='patientInfoDiv'> 
 	<tr>
 		<td valign="top">
@@ -26,6 +24,4 @@
 		</table>
 	</tr>
 </table>
-<input type='hidden' id='programStageId' name='programStageId'>
-
 </form>

=== 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	2012-10-05 06:46:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-10-05 07:22:56 +0000
@@ -1,18 +1,3 @@
-//--------------------------------------------------------------------------------------------
-// Load program-stages by the selected program
-//--------------------------------------------------------------------------------------------
-
-function loadProgramStages( programId )
-{
-	jQuery.getJSON( "loadProgramStageInstances.action",
-		{
-			programId: programId
-		},  
-		function( json ) 
-		{    
-			loadDataEntry( json.programStageInstances[0].id );
-		});
-}
 
 //------------------------------------------------------------------------------
 // Save value

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2012-10-05 06:46:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2012-10-05 07:22:56 +0000
@@ -29,11 +29,6 @@
 	disableCompletedButton(true);
 	disable('uncompleteBtn');
 	
-	jQuery(".stage-object-selected").removeClass('stage-object-selected');
-	var selectedProgramStageInstance = jQuery( '#' + prefixId + programStageInstanceId );
-	selectedProgramStageInstance.addClass('stage-object-selected');
-	setFieldValue( 'programStageId', selectedProgramStageInstance.attr('psid') );
-	
 	showLoader();	
 	$( '#dataEntryFormDiv' ).load( "dataentryform.action", 
 		{ 
@@ -57,7 +52,6 @@
 			{
 				disableCompletedButton(true);
 			}
-			
 			hideLoader();
 			hideById('contentDiv'); 
 		} );
@@ -165,4 +159,21 @@
 				jQuery( "#loaderDiv" ).hide();
 			}
 		});
-}
\ No newline at end of file
+}
+
+//--------------------------------------------------------------------------------------------
+// Load program-stages by the selected program
+//--------------------------------------------------------------------------------------------
+
+function loadProgramStages( programId )
+{
+	jQuery.getJSON( "loadProgramStageInstances.action",
+		{
+			programId: programId
+		},  
+		function( json ) 
+		{   
+			jQuery("#selectForm [id=programStageId]").attr('psid', json.programStageInstances[0].programStageId);	
+			loadDataEntry( json.programStageInstances[0].id );
+		});
+}

=== 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	2012-10-05 06:46:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2012-10-05 07:22:56 +0000
@@ -27,8 +27,9 @@
 <p><input type="button" class='button' value="$i18n.getString( 'back_to_search' )" id='backBtnFromEntry' onclick='backMainPage();' style='display:none;'></p>
 <span id='message'></span>
 
-<div class='hidden'>
+<div class='hidden' id='selectForm' name='selectForm'>
 	<input id='executionDateNewEvent' name='executionDateNewEvent'>
+	<input type='hidden' class='stage-object-selected stage-object' id='programStageId' name='programStageId'>
 </div>
 
 #parse( "dhis-web-commons/loader/loader.vm" )