dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8649
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-23 10:47:18 +0700
message:
  Small change report-entry form in program summary report.
added:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.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/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-10-18 04:24:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-10-23 03:47:18 +0000
@@ -242,7 +242,7 @@
 		<action name="viewProgramStageRecords"
 			class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
 			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/programStageDataEntryForm.vm</param>
+			<param name="page">/dhis-web-caseentry/reportDataEntryForm.vm</param>
 			<param name="javascripts">javascript/entry.js,../dhis-web-commons/javascripts/date.js</param>
 			<param name="stylesheets">style/style.css</param>
 		</action>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js	2012-10-07 03:12:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js	2012-10-23 03:47:18 +0000
@@ -32,7 +32,6 @@
 
 function loadDataEntry( programStageInstanceId ) 
 {
-	jQuery('#patientInforTB').val('');
 	jQuery('#viewRecordsDiv' )
 		.load( 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId
 		,function(){
@@ -40,12 +39,6 @@
 			jQuery("#viewRecordsDiv :input" ).datepicker("destroy");
 			jQuery(".ui-combobox" ).hide();
 			hideById('inputCriteriaDiv');
-			
-			var programStageInstance = jQuery("#ps_" + programStageInstanceId);
-			var header = "<h4>" + i18n_records_for + " " + getInnerHTML( 'org_' + programStageInstanceId )
-					+ " " + i18n_at + " " + programStageInstance.attr("psname")
-					+ " " + i18n_on_date + " " + programStageInstance.attr("reportDate") + "</h4><hr>";
-			setInnerHTML('patientInforTB', header );
 		})
 		.dialog({
 			title: i18n_reports,

=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2012-10-23 03:47:18 +0000
@@ -0,0 +1,5 @@
+<h3>$i18n.getString('records_for') $organisationUnit.name $i18n.getString('at') $programStage.name $i18n.getString('on') $format.formatDate($programStageInstance.executionDate)</h3>
+<hr>
+<form id='dataEntryFormDiv' name='dataEntryFormDiv' >
+	#parse( "dhis-web-caseentry/dataEntryForm.vm" )
+</form>
\ No newline at end of file