dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09208
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2384: Minor fix
------------------------------------------------------------
revno: 2384
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2010-12-15 19:02:33 +0100
message:
Minor fix
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.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-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js 2010-12-15 17:52:50 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js 2010-12-15 18:02:33 +0000
@@ -129,110 +129,3 @@
{
setTimeout( "getReportStatus();", millis );
}
-
-// -----------------------------------------------------------------------------
-// ReportTable
-// -----------------------------------------------------------------------------
-/*
-function createTable( tableId )
-{
- if ( validationError() )
- {
- return false;
- }
-
- var url = "createTable.action?id=" + tableId + "&doDataMart=" + getListValue( "doDataMart" ) + "&mode=table";
-
- if ( document.getElementById( "reportingPeriod" ) != null )
- {
- url += "&reportingPeriod=" + getListValue( "reportingPeriod" );
- }
-
- if ( paramOrganisationUnit != null )
- {
- url += "&organisationUnitId=" + paramOrganisationUnit;
- }
-
- var request = new Request();
- request.setCallbackSuccess( createTableReceived );
- request.send( url );
-}
-
-function createTableReceived( messageElement )
-{
- getTableStatus();
-}
-
-function getTableStatus()
-{
- var url = "getStatus.action";
-
- var request = new Request();
- request.setResponseTypeXML( 'status' );
- request.setCallbackSuccess( tableStatusReceived );
- request.send( url );
-}
-
-function tableStatusReceived( xmlObject )
-{
- var statusMessage = getElementValue( xmlObject, 'statusMessage' );
- var finished = getElementValue( xmlObject, 'finished' );
-
- if ( finished == "true" )
- {
- setMessage( i18n_process_completed );
- }
- else if ( statusMessage == null )
- {
- setWaitMessage( i18n_please_wait );
- }
- else
- {
- setWaitMessage( i18n_please_wait + " - " + statusMessage );
- }
-
- waitAndGetTableStatus( 2000 );
-}
-
-function waitAndGetTableStatus( millis )
-{
- setTimeout( "getTableStatus();", millis );
-}
-*/
-// -----------------------------------------------------------------------------
-// Export ReportTable
-// -----------------------------------------------------------------------------
-/*
-function exportToHtml( id )
-{
- verifyAndExport( id, "getTableData.action?id=" + id );
-}
-
-function exportToExcel( id )
-{
- verifyAndExport( id, "generateTableDataWorkbook.action?id=" + id );
-}
-
-function exportToCsv( id )
-{
- verifyAndExport( id, "getTableDataExport.action?exportFormat=CSV&id=" + id );
-}
-
-function verifyAndExport( id, url )
-{
- $.getJSON(
- "verifyReportTable.action",
- { "id": id },
- function( json )
- {
- if ( json.response == "error" )
- {
- setHeaderDelayMessage( i18n_generate_before_export );
- }
- else
- {
- window.location.href = url;
- }
- } );
-}
-*/
\ No newline at end of file