=== modified file 'local/vn/dhis-web-excel-reporting/pom.xml' --- local/vn/dhis-web-excel-reporting/pom.xml 2011-03-25 09:11:30 +0000 +++ local/vn/dhis-web-excel-reporting/pom.xml 2011-04-18 08:23:27 +0000 @@ -54,14 +54,11 @@ net.sourceforge.jexcelapi jxl - - === modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/CopyReportExcelItemAction.java' --- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/CopyReportExcelItemAction.java 2010-12-16 04:49:14 +0000 +++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/CopyReportExcelItemAction.java 2011-04-18 08:23:27 +0000 @@ -44,17 +44,17 @@ public class CopyReportExcelItemAction implements Action { - // ------------------------------------------- + // ------------------------------------------------------------------------- // Dependency - // ------------------------------------------- + // ------------------------------------------------------------------------- private ReportExcelService reportService; private StatementManager statementManager; - // ------------------------------------------- + // ------------------------------------------------------------------------- // Input - // ------------------------------------------- + // ------------------------------------------------------------------------- private Integer reportId; @@ -62,9 +62,9 @@ private List reportItems = new ArrayList(); - // ------------------------------------------- + // ------------------------------------------------------------------------- // Getter & Setter - // ------------------------------------------- + // ------------------------------------------------------------------------- public void setReportService( ReportExcelService reportService ) { === modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/DefaultPeriodGenericManager.java' --- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/DefaultPeriodGenericManager.java 2010-09-22 07:30:22 +0000 +++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/DefaultPeriodGenericManager.java 2011-04-18 08:23:27 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.reportexcel.period.generic; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2011, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,16 +48,14 @@ public class DefaultPeriodGenericManager implements PeriodGenericManager { - private static final Log log = LogFactory.getLog( DefaultPeriodGenericManager.class ); - - public static final String SESSION_KEY_SELECTED_PERIOD_TYPE= "SESSION_KEY_SELECTED_PERIOD_TYPE"; + public static final String SESSION_KEY_SELECTED_PERIOD_TYPE = "SESSION_KEY_SELECTED_PERIOD_TYPE"; public static final String SESSION_KEY_SELECTED_PERIOD_INDEX = "SESSION_KEY_SELECTED_PERIOD_INDEX"; public static final String SESSION_KEY_BASE_PERIOD = "SESSION_KEY_BASE_PERIOD"; - + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- @@ -68,12 +66,11 @@ { this.periodService = periodService; } - // ------------------------------------------------------------------------- // Period // ------------------------------------------------------------------------- - + public void setSelectedPeriodIndex( Integer index ) { getSession().put( SESSION_KEY_SELECTED_PERIOD_INDEX, index ); @@ -111,7 +108,7 @@ public List getPeriodList() { Period basePeriod = getBasePeriod(); - + CalendarPeriodType periodType = (CalendarPeriodType) getPeriodType(); List periods = periodType.generatePeriods( basePeriod ); @@ -119,7 +116,7 @@ Date now = new Date(); Iterator iterator = periods.iterator(); - + while ( iterator.hasNext() ) { if ( iterator.next().getStartDate().after( now ) ) @@ -127,10 +124,10 @@ iterator.remove(); } } - + return periods; } - + public void nextPeriodSpan() { List periods = getPeriodList(); @@ -168,7 +165,7 @@ private Period getBasePeriod() { Period basePeriod = (Period) getSession().get( SESSION_KEY_BASE_PERIOD ); - + PeriodType periodType = getPeriodType(); if ( basePeriod == null ) @@ -197,7 +194,6 @@ @Override public Period getSelectedPeriod( Integer index ) { - // TODO Auto-generated method stub return null; } === modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/PeriodGenericManager.java' --- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/PeriodGenericManager.java 2011-03-25 09:11:30 +0000 +++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/PeriodGenericManager.java 2011-04-18 08:23:27 +0000 @@ -1,7 +1,7 @@ package org.hisp.dhis.reportexcel.period.generic; /* - * Copyright (c) 2004-2010, University of Oslo + * Copyright (c) 2004-2011, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without === modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/action/GetPeriodsByPeriodTypeAction.java' --- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/action/GetPeriodsByPeriodTypeAction.java 2010-09-22 07:30:22 +0000 +++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/period/generic/action/GetPeriodsByPeriodTypeAction.java 2011-04-18 08:23:27 +0000 @@ -85,7 +85,6 @@ } else { - periodGenericManager.setPeriodType( periodTypeName ); } === modified file 'local/vn/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml' --- local/vn/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-04-04 04:54:43 +0000 +++ local/vn/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-04-18 08:23:27 +0000 @@ -588,7 +588,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /main.vm - /dhis-web-excel-reporting/individualReportExcel.vm - /dhis-web-excel-reporting/menuWithTree.vm - 220 - - javascript/individual.js, - javascript/commons.js, - ../dhis-web-commons/ouwt/ouwt.js - - style/style.css - - - - - /dhis-web-excel-reporting/responseDataElementGroup.vm - plainTextError - - - - - /dhis-web-commons/ajax/xmlResponseSuccess.vm - - /dhis-web-commons/ajax/xmlResponseError.vm - - - - - /dhis-web-commons/ajax/xmlResponseSuccess.vm - - - + + + + /dhis-web-commons/ajax/xmlResponseSuccess.vm + + === removed file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm' --- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm 2010-03-08 16:36:21 +0000 +++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm 1970-01-01 00:00:00 +0000 @@ -1,170 +0,0 @@ -

$i18n.getString( "individual_report" ) #openHelp( "excelReportingIndividualReport" )

-
- -
-
- -
- - - ## Labels - ## Input - - - - - - - - - -
- -
- - - ## Available DataElements - ## Filter - ## Selected DataElements - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Select data element
 
$i18n.getString( "available_data_elements" )$i18n.getString( "filter" )$i18n.getString( "selected_data_elements" )
- -  
 
- - - -

- $i18n.getString('category_option_combo')
- -
- -
- -
- - -
 
Select period
 
$i18n.getString( "available_periods" )$i18n.getString( "filter" )$i18n.getString( "selected_periods" )
- -  
-  
- - - - -
- -
- - -
- - -
-
- - - - === removed file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/individual.js' --- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/individual.js 2010-03-12 14:29:20 +0000 +++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/individual.js 1970-01-01 00:00:00 +0000 @@ -1,319 +0,0 @@ -// ----------------------------------------------------------------------------- -// Filter by data element group -// ----------------------------------------------------------------------------- - -function getOptionCombos(){ - - clearListById('availableOptionCombos'); - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( getOptionCombosReceived ); - request.send( "getOptionCombos.action?dataElementId=" + byId("availableDataElements").value ); - -} - -function getOptionCombosReceived( xmlObject ){ - - xmlObject = xmlObject.getElementsByTagName('categoryOptions')[0]; - - var optionComboList = byId( "availableOptionCombos" ); - - 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 ); - } -} - -// ----------------------------------------------------------------------------- -// Filter by data element group -// ----------------------------------------------------------------------------- - -function filterByDataElementGroup( selectedDataElementGroup ) -{ - - var request = new Request(); - var requestString = 'filterAvailableDataElementsByDataElementGroup.action'; - var params = 'dataElementGroupId=' + selectedDataElementGroup; - var selectedList = byId( 'selectedDataElements' ); - - for ( var i = 0; i < selectedList.options.length; ++i) - { - var selectedValue = selectedList.options[i].value; - - var id = selectedValue.substring(selectedValue.indexOf(".") + 1, selectedValue.length); - - params += '&selectedDataElements=' + id; - } - - // Clear the Dataelement list - var availableList = document.getElementById( 'availableDataElements' ); - availableList.options.length = 0; - - // Clear the OptionCombo list - availableList = document.getElementById( 'availableOptionCombos' ); - availableList.options.length = 0; - - request.setResponseTypeXML( 'dataElementGroup' ); - request.setCallbackSuccess( filterByDataElementGroupCompleted ); - request.sendAsPost( params ); - request.send( requestString ); - -} - -function filterByDataElementGroupCompleted( dataElementGroup ) -{ - var dataElements = dataElementGroup.getElementsByTagName( 'dataElements' )[0]; - var dataElementList = dataElements.getElementsByTagName( 'dataElement' ); - - var availableList = byId( 'availableDataElements' ); - - for ( var i = 0; i < dataElementList.length; i++ ) - { - var dataElement = dataElementList[i]; - var value = dataElement.firstChild.nodeValue; - var id = dataElement.getAttribute( 'id' ); - var option = new Option( value, id ); - - option.onmousemove = function(e){ - showToolTip( e, this.text); - } - - availableList.add( option , null ); - } - -} - -// ----------------------------------------------------------------------------- -// Filter available data elements -// ----------------------------------------------------------------------------- - -function filterAvailableDataElements() -{ - var filter = document.getElementById( 'availableDataElementsFilter' ).value; - var list = document.getElementById( 'availableDataElements' ); - - list.options.length = 0; - - for ( var id in availableAllDataElements ) - { - var value = availableAllDataElements[id]; - - var option = new Option( value, id ); - - option.onmousemove = function(e){ - showToolTip(e, name); - } - - if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 ) - { - list.add(option, null ); - } - } -} - -function initLists() -{ - var id; - - for ( id in availableAllDataElements ) - { - var option = new Option( availableAllDataElements[id], id ); - - option.onmousemove = function(e){ - showToolTip(e, this.text); - } - $("#availableDataElements").append( option ) ; - } -} - -// ----------------------------------------------------------------------------- -// Add and Remove dataSet members -// ----------------------------------------------------------------------------- - -function addDataSetMembers() -{ - var list = document.getElementById( 'availableDataElements' ); - - var listOptionCombo = document.getElementById( 'availableOptionCombos' ); - - if ( listOptionCombo.selectedIndex != -1 ) - { - var id = list.options[list.selectedIndex].value + "." + listOptionCombo[listOptionCombo.selectedIndex].value; - - dataSetMembers[id] = list.options[list.selectedIndex].text + " - " + listOptionCombo[listOptionCombo.selectedIndex].text; - - var option = new Option( dataSetMembers[id], id ); - - option.onmousemove = function(e){ - showToolTip( e, this.text); - } - - byId( 'selectedDataElements' ).add(option, null ); - - listOptionCombo.remove( listOptionCombo.selectedIndex ); - } -} - -function removeDataSetMembers() -{ - var listOptionCombo = document.getElementById( 'availableOptionCombos' ); - - var list = document.getElementById( 'selectedDataElements' ); - - var selectedIndex = list.selectedIndex; - - if ( selectedIndex != -1 ) - { - var selectedValue = list.options[selectedIndex].value; - - var id = selectedValue.substring(selectedValue.indexOf(".") + 1, selectedValue.length); - - var name = dataSetMembers[selectedValue].substring(dataSetMembers[selectedValue].lastIndexOf(" - ") + 2, dataSetMembers[selectedValue].length); - - listOptionCombo.add( new Option( name, id ), null ); - - list.remove( selectedIndex ); - } -} - - -function filterDataSetMembers() -{ - var filter = document.getElementById( 'dataSetMembersFilter' ).value; - - var list = document.getElementById( 'selectedDataElements' ); - - list.options.length = 0; - - for ( var id in dataSetMembers ) - { - var value = dataSetMembers[id]; - - if (value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 ) - { - list.add( new Option( value, id ), null ); - } - } -} - -// ----------------------------------------------------------------------------- -// Get Period by PeriodType -// ----------------------------------------------------------------------------- - -function getPeriods(){ - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( getListPeriodCompleted ); - request.send( '../dhis-web-commons-ajax/getPeriods.action?name=' + $("#availabelPeriodTypes").val()); -} - -function getListPeriodCompleted( xmlObject ){ - - clearListById('availablePeriods'); - var nodes = xmlObject.getElementsByTagName('period'); - for ( var i = 0; i < nodes.length; i++ ) - { - node = nodes.item(i); - var id = node.getElementsByTagName('id')[0].firstChild.nodeValue; - var name = node.getElementsByTagName('name')[0].firstChild.nodeValue; - addOption('availablePeriods', name, id); - } -} - -// ----------------------------------------------------------------------------- -// Generate individual report excel -// ----------------------------------------------------------------------------- - -function generateIndividualReportExcel(){ - // Check operands - var selectedDataElements = byId('selectedDataElements').options; - var message = ''; - if( selectedDataElements.length==0) - { - message = i18n_choose_dataelement + '
'; - } - // Check periods - selectedDataElements = byId('selectedPeriods').options; - if(selectedDataElements.length==0) - { - message += i18n_choose_period + '
'; - } - - if(message.length > 0 ){ - setMessage(message); - return; - } - $("#loading").showAtCenter( true ); - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( generateIndividualReportExcelReceived ); - var params = getQueryStringFromList('selectedDataElements', 'operands'); - params += getQueryStringFromList('selectedPeriods', 'periods'); - request.sendAsPost(params); - request.send( "generateIndividualReportExcel.action"); - -} - -function generateIndividualReportExcelReceived(xmlObject){ - - var type = xmlObject.getAttribute( 'type' ); - - if(type=='error') - { - setMessage( xmlObject.firstChild.nodeValue); - }else if(type=='success') - { - window.location = "downloadFile.action?outputFormat="; - } - - deleteDivEffect(); - $("#loading").hide(); -} - - -function getPeriodsByPeriodTypeName() { - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( responseListPeriodReceived ); - request.send( 'getPeriodsByPeriodTypeDB.action?periodTypeName=' + byId("availabelPeriodTypes").value); -} - -function lastPeriod() { - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( responseListPeriodReceived ); - request.send( 'previousPeriodsDB.action' ); -} - -function nextPeriod() { - - var request = new Request(); - request.setResponseTypeXML( 'xmlObject' ); - request.setCallbackSuccess( responseListPeriodReceived ); - request.send( 'nextPeriodsDB.action' ); -} - -function responseListPeriodReceived( xmlObject ) { - - clearListById('availablePeriods'); - var list = xmlObject.getElementsByTagName('period'); - for ( var i = 0; i < list.length; i++ ) - { - item = list[i]; - var id = item.getElementsByTagName('id')[0].firstChild.nodeValue; - var name = item.getElementsByTagName('name')[0].firstChild.nodeValue; - addOption('availablePeriods', name, id); - } -} \ No newline at end of file