← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 827: Fix bug advanced report excel.

 

------------------------------------------------------------
revno: 827
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-10-07 10:47:57 +0700
message:
  Fix bug advanced report excel.
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.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-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.js	2009-10-03 05:55:31 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.js	2009-10-07 03:47:57 +0000
@@ -73,12 +73,12 @@
 		$.post("generateAdvancedReportExcel.action",{
 		reportId:$('#report').val(),
 		periodId:$('#period').val(),
-		organisationGroupId:$('#availableOrgunitGroups').val()
+		organisationGroupId: byId('availableOrgunitGroups').value
 		},function(data){		
 			window.location = "downloadExcelOutput.action";
 			deleteDivEffect();
 			$("#loading").hide();		
-	},'xml');	
+		},'xml');
 	
 }
 
@@ -105,15 +105,13 @@
 					}
 				},'xml'); 
 		}
-		
 
-		byId('availableOrgunitGroups').disabled = false;		
-	} 
-	else
-	{ 	
-		
-		byId('availableOrgunitGroups').disabled=true;		
+		byId('availableOrgunitGroups').disabled = false;
+	
+	}else{
+		byId('availableOrgunitGroups').disabled = true;
 	}
+			
 	
 }
 	
@@ -173,6 +171,8 @@
 function openPreviewReport() {
 	
 	var reportId = $('#report').val();
-	var periodId = $('#period').val();	
+
+	var periodId = $('#period').val();
+
 	window.open("openPreviewReport.action?reportId=" + reportId + "&periodId=" + periodId, "_blank", "width=900,height=600,scrollbars=yes,menubar=yes,resizable=yes");
 }