dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9831
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-19 14:31:16 +0700
message:
  Minor fix for Statistical program report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.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/javascript/statisticalReport.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js	2013-01-08 04:25:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js	2013-02-19 07:31:16 +0000
@@ -73,9 +73,9 @@
 	jQuery('#viewRecordsDiv' )
 		.load( 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId
 		,function(){
+			showById('reportTitle');
 			jQuery("#viewRecordsDiv :input" ).attr("disabled", true);
 			jQuery("#viewRecordsDiv :input" ).datepicker("destroy");
-			showById('patientNameLbl');
 			jQuery(".ui-combobox" ).hide();
 			showById("viewRecordsDiv");
 			hideById('inputCriteriaDiv');
@@ -88,7 +88,6 @@
 function showCriteriaForm()
 {
 	showById('reportForm');
-	hideById('statisticalReportDiv');
 }
 
 function showStatisticalReport()
@@ -110,12 +109,3 @@
 	showById('programStageTitleLbl');
 	hideById('patientNameLbl');
 }
-
-function showStatisticalReportForm()
-{
-	if( getInnerHTML('statisticalReportDiv' )!="")
-	{
-		hideById('reportForm');
-		showById('statisticalReportDiv');
-	}
-}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm	2013-02-19 07:31:16 +0000
@@ -52,7 +52,7 @@
 			<tr>
 				<td></td>
 				<td><input type="submit" id='generateBtn' name='generateBtn' #if($!programs) #else disabled #end value="$i18n.getString( 'generate' )" style="width:10em" />
-					<input type="button" value="$i18n.getString( 'cancel' )" onclick="showStatisticalReportForm();" style="width:10em"/>
+					<input type="button" value="$i18n.getString( 'cancel' )" onclick="hideById('reportForm');" style="width:10em"/>
 				</td>
 			</tr>	                		
 		</table>
@@ -71,4 +71,5 @@
 	var i18n_total_result = '$encoder.jsEscape( $i18n.getString( "total_result" ), "'")'; 	
 	var i18n_reports = '$encoder.jsEscape( $i18n.getString( "reports" ), "'")';
 	var i18n_start = '$encoder.jsEscape( $i18n.getString( "start" ), "'")';
+	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ), "'")';
 </script>