dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15388
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5563: Removed chart UI from reporting module, its been replaced by data visualizer module
------------------------------------------------------------
revno: 5563
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-22 22:17:05 +0100
message:
Removed chart UI from reporting module, its been replaced by data visualizer module
removed:
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetAllChartsAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartOptionsAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/RemoveChartAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/ValidateChartAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementModeForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementOrgunitOrPeriodForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chartGroup.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportGroup.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportTableGroup.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonChart.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonCharts.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.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
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetAllChartsAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetAllChartsAction.java 2011-11-12 18:43:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetAllChartsAction.java 1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.reporting.chart.action;
-
-/*
- * Copyright (c) 2004-2011, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartService;
-import org.hisp.dhis.chart.comparator.ChartNameComparator;
-import org.hisp.dhis.paging.ActionPagingSupport;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetAllChartsAction
- extends ActionPagingSupport<Chart>
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ChartService chartService;
-
- public void setChartService( ChartService chartService )
- {
- this.chartService = chartService;
- }
-
- // -------------------------------------------------------------------------
- // Input & Output
- // -------------------------------------------------------------------------
-
- private String key;
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- private List<Chart> charts;
-
- public List<Chart> getCharts()
- {
- return charts;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- if ( isNotBlank( key ) )
- {
- this.paging = createPaging( chartService.getChartCountByName( key ) );
-
- charts = new ArrayList<Chart>( chartService.getChartsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
- }
- else
- {
- this.paging = createPaging( chartService.getChartCount() );
-
- charts = new ArrayList<Chart>( chartService.getChartsBetween( paging.getStartPos(), paging.getPageSize() ) );
- }
-
- Collections.sort( charts, new ChartNameComparator() );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartAction.java 1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-package org.hisp.dhis.reporting.chart.action;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetChartAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ChartService chartService;
-
- public void setChartService( ChartService chartService )
- {
- this.chartService = chartService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Chart chart;
-
- public Chart getChart()
- {
- return chart;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- if ( id != null )
- {
- chart = chartService.getChart( id );
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartOptionsAction.java 2011-12-22 13:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetChartOptionsAction.java 1970-01-01 00:00:00 +0000
@@ -1,312 +0,0 @@
-package org.hisp.dhis.reporting.chart.action;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementGroup;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorGroup;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitLevelComparator;
-import org.hisp.dhis.period.PeriodType;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- */
-public class GetChartOptionsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ChartService chartService;
-
- public void setChartService( ChartService chartService )
- {
- this.chartService = chartService;
- }
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
- private Comparator<Indicator> indicatorComparator;
-
- public void setIndicatorComparator( Comparator<Indicator> indicatorComparator )
- {
- this.indicatorComparator = indicatorComparator;
- }
-
- private Comparator<DataElement> dataElementComparator;
-
- public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
- {
- this.dataElementComparator = dataElementComparator;
- }
-
- private Comparator<DataSet> dataSetComparator;
-
- public void setDataSetComparator( Comparator<DataSet> dataSetComparator )
- {
- this.dataSetComparator = dataSetComparator;
- }
-
- private Comparator<OrganisationUnit> organisationUnitComparator;
-
- public void setOrganisationUnitComparator( Comparator<OrganisationUnit> organisationUnitComparator )
- {
- this.organisationUnitComparator = organisationUnitComparator;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String dimension;
-
- public String getDimension()
- {
- return dimension;
- }
-
- public void setDimension( String dimension )
- {
- this.dimension = dimension;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Chart chart;
-
- public Chart getChart()
- {
- return chart;
- }
-
- private List<IndicatorGroup> indicatorGroups = new ArrayList<IndicatorGroup>();
-
- public List<IndicatorGroup> getIndicatorGroups()
- {
- return indicatorGroups;
- }
-
- private List<DataElementGroup> dataElementGroups = new ArrayList<DataElementGroup>();
-
- public List<DataElementGroup> getDataElementGroups()
- {
- return dataElementGroups;
- }
-
- private List<Indicator> availableIndicators;
-
- public List<Indicator> getAvailableIndicators()
- {
- return availableIndicators;
- }
-
- private List<DataElement> availableDataElements;
-
- public List<DataElement> getAvailableDataElements()
- {
- return availableDataElements;
- }
-
- private List<DataSet> availableDataSets;
-
- public List<DataSet> getAvailableDataSets()
- {
- return availableDataSets;
- }
-
- private List<Indicator> selectedIndicators;
-
- public List<Indicator> getSelectedIndicators()
- {
- return selectedIndicators;
- }
-
- private List<DataElement> selectedDataElements;
-
- public List<DataElement> getSelectedDataElements()
- {
- return selectedDataElements;
- }
-
- private List<DataSet> selectedDataSets;
-
- public List<DataSet> getSelectedDataSets()
- {
- return selectedDataSets;
- }
-
- private List<PeriodType> periodTypes = new ArrayList<PeriodType>();
-
- public List<PeriodType> getPeriodTypes()
- {
- return periodTypes;
- }
-
- private List<OrganisationUnitLevel> levels = new ArrayList<OrganisationUnitLevel>();
-
- public List<OrganisationUnitLevel> getLevels()
- {
- return levels;
- }
-
- private List<OrganisationUnit> availableOrganisationUnits;
-
- public List<OrganisationUnit> getAvailableOrganisationUnits()
- {
- return availableOrganisationUnits;
- }
-
- private List<OrganisationUnit> selectedOrganisationUnits;
-
- public List<OrganisationUnit> getSelectedOrganisationUnits()
- {
- return selectedOrganisationUnits;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
-
- dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
-
- availableIndicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
-
- availableDataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
-
- availableDataSets = new ArrayList<DataSet>( dataSetService.getAllDataSets() );
-
- levels = organisationUnitService.getOrganisationUnitLevels();
-
- availableOrganisationUnits = new ArrayList<OrganisationUnit>(
- organisationUnitService.getOrganisationUnitsAtLevel( 1 ) );
-
- Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
- Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
- Collections.sort( availableIndicators, indicatorComparator );
- Collections.sort( availableDataElements, dataElementComparator );
- Collections.sort( availableDataSets, dataSetComparator );
- Collections.sort( levels, new OrganisationUnitLevelComparator() );
- Collections.sort( availableOrganisationUnits, organisationUnitComparator );
-
- displayPropertyHandler.handle( availableIndicators );
- displayPropertyHandler.handle( availableDataElements );
- displayPropertyHandler.handle( availableDataSets );
- displayPropertyHandler.handle( availableOrganisationUnits );
-
- if ( id != null )
- {
- chart = chartService.getChart( id );
-
- selectedIndicators = chart.getIndicators();
- availableIndicators.removeAll( selectedIndicators );
-
- selectedDataElements = chart.getDataElements();
- availableDataElements.removeAll( selectedDataElements );
-
- selectedDataSets = chart.getDataSets();
- availableDataSets.removeAll( selectedDataSets );
-
- selectedOrganisationUnits = chart.getOrganisationUnits();
- availableOrganisationUnits.removeAll( selectedOrganisationUnits );
-
- displayPropertyHandler.handle( selectedIndicators );
- displayPropertyHandler.handle( selectedDataElements );
- displayPropertyHandler.handle( selectedDataSets );
- displayPropertyHandler.handle( selectedOrganisationUnits );
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/RemoveChartAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/RemoveChartAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/RemoveChartAction.java 1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-package org.hisp.dhis.reporting.chart.action;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class RemoveChartAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ChartService chartService;
-
- public void setChartService( ChartService chartService )
- {
- this.chartService = chartService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- if ( id != null )
- {
- Chart chart = chartService.getChart( id );
-
- chartService.deleteChart( chart );
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java 2011-12-22 18:14:45 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java 1970-01-01 00:00:00 +0000
@@ -1,357 +0,0 @@
-package org.hisp.dhis.reporting.chart.action;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.hisp.dhis.system.util.ConversionUtils.getIntegerCollection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.period.RelativePeriods;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: UploadDesignAction.java 5207 2008-05-22 12:16:36Z larshelg $
- */
-public class SaveChartAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ChartService chartService;
-
- public void setChartService( ChartService chartService )
- {
- this.chartService = chartService;
- }
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String domainAxisLabel;
-
- public void setDomainAxisLabel( String domainAxisLabel )
- {
- this.domainAxisLabel = domainAxisLabel;
- }
-
- private String rangeAxisLabel;
-
- public void setRangeAxisLabel( String rangeAxisLabel )
- {
- this.rangeAxisLabel = rangeAxisLabel;
- }
-
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- private boolean hideSubtitle;
-
- public void setHideSubtitle( boolean hideSubtitle )
- {
- this.hideSubtitle = hideSubtitle;
- }
-
- private String type;
-
- public void setType( String type )
- {
- this.type = type;
- }
-
- private String series;
-
- public void setSeries( String series )
- {
- this.series = series;
- }
-
- private String category;
-
- public void setCategory( String category )
- {
- this.category = category;
- }
-
- private String filter;
-
- public void setFilter( String filter )
- {
- this.filter = filter;
- }
-
- private boolean hideLegend;
-
- public void setHideLegend( boolean hideLegend )
- {
- this.hideLegend = hideLegend;
- }
-
- private boolean regression;
-
- public void setRegression( boolean regression )
- {
- this.regression = regression;
- }
-
- private boolean targetLine;
-
- public void setTargetLine( boolean targetLine )
- {
- this.targetLine = targetLine;
- }
-
- private Double targetLineValue;
-
- public void setTargetLineValue( Double targetLineValue )
- {
- this.targetLineValue = targetLineValue;
- }
-
- private String targetLineLabel;
-
- public void setTargetLineLabel( String targetLineLabel )
- {
- this.targetLineLabel = targetLineLabel;
- }
-
- private boolean userOrganisationUnit;
-
- public void setUserOrganisationUnit( boolean userOrganisationUnit )
- {
- this.userOrganisationUnit = userOrganisationUnit;
- }
-
- private List<String> selectedIndicators = new ArrayList<String>();
-
- public void setSelectedIndicators( List<String> selectedIndicators )
- {
- this.selectedIndicators = selectedIndicators;
- }
-
- private List<String> selectedDataElements = new ArrayList<String>();
-
- public void setSelectedDataElements( List<String> selectedDataElements )
- {
- this.selectedDataElements = selectedDataElements;
- }
-
- private List<String> selectedOrganisationUnits = new ArrayList<String>();
-
- public void setSelectedOrganisationUnits( List<String> selectedOrganisationUnits )
- {
- this.selectedOrganisationUnits = selectedOrganisationUnits;
- }
-
- private List<String> selectedDataSets = new ArrayList<String>();
-
- public void setSelectedDataSets( List<String> selectedDataSets )
- {
- this.selectedDataSets = selectedDataSets;
- }
-
- private boolean lastMonth;
-
- public void setLastMonth( boolean lastMonth )
- {
- this.lastMonth = lastMonth;
- }
-
- private boolean last12Months;
-
- public void setLast12Months( boolean last12Months )
- {
- this.last12Months = last12Months;
- }
-
- private boolean lastQuarter;
-
- public void setLastQuarter( boolean lastQuarter )
- {
- this.lastQuarter = lastQuarter;
- }
-
- private boolean last4Quarters;
-
- public void setLast4Quarters( boolean last4Quarters )
- {
- this.last4Quarters = last4Quarters;
- }
-
- private boolean lastSixMonth;
-
- public void setLastSixMonth( boolean lastSixMonth )
- {
- this.lastSixMonth = lastSixMonth;
- }
-
- private boolean last2SixMonths;
-
- public void setLast2SixMonths( boolean last2SixMonths )
- {
- this.last2SixMonths = last2SixMonths;
- }
-
- private boolean thisYear;
-
- public void setThisYear( boolean thisYear )
- {
- this.thisYear = thisYear;
- }
-
- private boolean last5Years;
-
- public void setLast5Years( boolean last5Years )
- {
- this.last5Years = last5Years;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- Chart chart = id == null ? new Chart() : chartService.getChart( id );
-
- List<Indicator> indicators = new ArrayList<Indicator>();
- List<DataElement> dataElements = new ArrayList<DataElement>();
- List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>();
- List<DataSet> dataSets = new ArrayList<DataSet>();
-
- for ( Integer id : getIntegerCollection( selectedIndicators ) )
- {
- indicators.add( indicatorService.getIndicator( id ) );
- }
-
- for ( Integer id : getIntegerCollection( selectedDataElements ) )
- {
- dataElements.add( dataElementService.getDataElement( id ) );
- }
-
- for ( Integer id : getIntegerCollection( selectedDataSets ) )
- {
- dataSets.add( dataSetService.getDataSet( id ) );
- }
-
- for ( Integer id : getIntegerCollection( selectedOrganisationUnits ) )
- {
- organisationUnits.add( organisationUnitService.getOrganisationUnit( id ) );
- }
-
- chart.setName( name );
- chart.setDomainAxisLabel( StringUtils.trimToNull( domainAxisLabel ) );
- chart.setRangeAxisLabel( StringUtils.trimToNull( rangeAxisLabel ) );
- chart.setHideSubtitle( hideSubtitle );
- chart.setType( type );
- chart.setSeries( series );
- chart.setCategory( category );
- chart.setFilter( filter );
- chart.setHideLegend( hideLegend );
- chart.setRegression( regression );
- chart.setTargetLine( targetLine );
- chart.setTargetLineValue( targetLineValue );
- chart.setTargetLineLabel( StringUtils.trimToNull( targetLineLabel ) );
- chart.setUserOrganisationUnit( userOrganisationUnit );
- chart.setIndicators( indicators );
- chart.setDataElements( dataElements );
- chart.setDataSets( dataSets );
- chart.setOrganisationUnits( organisationUnits );
-
- RelativePeriods rp = new RelativePeriods();
- rp.setReportingMonth( lastMonth );
- rp.setLast12Months( last12Months );
- rp.setReportingQuarter( lastQuarter );
- rp.setLast4Quarters( last4Quarters );
- rp.setLastSixMonth( lastSixMonth );
- rp.setLast2SixMonths( last2SixMonths );
- rp.setThisYear( thisYear );
- rp.setLast5Years( last5Years );
-
- chart.setRelatives( rp );
-
- chartService.saveChart( chart );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/ValidateChartAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/ValidateChartAction.java 2011-11-12 18:43:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/ValidateChartAction.java 1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-package org.hisp.dhis.reporting.chart.action;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartService;
-import org.hisp.dhis.i18n.I18n;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ValidateChartAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ChartService chartService;
-
- public void setChartService( ChartService chartService )
- {
- this.chartService = chartService;
- }
-
- private I18n i18n;
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- if ( name == null )
- {
- message = i18n.getString( "specify_title" );
-
- return INPUT;
- }
- else
- {
- name = name.trim();
-
- if ( name.length() == 0 )
- {
- message = i18n.getString( "specify_title" );
-
- return INPUT;
- }
-
- Chart match = chartService.getChartByName( name );
-
- if ( match != null && (id == null || match.getId() != id) )
- {
- message = i18n.getString( "title_in_use" );
-
- return INPUT;
- }
- }
-
- message = i18n.getString( "ok" );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-12-22 17:28:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-12-22 21:17:05 +0000
@@ -57,44 +57,6 @@
<property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
</bean>
- <bean id="org.hisp.dhis.reporting.chart.action.GetAllChartsAction" class="org.hisp.dhis.reporting.chart.action.GetAllChartsAction"
- scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- </bean>
-
- <bean id="org.hisp.dhis.reporting.chart.action.GetChartAction" class="org.hisp.dhis.reporting.chart.action.GetChartAction"
- scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- </bean>
-
- <bean id="org.hisp.dhis.reporting.chart.action.GetChartOptionsAction" class="org.hisp.dhis.reporting.chart.action.GetChartOptionsAction"
- scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <bean id="org.hisp.dhis.reporting.chart.action.RemoveChartAction" class="org.hisp.dhis.reporting.chart.action.RemoveChartAction"
- scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- </bean>
-
- <bean id="org.hisp.dhis.reporting.chart.action.SaveChartAction" class="org.hisp.dhis.reporting.chart.action.SaveChartAction"
- scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <bean id="org.hisp.dhis.reporting.chart.action.ValidateChartAction" class="org.hisp.dhis.reporting.chart.action.ValidateChartAction"
- scope="prototype">
- <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- </bean>
-
<!-- TableCreator -->
<bean id="org.hisp.dhis.reporting.tablecreator.action.GetTableOptionsAction" class="org.hisp.dhis.reporting.tablecreator.action.GetTableOptionsAction"
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2011-12-22 17:28:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2011-12-22 21:17:05 +0000
@@ -63,33 +63,6 @@
<!-- Chart -->
- <action name="saveChart" class="org.hisp.dhis.reporting.chart.action.SaveChartAction">
- <result name="success" type="redirect">displayViewChartForm.action</result>
- <param name="requiredAuthorities">F_CHART_ADD</param>
- </action>
-
- <action name="removeChart" class="org.hisp.dhis.reporting.chart.action.RemoveChartAction">
- <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <param name="requiredAuthorities">F_CHART_DELETE</param>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="displayAddChartForm" class="org.hisp.dhis.reporting.chart.action.GetChartOptionsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-reporting/addChartForm.vm</param>
- <param name="menu">/dhis-web-reporting/menu.vm</param>
- <param name="javascripts">javascript/lists.js,javascript/chart.js</param>
- <param name="requiredAuthorities">F_CHART_ADD</param>
- </action>
-
- <action name="displayViewChartForm" class="org.hisp.dhis.reporting.chart.action.GetAllChartsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-reporting/viewChartForm.vm</param>
- <param name="menu">/dhis-web-reporting/menu.vm</param>
- <param name="javascripts">javascript/chart.js</param>
- <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
- </action>
-
<action name="viewChart" class="org.hisp.dhis.reporting.chart.action.ViewChartAction">
<result name="success" type="chart"></result>
</action>
@@ -97,22 +70,6 @@
<action name="generateChart" class="org.hisp.dhis.reporting.chart.action.GenerateChartAction">
<result name="success" type="chart"></result>
</action>
-
- <action name="getChart" class="org.hisp.dhis.reporting.chart.action.GetChartAction">
- <result name="success" type="velocity-json">/dhis-web-reporting/jsonChart.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="getCharts" class="org.hisp.dhis.reporting.chart.action.GetAllChartsAction">
- <result name="success" type="velocity-json">/dhis-web-reporting/jsonCharts.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="validateChart" class="org.hisp.dhis.reporting.chart.action.ValidateChartAction">
- <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <result name="input" type="velocity-json">/dhis-web-commons/ajax/jsonResponseInput.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
<!-- Report -->
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementModeForm.vm 2011-12-22 13:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementModeForm.vm 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-<table>
-<!-- Relative periods -->
-
-<tr>
- <th colspan="2">$i18n.getString( "relative_periods" )</th>
-</tr>
-<tr>
- <td>
- <label for="lastMonth">$i18n.getString( "last_month" )</label>
- <input type="checkbox" id="lastMonth" name="lastMonth" value="true"#if( $chart.relatives.isReportingMonth() ) checked#end>
- <label for="lastQuarter">$i18n.getString( "last_quarter" )</label>
- <input type="checkbox" id="lastQuarter" name="lastQuarter" value="true""#if( $chart.relatives.isReportingQuarter() ) checked#end>
- <label for="lastSixMonth">$i18n.getString( "last_six_month" )</label>
- <input type="checkbox" id="lastSixMonth" name="lastSixMonth" value="true"#if( $chart.relatives.isLastSixMonth() ) checked#end>
- <label for="thisYear">$i18n.getString( "this_year" )</label>
- <input type="checkbox" id="thisYear" name="thisYear" value="true"#if( $chart.relatives.isThisYear() ) checked#end><br>
-
- <label for="last12Months">$i18n.getString( "last_12_months" )</label>
- <input type="checkbox" id="last12Months" name="last12Months" value="true""#if( $chart.relatives.isLast12Months() ) checked#end>
- <label for="last4Quarters">$i18n.getString( "last_4_quarters" )</label>
- <input type="checkbox" id="last4Quarters" name="last4Quarters" value="true"#if( $chart.relatives.isLast4Quarters() ) checked#end>
- <label for="last2SixMonths">$i18n.getString( "last_2_sixmonths" )</label>
- <input type="checkbox" id="last2SixMonths" name="last2SixMonths" value="true"#if( $chart.relatives.isLast2SixMonths() ) checked#end>
- <label for="last5Years">$i18n.getString( "last_5_years" )</label>
- <input type="checkbox" id="last5Years" name="last5Years" value="true"#if( $chart.relatives.isLast5Years() ) checked#end>
- </td>
-</tr>
-<tr>
- <td style="height:15px"></td>
-</tr>
-<!-- Data elements -->
- <tr>
- <th colspan="2">$i18n.getString( "value_x_available_dataelements" )</th>
- </tr>
- <tr>
- <td colspan="2">
- <select id="dataElementGroupId" name="dataElementGroupId" style="min-width:600px" onchange="getDataElements()">
- <option value="$ALL">[ $i18n.getString( "select_dataelementgroup_all" ) ]</option>
- #foreach ( $group in $dataElementGroups )
- <option value="$group.id">$group.name</option>
- #end
- </select>
- </td>
- <td></td>
- </tr>
- <tr>
- <td colspan="2">
- <select multiple size="6" id="availableDataElements" name="availableDataElements" style="min-width:600px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
- #foreach ( $dataElement in $availableDataElements )
- <option value="$dataElement.id">$dataElement.name</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )" />
- <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableDataElements', 'selectedDataElements' )" />
- <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )" />
- <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedDataElements', 'availableDataElements' )" />
- </td>
- </tr>
-
- <tr>
- <th colspan="2">$i18n.getString( "value_x_selected_dataelements" )</th>
- </tr>
-
- <tr>
- <td>
- <select multiple size="6" id="selectedDataElements" name="selectedDataElements" style="min-width:600px" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
- #foreach( $dataElement in $selectedDataElements )
- <option value="$dataElement.id">$dataElement.name</option>
- #end
- </select>
- </td>
- <td>
- <a href="#" onclick="moveUpSelectedOption( 'selectedDataElements' )"><img src="../images/move_up.png" border="0" alt=""></a><br><br>
- <a href="#" onclick="moveDownSelectedOption( 'selectedDataElements' )"><img src="../images/move_down.png" border="0" alt=""></a>
- </td>
- </tr>
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
-
-<!-- OrganisationUnit -->
-
-<tr>
- <th colspan="2">$i18n.getString( "filter_available_organisationunits" ) - <a href="javascript:clearListById( 'selectedOrganisationUnits' )">$i18n.getString( 'clear' )</a></th>
-</tr>
-
-<tr>
- <td colspan="2">
- <select id="organisationUnitLevel" name="organisationUnitLevel" style="min-width:600px" onchange="getOrganisationUnitsToSelected()">
- <option value="$ALL">[ $i18n.getString( "select_organisationunit_level_all" ) ]</option>
- #foreach ( $level in $levels )
- <option value="$level.level">$encoder.htmlEncode( $level.name )</option>
- #end
- </select>
- </td>
-</tr>
-<tr>
- <td colspan="2">
- <select id="selectedOrganisationUnits" name="selectedOrganisationUnits" style="min-width:600px">
- #foreach ( $unit in $selectedOrganisationUnits )
- <option value="$unit.id">$unit.name</option>
- #end
- </select>
- </td>
-</tr>
-
-</table>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementOrgunitOrPeriodForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementOrgunitOrPeriodForm.vm 2011-06-07 16:12:23 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementOrgunitOrPeriodForm.vm 1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-<table>
-
- <col>
- <col width="16">
-
- <!-- Data elements -->
- <tr>
- <th colspan="2">$i18n.getString( "value_y_available_dataelements" )</th>
- </tr>
- <tr>
- <td colspan="2">
- <select id="dataElementGroupId" name="dataElementGroupId" style="min-width:600px" onchange="getDataElements()">
- <option value="$ALL">[ $i18n.getString( "select_dataelementgroup_all" ) ]</option>
- #foreach ( $group in $dataElementGroups )
- <option value="$group.id">$group.name</option>
- #end
- </select>
- </td>
- <td></td>
- </tr>
- <tr>
- <td colspan="2">
- <select multiple size="6" id="availableDataElements" name="availableDataElements" style="min-width:600px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
- #foreach ( $dataElement in $availableDataElements )
- <option value="$dataElement.id">$dataElement.name</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )" />
- <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableDataElements', 'selectedDataElements' )" />
- <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )" />
- <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedDataElements', 'availableDataElements' )" />
- </td>
- </tr>
-
- <tr>
- <th colspan="2">$i18n.getString( "value_y_selected_dataelements" )</th>
- </tr>
-
- <tr>
- <td>
- <select multiple size="6" id="selectedDataElements" name="selectedDataElements" style="min-width:600px" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
- #foreach( $dataElement in $selectedDataElements )
- <option value="$dataElement.id">$dataElement.name</option>
- #end
- </select>
- </td>
- <td>
- <a href="#" onclick="moveUpSelectedOption( 'selectedDataElements' )"><img src="../images/move_up.png" border="0" alt=""></a><br><br>
- <a href="#" onclick="moveDownSelectedOption( 'selectedDataElements' )"><img src="../images/move_down.png" border="0" alt=""></a>
- </td>
- </tr>
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
-
- <!-- Category -->
-
- #if ( $dimension == "period_dataElement" )
- #parse( "dhis-web-reporting/addChartPeriodModeForm.vm" )
- #else
- #parse( "dhis-web-reporting/addChartOrganisationUnitModeForm.vm" )
- #end
-
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
-
-</table>
-
-</form>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm 2011-12-22 13:59:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm 1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-<script type="text/javascript">
- jQuery(document).ready(function() {
- if( jQuery("#targetLine").attr("checked") === undefined )
- {
- jQuery("#targetLineValue").attr("disabled", "disabled");
- jQuery("#targetLineLabel").attr("disabled", "disabled");
- }
-
- jQuery("#targetLine").change(function() {
- if( jQuery("#targetLine").attr("checked") !== undefined ) {
- jQuery("#targetLineValue").removeAttr("disabled");
- jQuery("#targetLineLabel").removeAttr("disabled");
- jQuery("#targetLineValue").focus();
- } else {
- jQuery("#targetLineValue").attr("disabled", "disabled");
- jQuery("#targetLineLabel").attr("disabled", "disabled");
- }
- });
- });
-
- var i18n_must_select_at_least_one_indicator = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_indicator" ), "'")';
- var i18n_must_select_at_least_one_dataelement = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_dataelement" ), "'")';
- var i18n_must_select_at_least_one_dataset = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_dataset" ), "'")';
- var i18n_must_select_at_least_one_unit = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_unit" ), "'")';
- var i18n_must_select_at_least_one_period = '$encoder.jsEscape( $i18n.getString( "must_select_at_least_one_period" ), "'")';
- var i18n_target_line_value_must_be_provided = '$encoder.jsEscape( $i18n.getString( "target_line_value_must_be_provided" ), "'")';
- var i18n_target_line_value_must_be_number = '$encoder.jsEscape( $i18n.getString( "target_line_value_must_be_number" ), "'")';
-</script>
-
-#macro ( getHeader )
- #if ( $dimension == "period" )
- $i18n.getString( "create_period_by_indicator_chart" )
- #elseif( $dimension == "period_dataElement" )
- $i18n.getString( "create_period_by_dataelement_chart" )
- #elseif ( $dimension == "organisationUnit" )
- $i18n.getString( "create_indicator_by_organisation_unit_chart" )
- #elseif ( $dimension == "organisationUnit_dataElement" )
- $i18n.getString( "create_dataelement_by_organisation_unit_chart" )
- #elseif ( $dimension == "indicator" )
- $i18n.getString( "create_indicator_by_period_chart" )
- #elseif ( $dimension == "dataElement_period" )
- $i18n.getString( "create_dataelement_by_period_chart" )
- #end
-#end
-
-<h3>#getHeader()</h3>
-
-<form id="chartForm" name="chartForm" method="post" action="saveChart.action">
-
-<input type="hidden" id="id" name="id" value="$!chart.id" />
-<input type="hidden" id="dimension" name="dimension" value="$!dimension" />
-
-#if ( $dimension == "period" || $dimension == "period_dataElement" )
- <input type="hidden" name="series" value="PERIOD" />
- <input type="hidden" name="category" value="DATA" />
- <input type="hidden" name="filter" value="ORGANISATIONUNIT" />
-#elseif ( $dimension == "indicator" || $dimension == "dataElement_period" )
- <input type="hidden" name="series" value="DATA" />
- <input type="hidden" name="category" value="PERIOD" />
- <input type="hidden" name="filter" value="ORGANISATIONUNIT" />
-#elseif ( $dimension == "organisationUnit" || $dimension == "organisationUnit_dataElement" )
- <input type="hidden" name="series" value="DATA" />
- <input type="hidden" name="category" value="ORGANISATIONUNIT" />
- <input type="hidden" name="filter" value="PERIOD" />
-#end
-
-<table>
- <tr>
- <th colspan="2">$i18n.getString( "chart" )</th>
- </tr>
- <tr>
- <td><label for="name">$i18n.getString( "title" )</label></td>
- <td><input type="text" id="name" name="name" style="width:300px" value="$!chart.name"></td>
- </tr>
- <tr>
- <td><label for="domainAxisLabel">$i18n.getString( "domain_axis_label_x" )</label></td>
- <td><input type="text" id="domainAxisLabel" name="domainAxisLabel" style="width:300px" value="$!chart.domainAxixLabel"></td>
- </tr>
- <tr>
- <td><label for="rangeAxisLabel">$i18n.getString( "range_axis_label_y" )</label></td>
- <td><input type="text" id="rangeAxisLabel" name="rangeAxisLabel" style="width:300px" value="$!chart.rangeAxisLabel"></td>
- </tr>
- <tr>
- <td><label for="hideSubtitle">$i18n.getString( "hide_subtitle" )</label></td>
- <td><input type="checkbox" id="hideSubtitle" name="hideSubtitle" value="true"#if( $!chart.hideSubtitle ) checked#end></td>
- </tr>
- <tr>
- <td><label for="type">$i18n.getString( "chart_type" )</label></td>
- <td>
- <select id="type" name="type" style="width:300px">
- <option value="BAR"#if ( $!chart.type == "BAR" ) selected#end>$i18n.getString( "bar_chart" )</option>
- <option value="LINE"#if ( $!chart.type == "LINE" ) selected#end>$i18n.getString( "line_chart" )</option>
- <option value="PIE"#if ( $!chart.type == "PIE" ) selected#end>$i18n.getString( "pie_chart" )</option>
- <option value="STACKEDBAR"#if ( $!chart.type == "STACKEDBAR" ) selected#end>$i18n.getString( "stacked_bar_chart" )</option>
- </select>
- </td>
- </tr>
- <tr>
- <td><label for="hideLegend">$i18n.getString( "hide_legend" )</label></td>
- <td><input type="checkbox" id="hideLegend" name="hideLegend" value="true"#if( $!chart.hideLegend ) checked#end></td>
- </tr>
- <tr>
- <td><label for="regression">$i18n.getString( "include_regression_line" )</label></td>
- <td><input type="checkbox" id="regression" name="regression" value="true"#if( $!chart.regression ) checked#end></td>
- </tr>
- <tr>
- <td><label for="targetLine">$i18n.getString( "include_target_line" )</label></td>
- <td><input type="checkbox" id="targetLine" name="targetLine" value="true"#if( $!chart.targetLine ) checked#end></td>
- </tr>
- <tr>
- <td><label for="targetLineValue">$i18n.getString( "target_line_value" )</label></td>
- <td><input type="text" id="targetLineValue" name="targetLineValue" style="width:80px" value="$!chart.targetLineValue"></td>
- </tr>
- <tr>
- <td><label for="targetLineLabel">$i18n.getString( "target_line_label" )</label></td>
- <td><input type="text" id="targetLineLabel" name="targetLineLabel" style="width:80px" value="$!chart.targetLineLabel"></td>
- </tr>
- #if ( $currentUser && $currentUser.hasOrganisationUnit() )
- <tr>
- <td><label for="userOrganisationUnit">$i18n.getString( "user_organisation_unit" )</label></td>
- <td><input type="checkbox" id="userOrganisationUnit" name="userOrganisationUnit" value="true"#if( $!chart.userOrganisationUnit ) checked#end></td>
- </tr>
- #end
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
-</table>
-
-#if ( $dimension == "period" )
- #parse( "dhis-web-reporting/addChartOrgunitOrPeriodForm.vm" )
-#elseif( $dimension == "period_dataElement" )
- #parse( "dhis-web-reporting/addChartDataElementOrgunitOrPeriodForm.vm" )
-#elseif ( $dimension == "organisationUnit" )
- #parse( "dhis-web-reporting/addChartOrgunitOrPeriodForm.vm" )
-#elseif ( $dimension == "organisationUnit_dataElement" )
- #parse( "dhis-web-reporting/addChartDataElementOrgunitOrPeriodForm.vm" )
-#elseif ( $dimension == "indicator" )
- #parse( "dhis-web-reporting/addChartIndicatorModeForm.vm" )
-#elseif ( $dimension == "dataElement_period" )
- #parse( "dhis-web-reporting/addChartDataElementModeForm.vm" )
-#end
-
-<table>
- <!-- Submit -->
- <tr>
- <td colspan="2">
- <input type="button" value="$i18n.getString( 'save' )" onclick="saveChart('$dimension')" style="width:120px" />
- <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayViewChartForm.action'" style="width:120px" />
- </td>
- </tr>
-</table>
-
-</form>
-
-<span id="message"></span>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm 2011-12-22 13:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-<table>
-<!-- Relative periods -->
-
-<tr>
- <th colspan="2">$i18n.getString( "relative_periods" )</th>
-</tr>
-<tr>
- <td>
- <label for="lastMonth">$i18n.getString( "last_month" )</label>
- <input type="checkbox" id="lastMonth" name="lastMonth" value="true"#if( $chart.relatives.isReportingMonth() ) checked#end>
- <label for="lastQuarter">$i18n.getString( "last_quarter" )</label>
- <input type="checkbox" id="lastQuarter" name="lastQuarter" value="true""#if( $chart.relatives.isReportingQuarter() ) checked#end>
- <label for="lastSixMonth">$i18n.getString( "last_six_month" )</label>
- <input type="checkbox" id="lastSixMonth" name="lastSixMonth" value="true"#if( $chart.relatives.isLastSixMonth() ) checked#end>
- <label for="thisYear">$i18n.getString( "this_year" )</label>
- <input type="checkbox" id="thisYear" name="thisYear" value="true"#if( $chart.relatives.isThisYear() ) checked#end><br>
-
- <label for="last12Months">$i18n.getString( "last_12_months" )</label>
- <input type="checkbox" id="last12Months" name="last12Months" value="true""#if( $chart.relatives.isLast12Months() ) checked#end>
- <label for="last4Quarters">$i18n.getString( "last_4_quarters" )</label>
- <input type="checkbox" id="last4Quarters" name="last4Quarters" value="true"#if( $chart.relatives.isLast4Quarters() ) checked#end>
- <label for="last2SixMonths">$i18n.getString( "last_2_sixmonths" )</label>
- <input type="checkbox" id="last2SixMonths" name="last2SixMonths" value="true"#if( $chart.relatives.isLast2SixMonths() ) checked#end>
- <label for="last5Years">$i18n.getString( "last_5_years" )</label>
- <input type="checkbox" id="last5Years" name="last5Years" value="true"#if( $chart.relatives.isLast5Years() ) checked#end>
- </td>
-</tr>
-<tr>
- <td style="height:15px"></td>
-</tr>
-<!-- Indicators -->
- <tr>
- <th colspan="2">$i18n.getString( "value_x_available_indicators" )</th>
- </tr>
- <tr>
- <td colspan="2">
- <select id="indicatorGroupId" name="indicatorGroupId" style="min-width:600px" onchange="getIndicators()">
- <option value="$ALL">[ $i18n.getString( "select_indicatorgroup_all" ) ]</option>
- #foreach ( $group in $indicatorGroups )
- <option value="$group.id">$group.name</option>
- #end
- </select>
- </td>
- <td></td>
- </tr>
- <tr>
- <td colspan="2">
- <select multiple size="6" id="availableIndicators" name="availableIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
- #foreach ( $indicator in $availableIndicators )
- <option value="$indicator.id">$indicator.name</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )" />
- <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )" />
- <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )" />
- <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )" />
- </td>
- </tr>
-
- <tr>
- <th colspan="2">$i18n.getString( "value_x_selected_indicators" )</th>
- </tr>
-
- <tr>
- <td>
- <select multiple size="6" id="selectedIndicators" name="selectedIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
- #foreach( $indicator in $selectedIndicators )
- <option value="$indicator.id">$indicator.name</option>
- #end
- </select>
- </td>
- <td>
- <a href="#" onclick="moveUpSelectedOption( 'selectedIndicators' )"><img src="../images/move_up.png" border="0" alt=""></a><br><br>
- <a href="#" onclick="moveDownSelectedOption( 'selectedIndicators' )"><img src="../images/move_down.png" border="0" alt=""></a>
- </td>
- </tr>
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
-
-<!-- OrganisationUnit -->
-
-<tr>
- <th colspan="2">$i18n.getString( "filter_available_organisationunits" ) - <a href="javascript:clearListById( 'selectedOrganisationUnits' )">$i18n.getString( 'clear' )</a></th>
-</tr>
-
-<tr>
- <td colspan="2">
- <select id="organisationUnitLevel" name="organisationUnitLevel" style="min-width:600px" onchange="getOrganisationUnitsToSelected()">
- <option value="$ALL">[ $i18n.getString( "select_organisationunit_level_all" ) ]</option>
- #foreach ( $level in $levels )
- <option value="$level.level">$encoder.htmlEncode( $level.name )</option>
- #end
- </select>
- </td>
-</tr>
-<tr>
- <td colspan="2">
- <select id="selectedOrganisationUnits" name="selectedOrganisationUnits" style="min-width:600px">
- #foreach ( $unit in $selectedOrganisationUnits )
- <option value="$unit.id">$unit.name</option>
- #end
- </select>
- </td>
-</tr>
-
-</table>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm 2011-12-22 13:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm 1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-
-<!-- OrganisationUnit -->
-
-<tr>
- <th colspan="2">$i18n.getString( "category_x_available_organisationunits" )</th>
-</tr>
-<tr>
- <td colspan="2">
- <select id="organisationUnitLevel" name="organisationUnitLevel" style="min-width:600px" onchange="getOrganisationUnits()">
- <option value="0">[ $i18n.getString( "select_organisationunit_level_all" ) ]</option>
- #foreach ( $level in $levels )
- #if( $velocityCount == 1 )
- <option value="$level.level" selected="selected">$encoder.htmlEncode( $level.name )</option>
- #else
- <option value="$level.level">$encoder.htmlEncode( $level.name )</option>
- #end
- #end
- </select>
- </td>
-</tr>
-<tr>
- <td colspan="2">
- <select multiple size="6" id="availableOrganisationUnits" name="availableOrganisationUnits" style="min-width:600px" ondblclick="moveSelectedById( 'availableOrganisationUnits', 'selectedOrganisationUnits' )">
- #foreach ( $unit in $availableOrganisationUnits )
- <option value="$unit.id">$unit.name</option>
- #end
- </select>
- </td>
-</tr>
-<tr>
- <td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableOrganisationUnits', 'selectedOrganisationUnits' )" />
- <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableOrganisationUnits', 'selectedOrganisationUnits' )" />
- <input type="button" value="$i18n.getString( 'add_children' )" title="$i18n.getString( 'add_children' )" style="width:120px" onclick="getOrganisationUnitChildren()" />
- <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )" />
- <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )" />
- </td>
-</tr>
-
-<tr>
- <th colspan="2">$i18n.getString( "category_x_selected_organisationunits" )</th>
-</tr>
-
-<tr>
- <td>
- <select size="6" id="selectedOrganisationUnits" name="selectedOrganisationUnits" style="min-width:600px" multiple ondblclick="moveSelectedById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )">
- #foreach ( $unit in $selectedOrganisationUnits )
- <option value="$unit.id">$unit.name</option>
- #end
- </select>
- </td>
- <td>
- <img src="../images/move_up.png" style="cursor: pointer;" border="0" alt="" onclick="moveUpSelectedOption( 'selectedOrganisationUnits' )" /><br/><br/>
- <img src="../images/move_down.png" style="cursor: pointer;" border="0" alt="" onclick="moveDownSelectedOption( 'selectedOrganisationUnits' )" />
- </td>
-</tr>
-<tr>
- <td colspan="2" style="height:15px"></td>
-</tr>
-
-<!-- Period -->
-
-<tr>
- <th colspan="2">$i18n.getString( "filter_available_periods" )</th>
-</tr>
-<tr>
- <td>
- <label for="lastMonth">$i18n.getString( "last_month" )</label>
- <input type="checkbox" id="lastMonth" name="lastMonth" value="true"#if( $chart.relatives.isReportingMonth() ) checked#end>
- <label for="lastQuarter">$i18n.getString( "last_quarter" )</label>
- <input type="checkbox" id="lastQuarter" name="lastQuarter" value="true""#if( $chart.relatives.isReportingQuarter() ) checked#end>
- <label for="lastSixMonth">$i18n.getString( "last_six_month" )</label>
- <input type="checkbox" id="lastSixMonth" name="lastSixMonth" value="true"#if( $chart.relatives.isLastSixMonth() ) checked#end>
- <label for="thisYear">$i18n.getString( "this_year" )</label>
- <input type="checkbox" id="thisYear" name="thisYear" value="true"#if( $chart.relatives.isThisYear() ) checked#end>
- </td>
-</tr>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm 2011-06-23 14:27:06 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm 1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<table>
-
- <col>
- <col width="16">
-
- <!-- Indicators -->
- <tr>
- <th colspan="2">$i18n.getString( "value_y_available_indicators" )</th>
- </tr>
- <tr>
- <td colspan="2">
- <select id="indicatorGroupId" name="indicatorGroupId" style="min-width:600px" onchange="getIndicators()">
- <option value="$ALL">[ $i18n.getString( "select_indicatorgroup_all" ) ]</option>
- #foreach ( $group in $indicatorGroups )
- <option value="$group.id">$group.name</option>
- #end
- </select>
- </td>
- <td></td>
- </tr>
- <tr>
- <td colspan="2">
- <select multiple size="6" id="availableIndicators" name="availableIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
- #foreach ( $indicator in $availableIndicators )
- <option value="$indicator.id">$indicator.name</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )" />
- <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )" />
- <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )" />
- <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )" />
- </td>
- </tr>
- <tr>
- <th colspan="2">$i18n.getString( "value_y_selected_indicators" )</th>
- </tr>
- <tr>
- <td>
- <select multiple size="6" id="selectedIndicators" name="selectedIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
- #foreach( $indicator in $selectedIndicators )
- <option value="$indicator.id">$indicator.name</option>
- #end
- </select>
- </td>
- <td>
- <img src="../images/move_up.png" style="cursor: pointer;" border="0" alt="" onclick="moveUpSelectedOption( 'selectedIndicators' )" /><br/><br/>
- <img src="../images/move_down.png" style="cursor: pointer;" border="0" alt="" onclick="moveDownSelectedOption( 'selectedIndicators' )" />
- </td>
- </tr>
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
-
- <!-- Category -->
-
- #if ( $dimension == "period" )
- #parse( "dhis-web-reporting/addChartPeriodModeForm.vm" )
- #else
- #parse( "dhis-web-reporting/addChartOrganisationUnitModeForm.vm" )
- #end
-
- <tr>
- <td colspan="2" style="height:15px"></td>
- </tr>
-
-</table>
-
-</form>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm 2011-12-22 13:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm 1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-<table>
-<!-- Relative periods -->
-
-<tr>
- <th colspan="2">$i18n.getString( "relative_periods" )</th>
-</tr>
-<tr>
- <td>
- <label for="lastMonth">$i18n.getString( "last_month" )</label>
- <input type="checkbox" id="lastMonth" name="lastMonth" value="true"#if( $chart.relatives.isReportingMonth() ) checked#end>
- <label for="lastQuarter">$i18n.getString( "last_quarter" )</label>
- <input type="checkbox" id="lastQuarter" name="lastQuarter" value="true""#if( $chart.relatives.isReportingQuarter() ) checked#end>
- <label for="lastSixMonth">$i18n.getString( "last_six_month" )</label>
- <input type="checkbox" id="lastSixMonth" name="lastSixMonth" value="true"#if( $chart.relatives.isLastSixMonth() ) checked#end>
- <label for="thisYear">$i18n.getString( "this_year" )</label>
- <input type="checkbox" id="thisYear" name="thisYear" value="true"#if( $chart.relatives.isThisYear() ) checked#end><br>
-
- <label for="last12Months">$i18n.getString( "last_12_months" )</label>
- <input type="checkbox" id="last12Months" name="last12Months" value="true""#if( $chart.relatives.isLast12Months() ) checked#end>
- <label for="last4Quarters">$i18n.getString( "last_4_quarters" )</label>
- <input type="checkbox" id="last4Quarters" name="last4Quarters" value="true"#if( $chart.relatives.isLast4Quarters() ) checked#end>
- <label for="last2SixMonths">$i18n.getString( "last_2_sixmonths" )</label>
- <input type="checkbox" id="last2SixMonths" name="last2SixMonths" value="true"#if( $chart.relatives.isLast2SixMonths() ) checked#end>
- <label for="last5Years">$i18n.getString( "last_5_years" )</label>
- <input type="checkbox" id="last5Years" name="last5Years" value="true"#if( $chart.relatives.isLast5Years() ) checked#end>
- </td>
-</tr>
-<tr>
- <td style="height:15px"></td>
-</tr>
-
-<!-- OrganisationUnit -->
-
-<tr>
- <th colspan="2">$i18n.getString( "filter_available_organisationunits" ) - <a href="javascript:clearListById( 'selectedOrganisationUnits' )">$i18n.getString( 'clear' )</th>
-</tr>
-<tr>
- <td colspan="2">
- <select id="organisationUnitLevel" name="organisationUnitLevel" style="min-width:600px" onchange="getOrganisationUnitsToSelected()">
- <option value="$ALL">[ $i18n.getString( "select_organisationunit_level_all" ) ]</option>
- #foreach ( $level in $levels )
- <option value="$level.level">$encoder.htmlEncode( $level.name )</option>
- #end
- </select>
- </td>
-</tr>
-<tr>
- <td colspan="2">
- <select id="selectedOrganisationUnits" name="selectedOrganisationUnits" style="min-width:600px">
- #foreach ( $unit in $selectedOrganisationUnits )
- <option value="$unit.id">$unit.name</option>
- #end
- </select>
- </td>
-</tr>
-<table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm 2011-12-09 20:44:59 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm 2011-12-22 21:17:05 +0000
@@ -15,6 +15,5 @@
#introListImgItem( "displayOrgUnitDistribution.action" "orgunit_distribution_report" "distribution" )
#introListImgItem( "tallySheetGenerator.action" "tally_sheet_generator" "tallysheetgenerator" )
#introListImgItem( "displayManageTableForm.action" "report_table" "reporttable" )
- #introListImgItem( "displayViewChartForm.action" "chart" "chart" )
#introListImgItem( "displayPivotTableForm.action" "pivot_table" "pivottable" )
</ul>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addChartGroupForm.js 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-jQuery( document ).ready( function()
-{
- validation2( 'addChartGroupForm', function( form )
- {
- form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembers' );
- },
- 'rules' : getValidationRules( "chartGroup" )
- } );
-
- checkValueIsExist( "name", "validateChartGroup.action" );
-
- var nameField = document.getElementById( 'name' );
- nameField.select();
- nameField.focus();
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportGroupForm.js 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-jQuery( document ).ready( function()
-{
- validation2( 'addReportGroupForm', function( form )
- {
- form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembers' );
- },
- 'rules' : getValidationRules( "reportGroup" )
- } );
-
- checkValueIsExist( "name", "validateReportGroup.action" );
-
- var nameField = document.getElementById( 'name' );
- nameField.select();
- nameField.focus();
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/addReportTableGroupForm.js 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-jQuery( document ).ready( function()
-{
- validation2( 'addReportTableGroupForm', function( form )
- {
- form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembers' );
- },
- 'rules' : getValidationRules( "reportTableGroup" )
- } );
-
- checkValueIsExist( "name", "validateReportTableGroup.action" );
-
- var nameField = document.getElementById( 'name' );
- nameField.select();
- nameField.focus();
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js 2011-12-22 13:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js 1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-// -----------------------------------------------------------------------------
-// View chart
-// -----------------------------------------------------------------------------
-
-function viewChart( url )
-{
- $( '#chartImage' ).attr( 'src', url );
- $( '#chartView' ).dialog( {
- autoOpen : true,
- modal : true,
- height : 565,
- width : 745,
- resizable : false,
- title : 'Viewing Chart'
- } );
-}
-
-// -----------------------------------------------------------------------------
-// Remove chart
-// -----------------------------------------------------------------------------
-
-function removeChart( chartId, chartTitle )
-{
- removeItem( chartId, chartTitle, i18n_confirm_delete, "removeChart.action" );
-}
-
-// -----------------------------------------------------------------------------
-// Show chart details
-// -----------------------------------------------------------------------------
-
-function showChartDetails( chartId )
-{
- jQuery.post( 'getChart.action', {
- id : chartId
- }, function( json )
- {
- var indicators = parseInt( json.chart.indicators );
- var dataElements = parseInt( json.chart.dataElements );
- var dataSets = parseInt( json.chart.dataSets );
-
- setInnerHTML( 'nameField', json.chart.name );
- setInnerHTML( 'dimensionField', json.chart.dimension );
-
- if ( isIndicatorChart( json.chart.dimension ) )
- {
- $( '#dataElementsView' ).hide();
- $( '#dataSetsView' ).hide();
- $( '#indicatorsView' ).show();
-
- $( '#indicatorsField' ).text( indicators );
- }
- else if ( isDataElementChart( json.chart.dimension ) )
- {
- $( '#indicatorsView' ).hide();
- $( '#dataSetsView' ).hide();
- $( '#dataElementsView' ).show();
-
- $( '#dataElementsField' ).text( dataElements );
- }
-
- setInnerHTML( 'periodsField', json.chart.periods );
- setInnerHTML( 'organisationUnitsField', json.chart.organisationUnits );
-
- showDetails();
- } );
-}
-
-// -----------------------------------------------------------------------------
-// Validate and save
-// -----------------------------------------------------------------------------
-
-function saveChart( dimension )
-{
- if ( validateTargetLine() && validateCollections( dimension ) )
- {
- $.postJSON( "validateChart.action", {
- id : getFieldValue( "id" ),
- name : getFieldValue( "name" )
- }, function( json )
- {
- if ( json.response == "input" )
- {
- setMessage( json.message );
- return false;
- }
- else if ( json.response == "success" )
- {
- if ( $( "#selectedIndicators" ).attr( 'multiple' ) !== undefined )
- {
- $( "#selectedIndicators" ).children().attr( "selected", true );
- }
-
- if ( $( "#selectedDataElements" ).attr( 'multiple' ) !== undefined )
- {
- $( "#selectedDataElements" ).children().attr( "selected", true );
- }
-
- if ( $( "#selectedDataSets" ).attr( 'multiple' ) !== undefined )
- {
- $( "#selectedDataSets" ).children().attr( "selected", true );
- }
-
- if ( $( "#selectedOrganisationUnits" ).attr( 'multiple' ) !== undefined )
- {
- $( "#selectedOrganisationUnits" ).children().attr( "selected", true );
- }
-
- $( "#chartForm" ).submit();
- }
- } );
- }
-}
-
-function selectedChartType()
-{
- return $( "#type" ).val();
-}
-
-function selectedIndicatorsCount()
-{
- return $( "#selectedIndicators option" ).length;
-}
-
-function validateTargetLine()
-{
- var targetLine = $( "#targetLine" ).attr( "checked" );
-
- if ( targetLine )
- {
- var targetLineValue = $( "#targetLineValue" ).val();
-
- if ( targetLineValue.length == 0 )
- {
- setMessage( i18n_target_line_value_must_be_provided );
-
- return false;
- }
-
- if ( isNaN( targetLineValue ) )
- {
- setMessage( i18n_target_line_value_must_be_number );
-
- return false;
- }
- }
-
- return true;
-}
-
-function isIndicatorChart( dimension )
-{
- if ( dimension == "period" || dimension == "organisationUnit" || dimension == "indicator" )
- {
- return true;
- }
-
- return false;
-}
-
-function isDataElementChart( dimension )
-{
- if ( dimension == "period_dataElement" || dimension == "organisationUnit_dataElement"
- || dimension == "dataElement_period" )
- {
- return true;
- }
-
- return false;
-}
-
-function validateCollections( dimension )
-{
- if ( isIndicatorChart( dimension ) && !hasElements( "selectedIndicators" ) )
- {
- setMessage( i18n_must_select_at_least_one_indicator );
-
- return false;
- }
-
- if ( isDataElementChart( dimension ) && !hasElements( "selectedDataElements" ) )
- {
- setMessage( i18n_must_select_at_least_one_dataelement );
-
- return false;
- }
-
- if ( !hasElements( "selectedOrganisationUnits" ) && !isChecked( "userOrganisationUnit" ) )
- {
- setMessage( i18n_must_select_at_least_one_unit );
-
- return false;
- }
-
- if ( !relativePeriodsChecked() )
- {
- setMessage( i18n_must_select_at_least_one_period );
-
- return false;
- }
-
- return true;
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chartGroup.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chartGroup.js 2011-09-29 06:40:09 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chartGroup.js 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-function showChartGroupDetails( chartGroupId )
-{
- jQuery.post( 'getChartGroup.action', { id: chartGroupId }, function ( json ) {
- setInnerHTML( 'nameField', json.chartGroup.name );
- setInnerHTML( 'memberCountField', json.chartGroup.memberCount );
-
- showDetails();
- });
-}
-
-// -----------------------------------------------------------------------------
-// Remove chart group
-// -----------------------------------------------------------------------------
-
-function removeChartGroup( chartGroupId, chartGroupName )
-{
- removeItem( chartGroupId, chartGroupName, i18n_confirm_delete, 'removeChartGroup.action' );
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportGroup.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportGroup.js 2011-09-29 06:40:09 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportGroup.js 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-function showReportGroupDetails( reportGroupId )
-{
- jQuery.post( 'getReportGroup.action', { id: reportGroupId }, function ( json ) {
- setInnerHTML( 'nameField', json.reportGroup.name );
- setInnerHTML( 'memberCountField', json.reportGroup.memberCount );
-
- showDetails();
- });
-}
-
-// -----------------------------------------------------------------------------
-// Remove report group
-// -----------------------------------------------------------------------------
-
-function removeReportGroup( reportGroupId, reportGroupName )
-{
- removeItem( reportGroupId, reportGroupName, i18n_confirm_delete, 'removeReportGroup.action' );
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportTableGroup.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportTableGroup.js 2011-09-29 06:40:09 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/reportTableGroup.js 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-function showReportTableGroupDetails( reportTableGroupId )
-{
- jQuery.post( 'getReportTableGroup.action', { id: reportTableGroupId },
- function ( json ) {
- setInnerHTML( 'nameField', json.reportTableGroup.name );
- setInnerHTML( 'memberCountField', json.reportTableGroup.memberCount );
-
- showDetails();
- });
-}
-
-// -----------------------------------------------------------------------------
-// Remove report table group
-// -----------------------------------------------------------------------------
-
-function removeReportTableGroup( reportTableGroupId, reportTableGroupName )
-{
- removeItem( reportTableGroupId, reportTableGroupName, i18n_confirm_delete, 'removeReportTableGroup.action' );
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateChartGroupForm.js 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-jQuery( document ).ready( function()
-{
- validation2( 'updateChartGroupForm', function( form )
- {
- form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembers' );
- },
- 'rules' : getValidationRules( "chartGroup" )
- } );
-
- checkValueIsExist( "name", "validateChartGroup.action", {
- id : getFieldValue( "id" )
- } );
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportGroupForm.js 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-jQuery( document ).ready( function()
-{
- validation2( 'updateReportGroupForm', function( form )
- {
- form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembers' );
- },
- 'rules' : getValidationRules( "reportGroup" )
- } );
-
- checkValueIsExist( "name", "validateReportGroup.action", {
- id : getFieldValue( "id" )
- } );
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/updateReportTableGroupForm.js 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-jQuery( document ).ready( function()
-{
- validation2( 'updateReportTableGroupForm', function( form )
- {
- form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'memberValidator', 'groupMembers' );
- },
- 'rules' : getValidationRules( "reportTableGroup" )
- } );
-
- checkValueIsExist( "name", "validateReportTableGroup.action", {
- id : getFieldValue( "id" )
- } );
-
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonChart.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonChart.vm 2011-11-21 12:44:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonChart.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-{ "chart":
- {
- "id": "$!{chart.id}",
- "name": "$!encoder.jsonEncode( ${chart.name} )",
- "dimension": "$!encoder.jsonEncode( ${chart.dimension} )",
- "indicators": "$!{chart.indicators.size()}",
- "dataElements": "$!{chart.dataElements.size()}",
- "dataSets": "$!{chart.dataSets.size()}",
- "periods": "$!{chart.periods.size()}",
- "organisationUnits": "$!{chart.organisationUnits.size()}"
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonCharts.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonCharts.vm 2011-11-12 18:43:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonCharts.vm 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#set( $size = $charts.size() )
-{ "charts": [
-#foreach( $chart in $charts )
-#set( $groups = $chart.groups )
- {
- "id": $!{chart.id},
- "name": "$!encoder.jsonEncode( ${chart.name} )",
- "dimension": "$!encoder.jsonEncode( ${chart.dimension} )",
- "indicators": "$!encoder.jsonEncode( ${chart.indicators.size()} )",
- "dataElements": "$!encoder.jsonEncode( ${chart.dataElements.size()} )",
- "periods": "${chart.periods.size()}",
- "organisationUnits": $!{chart.organisationUnits.size()},
- "groups": [ #foreach( $group in $groups )${group.id}#if( $velocityCount < $groups.size() ),#end#end ]
- }#if( $velocityCount < $size ),#end
-#end
-]
-#if( $usePaging ),
- "paging":#parse( "/dhis-web-commons/ajax/jsonPaging.vm" )
-#end
-}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm 2011-12-09 20:44:59 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm 2011-12-22 21:17:05 +0000
@@ -10,11 +10,6 @@
<li><a href="displayManageTableForm.action">$i18n.getString( "report_table" ) </a></li>
</ul>
-<h2>$i18n.getString( "chart" ) </h2>
-<ul>
- <li><a href="displayViewChartForm.action">$i18n.getString( "chart" ) </a></li>
-</ul>
-
<h2>$i18n.getString( "pivot_table" ) </h2>
<ul>
<li><a href="displayPivotTableForm.action">$i18n.getString( "pivot_table" ) </a></li>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm 2011-12-21 22:11:29 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm 1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-<script type="text/javascript">
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
-
- jQuery('#add_chart').bind('click', function() {
- var optionValue = jQuery('#chart_type').find(":selected").attr('value');
- window.location.href = 'displayAddChartForm.action?dimension=' + optionValue;
- });
- });
-
- var i18n_please_wait = '$encoder.jsEscape( $i18n.getString( "please_wait" ), "'")';
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_chart" ), "'")';
- var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ), "'")';
- var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ), "'")';
-</script>
-
-<h3>$i18n.getString( "chart" )</h3>
-
-<table class="mainPageTable">
- <tr>
- <td style="vertical-align:top">
- <table width="100%">
- <tr>
- <td>#filterDiv( "displayViewChartForm" )</td>
- <td align="right" style="padding-top: 16px;">
- <select id="chart_type">
- <option value='indicator'>$i18n.getString( 'indicator_by_period_chart' )</option>
- <option value='organisationUnit'>$i18n.getString( 'indicator_by_organisation_unit_chart' )</option>
- <option value='dataElement_period'>$i18n.getString( 'dataelement_by_period_chart' )</option>
- <option value='organisationUnit_dataElement'>$i18n.getString( 'dataelement_by_organisation_unit_chart' )</option>
- <option value='period'>$i18n.getString( 'period_by_indicator_chart' )</option>
- <option value='period_dataElement'>$i18n.getString( 'period_by_dataelement_chart' )</option>
- </select>
- <button type="button" id="add_chart">$i18n.getString( 'add' )</button>
- </td>
- </tr>
- </table>
- <table class="listTable" id="listTable">
- <col>
- <col width="120px">
- <thead>
- <tr>
- <th>$i18n.getString( "title" )</th>
- <th class="{sorter: false}">$i18n.getString( "operations" )</th>
- </tr>
- </thead>
- <tbody id="list">
- #foreach ( $chart in $charts )
- <tr id="tr${chart.id}">
- <td onclick="showChartDetails( $chart.id )">$encoder.htmlEncode( $chart.name )</td>
- <td style="text-align:right">
- <a href="javascript:viewChart( 'viewChart.action?id=$chart.id' )" title="$i18n.getString( "view_chart" )"><img src="../images/start_process.png" alt="$i18n.getString( "view_chart" )"></a>
- <a href="displayAddChartForm.action?id=$chart.id&dimension=$chart.dimension" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
- #if( $auth.hasAccess( "dhis-web-reporting", "removeChart" ) )
- <a href="javascript:removeChart( $chart.id, '$encoder.jsEncode( $chart.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
- #else <img src="../images/delete-denied.png"> #end
- <a href="javascript:showChartDetails( $chart.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
- </td>
- </tr>
- #end
- </tbody>
- </table>
- <p></p>
- #parse( "/dhis-web-commons/paging/paging.vm" )
- </td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
- <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
- </div>
- <p><label>$i18n.getString( "title" ):</label><br><span id="nameField"></span></p>
- <p><label>$i18n.getString( "dimension" ):</label><br><span id="dimensionField"></span></p>
- <p id='indicatorsView'><label>$i18n.getString( "indicators" ):</label><br><span id="indicatorsField"></span></p>
- <p id='dataElementsView'><label>$i18n.getString( "dataelements" ):</label><br><span id="dataElementsField"></span></p>
- <p id='dataSetsView'><label>$i18n.getString( "datasets" ):</label><br><span id="dataSetsField"></span></p>
- <p><label>$i18n.getString( "periods" ):</label><br><span id="periodsField"></span></p>
- <p><label>$i18n.getString( "organisation_units" ):</label><br><span id="organisationUnitsField"></span></p>
- </div>
-
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
- <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
- </div>
- <p><span id="warningField"></span></p>
- </div>
- </td>
- </tr>
-</table>
-
-<div id="chartView" style="display: none; padding: 0; margin: 0;'">
- <img id="chartImage" src="" style="padding: 10px;"></img>
-</div>
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm 2011-07-29 03:29:05 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewGroups.vm 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<script type="text/javascript">
-jQuery(function() {
- /* make sure that the leftBar is always visible when entering page. */
- leftBar.showAnimated();
-});
-</script>
-
-<h3>$i18n.getString( "groups" )</h3>
-
-<ul id="introList">
- #introListImgItem( "chartGroup.action" "chart_groups" "groups")
- #introListImgItem( "reportGroup.action" "report_groups" "groups")
- #introListImgItem( "reportTableGroup.action" "report_table_groups" "groups" )
-</ul>
\ No newline at end of file
