dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43370
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21999: Removed Scheduling&Aggregation from Program
------------------------------------------------------------
revno: 21999
committer: Zubair Asghar<zubair@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-02-18 13:30:57 +0100
message:
Removed Scheduling&Aggregation from Program
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/AddCaseAggregationConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggConditionDescriptionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggPSDataElementsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAllCaseAggregationConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetCaseAggregationConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetDataElementsByDataSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetOptionsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetParamsByProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/RemoveCaseAggregationConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/TestCaseAggregationConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/UpdateCaseAggregationConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ValidateCaseAggregationConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleCaseAggregateConditionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregationList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggDataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggerateDataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseCaseAggDescription.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/scheduleSendMessage.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewScheduledCaseAggTasks.vm
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/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 directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/AddCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/AddCaseAggregationConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/AddCaseAggregationConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.apache.commons.lang3.StringUtils;
-
-import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version AddCaseAggregationConditionAction.java Nov 18, 2010 10:39:42 AM
- */
-public class AddCaseAggregationConditionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- private DataElementService dataElementService;
-
- private DataElementCategoryService dataElementCategoryService;
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private String operator;
-
- private String aggregationCondition;
-
- private String name;
-
- private String aggregationDataElementId;
-
- private Integer deSumId;
-
- private Integer dataSetId;
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- public Integer getDataSetId()
- {
- return dataSetId;
- }
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
- {
- this.dataElementCategoryService = dataElementCategoryService;
- }
-
- public void setAggregationDataElementId( String aggregationDataElementId )
- {
- this.aggregationDataElementId = aggregationDataElementId;
- }
-
- public void setOperator( String operator )
- {
- this.operator = operator;
- }
-
- public void setAggregationCondition( String aggregationCondition )
- {
- this.aggregationCondition = aggregationCondition;
- }
-
- public void setDeSumId( Integer deSumId )
- {
- this.deSumId = deSumId;
- }
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- String[] ids = aggregationDataElementId.split( "\\." );
-
- DataElement aggregationDataElement = dataElementService.getDataElement( Integer.parseInt( ids[0] ) );
-
- DataElementCategoryOptionCombo optionCombo = dataElementCategoryService
- .getDataElementCategoryOptionCombo( Integer.parseInt( ids[1] ) );
-
- CaseAggregationCondition condition = new CaseAggregationCondition();
-
- condition.setName( StringUtils.trimToNull( name ) );
- condition.setAggregationExpression( aggregationCondition );
- condition.setOperator( operator );
- condition.setAggregationDataElement( aggregationDataElement );
- condition.setOptionCombo( optionCombo );
-
- if ( deSumId != null )
- {
- DataElement deSum = dataElementService.getDataElement( deSumId );
- condition.setDeSum( deSum );
- }
- aggregationConditionService.addCaseAggregationCondition( condition );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggConditionDescriptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggConditionDescriptionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggConditionDescriptionAction.java 1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.caseaggregation.CaseAggregationConditionService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * @version $ID : GetAggConditionDescriptionAction.java Jan 11, 2011 9:14:19 PM
- * $
- */
-public class GetAggConditionDescriptionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- // -------------------------------------------------------------------------
- // Input && Output
- // -------------------------------------------------------------------------
-
- private String condition;
-
- private String description;
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public void setCondition( String condition )
- {
- this.condition = condition;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- description = aggregationConditionService.getConditionDescription( condition );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggPSDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggPSDataElementsAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggPSDataElementsAction.java 1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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 com.opensymphony.xwork2.Action;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.program.ProgramStage;
-import org.hisp.dhis.program.ProgramStageService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Chau Thu Tran
- * @version $Id: GetAggPSDataElementsAction.java Dec 22, 2011 9:24:49 AM $
- */
-public class GetAggPSDataElementsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- @Autowired
- private ProgramStageService programStageService;
-
- // -------------------------------------------------------------------------
- // Input & Output
- // -------------------------------------------------------------------------
-
- private Integer psId;
-
- public void setPsId( Integer psId )
- {
- this.psId = psId;
- }
-
- public Integer getPsId()
- {
- return psId;
- }
-
- private List<DataElement> dataElementList;
-
- public List<DataElement> getDataElementList()
- {
- return dataElementList;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- ProgramStage stage = programStageService.getProgramStage( psId );
-
- dataElementList = stage.getAllDataElements();
-
- if ( dataElementList != null && !dataElementList.isEmpty() )
- {
- Iterator<DataElement> deIterator = dataElementList.iterator();
-
- while ( deIterator.hasNext() )
- {
- DataElement de = deIterator.next();
-
- if ( !de.getValueType().isNumeric() )
- {
- deIterator.remove();
- }
- }
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAllCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAllCaseAggregationConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAllCaseAggregationConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.paging.ActionPagingSupport;
-
-/**
- * @author Chau Thu Tran
- *
- * @version GetAllCaseAggregationConditionAction.java Nov 18, 2010 10:42:01 AM
- */
-public class GetAllCaseAggregationConditionAction
- extends ActionPagingSupport<CaseAggregationCondition>
-{
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- public DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- private Integer dataSetId;
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public Integer getDataSetId()
- {
- return dataSetId;
- }
-
- private String key;
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- private Collection<CaseAggregationCondition> aggregationConditions;
-
- public Collection<CaseAggregationCondition> getAggregationConditions()
- {
- return aggregationConditions;
- }
-
- private List<DataSet> dataSets;
-
- public List<DataSet> getDataSets()
- {
- return dataSets;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- Collection<DataSet> _datasets = new HashSet<>();
- aggregationConditions = aggregationConditionService.getAllCaseAggregationCondition();
-
- for ( CaseAggregationCondition aggCondition : aggregationConditions )
- {
- DataElement dataElement = aggCondition.getAggregationDataElement();
-
- _datasets.addAll( dataElement.getDataSets() );
- }
-
- dataSets = new ArrayList<>( _datasets );
- Collections.sort( dataSets, IdentifiableObjectNameComparator.INSTANCE );
-
- Collection<DataElement> dataElements = ( dataSetId == null ) ? null : dataSetService.getDataSet( dataSetId ).getDataElements();
- this.paging = createPaging( aggregationConditionService.countCaseAggregationCondition( dataElements, key ) );
- aggregationConditions = aggregationConditionService.getCaseAggregationConditions( dataElements, key,
- paging.getStartPos(), paging.getPageSize() );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetCaseAggregationConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetCaseAggregationConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.caseaggregation.CaseAggregationCondition;
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version GetCaseAggregationConditionAction.java Nov 18, 2010 10:42:01 AM
- */
-public class GetCaseAggregationConditionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- // -------------------------------------------------------------------------
- // Input && Output
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- private CaseAggregationCondition caseAggregation;
-
- private String description;
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public CaseAggregationCondition getCaseAggregation()
- {
- return caseAggregation;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- caseAggregation = aggregationConditionService.getCaseAggregationCondition( id );
-
- description = aggregationConditionService.getConditionDescription( caseAggregation.getAggregationExpression() );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetDataElementsByDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetDataElementsByDataSetAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetDataElementsByDataSetAction.java 1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.Collections;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-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 com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version GetDataElementsByDataSetAction.java 9:43:55 PM Jul 6, 2012 $
- */
-public class GetDataElementsByDataSetAction
- implements Action
-{
- private static Integer MAX_DATAELEMENTS_DISPLAYED = 30;
-
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String query;
-
- public void setQuery( String query )
- {
- this.query = query;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private List<DataElement> dataElements;
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- DataSet dataSet = dataSetService.getDataSet( id );
-
- query = StringUtils.trimToNull( query );
-
- dataElements = dataElementService.getDataElements( dataSet, query, MAX_DATAELEMENTS_DISPLAYED );
-
- Collections.sort( dataElements, IdentifiableObjectNameComparator.INSTANCE );
-
- return SUCCESS;
- }
-
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetOptionsAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetOptionsAction.java 1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.struts2.ServletActionContext;
-import org.hisp.dhis.option.Option;
-import org.hisp.dhis.option.OptionService;
-import org.hisp.dhis.option.OptionSet;
-import org.hisp.dhis.util.ContextUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version $ GetOptionsAction.java Aug 9, 2014 10:31:19 PM $
- */
-public class GetOptionsAction
- implements Action
-{
- private static Integer MAX_OPTIONS_DISPLAYED = 30;
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private OptionService optionService;
-
- @Autowired
- public void setOptionService( OptionService optionService )
- {
- this.optionService = optionService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private String id;
-
- public void setId( String id )
- {
- this.id = id;
- }
-
- private String query;
-
- public void setQuery( String query )
- {
- this.query = query;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private List<Option> options;
-
- public List<Option> getOptions()
- {
- return options;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- query = StringUtils.trimToNull( query );
-
- OptionSet optionSet = optionService.getOptionSet( id );
-
- boolean isNotModified = (query == null && ContextUtils.isNotModified( ServletActionContext.getRequest(),
- ServletActionContext.getResponse(), optionSet ));
-
- if ( !isNotModified )
- {
- options = optionService.getOptions( optionSet.getId(), query, MAX_OPTIONS_DISPLAYED );
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetParamsByProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetParamsByProgramAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetParamsByProgramAction.java 1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.program.ProgramStage;
-import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.trackedentity.TrackedEntityAttributeService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version $Id: GetParamsByProgramAction.java Jun 02, 2012 02:24:49 PM $
- */
-public class GetParamsByProgramAction
- implements Action
-{
-
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private ProgramService programService;
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- private TrackedEntityAttributeService attributeService;
-
- public void setAttributeService( TrackedEntityAttributeService attributeService )
- {
- this.attributeService = attributeService;
- }
-
- // -------------------------------------------------------------------------
- // Input & Output
- // -------------------------------------------------------------------------
-
- private List<ProgramStage> programStages;
-
- public List<ProgramStage> getProgramStages()
- {
- return programStages;
- }
-
- private Integer programId;
-
- public void setProgramId( Integer programId )
- {
- this.programId = programId;
- }
-
- private Collection<TrackedEntityAttribute> attributes = new HashSet<>();
-
- public Collection<TrackedEntityAttribute> getAttributes()
- {
- return attributes;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
- @Override
- public String execute()
- {
- Program program = programService.getProgram( programId );
- programStages = new ArrayList<>( program.getProgramStages() );
-
- if ( program.isRegistration() )
- {
- attributes = attributeService.getAllTrackedEntityAttributes();
-
- Collection<Program> programs = programService.getAllPrograms();
- programs.remove( program );
-
- for ( Program _program : programs )
- {
- attributes.removeAll( _program.getProgramAttributes() );
- }
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java 2016-01-04 10:49:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java 1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.List;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.program.ProgramStage;
-import org.hisp.dhis.program.ProgramStageService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version $Id: GetTrackedEntityDataElementsAction.java Mar 09, 2011 01:24:49 PM $
- */
-public class GetTrackedEntityDataElementsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ProgramService programService;
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- private ProgramStageService programStageService;
-
- public void setProgramStageService( ProgramStageService programStageService )
- {
- this.programStageService = programStageService;
- }
-
- // -------------------------------------------------------------------------
- // Input & Output
- // -------------------------------------------------------------------------
-
- private Integer programId;
-
- public void setProgramId( Integer programId )
- {
- this.programId = programId;
- }
-
- private Integer programStageId;
-
- public void setProgramStageId( Integer programStageId )
- {
- this.programStageId = programStageId;
- }
-
- private Integer programStageUid;
-
- public void setProgramStageUid( Integer programStageUid )
- {
- this.programStageUid = programStageUid;
- }
-
- private List<DataElement> dataElements;
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- if ( programStageId != null )
- {
- ProgramStage stage = programStageService.getProgramStage( programStageId );
-
- dataElements = new ArrayList<>( stage.getAllDataElements() );
- }
- else if ( programStageUid != null )
- {
- ProgramStage stage = programStageService.getProgramStage( programStageUid );
-
- dataElements = new ArrayList<>( stage.getAllDataElements() );
- }
- else
- {
- Program program = programService.getProgram( programId );
-
- dataElements = new ArrayList<>( program.getDataElements() );
- }
-
- Collections.sort( dataElements, IdentifiableObjectNameComparator.INSTANCE );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/RemoveCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/RemoveCaseAggregationConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/RemoveCaseAggregationConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.caseaggregation.CaseAggregationCondition;
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version RemoveCaseAggregationConditionAction.java Nov 18, 2010 10:42:01 AM
- */
-public class RemoveCaseAggregationConditionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private int id;
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- public void setId( int id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- CaseAggregationCondition condition = aggregationConditionService.getCaseAggregationCondition( id );
-
- aggregationConditionService.deleteCaseAggregationCondition( condition );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java 1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.Collections;
-import java.util.List;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.trackedentity.TrackedEntityAttributeService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version ShowAddCaseAggregationConditionFormAction.java Nov 17, 2010 11:04:46 AM
- */
-public class ShowAddCaseAggregationConditionFormAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- public DataSetService dataSetService;
-
- public ProgramService programService;
-
- private TrackedEntityAttributeService attributeService;
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- private Integer dataSetId;
-
- private List<TrackedEntityAttribute> attributes;
-
- private List<DataSet> dataSets;
-
- private List<DataElement> dataElements;
-
- private List<Program> programs;
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- public void setAttributeService( TrackedEntityAttributeService attributeService )
- {
- this.attributeService = attributeService;
- }
-
- public Integer getId()
- {
- return id;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public Integer getDataSetId()
- {
- return dataSetId;
- }
-
- public List<Program> getPrograms()
- {
- return programs;
- }
-
- public List<DataSet> getDataSets()
- {
- return dataSets;
- }
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- public List<TrackedEntityAttribute> getAttributes()
- {
- return attributes;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- dataSets = dataSetService.getAllDataSets();
- Collections.sort( dataSets, IdentifiableObjectNameComparator.INSTANCE );
-
- programs = programService.getAllPrograms();
- Collections.sort( programs, IdentifiableObjectNameComparator.INSTANCE );
-
- attributes = attributeService.getAllTrackedEntityAttributes();
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java 1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.Collections;
-import java.util.List;
-
-import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.trackedentity.TrackedEntityAttributeService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * @version $ ShowUpdateCaseAggregationConditionFormAction.java May 26, 2011 11:43:19 AM $
- *
- */
-public class ShowUpdateCaseAggregationConditionFormAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- public DataSetService dataSetService;
-
- public ProgramService programService;
-
- private TrackedEntityAttributeService attributeService;
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- private Integer dataSetId;
-
- private CaseAggregationCondition caseAggregation;
-
- private String description;
-
- private List<TrackedEntityAttribute> attributes;
-
- private List<DataSet> dataSets;
-
- private List<Program> programs;
-
- private DataSet dataSet;
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- public void setAttributeService( TrackedEntityAttributeService attributeService )
- {
- this.attributeService = attributeService;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public Integer getDataSetId()
- {
- return dataSetId;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public CaseAggregationCondition getCaseAggregation()
- {
- return caseAggregation;
- }
-
- public List<DataSet> getDataSets()
- {
- return dataSets;
- }
-
- public List<Program> getPrograms()
- {
- return programs;
- }
-
- public List<TrackedEntityAttribute> getAttributes()
- {
- return attributes;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public DataSet getDataSet()
- {
- return dataSet;
- }
-
- @Override
- public String execute()
- throws Exception
- {
- dataSets = dataSetService.getAllDataSets();
- Collections.sort( dataSets, IdentifiableObjectNameComparator.INSTANCE );
-
- programs = programService.getAllPrograms();
- Collections.sort( programs, IdentifiableObjectNameComparator.INSTANCE );
-
- attributes = attributeService.getAllTrackedEntityAttributes();
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
-
- caseAggregation = aggregationConditionService.getCaseAggregationCondition( id );
- description = aggregationConditionService.getConditionDescription( caseAggregation.getAggregationExpression() );
-
- DataElement dataelement = caseAggregation.getAggregationDataElement();
- for ( DataSet _dataSet : dataSets )
- {
- if ( _dataSet.getDataElements().contains( dataelement ) )
- {
- dataSet = _dataSet;
- break;
- }
- }
-
- return SUCCESS;
- }
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/TestCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/TestCaseAggregationConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/TestCaseAggregationConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-import org.hisp.dhis.period.MonthlyPeriodType;
-import org.hisp.dhis.period.Period;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- */
-public class TestCaseAggregationConditionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService caseAggregationConditionService;
-
- public void setCaseAggregationConditionService( CaseAggregationConditionService caseAggregationConditionService )
- {
- this.caseAggregationConditionService = caseAggregationConditionService;
- }
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- private String condition;
-
- public void setCondition( String condition )
- {
- this.condition = condition;
- }
-
- private String operator;
-
- public void setOperator( String operator )
- {
- this.operator = operator;
- }
-
- private Integer deSumId;
-
- public void setDeSumId( Integer deSumId )
- {
- this.deSumId = deSumId;
- }
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- Collection<Integer> orgunitIds = new HashSet<>();
- orgunitIds.add( 0 );
-
- MonthlyPeriodType periodType = new MonthlyPeriodType();
- Period period = new Period();
- period.setStartDate( new Date() );
- period.setEndDate( new Date() );
- period.setPeriodType( periodType );
-
- String sql = caseAggregationConditionService.parseExpressionToSql( false, condition, operator, 0,
- "dataelementname", 0, "optioncomboid", deSumId, orgunitIds, period );
-
- List<Integer> ids = caseAggregationConditionService.executeSQL( sql );
-
- return (ids == null) ? INPUT : SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/UpdateCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/UpdateCaseAggregationConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/UpdateCaseAggregationConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.apache.commons.lang3.StringUtils;
-import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version UpdateCaseAggregationConditionAction.java Nov 18, 2010 10:42:42 AM
- */
-public class UpdateCaseAggregationConditionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- private DataElementService dataElementService;
-
- private DataElementCategoryService dataElementCategoryService;
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- private String operator;
-
- private String aggregationCondition;
-
- private String name;
-
- private String aggregationDataElementId;
-
- private Integer deSumId;
-
- private Integer dataSetId;
-
- // -------------------------------------------------------------------------
- // Getters && Setters
- // -------------------------------------------------------------------------
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- public Integer getDataSetId()
- {
- return dataSetId;
- }
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
- {
- this.dataElementCategoryService = dataElementCategoryService;
- }
-
- public void setAggregationDataElementId( String aggregationDataElementId )
- {
- this.aggregationDataElementId = aggregationDataElementId;
- }
-
- public void setOperator( String operator )
- {
- this.operator = operator;
- }
-
- public void setAggregationCondition( String aggregationCondition )
- {
- this.aggregationCondition = aggregationCondition;
- }
-
- public void setDeSumId( Integer deSumId )
- {
- this.deSumId = deSumId;
- }
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- String[] ids = aggregationDataElementId.split( "\\." );
-
- DataElement aggregationDataElement = dataElementService.getDataElement( Integer.parseInt( ids[0] ) );
- DataElementCategoryOptionCombo optionCombo = dataElementCategoryService
- .getDataElementCategoryOptionCombo( Integer.parseInt( ids[1] ) );
-
- CaseAggregationCondition expression = aggregationConditionService.getCaseAggregationCondition( id );
-
- expression.setName( StringUtils.trimToNull( name ) );
- expression.setAggregationExpression( aggregationCondition );
- expression.setOperator( operator );
- expression.setAggregationDataElement( aggregationDataElement );
- expression.setOptionCombo( optionCombo );
-
- if ( deSumId != null )
- {
- DataElement deSum = dataElementService.getDataElement( deSumId );
- expression.setDeSum( deSum );
- }
-
- aggregationConditionService.updateCaseAggregationCondition( expression );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ValidateCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ValidateCaseAggregationConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ValidateCaseAggregationConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-package org.hisp.dhis.trackedentity.action.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, 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.caseaggregation.CaseAggregationCondition;
-import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.i18n.I18n;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * @version $ ValidateCaseAggregationConditionAction.java Jul 28, 2011 12:53:50
- * PM $
- *
- */
-public class ValidateCaseAggregationConditionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CaseAggregationConditionService aggregationConditionService;
-
- public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
- {
- this.aggregationConditionService = aggregationConditionService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataElementCategoryService dataElementCategoryService;
-
- public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
- {
- this.dataElementCategoryService = dataElementCategoryService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String aggregationDataElementId;
-
- public void setAggregationDataElementId( String aggregationDataElementId )
- {
- this.aggregationDataElementId = aggregationDataElementId;
- }
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- private I18n i18n;
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- String[] ids = aggregationDataElementId.split( "\\." );
-
- DataElement aggregationDataElement = dataElementService.getDataElement( Integer.parseInt( ids[0] ) );
-
- DataElementCategoryOptionCombo optionCombo = dataElementCategoryService
- .getDataElementCategoryOptionCombo( Integer.parseInt( ids[1] ) );
-
- CaseAggregationCondition condition = aggregationConditionService.getCaseAggregationCondition(
- aggregationDataElement, optionCombo );
-
- if ( id != null && condition != null )
- {
- CaseAggregationCondition match = aggregationConditionService.getCaseAggregationCondition( id );
-
- if ( match != condition )
- {
- message = i18n.getString( "aggregation_data_element_in_use" );
- return INPUT;
- }
- }
- else if ( condition != null )
- {
- message = i18n.getString( "aggregation_data_element_in_use" );
- return INPUT;
- }
-
- message = i18n.getString( "everything_is_ok" );
- return SUCCESS;
- }
-}
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java 1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-package org.hisp.dhis.trackedentity.action.schedule;
-
-/*
- * Copyright (c) 2004-2016, 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.scheduling.CaseAggregateConditionSchedulingManager;
-import org.hisp.dhis.setting.SettingKey;
-import org.hisp.dhis.setting.SystemSettingManager;
-import org.hisp.dhis.system.scheduling.ScheduledTaskStatus;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- */
-public class GetScheduleAggQueryBuilderParamsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CaseAggregateConditionSchedulingManager schedulingManager;
-
- public void setSchedulingManager( CaseAggregateConditionSchedulingManager schedulingManager )
- {
- this.schedulingManager = schedulingManager;
- }
-
- private SystemSettingManager systemSettingManager;
-
- public void setSystemSettingManager( SystemSettingManager systemSettingManager )
- {
- this.systemSettingManager = systemSettingManager;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private ScheduledTaskStatus status;
-
- public ScheduledTaskStatus getStatus()
- {
- return status;
- }
-
- private boolean running;
-
- public boolean isRunning()
- {
- return running;
- }
-
- private String taskStrategy;
-
- public String getTaskStrategy()
- {
- return taskStrategy;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- taskStrategy = (String) systemSettingManager.getSystemSetting( SettingKey.SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY );
-
- status = schedulingManager.getTaskStatus();
-
- running = ScheduledTaskStatus.RUNNING.equals( status );
-
- return SUCCESS;
- }
-
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java 1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.trackedentity.action.schedule;
-
-/*
- * Copyright (c) 2004-2016, 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.scheduling.ProgramSchedulingManager;
-import org.hisp.dhis.setting.SettingKey;
-import org.hisp.dhis.setting.SystemSettingManager;
-import org.hisp.dhis.system.scheduling.ScheduledTaskStatus;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version GetScheduleParamsAction.java 10:57:08 AM Aug 9, 2012 $
- */
-public class GetScheduleParamsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SystemSettingManager systemSettingManager;
-
- public void setSystemSettingManager( SystemSettingManager systemSettingManager )
- {
- this.systemSettingManager = systemSettingManager;
- }
-
- private ProgramSchedulingManager schedulingManager;
-
- public void setSchedulingManager( ProgramSchedulingManager schedulingManager )
- {
- this.schedulingManager = schedulingManager;
- }
-
- // -------------------------------------------------------------------------
- // Input/Output
- // -------------------------------------------------------------------------
-
- private String timeSendingMessage;
-
- public String getTimeSendingMessage()
- {
- return timeSendingMessage;
- }
-
- private ScheduledTaskStatus status;
-
- public ScheduledTaskStatus getStatus()
- {
- return status;
- }
-
- private boolean running;
-
- public boolean isRunning()
- {
- return running;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- timeSendingMessage = (String)systemSettingManager.getSystemSetting( SettingKey.TIME_FOR_SENDING_MESSAGE );
-
- status = schedulingManager.getTaskStatus();
- running = ScheduledTaskStatus.RUNNING.equals( status );
-
- return SUCCESS;
- }
-
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleCaseAggregateConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleCaseAggregateConditionAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleCaseAggregateConditionAction.java 1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-package org.hisp.dhis.trackedentity.action.schedule;
-
-/*
- * Copyright (c) 2004-2016, 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.HashMap;
-import java.util.Map;
-
-import org.hisp.dhis.scheduling.CaseAggregateConditionSchedulingManager;
-import org.hisp.dhis.setting.SettingKey;
-import org.hisp.dhis.setting.SystemSettingManager;
-import org.hisp.dhis.system.scheduling.ScheduledTaskStatus;
-import org.hisp.dhis.system.scheduling.Scheduler;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version ScheduleCaseAggregateConditionAction.java 11:14:34 AM Oct 10, 2012 $
- */
-public class ScheduleCaseAggregateConditionAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CaseAggregateConditionSchedulingManager schedulingManager;
-
- public void setSchedulingManager( CaseAggregateConditionSchedulingManager schedulingManager )
- {
- this.schedulingManager = schedulingManager;
- }
-
- private SystemSettingManager systemSettingManager;
-
- public void setSystemSettingManager( SystemSettingManager systemSettingManager )
- {
- this.systemSettingManager = systemSettingManager;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private boolean execute;
-
- public void setExecute( boolean execute )
- {
- this.execute = execute;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private ScheduledTaskStatus status;
-
- public ScheduledTaskStatus getStatus()
- {
- return status;
- }
-
- private boolean running;
-
- public boolean isRunning()
- {
- return running;
- }
-
- private String taskStrategy;
-
- public void setTaskStrategy( String taskStrategy )
- {
- this.taskStrategy = taskStrategy;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- if ( execute )
- {
- schedulingManager.executeTasks();
- }
- else
- {
- if ( ScheduledTaskStatus.RUNNING.equals( schedulingManager.getTaskStatus() ) )
- {
- schedulingManager.stopTasks();
- }
- else
- {
- systemSettingManager.saveSystemSetting( SettingKey.SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY,
- taskStrategy );
-
- Map<String, String> keyCronMap = new HashMap<>();
-
- keyCronMap.put( CaseAggregateConditionSchedulingManager.TASK_AGGREGATE_QUERY_BUILDER,
- Scheduler.CRON_DAILY_11PM );
-
- schedulingManager.scheduleTasks( keyCronMap );
- }
- }
-
- status = schedulingManager.getTaskStatus();
-
- running = ScheduledTaskStatus.RUNNING.equals( status );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java 1970-01-01 00:00:00 +0000
@@ -1,185 +0,0 @@
-package org.hisp.dhis.trackedentity.action.schedule;
-
-/*
- * Copyright (c) 2004-2016, 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.HashMap;
-import java.util.Map;
-
-import org.hisp.dhis.scheduling.ProgramSchedulingManager;
-import org.hisp.dhis.scheduling.SendScheduledMessageTask;
-import org.hisp.dhis.scheduling.TaskCategory;
-import org.hisp.dhis.scheduling.TaskId;
-import org.hisp.dhis.setting.SettingKey;
-import org.hisp.dhis.setting.SystemSettingManager;
-import org.hisp.dhis.system.notification.Notifier;
-import org.hisp.dhis.system.scheduling.ScheduledTaskStatus;
-import org.hisp.dhis.user.CurrentUserService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version ScheduleSendMessageTasksAction.java 12:10:35 PM Sep 10, 2012 $
- */
-public class ScheduleSendMessageTasksAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SystemSettingManager systemSettingManager;
-
- public void setSystemSettingManager( SystemSettingManager systemSettingManager )
- {
- this.systemSettingManager = systemSettingManager;
- }
-
- private ProgramSchedulingManager schedulingManager;
-
- public void setSchedulingManager( ProgramSchedulingManager schedulingManager )
- {
- this.schedulingManager = schedulingManager;
- }
-
- private CurrentUserService currentUserService;
-
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
- private SendScheduledMessageTask sendMessageScheduled;
-
- public void setSendMessageScheduled( SendScheduledMessageTask sendMessageScheduled )
- {
- this.sendMessageScheduled = sendMessageScheduled;
- }
-
- private Notifier notifier;
-
- public void setNotifier( Notifier notifier )
- {
- this.notifier = notifier;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private boolean execute;
-
- public void setExecute( boolean execute )
- {
- this.execute = execute;
- }
-
- private String timeSendingMessage;
-
- public void setTimeSendingMessage( String timeSendingMessage )
- {
- this.timeSendingMessage = timeSendingMessage;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private ScheduledTaskStatus status;
-
- public ScheduledTaskStatus getStatus()
- {
- return status;
- }
-
- private boolean running;
-
- public boolean isRunning()
- {
- return running;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- TaskId taskId = new TaskId( TaskCategory.SENDING_REMINDER_MESSAGE, currentUserService.getCurrentUser() );
- notifier.clear( taskId );
- sendMessageScheduled.setTaskId( taskId );
-
- systemSettingManager.saveSystemSetting( SettingKey.TIME_FOR_SENDING_MESSAGE, timeSendingMessage );
-
- if ( execute )
- {
- schedulingManager.executeTasks();
- }
- else
- {
- if ( ScheduledTaskStatus.RUNNING.equals( schedulingManager.getTaskStatus() ) )
- {
- schedulingManager.stopTasks();
- }
- else
- {
- Map<String, String> keyCronMap = new HashMap<>();
- String time = (String) systemSettingManager.getSystemSetting( SettingKey.TIME_FOR_SENDING_MESSAGE );
-
- // Schedule for sending messages
- String[] infor = time.split( ":" );
- String hour = infor[0].trim();
- String minute = infor[1].trim();
-
- if ( hour.trim().equals( "00" ) )
- {
- hour = "0";
- }
- if ( minute.trim().equals( "00" ) )
- {
- minute = "0";
- }
-
- String cron = "0 " + Integer.parseInt( minute ) + " " + Integer.parseInt( hour ) + " ? * *";
-
- keyCronMap.put( SettingKey.SEND_MESSAGE_SCHEDULED_TASKS.getName(), cron );
- keyCronMap.put( SettingKey.SCHEDULE_MESSAGE_TASKS.getName(), "0 0 0 * * ?" );
-
- schedulingManager.scheduleTasks( keyCronMap );
- }
- }
-
- status = schedulingManager.getTaskStatus();
- running = ScheduledTaskStatus.RUNNING.equals( status );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml 2015-09-09 20:18:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml 2016-02-18 12:30:57 +0000
@@ -591,171 +591,7 @@
<property name="attributeGroupService"
ref="org.hisp.dhis.trackedentity.TrackedEntityAttributeGroupService" />
</bean>
-
- <!-- Case Aggregation Mapping -->
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.AddCaseAggregationConditionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.AddCaseAggregationConditionAction"
- scope="prototype">
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
- <property name="dataElementCategoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetCaseAggregationConditionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetCaseAggregationConditionAction"
- scope="prototype">
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetAllCaseAggregationConditionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAllCaseAggregationConditionAction"
- scope="prototype">
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetParamsByProgramAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetParamsByProgramAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="attributeService"
- ref="org.hisp.dhis.trackedentity.TrackedEntityAttributeService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetTrackedEntityDataElementsAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetTrackedEntityDataElementsAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggPSDataElementsAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggPSDataElementsAction"
- scope="prototype"/>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.RemoveCaseAggregationConditionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.RemoveCaseAggregationConditionAction"
- scope="prototype">
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.ShowAddCaseAggregationConditionFormAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.ShowAddCaseAggregationConditionFormAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService" />
- </property>
- <property name="programService">
- <ref bean="org.hisp.dhis.program.ProgramService" />
- </property>
- <property name="attributeService">
- <ref bean="org.hisp.dhis.trackedentity.TrackedEntityAttributeService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.ShowUpdateCaseAggregationConditionFormAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.ShowUpdateCaseAggregationConditionFormAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService" />
- </property>
- <property name="programService">
- <ref bean="org.hisp.dhis.program.ProgramService" />
- </property>
- <property name="attributeService">
- <ref bean="org.hisp.dhis.trackedentity.TrackedEntityAttributeService" />
- </property>
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.UpdateCaseAggregationConditionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.UpdateCaseAggregationConditionAction"
- scope="prototype">
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
- <property name="dataElementCategoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggConditionDescriptionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggConditionDescriptionAction"
- scope="prototype">
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.ValidateCaseAggregationConditionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.ValidateCaseAggregationConditionAction"
- scope="prototype">
- <property name="aggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
- <property name="dataElementCategoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.TestCaseAggregationConditionAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.TestCaseAggregationConditionAction"
- scope="prototype">
- <property name="caseAggregationConditionService">
- <ref bean="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetDataElementsByDataSetAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetDataElementsByDataSetAction"
- scope="prototype">
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.caseaggregation.GetOptionsAction"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetOptionsAction"
- scope="prototype">
- </bean>
-
+
<!-- Validation - ValidationCriteria -->
<bean
@@ -882,52 +718,6 @@
ref="org.hisp.dhis.program.ProgramExpressionService" />
</bean>
-
- <!-- Scheduling -->
-
- <bean
- id="org.hisp.dhis.trackedentity.action.schedule.GetScheduleParamsAction"
- class="org.hisp.dhis.trackedentity.action.schedule.GetScheduleParamsAction"
- scope="prototype">
- <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
- <property name="schedulingManager"
- ref="org.hisp.dhis.scheduling.ProgramSchedulingManager" />
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.schedule.ScheduleSendMessageTasksAction"
- class="org.hisp.dhis.trackedentity.action.schedule.ScheduleSendMessageTasksAction"
- scope="prototype">
- <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
- <property name="schedulingManager"
- ref="org.hisp.dhis.scheduling.ProgramSchedulingManager" />
- <property name="notifier" ref="notifier" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="sendMessageScheduled" ref="sendMessageScheduled" />
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.schedule.GetScheduleAggQueryBuilderParamsAction"
- class="org.hisp.dhis.trackedentity.action.schedule.GetScheduleAggQueryBuilderParamsAction"
- scope="prototype">
- <property name="schedulingManager"
- ref="org.hisp.dhis.scheduling.CaseAggregateConditionSchedulingManager" />
- <property name="systemSettingManager">
- <ref bean="org.hisp.dhis.setting.SystemSettingManager" />
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.trackedentity.action.schedule.ScheduleCaseAggregateConditionAction"
- class="org.hisp.dhis.trackedentity.action.schedule.ScheduleCaseAggregateConditionAction"
- scope="prototype">
- <property name="schedulingManager"
- ref="org.hisp.dhis.scheduling.CaseAggregateConditionSchedulingManager" />
- <property name="systemSettingManager">
- <ref bean="org.hisp.dhis.setting.SystemSettingManager" />
- </property>
- </bean>
-
<!-- Program Indicator -->
<bean
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2015-09-09 20:18:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2016-02-18 12:30:57 +0000
@@ -668,122 +668,6 @@
<!-- Case Aggregation Condition -->
- <action name="caseAggregation"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAllCaseAggregationConditionAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-program/caseAggregation.vm</param>
- <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
- <param name="javascripts">javascript/caseaggregation.js</param>
- <param name="stylesheets">style/basic.css</param>
- </action>
-
- <action name="showAddCaseAggregationForm"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.ShowAddCaseAggregationConditionFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-program/addCaseAggregation.vm</param>
- <param name="javascripts">javascript/caseaggregation.js</param>
- <param name="stylesheets">style/basic.css</param>
- </action>
-
- <action name="showUpdateCaseAggregationForm"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.ShowUpdateCaseAggregationConditionFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-program/updateCaseAggregation.vm</param>
- <param name="javascripts">javascript/caseaggregation.js</param>
- <param name="stylesheets">style/basic.css</param>
- </action>
-
- <action name="addCaseAggregation"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.AddCaseAggregationConditionAction">
- <result name="success" type="redirect">caseAggregation.action
- </result>
- </action>
-
- <action name="updateCaseAggregation"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.UpdateCaseAggregationConditionAction">
- <result name="success" type="redirect">caseAggregation.action
- </result>
- </action>
-
- <action name="removeCaseAggregation"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.RemoveCaseAggregationConditionAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm
- </result>
- </action>
-
- <action name="getDataElementsByDataset"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetDataElementsByDataSetAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-program/responseAggerateDataElement.vm
- </result>
- </action>
-
- <action name="getParamsByProgram"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetParamsByProgramAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-program/jsonParamsByProgram.vm
- </result>
- </action>
-
- <action name="getTrackedEntityDataElements"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetTrackedEntityDataElementsAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm
- </result>
- </action>
-
- <action name="getAggPSDataElements"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggPSDataElementsAction">
- <result name="success" type="velocity-xml">
- /dhis-web-maintenance-program/responseAggDataElement.vm
- </result>
- </action>
-
- <action name="getCaseAggregation"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetCaseAggregationConditionAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonCaseAggregation.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="getCaseAggregationDescription"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggConditionDescriptionAction">
- <result name="success" type="velocity">
- /dhis-web-maintenance-program/responseCaseAggDescription.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="validateCaseAggregation"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.ValidateCaseAggregationConditionAction">
- <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>
-
- <action name="testCaseAggregationCondition"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.TestCaseAggregationConditionAction">
- <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>
-
- <action name="getCaseAggConditionByDataset"
- class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAllCaseAggregationConditionAction">
- <result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-maintenance-program/caseAggregationList.vm</param>
- </action>
-
<action name="getProgramStages"
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageListAction">
<result name="success" type="velocity-json">
@@ -944,43 +828,6 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <!-- Scheduling -->
-
- <action name="viewScheduleTasks"
- class="org.hisp.dhis.trackedentity.action.schedule.GetScheduleParamsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-program/scheduleSendMessage.vm</param>
- <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
- <param name="javascripts">javascript/scheduling.js</param>
- <param name="schedule">true</param>
- <param name="requiredAuthorities">F_SCHEDULING_SEND_MESSAGE</param>
- </action>
-
- <action name="scheduleTasks"
- class="org.hisp.dhis.trackedentity.action.schedule.ScheduleSendMessageTasksAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-program/jsonResponseScheduleTasks.vm
- </result>
- <param name="requiredAuthorities">F_SCHEDULING_SEND_MESSAGE</param>
- </action>
-
- <action name="viewScheduledCaseAggCondTasks"
- class="org.hisp.dhis.trackedentity.action.schedule.GetScheduleAggQueryBuilderParamsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-program/viewScheduledCaseAggTasks.vm</param>
- <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
- <param name="javascripts">javascript/scheduling.js</param>
- <param name="requiredAuthorities">F_SCHEDULING_CASE_AGGREGATE_QUERY_BUILDER</param>
- </action>
-
- <action name="scheduleCaseAggTasks"
- class="org.hisp.dhis.trackedentity.action.schedule.ScheduleCaseAggregateConditionAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-program/jsonResponseScheduleTasks.vm
- </result>
- <param name="requiredAuthorities">F_SCHEDULING_CASE_AGGREGATE_QUERY_BUILDER</param>
- </action>
-
<!-- Program Indicator -->
<action name="programIndicator"
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm 2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm 1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-<script>
- var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
- var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
- var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_item" ) , "'" )';
- var i18n_all = '[' + '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )' + ']';
-</script>
-
-<script type="text/javascript" src="javascript/addCaseAggregationForm.js"></script>
-
-<h3>$i18n.getString( "create_new_aggregation_query_builder" ) #openHelp( "tracked_entity_aggregation_query_builder_information" )</h3>
-
-<form id="addCaseAggregationForm" action="addCaseAggregation.action" method="post" onsubmit='setFieldValue("dataSetId",getFieldValue("dataSets") );' >
-
-<input type='hidden' id='dataSetId' name='dataSetId'>
-<table>
- <thead>
- <tr>
- <th colspan="2">$i18n.getString( "case_aggregation_query_builder_detail" )</th>
- </tr>
- </thead>
-
- <tbody>
-
- <tr>
- <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <input type="text" id="name" name="name" >
- </td>
- </tr>
-
- <tr>
- <td><label for="dataSets">$i18n.getString( "dataset" )</label></td>
- <td>
- <select id="dataSets" name="dataSets" onChange="getDataElementsByDataset();">
- <option value="">[$i18n.getString('please_select')]</option>
- #foreach( $dataSet in $dataSets)
- <option value="$dataSet.id" #if( $dataSetId=="$dataSet.id") selected #end>$dataSet.displayName</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <input id="aggregationDataElementInput" name="aggregationDataElementInput" style='width:300px;'>
- <a style='width:20px; margin-bottom:-5px;height:20px;' id='dataElementsButton' name='dataElementsButton'></a>
- <input type='hidden' id="aggregationDataElementId" name="aggregationDataElementId" >
- </td>
- </tr>
-
- <tr>
- <td><label for="operator">$i18n.getString( "operator" )</label></td>
- <td>
- <input type="radio" id="operator1" name="operator" value="COUNT" checked onchange='operatorOnchange(this.value)'> <label for='operator1'>$i18n.getString('number_of_tracked_entity_instances')</label><br>
- <input type="radio" id="operator2" name="operator" value="times" onchange='operatorOnchange(this.value)'> <label for='operator2'>$i18n.getString('number_of_visits')</label><br>
- <input type="radio" id="operator3" name="operator" value="sum" onchange='operatorOnchange(this.value)'> <label for='operator3'>$i18n.getString('sum_dataelement_value')</label><br>
- <input type="radio" id="operator4" name="operator" value="avg" onchange='operatorOnchange(this.value)'> <label for='operator4'>$i18n.getString('avg_dataelement_value')</label><br>
- <input type="radio" id="operator5" name="operator" value="min" onchange='operatorOnchange(this.value)'> <label for='operator5'>$i18n.getString('min_dataelement_value')</label><br>
- <input type="radio" id="operator6" name="operator" value="max" onchange='operatorOnchange(this.value)'> <label for='operator6'>$i18n.getString('max_dataelement_value')</label>
- </td>
- </tr>
-
- <tr>
- <td>
- <label for="programId">$i18n.getString( "program" )</label>
- </td>
- <td>
- <select id="programId" name="programId" onChange="getParams();">
- <option value="">[$i18n.getString('please_select')]</option>
- #foreach( $program in $programs )
- <option value="$program.id" title='$program.displayName' programType='$program.programType.value'>$encoder.htmlEncode( $program.displayName )</option></option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td>
- <label for="programStageId">$i18n.getString( "program_stage" )</label>
- </td>
- <td>
- <select id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();"></select>
- </td>
- </tr>
-
- <tr>
- <td>
- <label for="deSumId">$i18n.getString( "data_element_for_sum_avg_min_max" ) <em title="$i18n.getString( "required" )" class="required">*</em></label>
- </td>
- <td>
- <select id="deSumId" name="deSumId" disabled ></select>
- </td>
- </tr>
-
- <tr>
- <td colspan="2"><p></p></td>
- </tr>
-
- </tbody>
-</table>
-
-#parse( "/dhis-web-maintenance-program/caseAggregationForm.vm" )
-
-<p>
- <input type="submit" value="$i18n.getString( 'add' )" />
- <input type="button" value="$i18n.getString( 'test_condition' )" onclick='testCaseAggregationCondition();'/>
- <input type="button" value="$i18n.getString( 'cancel' )" onClick="cancelOnClick();" />
-</p>
-
-</form>
-
-<script>
- #if( $dataSetId )
- getDataElementsByDataset();
- #end
-</script>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm 2014-11-03 13:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm 1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-<script>
-$(function() {
- dhis2.contextmenu.makeContextMenu({
- menuId: 'contextMenu',
- menuItemActiveClass: 'contextMenuItemActive'
- });
-});
-</script>
-
-<h3>$i18n.getString( 'tracked_entity_aggregation_query_builder_management' ) #openHelp( "tracked_entity_aggregation_query_builder" )</h3>
-
-<div id="contextMenu" class="contextMenu">
- <ul id="contextMenuItems" class="contextMenuItems">
- <li><a data-target-fn="showUpdateCaseAggregationForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
- <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
- <li><a data-target-fn="removeCaseAggregation"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
- <li><a data-target-fn="showCaseAggregationDetails"><i class="fa fa-info-circle"></i> $i18n.getString( "show_details" )</a></li>
- </ul>
-</div>
-
-<table class="mainPageTable">
- <tr>
- <td style="vertical-align:top">
- <table width="100%">
-
- <tr>
- <td>$i18n.getString( "filter_by_data_set" )</td>
- <td>
- <select id='dataSetId' name='dataSetId' onchange='getCaseAggConditionByDataset();'>
- <option value=''>[ $i18n.getString( "all" ) ]</option>
- #foreach( $dataSet in $dataSets )
- <option value='$dataSet.id' #if( $dataSetId=="$dataSet.id") selected #end >$encoder.htmlEncode($dataSet.displayName)</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td>$i18n.getString( "filter_by_name" )</td>
- <td>
- <input type="text" id="key" name="key" placeholder="$i18n.getString('filter_by_name')" onchange="getCaseAggConditionByDataset();" style="width:205px;" />
- <input type="button" value="$i18n.getString('filter')" onclick="getCaseAggConditionByDataset();" class="nornal-button" />
- <input type="button" value="$i18n.getString('clear')" onclick="setFieldValue('key','');getCaseAggConditionByDataset();" class="nornal-button" />
-
- </td>
- <td colspan="3" style="text-align:right">
- <input type="button" value="$i18n.getString( 'add_new' )" onclick="showAddCaseAggregationForm();" >
- </td>
- </tr>
- </table>
-
- <table class="listTable">
- <col>
- <thead>
- <tr>
- <th>$i18n.getString( "name" )</th>
- </tr>
- </thead>
- <tbody id="list">
- #parse( "/dhis-web-maintenance-program/caseAggregationList.vm" )
- </tbody>
- </table>
- <p></p>
- #parse( "/dhis-web-commons/paging/paging.vm" )
- </td>
-
- <td id="detailsData">
- <div id="detailsArea">
- <div id="hideDetailsArea">
- <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
- </div>
- <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
- <p><label class="bold">$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
- <p><label class="bold">$i18n.getString( "aggregation_data_element" ):</label><br><span id="aggregationDataElementField"></span></p>
- <p><label class="bold">$i18n.getString( "option_combo" ):</label><br><span id="optionComboField"></span></p>
- <p><label class="bold">$i18n.getString( "data_element_for_sum_avg_min_max" ):</label><br><span id="deSumField"></span></p>
- <p><label class="bold">$i18n.getString( "aggregation_expression" ):</label><br><span id="aggregationExpressionField"></span></p>
- <p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
- </div>
- </td>
- </tr>
-</table>
-
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_tracked_entity_attribute" ) , "'" )';
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
- var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
- var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
- var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ) , "'")';
- var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
- var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
- var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
- var i18n_option_set = '$encoder.jsEscape( $i18n.getString( "option_set" ) , "'")';
- var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
- var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
-</script>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregationList.vm 2013-12-17 01:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregationList.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-#foreach( $aggregationCondition in $aggregationConditions )
- <tr id="tr${aggregationCondition.id}" data-id="$!aggregationCondition.id" data-uid="$!aggregationCondition.uid" data-type="CaseAggregationCondition"
- data-name="$encoder.htmlEncode( $!aggregationCondition.displayName )"
- data-can-manage="$security.canManage( $aggregationCondition )"
- data-can-update="$security.canUpdate( $aggregationCondition )"
- data-can-delete="$security.canDelete( $aggregationCondition )">
- <td>$encoder.htmlEncode( $!aggregationCondition.displayName )</td>
- </tr>
-#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm 2015-06-19 07:35:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm 2016-02-18 12:30:57 +0000
@@ -6,13 +6,4 @@
#if( $security.canView( "relationShipType" ) )#introListImgItem( "relationshipType.action" "relationship_type" "patient" )#end
#if( $security.canView( "trackedEntity" ) )#introListImgItem( "trackedEntity.action" "tracked_entity" "patient" )#end
#if( $security.canView( "program" ) )#introListImgItem( "program.action" "program" "program" )#end
- #introListImgItem( "caseAggregation.action" "aggregation_query_builder" "caseaggregationmapping" )
-
- #if( $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduleTasks" ) )
- #introListImgItem( "viewScheduleTasks.action" "schedule_automated_message_reminder" "scheduling" )
- #end
- #if($auth.hasAccess( "dhis-web-maintenance-program", "viewScheduledCaseAggCondTasks" ) )
- #introListImgItem( "viewScheduledCaseAggCondTasks.action" "schedule_automated_aggregation" "scheduling" )
- #end
-
</ul>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm 2014-08-11 12:53:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-{ #set( $size = $!{programStages.size()} )
- "programStages": [
- #foreach( ${programStage} in $!{programStages} )
- {
- "id": "${programStage.id}",
- "name": "$!encoder.jsonEncode( ${programStage.displayName} )"
- }#if( $velocityCount < $size ),#end
- #end
- ],
- "attributes":[
- #set( $size = $!{attributes.size()} )
- #foreach( $attribute in $!{attributes} )
- {
- "id": "[CA:${attribute.id}]",
- "name": "$!encoder.jsonEncode( ${attribute.name} )",
- "optionSet": #if( $!dataElement.optionSet)
- "$!dataElement.optionSet.uid"
- #else
- ""
- #end
-
- }#if( $velocityCount < $size ),#end
- #end
- ]
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm 2015-09-07 03:11:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-{ #set( $size = $!{dataElements.size()} )
- "dataElements": [
- #foreach( ${dataElement} in $!{dataElements} )
- {
- "id": "${dataElement.uid}",
- "localid": "${dataElement.id}",
- "name": "$!encoder.jsonEncode( ${dataElement.name} )",
- "code": "$!encoder.jsonEncode( ${dataElement.code} )",
- "valueType": "${dataElement.valueType}",
- "optionset": #if( $!dataElement.optionSet ) "$!dataElement.optionSet.uid" #else "" #end
-
- }#if( $velocityCount < $size ),#end
- #end
- ]
-}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/menu.vm 2015-06-19 07:35:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/menu.vm 2016-02-18 12:30:57 +0000
@@ -9,17 +9,4 @@
<h2>$i18n.getString( "programs" )</h2>
<ul>
#if( $security.canView( "program" ) )<li><a href="program.action">$i18n.getString( "program" )</a></li>#end
- <li><a href="caseAggregation.action">$i18n.getString( "aggregation_query_builder" )</a></li>
-</ul>
-
-#if( $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduleTasks" ) || $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduledCaseAggCondTasks" ) )
-<h2>$i18n.getString( "scheduling" )</h2>
-<ul>
- #if( $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduleTasks" ) )
- <li><a href="viewScheduleTasks.action">$i18n.getString( "schedule_automated_message_reminder" )</a></li>
- #end
- #if($auth.hasAccess( "dhis-web-maintenance-program", "viewScheduledCaseAggCondTasks" ) )
- <li><a href="viewScheduledCaseAggCondTasks.action">$i18n.getString( "schedule_automated_aggregation" )</a></li>
- #end
-</ul>
-#end
+</ul>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggDataElement.vm 2012-03-22 03:06:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggDataElement.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataelements>
- #foreach( $dataElement in $dataElementList )
- <dataelement>
- <id>[DE:$psId.$dataElement.id]</id>
- <name>$encoder.xmlEncode( $dataElement.name )</name>
- </dataelement>
- #end
-</dataelements>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggerateDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggerateDataElement.vm 2012-07-06 15:37:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseAggerateDataElement.vm 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#set( $size = $dataElements.size() )
-{
- "dataElements": [
- #foreach( $dataElement in $dataElements )
- #set( $subSize = $dataElement.categoryCombo.optionCombos.size() )
- #foreach ( $optionCombo in $dataElement.categoryCombo.optionCombos )
- {
- #set( $name="${dataElement.name} ${optionCombo.name}")
- "id": "${dataElement.id}.${optionCombo.id}",
- "name": "$!encoder.jsonEncode( $name )"
- }#if( $velocityCount < $subSize ),#end
- #end#if( $velocityCount < $size ),#end
- #end
- ]
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseCaseAggDescription.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseCaseAggDescription.vm 2011-01-12 02:42:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseCaseAggDescription.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-$encoder.xmlEncode( $!description )
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/scheduleSendMessage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/scheduleSendMessage.vm 2015-11-27 15:15:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/scheduleSendMessage.vm 1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-<h3>$i18n.getString('schedule_automated_message_reminder_form') #openHelp( "schedule_sending_message" )</h3>
-
-<form id='scheduleMessageForm' name='scheduleMessageForm' method="post">
- <table>
- <tbody>
- <tr>
- <td>$i18n.getString( "time_for_sending_message" )</td>
- <td>
- <input type="text" id="timeSendingMessage" name="timeSendingMessage" value="$!timeSendingMessage" style="width:295px;" class="{validate:{required:true,time:true}}"/>
- </td>
- </tr>
-
- <tr>
- <td></td>
- <td>
- <input type="submit" style="width:150px;" id="scheduledBtn" name="scheduledBtn"
- #if ( $running=='true' )
- value="$i18n.getString( 'stop' )"
- #else
- value="$i18n.getString( 'start' )"
- #end
- onclick="javascript:isExecute=false;"/>
- <input type="submit" id="executeButton" name="executeButton" style="width:150px;" value="$i18n.getString( 'execute' )" onclick="javascript:isExecute=true;" #if ( $running=='false' ) disabled #end/>
- </td>
- </tr>
-
- </tbody>
- </table>
- <span id="info">$i18n.getString( "scheduling_is" ) $!i18n.getString( $!status.key )</span>
-
- <table id="notificationTable" class="notificationTable" style="display:none">
- <col width="120">
- <col width="380">
- </table>
-
-</form>
-
-<script>
- jQuery(document).ready( function(){
- validation( 'scheduleMessageForm', function(form){
- if(isExecute){
- executeTasks();
- }
- else{
- scheduleTasks();
- }
- });
- });
-
- var i18n_scheduled = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
- var i18n_start = '$encoder.jsEscape( $i18n.getString( "start" ) , "'" )';
- var i18n_stop = '$encoder.jsEscape( $i18n.getString( "stop" ) , "'" )';
- var i18n_not_started = '$encoder.jsEscape( $i18n.getString( "not_started" ) , "'" )';
- var i18n_scheduling_is = '$encoder.jsEscape( $i18n.getString( "scheduling_is" ) , "'" )';
- var i18n_executing = '$encoder.jsEscape( $i18n.getString( "executing" ) , "'" )';
- var i18n_execute_success = '$encoder.jsEscape( $i18n.getString( "execute_success" ) , "'" )';
- var i18n_execute_tasks_confirmation = '$encoder.jsEscape( $i18n.getString( "execute_tasks_confirmation" ) , "'" )';
-</script>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-<script>
- var i18n_run_success = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
- var i18n_run_fail = '$encoder.jsEscape( $i18n.getString( "run_fail" ) , "'" )';
- var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_item" ) , "'" )';
- var i18n_all = '[' + '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )' + ']';
-</script>
-
-<script type="text/javascript" src="javascript/updateCaseAggregationForm.js"></script>
-
-<h3>$i18n.getString( "edit_aggregation_query_builder" ) #openHelp( "tracked_entity_aggregation_query_builder_information" )</h3>
-
-<form id="updateCaseAggregationForm" action="updateCaseAggregation.action" method="post" onsubmit='setFieldValue("dataSetId",getFieldValue("dataSets") );' class="inputForm">
-
-<input type='hidden' id='id' name='id' value='$caseAggregation.id'>
-<input type='hidden' id='dataSetId' name='dataSetId' value='$dataSet.id'>
-<table>
- <thead>
- <tr>
- <th colspan="2">$i18n.getString( "case_aggregation_query_builder_detail" )</th>
- </tr>
- </thead>
-
- <tbody>
-
- <tr>
- <td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode($caseAggregation.name)"></td>
- </tr>
-
- <tr>
- <td><label for="dataSets">$i18n.getString( "dataset" )</label></td>
- <td>
- <select id="dataSets" name="dataSets" onchange="getDataElementsByDataset();">
- <option value="">[$i18n.getString('please_select')]</option>
- #foreach( $ds in $dataSets)
- <option value="$ds.id" #if( $dataSet.id=="$ds.id") selected #end >$encoder.htmlEncode($ds.displayName)</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td><label for="aggregationDataElementInput">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td>
- <input id="aggregationDataElementInput" name="aggregationDataElementInput" value='$caseAggregation.aggregationDataElement.name $caseAggregation.optionCombo.name' style='width:300px;'>
- <a style='width:20px; margin-bottom:-5px;height:20px;' id='dataElementsButton' name='dataElementsButton'></a>
- <input id="aggregationDataElementId" name="aggregationDataElementId" value="$caseAggregation.aggregationDataElement.id.$caseAggregation.optionCombo.id" class="hidden" >
- </td>
- </tr>
- <tr>
- <td><label for="operator">$i18n.getString( "operator" )</label></td>
- <td>
- <input type="radio" id="operator1" name="operator" value="COUNT" onchange='operatorOnchange(this.value)' #if($caseAggregation.operator=="COUNT") checked #end > <label for='operator1'>$i18n.getString('number_of_tracked_entities')</label><br>
- <input type="radio" id="operator2" name="operator" value="times" onchange='operatorOnchange(this.value)' #if($caseAggregation.operator=="times") checked #end > <label for='operator2'>$i18n.getString('number_of_visits')</label><br>
- <input type="radio" id="operator3" name="operator" value="sum" onchange='operatorOnchange(this.value)' #if($caseAggregation.operator=="sum") checked #end > <label for='operator3'>$i18n.getString('sum_dataelement_value')</label><br>
- <input type="radio" id="operator4" name="operator" value="avg" onchange='operatorOnchange(this.value)' #if($caseAggregation.operator=="avg") checked #end > <label for='operator4'>$i18n.getString('avg_dataelement_value')</label><br>
- <input type="radio" id="operator5" name="operator" value="min" onchange='operatorOnchange(this.value)' #if($caseAggregation.operator=="min") checked #end > <label for='operator5'>$i18n.getString('min_dataelement_value')</label><br>
- <input type="radio" id="operator6" name="operator" value="max" onchange='operatorOnchange(this.value)' #if($caseAggregation.operator=="max") checked #end > <label for='operator6'>$i18n.getString('max_dataelement_value')</label>
- </td>
- </tr>
- <tr>
- <td>
- <label for="programId">$i18n.getString( "program" )</label>
- </td>
- <td>
- <select id="programId" name="programId" onChange="getParams();">
- <option value="">[$i18n.getString('please_select')]</option>
- #foreach( $program in $programs )
- <option value="$program.id" title='$program.displayName' programType='$program.programType.value'>$encoder.htmlEncode( $program.displayName )</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td>
- <label for="programStageId">$i18n.getString( "program_stage" )</label>
- </td>
- <td>
- <select id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();"></select>
- </td>
- </tr>
-
- <tr>
- <td>
- <label for="deSumId">$i18n.getString( "data_element_for_sum_avg_min_max" ) <em title="$i18n.getString( "required" )" class="required">*</em></label>
- </td>
- <td>
- <select id="deSumId" name="deSumId" #if( $caseAggregation.deSum ) #else disabled #end>
- #if( $caseAggregation.deSum )
- <option value='$caseAggregation.deSum.id'>$encoder.htmlEncode($caseAggregation.deSum.displayName)</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td colspan="2"><p></p></td>
- </tr>
-
- </tbody>
-</table>
-
-#parse( "/dhis-web-maintenance-program/caseAggregationForm.vm" )
-
-<p>
- <input type="submit" value="$i18n.getString( 'update' )" >
- <input type="button" value="$i18n.getString( 'test_condition' )" onclick='testCaseAggregationCondition();'/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="cancelOnClick();" >
-</p>
-
-</form>
-
-<script>
- #if( $dataSetId )
- getDataElementsByDataset();
- var selectedValue = "$caseAggregation.aggregationDataElement.id" + "." + "$caseAggregation.optionCombo.id";
- jQuery("#aggregationDataElementId").val( selectedValue );
- #end
-</script>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewScheduledCaseAggTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewScheduledCaseAggTasks.vm 2015-11-27 15:15:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewScheduledCaseAggTasks.vm 1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-<script type="text/javascript">
- var i18n_scheduled = '$encoder.jsEscape( $i18n.getString( "run_success" ) , "'" )';
- var i18n_start = '$encoder.jsEscape( $i18n.getString( "start" ) , "'" )';
- var i18n_stop = '$encoder.jsEscape( $i18n.getString( "stop" ) , "'" )';
- var i18n_not_started = '$encoder.jsEscape( $i18n.getString( "not_started" ) , "'" )';
- var i18n_scheduling_is = '$encoder.jsEscape( $i18n.getString( "scheduling_is" ) , "'" )';
- var i18n_executing = '$encoder.jsEscape( $i18n.getString( "executing" ) , "'" )';
- var i18n_execute_success = '$encoder.jsEscape( $i18n.getString( "execute_success" ) , "'" )';
- var i18n_execute_tasks_confirmation = '$encoder.jsEscape( $i18n.getString( "execute_tasks_confirmation" ), "'" )';
-</script>
-
-<h3>$i18n.getString( "schedule_automated_aggregation_form" ) #openHelp( "scheduling_aggregation_query_builder" )</h3>
-
-<input id="isRunning" type="hidden" value="${running}">
-
-<form id="schedulingForm" action="scheduleCaseAggTasks.action" method="post" class="inputForm">
-<input type='hidden' id='execute' name='execute'/>
-
-<table>
-
-<tr>
- <th>$i18n.getString("task_stragely")</th>
-</tr>
-<tr>
- <td>
- <select id='taskStrategy' name='taskStrategy'>
- <option value='lastMonth' #if($taskStrategy=='lastMonth') selected #end>$i18n.getString("last_month")</option>
- <option value='last3Month' #if($taskStrategy=='last3Month') selected #end>$i18n.getString("last_3_month")</option>
- <option value='last6Month' #if($taskStrategy=='last6Month') selected #end>$i18n.getString("last_6_month")</option>
- <option value='last12Month' #if($taskStrategy=='last12Month') selected #end>$i18n.getString("last_12_month")</option>
- </select>
- </td>
-</tr>
-<tr>
- <td>
- <input type="button" style="width:140px" onclick="schedulingAggCondTasks();" id="scheduledBtn" name="scheduledBtn"
- #if ( $running )
- value="$i18n.getString( 'stop' )"
- #else
- value="$i18n.getString( 'start' )"
- #end
- />
- <input type="button" id="executeButton" name="executeButton" style="width:140px" onclick="executeAggCondTasks();" value="$i18n.getString( 'execute' )" #if ( $running=='false' ) disabled #end />
- </td>
-</tr>
-</table>
-</form>
-
-<span id="info">$i18n.getString( "scheduling_is" ) $!i18n.getString( $!status.key )</span>
-
-<table id="notificationTable" class="notificationTable" style="display:none">
- <col width="120">
- <col width="380">
-</table>
