dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4937
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-14 11:25:39 +0700
message:
  Default dataentry is shown in Register Event form ( Patient module ) if report-date doesn't have value.
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/entry.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	2011-10-07 02:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2011-10-14 04:25:39 +0000
@@ -19,8 +19,10 @@
 </script>
 
 <div id='entryFormContainer'>
+
 <input type='hidden' id='incidentDate' value='$!format.formatDate($programStageInstance.programInstance.dateOfIncident)'>
 <input type='hidden' name='programStageInstanceId' id='programStageInstanceId' value='$!programStageInstance.id'>
+
 <hr style="clear:both">
 
 <span id="startMsg" style="font-style:italic; color:blue; display: #if($!programStageInstance.executionDate!='') none #else block #end;">$i18n.getString( "report_date_warning" )</span>

=== 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-07 03:12:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2011-10-14 04:25:39 +0000
@@ -610,10 +610,17 @@
         if ( codeElement == 'success' )
         {
             markValue( resultColor );
-			setFieldValue('programStageInstanceId',rootElement.firstChild.nodeValue);
-			showById('entryFormContainer');
-			showById('dataEntryFormDiv');
-			showById('entryForm');
+			if( getFieldValue('programStageInstanceId' )=='' )
+			{
+				setFieldValue('programStageInstanceId',rootElement.firstChild.nodeValue);
+				loadDataEntry();
+			}
+			else
+			{
+				showById('entryFormContainer');
+				showById('dataEntryFormDiv');
+				showById('entryForm');
+			}
         }
         else
         {