=======================
"; - } - - setMessage( warningMessages ); + jQuery.postJSON( url, {}, function ( json ) + { + if ( json.response == "success" ) + { + warningMessages += + " ======= Sheet [" + sheetId + "] ========" + + "
[" + (ItemsSaved.length) + "/" + (NumberOfItemsChecked) + "]:: " + + i18n_copy_successful + + "
=======================
"; } - ); + + setMessage( warningMessages ); + } ); } /** @@ -533,134 +503,35 @@ function filterIndicators() { - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( filterIndicatorsCompleted ); - request.send( "../dhis-web-commons-ajax/getIndicators.action?id=" + $("#indicatorGroups").val()); -} - -function filterIndicatorsCompleted( xmlObject ) -{ - var indiatorList = byId( "availableIndicators" ); - indiatorList.options.length = 0; - - var indicators = xmlObject.getElementsByTagName( "indicator" ); - - for ( var i = 0; i < indicators.length; i++ ) - { - var id = indicators[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue; - var indicatorName = indicators[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue; - var option = document.createElement( "option" ); - - option.value = "[" + id + "]"; - option.text = indicatorName; - indiatorList.add( option, null ); - - var formula = byId('formulaIndicator').value; - if(formula==option.value){ - option.selected = true; - byId("formulaIndicatorDiv").innerHTML = indicatorName; - } - } -} - -/** -* Open Category Expression -*/ -function openCategoryExpression() -{ - byId("categoryFormula").value = byId("expression").value; - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( openCategoryExpressionReceived ); - request.send("getExportReport.action?id=" + exportReportId); -} - -function openCategoryExpressionReceived( data ) { - - var selectedDataElementGroups = document.getElementById('dataElementGroup_'); - selectedDataElementGroups.options.length = 0; - var dataElementGroups = data.getElementsByTagName('dataElementGroup'); - - for( var i = 0 ; i < dataElementGroups.length ; i++ ) { - - var id = dataElementGroups.item(i).getElementsByTagName('id')[0].firstChild.nodeValue; - var name = dataElementGroups.item(i).getElementsByTagName('name')[0].firstChild.nodeValue; - //selectedDataElementGroups.options.add(new Option(name, id)); - - var option = new Option( name, id ); - option.onmousemove = function(e){ - showToolTip( e, this.text); - } - selectedDataElementGroups.add(option, null); - } - - getDataElementGroupOrder(); - setPositionCenter( 'category' ); - enable( "dataElementGroup_" ); - enable( "availableDataElements_" ); - byId( "availableDataElements_" ).onchange = function(e){ getOptionCombos_() }; - - $( "#category" ).show(); -} - -function getOptionCombos_() -{ - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( getOptionCombos_Received ); - request.send( "getOptionCombos.action?dataElementId=" + byId("availableDataElements_").value ); -} - -function getOptionCombos_Received( xmlObject ) { - - xmlObject = xmlObject.getElementsByTagName('categoryOptions')[0]; - - var optionComboList = byId( "optionCombos_" ); - optionComboList.options.length = 0; - var optionCombos = xmlObject.getElementsByTagName( "categoryOption" ); - - for ( var i = 0; i < optionCombos.length; i++ ) - { - var id = optionCombos[ i ].getAttribute('id'); - var name = optionCombos[ i ].firstChild.nodeValue; - var option = document.createElement( "option" ); - - option.value = id ; - option.text = name; - optionComboList.add( option, null ); - } -} - -function insertDataElementId_() -{ - var optionCombo = byId("optionCombos_"); - var dataElementComboId = "[*." + optionCombo.value + "]"; - byId("categoryFormula").value = dataElementComboId; - byId("categoryFormulaDiv").innerHTML = "*." + optionCombo[optionCombo.selectedIndex].text ; -} - -function clearFormula(formulaFieldName) + jQuery.postJSON( "../dhis-web-commons-ajax-json/getIndicators.action" { + id: $("#indicatorGroups").val() + }, function( json ) { + var indiatorList = byId( "availableIndicators" ); + indiatorList.options.length = 0; + + var indicators = json.indicators; + + for ( var i = 0; i < indicators.length; i++ ) + { + var id = indicators[ i ].id; + var name = indicators[ i ].name; + var option = document.createElement( "option" ); + + option.value = "[" + id + "]"; + option.text = name; + indiatorList.add( option, null ); + + if ( byId('formulaIndicator').value == option.value ) + { + option.selected = true; + setInnerHTML( "formulaIndicatorDiv", name ); + } + } + } ); +} + +function clearFormula( formulaFieldName ) { byId(formulaFieldName).value = ''; byId(formulaFieldName + "Div").innerHTML = '' } -// ------------------------------------------------------------------------------- -// Show textFormula -// ------------------------------------------------------------------------------- - -function updateFormulaText( formulaFieldName ) -{ - var formula = htmlEncode( byId( formulaFieldName ).value ); - var url = "getFormulaText.action?formula=" + formula; - - var request = new Request(); - request.setCallbackSuccess( updateFormulaTextReceived ); - request.send( url ); -} - -function updateFormulaTextReceived( messageElement ) -{ - byId( "formulaDiv").innerHTML = messageElement; -} === removed file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportReports.js' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportReports.js 2011-08-04 08:39:55 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportReports.js 1970-01-01 00:00:00 +0000 @@ -1,66 +0,0 @@ -function backupExportReport( id ) -{ - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( backupExportReportReceived ); - request.send( "backupExportReport.action?id=" + id ); - -} - -function backupExportReportReceived( data ) { - - window.location = "downloadFile.action?outputFormat=application/xml-external-parsed-entity"; -} - -function restoreExportReport() { - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( restoreExportReportReceived ); - request.send( "restoreExportReport.action"); - -} - -function restoreExportReportReceived( xmlObject ) { - - var type = xmlObject.getAttribute( 'type' ); - - if ( type == 'error' ) - { - setMessage( xmlObject.firstChild.nodeValue ); - } - else if ( type == 'success' ) - { - window.location.reload(); - } -} - -function getListExcelTemplate() -{ - var request = new Request(); - request.setResponseTypeXML( 'files' ); - request.setCallbackSuccess( getListExcelTemplateReceived ); - request.send( "getListExcelTemplateFile.action"); -} - -function getListExcelTemplateReceived( files ) -{ - var html = "
- ";
- var excels = files.getElementsByTagName( "file");
-
- for( var i=0;i
[" + (ItemsSaved.length) + "/" + (noItemsChecked) + "]:: " - + i18n_copy_successful - + "
======================
"; - - } - - setMessage( warningMessages ); +function executeCopyItems( url ) +{ + jQuery.postJSON( url, {}, function ( json ) + { + if ( json.response == "success" ) + { + warningMessages += + " ======= Sheet [" + sheetId + "] ========" + + "
[" + (ItemsSaved.length) + "/" + (noItemsChecked) + "]:: " + + i18n_copy_successful + + "
======================
"; + } + + setMessage( warningMessages ); + } ); } \ No newline at end of file === modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js 2011-12-13 07:46:57 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js 2012-02-28 08:50:46 +0000 @@ -50,21 +50,14 @@ }); } -function previewExportReport() { - - var request = new Request(); - request.setResponseTypeXML( 'reportXML' ); - request.setCallbackSuccess( previewExportReportReceived ); - request.send( 'previewExportReport.action' ); +function previewExportReport() +{ + jQuery.post( "previewExportReport.action", {}, previewExportReportReceived ); } function previewAdvandReport() { - var request = new Request(); - request.setResponseTypeXML( 'reportXML' ); - request.setCallbackSuccess( previewExportReportReceived ); - request.sendAsPost( params ); - request.send( "previewAdvancedExportReport.action?organisationGroupId=" + byId("availableOrgunitGroups").value ); + jQuery.post( "previewAdvancedExportReport.action", { organisationGroupId: byId( "availableOrgunitGroups" ).value }, previewExportReportReceived ); } function previewExportReportReceived( parentElement ) === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementCategoryOptionCombos.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementCategoryOptionCombos.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementCategoryOptionCombos.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,9 @@ +#set( $size = $dataElementCategoryOptionCombos.size() ) +{ "dataElementCategoryOptionCombos": [ +#foreach( $de in $dataElementCategoryOptionCombos ) + { + "id": $!{de.id}, + "name": "$!encoder.jsEncode( ${de.name} )" + }#if( $velocityCount < $size ),#end +#end +] } === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportGroups.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportGroups.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportGroups.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,6 @@ +#set( $size = $groups.size() ) +#foreach($g in $groups) +[ + {"id":"$!encoder.jsEncode( ${g} )", "label": "$!encoder.jsEncode( ${g} )", "value":"$!encoder.jsEncode( ${g} )"}#if( $velocityCount < $size ),#end +] +#end \ No newline at end of file === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportItems.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportItems.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportItems.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,13 @@ +#set( $size = $exportItems.size() ) +{ + "exportItems": [ + #foreach( $exportItem in $exportItems ) + { + "id": "${exportItem.id}", + "name": "$!encoder.jsonEncode( ${exportItem.name} )", + "row": "${exportItem.row}", + "column": "${exportItem.column}" + }#if( $velocityCount < $size ),#end + #end + ] +} \ No newline at end of file === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportItem.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportItem.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportItem.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,10 @@ +{ "importItem": + { + "id": "${importItem.id}", + "name": "$!encoder.jsonEncode( ${importItem.name} )", + "row": "${importItem.row}", + "column": "${importItem.column}", + "expression": "$!encoder.jsonEncode( ${importItem.expression} )", + "sheetNo": "$importItem.sheetNo" + } +} \ No newline at end of file === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportItems.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportItems.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportItems.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,15 @@ +#set( $size = $importItems.size() ) +{ + "importItems": [ + #foreach($importItem in $importItems) + { + "id": "${importItem.id}", + "name": "$!encoder.jsonEncode( ${importItem.name} )", + "row": "${importItem.row}", + "column": "${importItem.column}", + "expression": "$!encoder.jsonEncode( ${importItem.expression} )", + "sheetNo": "${importItem.sheetNo}" + }#if( $velocityCount < $size ),#end + #end + ] +} \ No newline at end of file === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReport.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReport.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReport.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,9 @@ +{ "importReport": + { + "id": "${report.id}", + "name": "$!encoder.jsonEncode( $!{report.name} )", + "type": "${report.type}", + "periodType": "${report.periodType.name}", + "excelTemplateFile": "${report.excelTemplateFile}" + } +} \ No newline at end of file === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReports.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReports.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReports.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,14 @@ +#set( $size = $!importReports.size() ) +{ + "importReports": [ + #foreach( $importReport in $importReports ) + { + "id": "${importReport.id}", + "name": "$!encoder.jsonEncode( $!{importReport.name} )", + "type": "${importReport.type}", + "periodType": "${importReport.periodType.name}", + "excelTemplateFile": "${importReport.excelTemplateFile}" + }#if( $velocityCount < $size ),#end + #end + ] +} \ No newline at end of file === added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonPeriodColumn.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonPeriodColumn.vm 1970-01-01 00:00:00 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonPeriodColumn.vm 2012-02-28 08:50:46 +0000 @@ -0,0 +1,9 @@ +{ "periodColumn": + { + "id": "${periodColumn.id}", + "startdate": "$!encoder.jsonEncode( $!format.formatDate( ${periodColumn.startdate} ) )", + "enddate": "$!encoder.jsonEncode( $!format.formatDate( ${periodColumn.enddate ) )", + "column": "${periodColumn.column}", + "periodType": "$!encoder.jsonEncode( ${periodColumn.periodType} )" + } +} \ No newline at end of file === modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitAtLevels.vm' --- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitAtLevels.vm 2011-07-28 09:50:39 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitAtLevels.vm 2012-02-28 08:50:46 +0000 @@ -1,3 +1,9 @@ + +
$encoder.htmlEncode($exportReport.name)
$!encoder.htmlEncode($!report.name)
| $i18n.getString( "filter_by_name" ): |
|
| $i18n.getString('start_date') | $i18n.getString('end_date') | $i18n.getString('period_type') | $i18n.getString('column') | $i18n.getString('operations') |
|---|---|---|---|---|
| $format.formatDate($periodColumn.startdate) | $format.formatDate($periodColumn.enddate) | $i18n.getString( $periodColumn.periodType ) | $periodColumn.column |
|
$!encoder.htmlEncode($!report.name)
| $i18n.getString( "filter_by_name" ): |
|
| $i18n.getString('start_date') | $i18n.getString('end_date') | $i18n.getString('period_type') | $i18n.getString('column') | $i18n.getString('operations') |
|---|---|---|---|---|
| $format.formatDate($periodColumn.startdate) | $format.formatDate($periodColumn.enddate) | $i18n.getString( $periodColumn.periodType ) | $periodColumn.column |
|