dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33514
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17116: Remove DataDictionary object.
------------------------------------------------------------
revno: 17116
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-10-15 11:17:05 +0700
message:
Remove DataDictionary object.
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionary.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryDataElementConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryIndicatorConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataDictionaryController.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/AddDataDictionaryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryMembersAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/RemoveDataDictionaryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/UpdateDataDictionaryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/ObjectMappingGenerator.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDataElementListAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetIndicatorListAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedExport.js
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java 2014-10-15 04:17:05 +0000
@@ -44,7 +44,6 @@
INDICATORGROUP,
INDICATORGROUPSET,
DATASET,
- DATADICTIONARY,
SOURCE,
ORGANISATIONUNIT,
ORGANISATIONUNITGROUP,
=== removed directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionary.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionary.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionary.java 1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-package org.hisp.dhis.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.hisp.dhis.common.BaseIdentifiableObject;
-import org.hisp.dhis.common.DxfNamespaces;
-import org.hisp.dhis.common.IdentifiableObject;
-import org.hisp.dhis.common.annotation.Scanned;
-import org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.indicator.Indicator;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Lars Helge Overland
- */
-@JacksonXmlRootElement( localName = "dataDictionary", namespace = DxfNamespaces.DXF_2_0 )
-public class DataDictionary
- extends BaseIdentifiableObject
-{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = -2221681462723457717L;
-
- private String description;
-
- private String region;
-
- @Scanned
- private Set<DataElement> dataElements = new HashSet<>();
-
- @Scanned
- private Set<Indicator> indicators = new HashSet<>();
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public DataDictionary()
- {
- setAutoFields();
- }
-
- public DataDictionary( String name, String description, String region )
- {
- this();
- this.name = name;
- this.description = description;
- this.region = region;
- }
-
- // -------------------------------------------------------------------------
- // Logic
- // -------------------------------------------------------------------------
-
- public void removeAllIndicators()
- {
- indicators.clear();
- }
-
- public void removeAllDataElements()
- {
- dataElements.clear();
- }
-
- // -------------------------------------------------------------------------
- // Set and get methods
- // -------------------------------------------------------------------------
-
- @Override
- public boolean haveUniqueNames()
- {
- return false;
- }
-
- @JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public String getDescription()
- {
- return description;
- }
-
- public void setDescription( String description )
- {
- this.description = description;
- }
-
- @JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public String getRegion()
- {
- return region;
- }
-
- public void setRegion( String region )
- {
- this.region = region;
- }
-
- @JsonProperty
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( namespace = DxfNamespaces.DXF_2_0, localName = "dataElements" )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0, localName = "dataElement" )
- public Set<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- public void setDataElements( Set<DataElement> dataElements )
- {
- this.dataElements = dataElements;
- }
-
- @JsonProperty
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( namespace = DxfNamespaces.DXF_2_0, localName = "indicators" )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0, localName = "indicator" )
- public Set<Indicator> getIndicators()
- {
- return indicators;
- }
-
- public void setIndicators( Set<Indicator> indicators )
- {
- this.indicators = indicators;
- }
-
- @Override
- public void mergeWith( IdentifiableObject other )
- {
- super.mergeWith( other );
-
- if ( other.getClass().isInstance( this ) )
- {
- DataDictionary dataDictionary = (DataDictionary) other;
-
- description = dataDictionary.getDescription() == null ? description : dataDictionary.getDescription();
- region = dataDictionary.getRegion() == null ? region : dataDictionary.getRegion();
-
- removeAllDataElements();
- dataElements.addAll( dataDictionary.getDataElements() );
-
- removeAllIndicators();
- indicators.addAll( dataDictionary.getIndicators() );
- }
- }
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java 1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-package org.hisp.dhis.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.List;
-
-import org.hisp.dhis.dataelement.DataElement;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public interface DataDictionaryService
-{
- String ID = DataDictionaryService.class.getName();
-
- // -------------------------------------------------------------------------
- // DataDictionary
- // -------------------------------------------------------------------------
-
- /**
- * Saves the DataDictionary.
- *
- * @param dataDictionary the DataDictionary to save.
- * @return the generated identifier.
- */
- int saveDataDictionary( DataDictionary dataDictionary );
-
- /**
- * Retrieves the DataDictionary with the given identifier.
- *
- * @param id the identifier of the DataDictionary.
- * @return the DataDictionary.
- */
- DataDictionary getDataDictionary( int id );
-
- /**
- * Retrieves the DataDictionaries with the given identifiers.
- *
- * @param identifiers the identifiers.
- * @return a collection of DataDictionaries.
- */
- Collection<DataDictionary> getDataDictionaries( Collection<Integer> identifiers );
-
- /**
- * Retrieves the DataDictionary with the given name.
- *
- * @param name the name of the DataDictionary.
- * @return the DataDictionary.
- */
- List<DataDictionary> getDataDictionaryByName( String name );
-
- /**
- * Deletes the DataDictionary.
- *
- * @param dataDictionary the DataDictionary to delete.
- */
- void deleteDataDictionary( DataDictionary dataDictionary );
-
- /**
- * Retrieves all DataDictionaries.
- *
- * @return a collection of DataDictionaries.
- */
- List<DataDictionary> getAllDataDictionaries();
-
- List<DataElement> getDataElementsByDictionaryId( int dictionaryId );
-
- List<DataDictionary> getDataDictionariesBetween( int first, int max );
-
- List<DataDictionary> getDataDictionariesBetweenByName( String name, int first, int max );
-
- int getDataDictionaryCount();
-
- int getDataDictionaryCountByName( String name );
-}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java 2014-10-15 04:17:05 +0000
@@ -41,8 +41,6 @@
DATAELEMENTGROUPSET,
INDICATORGROUP,
INDICATORGROUPSET,
- DATADICTIONARY_DATAELEMENT,
- DATADICTIONARY_INDICATOR,
DATASET,
DATASET_SOURCE,
ORGANISATIONUNITGROUP,
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java 2014-05-31 13:18:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataDictionarySchemaDescriptor.java 1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-package org.hisp.dhis.schema.descriptors;
-
-/*
- * Copyright (c) 2004-2014, 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.google.common.collect.Lists;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.schema.Authority;
-import org.hisp.dhis.schema.AuthorityType;
-import org.hisp.dhis.schema.Schema;
-import org.hisp.dhis.schema.SchemaDescriptor;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
- */
-@Component
-public class DataDictionarySchemaDescriptor implements SchemaDescriptor
-{
- public static final String SINGULAR = "dataDictionary";
-
- public static final String PLURAL = "dataDictionaries";
-
- public static final String API_ENDPOINT = "/" + PLURAL;
-
- @Override
- public Schema getSchema()
- {
- Schema schema = new Schema( DataDictionary.class, SINGULAR, PLURAL );
- schema.setApiEndpoint( API_ENDPOINT );
- schema.setShareable( true );
- schema.setOrder( 1280 );
-
- schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DATADICTIONARY_PUBLIC_ADD" ) ) );
- schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DATADICTIONARY_PRIVATE_ADD" ) ) );
- schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_DATADICTIONARY_DELETE" ) ) );
-
- return schema;
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java 2014-10-15 04:17:05 +0000
@@ -67,7 +67,6 @@
objectCounts.put( Objects.INDICATOR, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM indicator", Integer.class ) );
objectCounts.put( Objects.INDICATORGROUP, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM indicatorgroup", Integer.class ) );
objectCounts.put( Objects.DATASET, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM dataset", Integer.class ) );
- objectCounts.put( Objects.DATADICTIONARY, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM datadictionary", Integer.class ) );
objectCounts.put( Objects.SOURCE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM organisationunit", Integer.class ) );
objectCounts.put( Objects.VALIDATIONRULE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM validationrule", Integer.class ) );
objectCounts.put( Objects.PERIOD, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM period", Integer.class ) );
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryDeletionHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryDeletionHandler.java 1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-package org.hisp.dhis.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.dataelement.DataElement;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.system.deletion.DeletionHandler;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryDeletionHandler
- extends DeletionHandler
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- // -------------------------------------------------------------------------
- // DeletionHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String getClassName()
- {
- return DataDictionary.class.getSimpleName();
- }
-
- @Override
- public void deleteDataElement( DataElement dataElement )
- {
- for ( DataDictionary dictionary : dataDictionaryService.getAllDataDictionaries() )
- {
- if ( dictionary.getDataElements().remove( dataElement ) )
- {
- dataDictionaryService.saveDataDictionary( dictionary );
- }
- }
- }
-
- @Override
- public void deleteIndicator( Indicator indicator )
- {
- for ( DataDictionary dictionary : dataDictionaryService.getAllDataDictionaries() )
- {
- if ( dictionary.getIndicators().remove( indicator ) )
- {
- dataDictionaryService.saveDataDictionary( dictionary );
- }
- }
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java 2014-09-08 13:02:43 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java 1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-package org.hisp.dhis.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.common.GenericIdentifiableObjectStore;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.i18n.I18nService;
-import org.hisp.dhis.system.util.Filter;
-import org.hisp.dhis.system.util.FilterUtils;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import static org.hisp.dhis.i18n.I18nUtils.i18n;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-@Transactional
-public class DefaultDataDictionaryService
- implements DataDictionaryService
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private GenericIdentifiableObjectStore<DataDictionary> dataDictionaryStore;
-
- public void setDataDictionaryStore( GenericIdentifiableObjectStore<DataDictionary> dataDictionaryStore )
- {
- this.dataDictionaryStore = dataDictionaryStore;
- }
-
- private I18nService i18nService;
-
- public void setI18nService( I18nService service )
- {
- i18nService = service;
- }
-
- // -------------------------------------------------------------------------
- // DataDictionary
- // -------------------------------------------------------------------------
-
- public int saveDataDictionary( DataDictionary dataDictionary )
- {
- return dataDictionaryStore.save( dataDictionary );
- }
-
- public DataDictionary getDataDictionary( int id )
- {
- return i18n( i18nService, dataDictionaryStore.get( id ) );
- }
-
- public Collection<DataDictionary> getDataDictionaries( final Collection<Integer> identifiers )
- {
- Collection<DataDictionary> dictionaries = getAllDataDictionaries();
-
- return identifiers == null ? dictionaries : FilterUtils.filter( dictionaries, new Filter<DataDictionary>()
- {
- public boolean retain( DataDictionary object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- public void deleteDataDictionary( DataDictionary dataDictionary )
- {
- dataDictionaryStore.delete( dataDictionary );
- }
-
- public List<DataDictionary> getDataDictionaryByName( String name )
- {
- return new ArrayList<>( i18n( i18nService, dataDictionaryStore.getAllEqName( name ) ) );
- }
-
- public List<DataDictionary> getAllDataDictionaries()
- {
- return new ArrayList<>( i18n( i18nService, dataDictionaryStore.getAll() ) );
- }
-
- public List<DataElement> getDataElementsByDictionaryId( int dictionaryId )
- {
- return new ArrayList<>( i18n( i18nService, dataDictionaryStore.get( dictionaryId ).getDataElements() ) );
- }
-
- public int getDataDictionaryCount()
- {
- return dataDictionaryStore.getCount();
- }
-
- public int getDataDictionaryCountByName( String name )
- {
- return dataDictionaryStore.getCountLikeName( name );
- }
-
- public List<DataDictionary> getDataDictionariesBetween( int first, int max )
- {
- return new ArrayList<>( i18n( i18nService, dataDictionaryStore.getAllOrderedName( first, max ) ) );
- }
-
- public List<DataDictionary> getDataDictionariesBetweenByName( String name, int first, int max )
- {
- return new ArrayList<>( i18n( i18nService, dataDictionaryStore.getAllLikeName( name, first, max ) ) );
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-10-13 12:13:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-10-15 04:17:05 +0000
@@ -254,7 +254,6 @@
// set varchar to text
executeSql( "ALTER TABLE dataelement ALTER description TYPE text" );
executeSql( "ALTER TABLE indicator ALTER description TYPE text" );
- executeSql( "ALTER TABLE datadictionary ALTER description TYPE text" );
executeSql( "ALTER TABLE validationrule ALTER description TYPE text" );
executeSql( "ALTER TABLE expression ALTER expression TYPE text" );
executeSql( "ALTER TABLE translation ALTER value TYPE text" );
@@ -385,7 +384,6 @@
executeSql( "ALTER TABLE chart DROP COLUMN uuid" );
executeSql( "ALTER TABLE concept DROP COLUMN uuid" );
executeSql( "ALTER TABLE constant DROP COLUMN uuid" );
- executeSql( "ALTER TABLE datadictionary DROP COLUMN uuid" );
executeSql( "ALTER TABLE dataelement DROP COLUMN uuid" );
executeSql( "ALTER TABLE dataelementcategory DROP COLUMN uuid" );
executeSql( "ALTER TABLE dataelementcategoryoption DROP COLUMN uuid" );
@@ -580,7 +578,6 @@
executeSql( "UPDATE userroleauthorities SET authority='F_REPORT_PUBLIC_ADD' WHERE authority='F_REPORT_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_REPORTTABLE_PUBLIC_ADD' WHERE authority='F_REPORTTABLE_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_DATASET_PUBLIC_ADD' WHERE authority='F_DATASET_ADD'" );
- executeSql( "UPDATE userroleauthorities SET authority='F_DATADICTIONARY_PUBLIC_ADD' WHERE authority='F_DATADICTIONARY_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_DATAELEMENT_PUBLIC_ADD' WHERE authority='F_DATAELEMENT_ADD'" );
executeSql( "UPDATE userroleauthorities SET authority='F_DATAELEMENTGROUP_PUBLIC_ADD' WHERE authority='F_DATAELEMENTGROUP_ADD'" );
@@ -610,7 +607,6 @@
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENT_UPDATE'" );
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENTGROUP_UPDATE'" );
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENTGROUPSET_UPDATE'" );
- executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATADICTIONARY_UPDATE'" );
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENT_MINMAX_UPDATE'" );
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATASET_UPDATE'" );
executeSql( "DELETE FROM userroleauthorities WHERE authority='F_SECTION_UPDATE'" );
@@ -658,7 +654,6 @@
executeSql( "ALTER TABLE reporttable DROP CONSTRAINT reporttable_name_key" );
executeSql( "ALTER TABLE report DROP CONSTRAINT report_name_key" );
executeSql( "ALTER TABLE usergroup DROP CONSTRAINT usergroup_name_key" );
- executeSql( "ALTER TABLE datadictionary DROP CONSTRAINT datadictionary_name_key" );
executeSql( "update relativeperiods set lastweek = false where lastweek is null" );
executeSql( "update relativeperiods set last4weeks = false where last4weeks is null" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java 2014-10-15 04:17:05 +0000
@@ -28,7 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.system.deletion.DeletionHandler;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,8 +38,6 @@
public class UserSettingDeletionHandler
extends DeletionHandler
{
- private static final String SETTING_NAME_DATADICTIONARY = "currentDataDictionary";
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -59,18 +56,6 @@
}
@Override
- public void deleteDataDictionary( DataDictionary dataDictionary )
- {
- for ( UserSetting setting : userService.getUserSettings( SETTING_NAME_DATADICTIONARY ) )
- {
- if ( setting.getValue() != null && (Integer) setting.getValue() == dataDictionary.getId() )
- {
- userService.deleteUserSetting( setting );
- }
- }
- }
-
- @Override
public void deleteUser( User user )
{
for ( UserSetting setting : userService.getAllUserSettings( user ) )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-10-01 11:57:21 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-10-15 04:17:05 +0000
@@ -63,12 +63,6 @@
<property name="cacheable" value="true" />
</bean>
- <bean id="org.hisp.dhis.datadictionary.DataDictionaryStore" class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
- <property name="clazz" value="org.hisp.dhis.datadictionary.DataDictionary" />
- <property name="sessionFactory" ref="sessionFactory" />
- <property name="cacheable" value="true" />
- </bean>
-
<bean id="org.hisp.dhis.datavalue.DataValueStore" class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore">
<property name="sessionFactory" ref="sessionFactory" />
<property name="periodStore" ref="org.hisp.dhis.period.PeriodStore" />
@@ -461,11 +455,6 @@
<property name="minMaxDataElementStore" ref="org.hisp.dhis.minmax.MinMaxDataElementStore" />
</bean>
- <bean id="org.hisp.dhis.datadictionary.DataDictionaryService" class="org.hisp.dhis.datadictionary.DefaultDataDictionaryService">
- <property name="dataDictionaryStore" ref="org.hisp.dhis.datadictionary.DataDictionaryStore" />
- <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
- </bean>
-
<bean id="org.hisp.dhis.indicator.IndicatorService" class="org.hisp.dhis.indicator.DefaultIndicatorService">
<property name="indicatorStore" ref="org.hisp.dhis.indicator.IndicatorStore" />
<property name="indicatorTypeStore" ref="org.hisp.dhis.indicator.IndicatorTypeStore" />
@@ -999,7 +988,6 @@
<value>indicator</value>
<value>indicatorgroup</value>
<value>indicatorgroupset</value>
- <value>datadictionary</value>
<value>validationrule</value>
<value>validationrulegroup</value>
<value>dataset</value>
@@ -1089,10 +1077,6 @@
<property name="jdbcTemplate" ref="jdbcTemplate" />
</bean>
- <bean id="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler" class="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- </bean>
-
<bean id="org.hisp.dhis.dataelement.DataElementDeletionHandler" class="org.hisp.dhis.dataelement.DataElementDeletionHandler">
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
@@ -1259,7 +1243,6 @@
<list>
<list>
<ref local="org.hisp.dhis.dataapproval.DataApprovalDeletionHandler" />
- <ref local="org.hisp.dhis.datadictionary.DataDictionaryDeletionHandler" />
<ref local="org.hisp.dhis.dataelement.DataElementDeletionHandler" />
<ref local="org.hisp.dhis.dataelement.DataElementGroupDeletionHandler" />
<ref local="org.hisp.dhis.dataelement.DataElementCategoryOptionDeletionHandler" />
@@ -1307,7 +1290,6 @@
<aop:aspect ref="deletionInterceptor">
<aop:before pointcut="execution( * org.hisp.dhis.dataapproval.DataApprovalLevelService.delete*(..) )" method="intercept" />
- <aop:before pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.delete*(..) )" method="intercept" />
<aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.delete*(..) )" method="intercept" />
<aop:before pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.delete*(..) )" method="intercept" />
<aop:before pointcut="execution( * org.hisp.dhis.dataset.DataSetService.deleteDataSet(..) )" method="intercept" />
@@ -1334,7 +1316,6 @@
<!-- <aop:aspect ref="i18nTranslationInterceptor"> <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementService.get*(..)
)" method="intercept" returning="idObject"/> <aop:after-returning pointcut="execution( * org.hisp.dhis.dataelement.DataElementCategoryService.get*(..)
)" method="intercept" returning="idObject"/> <aop:after-returning pointcut="execution( * org.hisp.dhis.indicator.IndicatorService.get*(..)
- )" method="intercept" returning="idObject"/> <aop:after-returning pointcut="execution( * org.hisp.dhis.datadictionary.DataDictionaryService.get*(..)
)" method="intercept" returning="idObject"/> <aop:after-returning pointcut="execution( * org.hisp.dhis.dataset.DataSetService.get*(..)
)" method="intercept" returning="idObject"/> <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitService.get*(..)
)" method="intercept" returning="idObject"/> <aop:after-returning pointcut="execution( * org.hisp.dhis.organisationunit.OrganisationUnitGroupService.get*(..)
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml 2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml 2014-10-15 04:17:05 +0000
@@ -5460,18 +5460,6 @@
<para>Type the name of the category combination in the "Name" field, and then select the desired categories from the left panel. Press the "Move right" button to add the selected categories to the category combination. Press "Move left" to remove any categories that should not be part of the category combination. </para>
<para>Categories can only be added to a category combination at this step. Categories can be removed from category combinations later by editing the category combination, however, it is not allowed to add additional categories once the combination has been created. Ensure that the category combination and its respective categories is final before you create the category combination and assign it to a data element. </para>
</section>
-<section id="dataDictionary">
-<title>Data dictionaries</title>
-<para>Data dictionaries are used to group data elements and indicators during filtering operations. They are useful for combining related groups of data elements and indicators according to the programs to which they belong. For instance a data dictionary called "MCH" could be created, and all maternal and child health data elements and indicators could be added to the dictionary. The data dictionary can be access by choosing Maintenance->Data elements and indicators->Data dictionary. The following screen will be displayed in the browser. </para>
-<screenshot>
-<mediaobject>
-<imageobject>
-<imagedata width="100%" fileref="resources/images/maintainence/data_dictionary.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-<para>Provide a name for the data dictionary in the "Name" field and a description of its contents. Data elements and indicators can be added or removed from the dictionary. Click "Save" if you are creating a new data dictionary or "Add" if you are editing the contents of an existing data dictionary. </para>
-</section>
<section id="translation">
<title>Translations</title>
<para>DHIS 2 provides functionality for translations of database content like data elements, data element groups, indicators, indicator groups, validation rules and more. These elements can be translated to any number of locales. A locale represents a specific geographical, political, or cultural region. </para>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-10-10 17:54:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-10-15 04:17:05 +0000
@@ -74,7 +74,7 @@
#-- Intro modules -------------------------------------------------------------#
-intro_dhis-web-maintenance-datadictionary=Maintain data elements, indicators, data dictionaries, categories and groups.
+intro_dhis-web-maintenance-datadictionary=Maintain data elements, indicators, categories and groups.
intro_dhis-web-maintenance-dataset=Maintain data sets, custom forms, sections and compulsory data elements.
intro_dhis-web-maintenance-organisationunit=Maintain organisation units and its hierarchy, groups and group sets.
intro_dhis-web-maintenance-user=Maintain users in terms of authorities and passwords, user roles and groups.
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary'
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml 2013-02-12 06:55:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
- [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
- >
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.datadictionary.DataDictionary" table="datadictionary">
-
- <cache usage="read-write" />
-
- <id name="id" column="datadictionaryid">
- <generator class="native" />
- </id>
- &identifiableProperties;
-
- <property name="name" column="name" not-null="true" unique="false" length="230" />
-
- <property name="description" type="text" />
-
- <property name="region" />
-
- <set name="dataElements" table="datadictionarydataelements">
- <key column="datadictionaryid" foreign-key="fk_datadictionarydataelements_datadictionaryid" />
- <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
- foreign-key="fk_datadictionarydataelements_dataelementid" />
- </set>
-
- <set name="indicators" table="datadictionaryindicators">
- <key column="datadictionaryid" foreign-key="fk_datadictionaryindicators_datadictionaryid" />
- <many-to-many class="org.hisp.dhis.indicator.Indicator" column="indicatorid" foreign-key="fk_datadictionaryindicators_indicatorid" />
- </set>
-
- <!-- Access properties -->
- <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_datadictionary_userid" />
-
- <property name="publicAccess" length="8" />
-
- <set name="userGroupAccesses" table="datadictionaryusergroupaccesses">
- <cache usage="read-write" />
- <key column="datadictionaryid" />
- <many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
- </set>
-
- </class>
-</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java 2014-09-12 11:14:27 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java 2014-10-15 04:17:05 +0000
@@ -28,11 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.chart.Chart;
@@ -44,7 +42,6 @@
import org.hisp.dhis.dashboard.Dashboard;
import org.hisp.dhis.dashboard.DashboardItem;
import org.hisp.dhis.dataapproval.DataApprovalLevel;
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.dataelement.CategoryOptionGroup;
import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
import org.hisp.dhis.dataelement.DataElement;
@@ -98,9 +95,11 @@
import org.hisp.dhis.validation.ValidationRule;
import org.hisp.dhis.validation.ValidationRuleGroup;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.google.common.collect.Lists;
/**
* @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
@@ -202,8 +201,6 @@
private List<MapLayer> mapLayers = new ArrayList<>();
- private List<DataDictionary> dataDictionaries = new ArrayList<>();
-
private List<Section> sections = new ArrayList<>();
private List<DataSet> dataSets = new ArrayList<>();
@@ -862,19 +859,6 @@
}
@JsonProperty
- @JacksonXmlElementWrapper( localName = "dataDictionaries", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "dataDictionary", namespace = DxfNamespaces.DXF_2_0 )
- public List<DataDictionary> getDataDictionaries()
- {
- return dataDictionaries;
- }
-
- public void setDataDictionaries( List<DataDictionary> dataDictionaries )
- {
- this.dataDictionaries = dataDictionaries;
- }
-
- @JsonProperty
@JacksonXmlElementWrapper( localName = "programs", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "program", namespace = DxfNamespaces.DXF_2_0 )
public List<Program> getPrograms()
@@ -1104,7 +1088,6 @@
", mapLegends=" + mapLegends +
", mapLegendSets=" + mapLegendSets +
", mapLayers=" + mapLayers +
- ", dataDictionaries=" + dataDictionaries +
", sections=" + sections +
", dataSets=" + dataSets +
", programs=" + programs +
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2014-10-09 10:18:31 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2014-10-15 04:17:05 +0000
@@ -225,10 +225,6 @@
<constructor-arg name="importerClass" type="java.lang.Class" value="org.hisp.dhis.validation.ValidationRuleGroup" />
</bean>
- <bean id="dataDictionaryImporter" class="org.hisp.dhis.dxf2.metadata.importers.DefaultIdentifiableObjectImporter" scope="prototype">
- <constructor-arg name="importerClass" type="java.lang.Class" value="org.hisp.dhis.datadictionary.DataDictionary" />
- </bean>
-
<!-- register tracker importers -->
<bean id="eventReportImporter" class="org.hisp.dhis.dxf2.metadata.importers.DefaultIdentifiableObjectImporter" scope="prototype">
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java 2014-10-15 04:17:05 +0000
@@ -69,15 +69,9 @@
void importIndicatorGroupSets();
void importIndicatorGroupSetMembers();
-
- void importDataDictionaries();
-
+
void importDataSets();
- void importDataDictionaryDataElements();
-
- void importDataDictionaryIndicators();
-
void importDataSetMembers();
void importOrganisationUnits();
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java 2014-10-10 16:57:54 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java 2014-10-15 04:17:05 +0000
@@ -41,8 +41,6 @@
import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.constant.Constant;
import org.hisp.dhis.constant.ConstantService;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -73,9 +71,6 @@
import org.hisp.dhis.jdbc.batchhandler.CategoryComboCategoryAssociationBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.ConceptBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.ConstantBatchHandler;
-import org.hisp.dhis.jdbc.batchhandler.DataDictionaryBatchHandler;
-import org.hisp.dhis.jdbc.batchhandler.DataDictionaryDataElementBatchHandler;
-import org.hisp.dhis.jdbc.batchhandler.DataDictionaryIndicatorBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementCategoryBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementCategoryComboBatchHandler;
@@ -185,13 +180,6 @@
this.indicatorService = indicatorService;
}
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
private DataSetService dataSetService;
public void setDataSetService( DataSetService dataSetService )
@@ -656,62 +644,6 @@
log.info( "Imported IndicatorGroupSet members" );
}
- else if ( reader.isStartElement( DataDictionaryConverter.COLLECTION_NAME ) )
- {
- log.debug("Starting DataDictionaries import");
-
- state.setMessage( "importing_data_dictionaries" );
-
- BatchHandler<DataDictionary> batchHandler = batchHandlerFactory.createBatchHandler(
- DataDictionaryBatchHandler.class ).init();
-
- XMLConverter converter = new DataDictionaryConverter( batchHandler, importObjectService,
- dataDictionaryService );
-
- converterInvoker.invokeRead( converter, reader, params );
-
- batchHandler.flush();
-
- log.info( "Imported DataDictionaries" );
- }
- else if ( reader.isStartElement( DataDictionaryDataElementConverter.COLLECTION_NAME ) )
- {
- log.debug("Starting DataDictionary DataElements import");
-
- state.setMessage( "importing_data_dictionary_data_elements" );
-
- BatchHandler<GroupMemberAssociation> batchHandler = batchHandlerFactory.createBatchHandler(
- DataDictionaryDataElementBatchHandler.class ).init();
-
- XMLConverter converter = new DataDictionaryDataElementConverter( batchHandler, importObjectService,
- objectMappingGenerator.getDataDictionaryMapping( params.skipMapping() ), objectMappingGenerator
- .getDataElementMapping( params.skipMapping() ) );
-
- converterInvoker.invokeRead( converter, reader, params );
-
- batchHandler.flush();
-
- log.info( "Imported DataDictionary DataElements" );
- }
- else if ( reader.isStartElement( DataDictionaryIndicatorConverter.COLLECTION_NAME ) )
- {
- log.debug("Starting DataDictionary Indicators import");
-
- state.setMessage( "importing_data_dictionary_indicators" );
-
- BatchHandler<GroupMemberAssociation> batchHandler = batchHandlerFactory.createBatchHandler(
- DataDictionaryIndicatorBatchHandler.class ).init();
-
- XMLConverter converter = new DataDictionaryIndicatorConverter( batchHandler, importObjectService,
- objectMappingGenerator.getDataDictionaryMapping( params.skipMapping() ), objectMappingGenerator
- .getIndicatorMapping( params.skipMapping() ) );
-
- converterInvoker.invokeRead( converter, reader, params );
-
- batchHandler.flush();
-
- log.info( "Imported DataDictionary Indicators" );
- }
else if ( reader.isStartElement( DataSetConverter.COLLECTION_NAME ) )
{
log.debug("Starting DataSets import");
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.java 1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-package org.hisp.dhis.importexport.dxf.converter;
-
-/*
- * Copyright (c) 2004-2014, 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.Map;
-
-import org.amplecode.quick.BatchHandler;
-import org.amplecode.staxwax.reader.XMLReader;
-import org.amplecode.staxwax.writer.XMLWriter;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.importexport.ExportParams;
-import org.hisp.dhis.importexport.ImportObjectService;
-import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
-import org.hisp.dhis.importexport.importer.DataDictionaryImporter;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryConverter
- extends DataDictionaryImporter implements XMLConverter
-{
- public static final String COLLECTION_NAME = "dataDictionaries";
- public static final String ELEMENT_NAME = "dataDictionary";
-
- private static final String FIELD_ID = "id";
- private static final String FIELD_UID = "uid";
- private static final String FIELD_CODE = "code";
- private static final String FIELD_NAME = "name";
- private static final String FIELD_DESCRIPTION = "description";
- private static final String FIELD_REGION = "region";
-
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- /**
- * Constructor for write operations.
- */
- public DataDictionaryConverter( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- /**
- * Constructor for read operations.
- *
- * @param batchHandler the batchHandler to use.
- * @param importObjectService the importObjectService to use.
- * @param dataDictionaryService the dataDictionaryService to use.
- */
- public DataDictionaryConverter( BatchHandler<DataDictionary> batchHandler,
- ImportObjectService importObjectService,
- DataDictionaryService dataDictionaryService )
- {
- this.batchHandler = batchHandler;
- this.importObjectService = importObjectService;
- this.dataDictionaryService = dataDictionaryService;
- }
-
- // -------------------------------------------------------------------------
- // XMLConverter implementation
- // -------------------------------------------------------------------------
-
- public void write( XMLWriter writer, ExportParams params )
- {
- Collection<DataDictionary> dataDictionaries = dataDictionaryService.getDataDictionaries( params.getDataDictionaries() );
-
- if ( dataDictionaries != null && dataDictionaries.size() > 0 )
- {
- writer.openElement( COLLECTION_NAME );
-
- for ( DataDictionary dictionary : dataDictionaries )
- {
- writer.openElement( ELEMENT_NAME );
-
- writer.writeElement( FIELD_ID, String.valueOf( dictionary.getId() ) );
- writer.writeElement( FIELD_UID, dictionary.getUid() );
- writer.writeElement( FIELD_CODE, dictionary.getCode() );
- writer.writeElement( FIELD_NAME, dictionary.getName() );
- writer.writeElement( FIELD_DESCRIPTION, dictionary.getDescription() );
- writer.writeElement( FIELD_REGION, dictionary.getRegion() );
-
- writer.closeElement();
- }
-
- writer.closeElement();
- }
- }
-
- public void read( XMLReader reader, ImportParams params )
- {
- while ( reader.moveToStartElement( ELEMENT_NAME, COLLECTION_NAME ) )
- {
- final Map<String, String> values = reader.readElements( ELEMENT_NAME );
-
- final DataDictionary dictionary = new DataDictionary();
-
- dictionary.setId( Integer.parseInt( values.get( FIELD_ID ) ) );
- dictionary.setUid( values.get( FIELD_UID ) );
- dictionary.setCode( values.get( FIELD_CODE ) );
- dictionary.setName( values.get( FIELD_NAME ) );
- dictionary.setDescription( values.get( FIELD_DESCRIPTION ) );
- dictionary.setRegion( values.get( FIELD_REGION ) );
-
- importObject( dictionary, params );
- }
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryDataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryDataElementConverter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryDataElementConverter.java 1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-package org.hisp.dhis.importexport.dxf.converter;
-
-/*
- * Copyright (c) 2004-2014, 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.Map;
-
-import org.amplecode.quick.BatchHandler;
-import org.amplecode.staxwax.reader.XMLReader;
-import org.amplecode.staxwax.writer.XMLWriter;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.importexport.AssociationType;
-import org.hisp.dhis.importexport.ExportParams;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-import org.hisp.dhis.importexport.GroupMemberType;
-import org.hisp.dhis.importexport.ImportObjectService;
-import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.Importer;
-import org.hisp.dhis.importexport.XMLConverter;
-import org.hisp.dhis.importexport.importer.GroupMemberImporter;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryDataElementConverter
- extends GroupMemberImporter implements XMLConverter, Importer<GroupMemberAssociation>
-{
- public static final String COLLECTION_NAME = "dataDictionaryDataElements";
- public static final String ELEMENT_NAME = "dataDictionaryDataElement";
-
- private static final String FIELD_DATADICTIONARY = "dataDictionary";
- private static final String FIELD_DATAELEMENT = "dataElement";
-
- // -------------------------------------------------------------------------
- // Properties
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- private Map<Object, Integer> dataDictionaryMapping;
-
- private Map<Object, Integer> dataElementMapping;
-
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- /**
- * Constructor for write operations.
- */
- public DataDictionaryDataElementConverter( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- /**
- * Constructor for read operations.
- */
- public DataDictionaryDataElementConverter( BatchHandler<GroupMemberAssociation> batchHandler,
- ImportObjectService importObjectService,
- Map<Object, Integer> dataDictionaryMapping,
- Map<Object, Integer> dataElementMapping )
- {
- this.batchHandler = batchHandler;
- this.importObjectService = importObjectService;
- this.dataDictionaryMapping = dataDictionaryMapping;
- this.dataElementMapping = dataElementMapping;
- }
-
- // -------------------------------------------------------------------------
- // XMLConverter implementation
- // -------------------------------------------------------------------------
-
- public void write( XMLWriter writer, ExportParams params )
- {
- Collection<DataDictionary> dataDictionaries = dataDictionaryService.getDataDictionaries( params.getDataDictionaries() );
-
- if ( dataDictionaries != null && dataDictionaries.size() > 0 )
- {
- writer.openElement( COLLECTION_NAME );
-
- for ( DataDictionary dictionary : dataDictionaries )
- {
- if ( dictionary.getDataElements() != null )
- {
- for ( DataElement element : dictionary.getDataElements() )
- {
- writer.openElement( ELEMENT_NAME );
-
- writer.writeElement( FIELD_DATADICTIONARY, String.valueOf( dictionary.getId() ) );
- writer.writeElement( FIELD_DATAELEMENT, String.valueOf( element.getId() ) );
-
- writer.closeElement();
- }
- }
- }
-
- writer.closeElement();
- }
- }
-
- public void read( XMLReader reader, ImportParams params )
- {
- while ( reader.moveToStartElement( ELEMENT_NAME, COLLECTION_NAME ) )
- {
- final Map<String, String> values = reader.readElements( ELEMENT_NAME );
-
- final GroupMemberAssociation association = new GroupMemberAssociation( AssociationType.SET );
-
- association.setGroupId( dataDictionaryMapping.get( Integer.parseInt( values.get( FIELD_DATADICTIONARY ) ) ) );
- association.setMemberId( dataElementMapping.get( Integer.parseInt( values.get( FIELD_DATAELEMENT ) ) ) );
-
- importObject( association, params );
- }
- }
-
- public void importObject( GroupMemberAssociation object, ImportParams params )
- {
- read( object, GroupMemberType.DATADICTIONARY_DATAELEMENT, params );
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryIndicatorConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryIndicatorConverter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryIndicatorConverter.java 1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-package org.hisp.dhis.importexport.dxf.converter;
-
-/*
- * Copyright (c) 2004-2014, 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.Map;
-
-import org.amplecode.quick.BatchHandler;
-import org.amplecode.staxwax.reader.XMLReader;
-import org.amplecode.staxwax.writer.XMLWriter;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.importexport.AssociationType;
-import org.hisp.dhis.importexport.ExportParams;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-import org.hisp.dhis.importexport.GroupMemberType;
-import org.hisp.dhis.importexport.ImportObjectService;
-import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.Importer;
-import org.hisp.dhis.importexport.XMLConverter;
-import org.hisp.dhis.importexport.importer.GroupMemberImporter;
-import org.hisp.dhis.indicator.Indicator;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryIndicatorConverter
- extends GroupMemberImporter implements XMLConverter, Importer<GroupMemberAssociation>
-{
- public static final String COLLECTION_NAME = "dataDictionaryIndicators";
- public static final String ELEMENT_NAME = "dataDictionaryIndicator";
-
- private static final String FIELD_DATADICTIONARY = "dataDictionary";
- private static final String FIELD_INDICATOR = "indicator";
-
- // -------------------------------------------------------------------------
- // Properties
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- private Map<Object, Integer> dataDictionaryMapping;
-
- private Map<Object, Integer> indicatorMapping;
-
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- /**
- * Constructor for write operations.
- */
- public DataDictionaryIndicatorConverter( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- /**
- * Constructor for read operations.
- */
- public DataDictionaryIndicatorConverter( BatchHandler<GroupMemberAssociation> batchHandler,
- ImportObjectService importObjectService,
- Map<Object, Integer> dataDictionaryMapping,
- Map<Object, Integer> indicatorMapping )
- {
- this.batchHandler = batchHandler;
- this.importObjectService = importObjectService;
- this.dataDictionaryMapping = dataDictionaryMapping;
- this.indicatorMapping = indicatorMapping;
- }
-
- // -------------------------------------------------------------------------
- // XMLConverter implementation
- // -------------------------------------------------------------------------
-
- public void write( XMLWriter writer, ExportParams params )
- {
- Collection<DataDictionary> dataDictionaries = dataDictionaryService.getDataDictionaries( params.getDataDictionaries() );
-
- if ( dataDictionaries != null && dataDictionaries.size() > 0 )
- {
- writer.openElement( COLLECTION_NAME );
-
- for ( DataDictionary dictionary : dataDictionaries )
- {
- if ( dictionary.getDataElements() != null )
- {
- for ( Indicator indicator : dictionary.getIndicators() )
- {
- writer.openElement( ELEMENT_NAME );
-
- writer.writeElement( FIELD_DATADICTIONARY, String.valueOf( dictionary.getId() ) );
- writer.writeElement( FIELD_INDICATOR, String.valueOf( indicator.getId() ) );
-
- writer.closeElement();
- }
- }
- }
-
- writer.closeElement();
- }
- }
-
- public void read( XMLReader reader, ImportParams params )
- {
- while ( reader.moveToStartElement( ELEMENT_NAME, COLLECTION_NAME ) )
- {
- final Map<String, String> values = reader.readElements( ELEMENT_NAME );
-
- final GroupMemberAssociation association = new GroupMemberAssociation( AssociationType.SET );
-
- association.setGroupId( dataDictionaryMapping.get( Integer.parseInt( values.get( FIELD_DATADICTIONARY ) ) ) );
- association.setMemberId( indicatorMapping.get( Integer.parseInt( values.get( FIELD_INDICATOR ) ) ) );
-
- importObject( association, params );
- }
- }
-
- @Override
- public void importObject( GroupMemberAssociation object, ImportParams params )
- {
- read( object, GroupMemberType.DATADICTIONARY_INDICATOR, params );
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2014-10-15 04:17:05 +0000
@@ -49,7 +49,6 @@
import org.hisp.dhis.chart.ChartService;
import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.constant.ConstantService;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.DataSetService;
@@ -61,9 +60,6 @@
import org.hisp.dhis.importexport.dxf.converter.ChartConverter;
import org.hisp.dhis.importexport.dxf.converter.ConceptConverter;
import org.hisp.dhis.importexport.dxf.converter.ConstantConverter;
-import org.hisp.dhis.importexport.dxf.converter.DataDictionaryConverter;
-import org.hisp.dhis.importexport.dxf.converter.DataDictionaryDataElementConverter;
-import org.hisp.dhis.importexport.dxf.converter.DataDictionaryIndicatorConverter;
import org.hisp.dhis.importexport.dxf.converter.DataElementCategoryComboConverter;
import org.hisp.dhis.importexport.dxf.converter.DataElementCategoryConverter;
import org.hisp.dhis.importexport.dxf.converter.DataElementCategoryOptionComboConverter;
@@ -157,13 +153,6 @@
this.indicatorService = indicatorService;
}
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
private DataSetService dataSetService;
public void setDataSetService( DataSetService dataSetService )
@@ -282,10 +271,6 @@
thread.registerXMLConverter( new IndicatorGroupSetConverter( indicatorService ) );
thread.registerXMLConverter( new IndicatorGroupSetMemberConverter( indicatorService ) );
- thread.registerXMLConverter( new DataDictionaryConverter( dataDictionaryService ) );
- thread.registerXMLConverter( new DataDictionaryDataElementConverter( dataDictionaryService ) );
- thread.registerXMLConverter( new DataDictionaryIndicatorConverter( dataDictionaryService ) );
-
thread.registerXMLConverter( new DataSetConverter( dataSetService ) );
thread.registerXMLConverter( new DataSetMemberConverter( dataSetService, dataElementService ) );
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java 1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-package org.hisp.dhis.importexport.importer;
-
-/*
- * Copyright (c) 2004-2014, 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.amplecode.quick.BatchHandler;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.importexport.GroupMemberType;
-import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.Importer;
-import org.hisp.dhis.importexport.mapping.NameMappingUtil;
-
-import java.util.List;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryImporter
- extends AbstractImporter<DataDictionary> implements Importer<DataDictionary>
-{
- protected DataDictionaryService dataDictionaryService;
-
- public DataDictionaryImporter()
- {
- }
-
- public DataDictionaryImporter( BatchHandler<DataDictionary> batchHandler, DataDictionaryService dataDictionaryService )
- {
- this.batchHandler = batchHandler;
- this.dataDictionaryService = dataDictionaryService;
- }
-
- @Override
- public void importObject( DataDictionary object, ImportParams params )
- {
- NameMappingUtil.addDataDictionaryMapping( object.getId(), object.getName() );
-
- read( object, GroupMemberType.NONE, params );
- }
-
- @Override
- protected void importUnique( DataDictionary object )
- {
- batchHandler.addObject( object );
- }
-
- @Override
- protected void importMatching( DataDictionary object, DataDictionary match )
- {
- match.setName( object.getName() );
- match.setDescription( object.getDescription() );
- match.setRegion( object.getRegion() );
-
- dataDictionaryService.saveDataDictionary( match );
- }
-
- @Override
- protected DataDictionary getMatching( DataDictionary object )
- {
- List<DataDictionary> dataDictionaryByName = dataDictionaryService.getDataDictionaryByName( object.getName() );
- return dataDictionaryByName.isEmpty() ? null : dataDictionaryByName.get( 0 );
- }
-
- @Override
- protected boolean isIdentical( DataDictionary object, DataDictionary existing )
- {
- if ( !object.getName().equals( existing.getName() ) )
- {
- return false;
- }
- if ( !isSimiliar( object.getDescription(), existing.getDescription() ) || (isNotNull( object.getDescription(), existing.getDescription() ) && !object.getDescription().equals( existing.getDescription() )) )
- {
- return false;
- }
- if ( !isSimiliar( object.getRegion(), existing.getRegion() ) || (isNotNull( object.getRegion(), existing.getRegion() ) && !object.getRegion().equals( existing.getRegion() )) )
- {
- return false;
- }
-
- return true;
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java 2014-10-15 04:17:05 +0000
@@ -35,7 +35,6 @@
import org.amplecode.quick.BatchHandlerFactory;
import org.hisp.dhis.concept.Concept;
import org.hisp.dhis.constant.Constant;
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -51,7 +50,6 @@
import org.hisp.dhis.indicator.IndicatorType;
import org.hisp.dhis.jdbc.batchhandler.ConceptBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.ConstantBatchHandler;
-import org.hisp.dhis.jdbc.batchhandler.DataDictionaryBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementCategoryBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementCategoryComboBatchHandler;
@@ -261,18 +259,6 @@
}
// -------------------------------------------------------------------------
- // DataDictionary
- // -------------------------------------------------------------------------
-
- public Map<Object, Integer> getDataDictionaryMapping( boolean skipMapping )
- {
- BatchHandler<DataDictionary> batchHandler = batchHandlerFactory
- .createBatchHandler( DataDictionaryBatchHandler.class );
-
- return getMapping( batchHandler, NameMappingUtil.getDataDictionaryMap(), skipMapping );
- }
-
- // -------------------------------------------------------------------------
// DataSet
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java 2014-10-15 04:17:05 +0000
@@ -53,7 +53,6 @@
private static ThreadLocal<Map<Object, String>> indicatorGroupMap = new ThreadLocal<>();
private static ThreadLocal<Map<Object, String>> indicatorGroupSetMap = new ThreadLocal<>();
private static ThreadLocal<Map<Object, String>> indicatorTypeMap = new ThreadLocal<>();
- private static ThreadLocal<Map<Object, String>> dataDictionaryMap = new ThreadLocal<>();
private static ThreadLocal<Map<Object, Period>> periodMap = new ThreadLocal<>();
private static ThreadLocal<Map<Object, String>> dataSetMap = new ThreadLocal<>();
private static ThreadLocal<Map<Object, String>> organisationUnitMap = new ThreadLocal<>();
@@ -82,7 +81,6 @@
indicatorGroupMap.remove();
indicatorGroupSetMap.remove();
indicatorTypeMap.remove();
- dataDictionaryMap.remove();
periodMap.remove();
dataSetMap.remove();
organisationUnitMap.remove();
@@ -347,26 +345,6 @@
{
return indicatorTypeMap.get() != null ? new HashMap<>( indicatorTypeMap.get() ) : new HashMap<Object, String>();
}
-
- // -------------------------------------------------------------------------
- // DataDictionary
- // -------------------------------------------------------------------------
-
- /**
- * Adds a map entry with DataDictionary identifier as key and name as value.
- */
- public static void addDataDictionaryMapping( Object dictionaryId, String dictionaryName )
- {
- put( dataDictionaryMap, dictionaryId, dictionaryName );
- }
-
- /**
- * Returns a map with all DataDictionary identifier and name entries.
- */
- public static Map<Object, String> getDataDictionaryMap()
- {
- return dataDictionaryMap.get() != null ? new HashMap<>( dataDictionaryMap.get() ) : new HashMap<Object, String>();
- }
// -------------------------------------------------------------------------
// Period
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/ObjectMappingGenerator.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/ObjectMappingGenerator.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/ObjectMappingGenerator.java 2014-10-15 04:17:05 +0000
@@ -71,8 +71,6 @@
Map<Object, Integer> getIndicatorTypeMapping( boolean skipMapping );
- Map<Object, Integer> getDataDictionaryMapping( boolean skipMapping );
-
Map<Object, Integer> getDataSetMapping( boolean skipMapping );
Map<Object, Integer> getOrganisationUnitMapping( boolean skipMapping );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2014-10-15 04:17:05 +0000
@@ -41,8 +41,6 @@
import org.hisp.dhis.chart.ChartService;
import org.hisp.dhis.constant.Constant;
import org.hisp.dhis.constant.ConstantService;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -71,7 +69,6 @@
import org.hisp.dhis.importexport.Importer;
import org.hisp.dhis.importexport.importer.ChartImporter;
import org.hisp.dhis.importexport.importer.ConstantImporter;
-import org.hisp.dhis.importexport.importer.DataDictionaryImporter;
import org.hisp.dhis.importexport.importer.DataElementCategoryComboImporter;
import org.hisp.dhis.importexport.importer.DataElementCategoryImporter;
import org.hisp.dhis.importexport.importer.DataElementCategoryOptionImporter;
@@ -103,9 +100,6 @@
import org.hisp.dhis.jdbc.batchhandler.CategoryCategoryOptionAssociationBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.CategoryComboCategoryAssociationBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.ConstantBatchHandler;
-import org.hisp.dhis.jdbc.batchhandler.DataDictionaryBatchHandler;
-import org.hisp.dhis.jdbc.batchhandler.DataDictionaryDataElementBatchHandler;
-import org.hisp.dhis.jdbc.batchhandler.DataDictionaryIndicatorBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementCategoryBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.DataElementCategoryComboBatchHandler;
@@ -204,13 +198,6 @@
this.dataElementService = dataElementService;
}
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
private IndicatorService indicatorService;
public void setIndicatorService( IndicatorService indicatorService )
@@ -677,53 +664,7 @@
log.info( "Imported IndicatorGroupSet members" );
}
-
- @Transactional
- public void importDataDictionaries()
- {
- BatchHandler<DataDictionary> batchHandler = batchHandlerFactory.createBatchHandler(
- DataDictionaryBatchHandler.class ).init();
-
- Collection<ImportObject> importObjects = importObjectStore.getImportObjects( DataDictionary.class );
-
- Importer<DataDictionary> importer = new DataDictionaryImporter( batchHandler, dataDictionaryService );
-
- for ( ImportObject importObject : importObjects )
- {
- importer.importObject( (DataDictionary) importObject.getObject(), params );
- }
-
- batchHandler.flush();
-
- importObjectStore.deleteImportObjects( DataDictionary.class );
-
- log.info( "Imported DataDictionaries" );
- }
-
- @Transactional
- public void importDataDictionaryDataElements()
- {
- BatchHandler<GroupMemberAssociation> batchHandler = batchHandlerFactory
- .createBatchHandler( DataDictionaryDataElementBatchHandler.class );
-
- importGroupMemberAssociation( batchHandler, GroupMemberType.DATADICTIONARY_DATAELEMENT, objectMappingGenerator
- .getDataDictionaryMapping( false ), objectMappingGenerator.getDataElementMapping( false ) );
-
- log.info( "Imported DataDictionary DataElements" );
- }
-
- @Transactional
- public void importDataDictionaryIndicators()
- {
- BatchHandler<GroupMemberAssociation> batchHandler = batchHandlerFactory
- .createBatchHandler( DataDictionaryIndicatorBatchHandler.class );
-
- importGroupMemberAssociation( batchHandler, GroupMemberType.DATADICTIONARY_INDICATOR, objectMappingGenerator
- .getDataDictionaryMapping( false ), objectMappingGenerator.getIndicatorMapping( false ) );
-
- log.info( "Imported DataDictionary Indicators" );
- }
-
+
@Transactional
public void importDataSets()
{
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2014-06-27 16:27:09 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2014-10-15 04:17:05 +0000
@@ -40,8 +40,6 @@
import org.hisp.dhis.common.ImportableObject;
import org.hisp.dhis.constant.Constant;
import org.hisp.dhis.constant.ConstantService;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -137,13 +135,6 @@
this.indicatorService = indicatorService;
}
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
private DataSetService dataSetService;
public void setDataSetService( DataSetService dataSetService )
@@ -305,7 +296,6 @@
deleteMemberAssociations( GroupMemberType.DATAELEMENTGROUP, element.getId() );
deleteMemberAssociations( GroupMemberType.DATASET, element.getId() );
- deleteMemberAssociations( GroupMemberType.DATADICTIONARY_DATAELEMENT, element.getId() );
deleteIndicatorsContainingDataElement( element.getId() );
@@ -335,7 +325,6 @@
Indicator indicator = (Indicator) importObject.getObject();
deleteMemberAssociations( GroupMemberType.INDICATORGROUP, indicator.getId() );
- deleteMemberAssociations( GroupMemberType.DATADICTIONARY_INDICATOR, indicator.getId() );
}
else if ( importObject.getClassName().equals( IndicatorGroup.class.getName() ) )
{
@@ -350,13 +339,6 @@
deleteGroupAssociations( GroupMemberType.INDICATORGROUPSET, groupSet.getId() );
}
- else if ( importObject.getClassName().equals( DataDictionary.class.getName() ) )
- {
- DataDictionary dictionary = (DataDictionary) importObject.getObject();
-
- deleteGroupAssociations( GroupMemberType.DATADICTIONARY_DATAELEMENT, dictionary.getId() );
- deleteGroupAssociations( GroupMemberType.DATADICTIONARY_INDICATOR, dictionary.getId() );
- }
else if ( importObject.getClassName().equals( DataSet.class.getName() ) )
{
DataSet dataSet = (DataSet) importObject.getObject();
@@ -420,9 +402,6 @@
importObjectStore.deleteImportObjects( Indicator.class );
importObjectStore.deleteImportObjects( GroupMemberType.INDICATORGROUP );
- importObjectStore.deleteImportObjects( GroupMemberType.DATADICTIONARY_INDICATOR );
-
- importObjectStore.deleteImportObjects( GroupMemberType.DATADICTIONARY_DATAELEMENT );
importDataValueService.deleteImportDataValues();
}
@@ -439,12 +418,10 @@
{
importObjectStore.deleteImportObjects( Indicator.class );
importObjectStore.deleteImportObjects( GroupMemberType.INDICATORGROUP );
- importObjectStore.deleteImportObjects( GroupMemberType.DATADICTIONARY_INDICATOR );
}
else if ( clazz.equals( Indicator.class ) )
{
importObjectStore.deleteImportObjects( GroupMemberType.INDICATORGROUP );
- importObjectStore.deleteImportObjects( GroupMemberType.DATADICTIONARY_INDICATOR );
}
else if ( clazz.equals( IndicatorGroup.class ) )
{
@@ -455,11 +432,6 @@
{
importObjectStore.deleteImportObjects( GroupMemberType.INDICATORGROUPSET );
}
- else if ( clazz.equals( DataDictionary.class ) )
- {
- importObjectStore.deleteImportObjects( GroupMemberType.DATADICTIONARY_DATAELEMENT );
- importObjectStore.deleteImportObjects( GroupMemberType.DATADICTIONARY_INDICATOR );
- }
else if ( clazz.equals( DataSet.class ) )
{
importObjectStore.deleteImportObjects( GroupMemberType.DATASET );
@@ -549,12 +521,6 @@
groupSet.setName( indicatorService.getIndicatorGroupSet( existingObjectId ).getName() );
}
- else if ( object.getClass().equals( DataDictionary.class ) )
- {
- DataDictionary dictionary = (DataDictionary) object;
-
- dictionary.setName( dataDictionaryService.getDataDictionary( existingObjectId ).getName() );
- }
else if ( object.getClass().equals( DataSet.class ) )
{
DataSet dataSet = (DataSet) object;
@@ -652,9 +618,6 @@
importObjectManager.importIndicatorGroupMembers();
importObjectManager.importIndicatorGroupSets();
importObjectManager.importIndicatorGroupSetMembers();
- importObjectManager.importDataDictionaries();
- importObjectManager.importDataDictionaryDataElements();
- importObjectManager.importDataDictionaryIndicators();
importObjectManager.importDataSets();
importObjectManager.importDataSetMembers();
importObjectManager.importOrganisationUnits();
@@ -772,8 +735,6 @@
importObjectStore.deleteImportObject( importObject );
deleteMemberAssociations( GroupMemberType.INDICATORGROUP, indicator.getId() );
-
- deleteMemberAssociations( GroupMemberType.DATADICTIONARY_INDICATOR, indicator.getId() );
}
}
}
@@ -791,8 +752,6 @@
importObjectStore.deleteImportObject( importObject );
deleteMemberAssociations( GroupMemberType.INDICATORGROUP, indicator.getId() );
-
- deleteMemberAssociations( GroupMemberType.DATADICTIONARY_INDICATOR, indicator.getId() );
}
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2014-10-11 11:23:15 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2014-10-15 04:17:05 +0000
@@ -70,7 +70,6 @@
<property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
@@ -96,7 +95,6 @@
<property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
@@ -194,7 +192,6 @@
<property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
@@ -227,7 +224,6 @@
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java 2014-10-01 14:49:20 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java 2014-10-15 04:17:05 +0000
@@ -130,10 +130,6 @@
emptyTable( "orgunitgroupmembers" );
emptyTable( "orgunitgroup" );
- emptyTable( "datadictionarydataelements" );
- emptyTable( "datadictionaryindicators" );
- emptyTable( "datadictionary" );
-
emptyTable( "validationrulegroupusergroupstoalert" );
emptyTable( "validationrulegroupmembers" );
emptyTable( "validationrulegroup" );
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * Copyright (c) 2004-2014, 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.datadictionary.DataDictionary;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryBatchHandler
- extends AbstractBatchHandler<DataDictionary>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataDictionaryBatchHandler( JdbcConfiguration config )
- {
- super( config, false, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- protected void setTableName()
- {
- statementBuilder.setTableName( "datadictionary" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "datadictionaryid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "datadictionaryid" );
- }
-
- @Override
- protected void setIdentifierValues( DataDictionary dataDictionary )
- {
- statementBuilder.setIdentifierValue( dataDictionary.getId() );
- }
-
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- }
-
- protected void setUniqueValues( DataDictionary dataDictionary )
- {
- statementBuilder.setUniqueValue( dataDictionary.getName() );
- }
-
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "name" );
- statementBuilder.setColumn( "description" );
- statementBuilder.setColumn( "region" );
- }
-
- protected void setValues( DataDictionary dataDictionary )
- {
- statementBuilder.setValue( dataDictionary.getUid() );
- statementBuilder.setValue( dataDictionary.getCode() );
- statementBuilder.setValue( dataDictionary.getName() );
- statementBuilder.setValue( dataDictionary.getDescription() );
- statementBuilder.setValue( dataDictionary.getRegion() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * Copyright (c) 2004-2014, 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryDataElementBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataDictionaryDataElementBatchHandler( JdbcConfiguration config )
- {
- super( config, true, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- protected void setTableName()
- {
- statementBuilder.setTableName( "datadictionarydataelements" );
- }
-
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "datadictionaryid" );
- statementBuilder.setUniqueColumn( "dataelementid" );
- }
-
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- protected void setColumns()
- {
- statementBuilder.setColumn( "datadictionaryid" );
- statementBuilder.setColumn( "dataelementid" );
- }
-
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * Copyright (c) 2004-2014, 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryIndicatorBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataDictionaryIndicatorBatchHandler( JdbcConfiguration config )
- {
- super( config, true, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- protected void setTableName()
- {
- statementBuilder.setTableName( "datadictionaryindicators" );
- }
-
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "datadictionaryid" );
- statementBuilder.setUniqueColumn( "indicatorid" );
- }
-
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- protected void setColumns()
- {
- statementBuilder.setColumn( "datadictionaryid" );
- statementBuilder.setColumn( "indicatorid" );
- }
-
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2014-07-27 17:00:16 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2014-10-15 04:17:05 +0000
@@ -36,7 +36,6 @@
import org.hisp.dhis.constant.Constant;
import org.hisp.dhis.dashboard.DashboardItem;
import org.hisp.dhis.dataapproval.DataApprovalLevel;
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.dataelement.CategoryOptionGroup;
import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
import org.hisp.dhis.dataelement.DataElement;
@@ -165,15 +164,6 @@
return null;
}
- public void deleteDataDictionary( DataDictionary dataDictionary )
- {
- }
-
- public String allowDeleteDataDictionary( DataDictionary dataDictionary )
- {
- return null;
- }
-
public void deleteDataElement( DataElement dataElement )
{
}
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-10-14 05:46:33 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-10-15 04:17:05 +0000
@@ -55,7 +55,6 @@
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.concept.Concept;
import org.hisp.dhis.constant.Constant;
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.dataelement.CategoryOptionGroup;
import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
import org.hisp.dhis.dataelement.DataElement;
@@ -605,21 +604,6 @@
/**
* @param uniqueCharacter A unique character to identify the object.
*/
- public static DataDictionary createDataDictionary( char uniqueCharacter )
- {
- DataDictionary dictionary = new DataDictionary();
- dictionary.setAutoFields();
-
- dictionary.setName( "DataDictionary" + uniqueCharacter );
- dictionary.setDescription( "Description" + uniqueCharacter );
- dictionary.setRegion( "Region" + uniqueCharacter );
-
- return dictionary;
- }
-
- /**
- * @param uniqueCharacter A unique character to identify the object.
- */
public static IndicatorType createIndicatorType( char uniqueCharacter )
{
IndicatorType type = new IndicatorType();
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataDictionaryController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataDictionaryController.java 2014-05-27 12:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataDictionaryController.java 1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-package org.hisp.dhis.webapi.controller;
-
-/*
- * Copyright (c) 2004-2014, 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.datadictionary.DataDictionary;
-import org.hisp.dhis.schema.descriptors.DataDictionarySchemaDescriptor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
- */
-@Controller
-@RequestMapping( value = DataDictionarySchemaDescriptor.API_ENDPOINT )
-public class DataDictionaryController
- extends AbstractCrudController<DataDictionary>
-{
-}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2014-09-29 16:05:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2014-10-15 04:17:05 +0000
@@ -296,18 +296,6 @@
"rangelength" : [ 2, 255 ]
}
},
- "dataDictionary" : {
- "name" : {
- "required" : true,
- "rangelength" : [ 2, 160 ]
- },
- "description" : {
- "rangelength" : [ 0, 255 ]
- },
- "region" : {
- "rangelength" : [ 0, 255 ]
- }
- },
"indicator" : {
"name" : {
"required" : true,
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDataElementListAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDataElementListAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDataElementListAction.java 2014-10-15 04:17:05 +0000
@@ -29,14 +29,10 @@
*/
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.collections.CollectionUtils;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
@@ -62,13 +58,6 @@
this.dataElementService = dataElementService;
}
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -87,29 +76,10 @@
return dataElementGroups;
}
- private List<DataDictionary> dataDictionaries;
-
- public List<DataDictionary> getDataDictionaries()
- {
- return dataDictionaries;
- }
-
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
- private Integer dataDictionaryId;
-
- public Integer getDataDictionaryId()
- {
- return dataDictionaryId;
- }
-
- public void setDataDictionaryId( Integer dataDictionaryId )
- {
- this.dataDictionaryId = dataDictionaryId;
- }
-
private Integer dataElementGroupId;
public void setDataElementGroupId( Integer dataElementGroupId )
@@ -126,25 +96,12 @@
// Action implemantation
// -------------------------------------------------------------------------
- @SuppressWarnings( "unchecked" )
public String execute()
{
- if ( dataDictionaryId != null && dataElementGroupId == null )
- {
- dataElements = new ArrayList<>( dataDictionaryService.getDataDictionary( dataDictionaryId ).getDataElements() );
- }
- else if ( dataDictionaryId == null && dataElementGroupId != null )
+ if ( dataElementGroupId != null )
{
dataElements = new ArrayList<>( dataElementService.getDataElementGroup( dataElementGroupId ).getMembers() );
}
- else if ( dataDictionaryId != null && dataElementGroupId != null )
- {
- Collection<DataElement> dictionary = dataDictionaryService.getDataDictionary( dataDictionaryId ).getDataElements();
-
- Collection<DataElement> members = dataElementService.getDataElementGroup( dataElementGroupId ).getMembers();
-
- dataElements = new ArrayList<DataElement>( CollectionUtils.intersection( dictionary, members ) );
- }
else
{
dataElements = new ArrayList<>( dataElementService.getAllDataElements() );
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetIndicatorListAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetIndicatorListAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetIndicatorListAction.java 2014-10-15 04:17:05 +0000
@@ -29,13 +29,10 @@
*/
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.collections.CollectionUtils;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
@@ -60,13 +57,6 @@
this.indicatorService = indicatorService;
}
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -82,13 +72,6 @@
// Input & Output
// -------------------------------------------------------------------------
- private Integer dataDictionaryId;
-
- public void setDataDictionaryId( Integer dataDictionaryId )
- {
- this.dataDictionaryId = dataDictionaryId;
- }
-
private Integer indicatorGroupId;
public void setIndicatorGroupId( Integer indicatorGroupId )
@@ -100,25 +83,12 @@
// Action implemantation
// -------------------------------------------------------------------------
- @SuppressWarnings( "unchecked" )
public String execute()
{
- if ( dataDictionaryId != null && indicatorGroupId == null )
- {
- indicators = new ArrayList<>( dataDictionaryService.getDataDictionary( dataDictionaryId ).getIndicators() );
- }
- else if ( dataDictionaryId == null && indicatorGroupId != null )
+ if ( indicatorGroupId != null )
{
indicators = new ArrayList<>( indicatorService.getIndicatorGroup( indicatorGroupId ).getMembers() );
}
- else if ( dataDictionaryId != null && indicatorGroupId != null )
- {
- Collection<Indicator> dictionary = dataDictionaryService.getDataDictionary( dataDictionaryId ).getIndicators();
-
- Collection<Indicator> members = indicatorService.getIndicatorGroup( indicatorGroupId ).getMembers();
-
- indicators = new ArrayList<Indicator>( CollectionUtils.intersection( dictionary, members ) );
- }
else
{
indicators = new ArrayList<>( indicatorService.getAllIndicators() );
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java 2014-10-15 04:17:05 +0000
@@ -30,7 +30,6 @@
import static org.hisp.dhis.common.Objects.CHART;
import static org.hisp.dhis.common.Objects.CONSTANT;
-import static org.hisp.dhis.common.Objects.DATADICTIONARY;
import static org.hisp.dhis.common.Objects.DATAELEMENT;
import static org.hisp.dhis.common.Objects.DATAELEMENTGROUP;
import static org.hisp.dhis.common.Objects.DATAELEMENTGROUPSET;
@@ -51,7 +50,6 @@
import org.hisp.dhis.chart.ChartService;
import org.hisp.dhis.constant.ConstantService;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.importexport.ImportObjectService;
@@ -149,13 +147,6 @@
this.indicatorService = indicatorService;
}
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
private DataSetService dataSetService;
public void setDataSetService( DataSetService dataSetService )
@@ -246,10 +237,6 @@
{
objects = indicatorService.getAllIndicatorGroupSets();
}
- else if ( objectType.equals( DATADICTIONARY.name() ) )
- {
- objects = dataDictionaryService.getAllDataDictionaries();
- }
else if ( objectType.equals( DATASET.name() ) )
{
objects = dataSetService.getAllDataSets();
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java 2014-10-15 04:17:05 +0000
@@ -42,7 +42,6 @@
import org.hisp.dhis.chart.Chart;
import org.hisp.dhis.constant.Constant;
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementGroupSet;
@@ -193,13 +192,6 @@
return newIndicatorGroupSets;
}
- private Integer newDataDictionaries;
-
- public Integer getNewDataDictionaries()
- {
- return newDataDictionaries;
- }
-
private Integer newDataSets;
public Integer getNewDataSets()
@@ -347,13 +339,6 @@
return updateIndicatorGroupSets;
}
- private Integer updateDataDictionaries;
-
- public Integer getUpdateDataDictionaries()
- {
- return updateDataDictionaries;
- }
-
private Integer updateDataSets;
public Integer getUpdateDataSets()
@@ -453,7 +438,6 @@
newIndicators = importObjectService.getImportObjects( NEW, Indicator.class ).size();
newIndicatorGroups = importObjectService.getImportObjects( NEW, IndicatorGroup.class ).size();
newIndicatorGroupSets = importObjectService.getImportObjects( NEW, IndicatorGroupSet.class ).size();
- newDataDictionaries = importObjectService.getImportObjects( NEW, DataDictionary.class ).size();
newDataSets = importObjectService.getImportObjects( NEW, DataSet.class ).size();
newOrganisationUnits = importObjectService.getImportObjects( NEW, OrganisationUnit.class ).size();
newOrganisationUnitGroups = importObjectService.getImportObjects( NEW, OrganisationUnitGroup.class ).size();
@@ -473,7 +457,6 @@
updateIndicators = importObjectService.getImportObjects( UPDATE, Indicator.class ).size();
updateIndicatorGroups = importObjectService.getImportObjects( UPDATE, IndicatorGroup.class ).size();
updateIndicatorGroupSets = importObjectService.getImportObjects( UPDATE, IndicatorGroupSet.class ).size();
- updateDataDictionaries = importObjectService.getImportObjects( UPDATE, DataDictionary.class ).size();
updateDataSets = importObjectService.getImportObjects( UPDATE, DataSet.class ).size();
updateOrganisationUnits = importObjectService.getImportObjects( UPDATE, OrganisationUnit.class ).size();
updateOrganisationUnitGroups = importObjectService.getImportObjects( UPDATE, OrganisationUnitGroup.class ).size();
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java 2014-10-15 04:17:05 +0000
@@ -29,7 +29,6 @@
*/
import static org.hisp.dhis.common.Objects.CONSTANT;
-import static org.hisp.dhis.common.Objects.DATADICTIONARY;
import static org.hisp.dhis.common.Objects.DATAELEMENT;
import static org.hisp.dhis.common.Objects.DATAELEMENTGROUP;
import static org.hisp.dhis.common.Objects.DATAELEMENTGROUPSET;
@@ -52,7 +51,6 @@
import org.hisp.dhis.common.Objects;
import org.hisp.dhis.constant.Constant;
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementGroupSet;
@@ -89,7 +87,6 @@
classMap.put( INDICATOR, Indicator.class );
classMap.put( INDICATORGROUP, IndicatorGroup.class );
classMap.put( INDICATORGROUPSET, IndicatorGroupSet.class );
- classMap.put( DATADICTIONARY, DataDictionary.class );
classMap.put( DATASET, DataSet.class );
classMap.put( ORGANISATIONUNIT, OrganisationUnit.class );
classMap.put( ORGANISATIONUNITGROUP, OrganisationUnitGroup.class );
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml 2014-10-11 11:23:15 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml 2014-10-15 04:17:05 +0000
@@ -105,7 +105,6 @@
<property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
@@ -164,14 +163,12 @@
class="org.hisp.dhis.importexport.action.exp.GetDataElementListAction"
scope="prototype">
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
</bean>
<bean id="org.hisp.dhis.importexport.action.exp.GetIndicatorListAction"
class="org.hisp.dhis.importexport.action.exp.GetIndicatorListAction"
scope="prototype">
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
</bean>
<bean id="org.hisp.dhis.importexport.action.exp.ValidateAggregatedExportAction"
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm 2014-06-26 09:29:30 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm 2014-10-15 04:17:05 +0000
@@ -101,13 +101,6 @@
#compareAggregationOperatorProperty( $importObject.object.denominatorAggregationOperator $importObject.compareObject.denominatorAggregationOperator "denominator_aggregation_operator" )
#end
-
- #if ( $objectType == "DATADICTIONARY" )
-
- #compareProperty( $importObject.object.description $importObject.compareObject.description "description" )
- #compareProperty( $importObject.object.region $importObject.compareObject.region "region" )
-
- #end
#if ( $objectType == "ORGANISATIONUNIT" )
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedExport.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedExport.js 2011-04-11 16:43:51 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedExport.js 2014-10-15 04:17:05 +0000
@@ -4,14 +4,12 @@
clearFilter( "dataElementFilter", "availableDataElements" );
var dataElementGroupId = getListValue( "dataElementGroupList" );
- var dataDictionaryId = getListValue( "dataDictionaryDataElementList" );
var url = "getDataElementList.action";
$.getJSON(
url,
{
- "dataDictionaryId": dataDictionaryId,
"dataElementGroupId": dataElementGroupId
},
function( json )
@@ -33,14 +31,12 @@
clearFilter( "indicatorFilter", "availableIndicators" );
var indicatorGroupId = getListValue( "indicatorGroupList" );
- var dataDictionaryId = getListValue( "dataDictionaryIndicatorList" );
var url = "getIndicatorList.action";
$.getJSON(
url,
{
- "dataDictionaryId": dataDictionaryId,
"indicatorGroupId": indicatorGroupId
},
function( json )
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2014-06-26 09:29:30 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2014-10-15 04:17:05 +0000
@@ -93,13 +93,6 @@
#displayAggregationOperatorProperty( "denominator_aggregation_operator" $importObject.object.denominatorAggregationOperator )
#end
-
- #if ( $objectType == "DATADICTIONARY" )
-
- #displayProperty( "description" $importObject.object.description )
- #displayProperty( "region" $importObject.object.region )
-
- #end
#if ( $objectType == "ORGANISATIONUNIT" )
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm 2012-06-27 12:51:09 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm 2014-10-15 04:17:05 +0000
@@ -51,7 +51,6 @@
#displayObjects( "indicator" "Indicator" $newIndicators $updateIndicators )
#displayObjects( "indicator_group" "IndicatorGroup" $newIndicatorGroups $updateIndicatorGroups )
#displayObjects( "indicator_group_set" "IndicatorGroupSet" $newIndicatorGroupSets $updateIndicatorGroupSets )
- #displayObjects( "data_dictionary" "DataDictionary" $newDataDictionaries $updateDataDictionaries )
#displayObjects( "dataset" "DataSet" $newDataSets $updateDataSets )
#displayObjects( "organisation_unit" "OrganisationUnit" $newOrganisationUnits $updateOrganisationUnits )
#displayObjects( "organisation_unit_group" "OrganisationUnitGroup" $newOrganisationUnitGroups $updateOrganisationUnitGroups )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm 2013-10-21 17:17:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm 2014-10-15 04:17:05 +0000
@@ -29,10 +29,6 @@
<td>$objects.getValue( "DATASET" )</td>
</tr>
<tr>
- <td>$i18n.getString( "data_dictionaries" )</td>
- <td>$objects.getValue( "DATADICTIONARY" )</td>
- </tr>
- <tr>
<td>$i18n.getString( "organisation_units" )</td>
<td>$objects.getValue( "SOURCE" )</td>
</tr>
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/AddDataDictionaryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/AddDataDictionaryAction.java 2014-09-24 11:57:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/AddDataDictionaryAction.java 1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-package org.hisp.dhis.dd.action.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.hisp.dhis.system.util.TextUtils.nullIfEmpty;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class AddDataDictionaryAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- private String description;
-
- public void setDescription( String description )
- {
- this.description = description;
- }
-
- private String region;
-
- public void setRegion( String region )
- {
- this.region = region;
- }
-
- private List<String> deSelected = new ArrayList<>();
-
- public void setDeSelected( List<String> deSelected )
- {
- this.deSelected = deSelected;
- }
-
- private List<String> inSelected = new ArrayList<>();
-
- public void setInSelected( List<String> indicators )
- {
- this.inSelected = indicators;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- DataDictionary dictionary = new DataDictionary();
-
- dictionary.setName( name );
- dictionary.setDescription( nullIfEmpty( description ) );
- dictionary.setRegion( nullIfEmpty( region ) );
-
- if ( deSelected != null )
- {
- Set<DataElement> members = new HashSet<>( deSelected.size() );
-
- for ( String id : deSelected )
- {
- members.add( dataElementService.getDataElement( id ) );
- }
-
- dictionary.setDataElements( members );
- }
- else
- {
- dictionary.setDataElements( new HashSet<DataElement>() );
- }
-
- if ( inSelected != null )
- {
- Set<Indicator> members = new HashSet<>( inSelected.size() );
-
- for ( String id : inSelected )
- {
- members.add( indicatorService.getIndicator( id ) );
- }
-
- dictionary.setIndicators( members );
- }
- else
- {
- dictionary.setIndicators( new HashSet<Indicator>() );
- }
-
- dataDictionaryService.saveDataDictionary( dictionary );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryAction.java 1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-package org.hisp.dhis.dd.action.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetDataDictionaryAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- // -------------------------------------------------------------------------
- // Input/output
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private DataDictionary dataDictionary;
-
- public DataDictionary getDataDictionary()
- {
- return dataDictionary;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- dataDictionary = dataDictionaryService.getDataDictionary( id );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java 1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-package org.hisp.dhis.dd.action.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.paging.ActionPagingSupport;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetDataDictionaryListAction
- extends ActionPagingSupport<DataDictionary>
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- // -------------------------------------------------------------------------
- // Input & Output
- // -------------------------------------------------------------------------
-
- private List<DataDictionary> dataDictionaries;
-
- public List<DataDictionary> getDataDictionaries()
- {
- return dataDictionaries;
- }
-
- private String key;
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- if ( isNotBlank( key ) ) // Filter on key only if set
- {
- this.paging = createPaging( dataDictionaryService.getDataDictionaryCountByName( key ) );
-
- dataDictionaries = new ArrayList<>( dataDictionaryService.getDataDictionariesBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
- }
- else
- {
- this.paging = createPaging( dataDictionaryService.getDataDictionaryCount() );
-
- dataDictionaries = new ArrayList<>( dataDictionaryService.getDataDictionariesBetween( paging.getStartPos(), paging.getPageSize() ) );
- }
-
- Collections.sort( dataDictionaries, IdentifiableObjectNameComparator.INSTANCE );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryMembersAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryMembersAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryMembersAction.java 1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-package org.hisp.dhis.dd.action.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.indicator.Indicator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- */
-public class GetDataDictionaryMembersAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private List<DataElement> selectedDataElements = new ArrayList<>() ;
-
- public List<DataElement> getSelectedDataElements()
- {
- return selectedDataElements;
- }
-
- private List<Indicator> selectedIndicators = new ArrayList<>();
-
- public List<Indicator> getSelectedIndicators()
- {
- return selectedIndicators;
- }
-
- private DataDictionary dataDictionary;
-
- public DataDictionary getDataDictionary()
- {
- return dataDictionary;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- // ---------------------------------------------------------------------
- // Get selected elements
- // ---------------------------------------------------------------------
-
- if ( id != null )
- {
- dataDictionary = dataDictionaryService.getDataDictionary( id );
-
- selectedDataElements = new ArrayList<>( dataDictionary.getDataElements() );
- Collections.sort( selectedDataElements, new IdentifiableObjectNameComparator() );
-
- selectedIndicators = new ArrayList<>( dataDictionary.getIndicators() );
- Collections.sort( selectedIndicators, new IdentifiableObjectNameComparator() );
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/RemoveDataDictionaryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/RemoveDataDictionaryAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/RemoveDataDictionaryAction.java 1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-package org.hisp.dhis.dd.action.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class RemoveDataDictionaryAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- DataDictionary dataDictionary = dataDictionaryService.getDataDictionary( id );
-
- if ( dataDictionary != null )
- {
- dataDictionaryService.deleteDataDictionary( dataDictionary );
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/UpdateDataDictionaryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/UpdateDataDictionaryAction.java 2014-09-24 11:57:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/UpdateDataDictionaryAction.java 1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-package org.hisp.dhis.dd.action.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.datadictionary.DataDictionary;
-import org.hisp.dhis.datadictionary.DataDictionaryService;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.hisp.dhis.system.util.TextUtils.nullIfEmpty;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class UpdateDataDictionaryAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataDictionaryService dataDictionaryService;
-
- public void setDataDictionaryService( DataDictionaryService dataDictionaryService )
- {
- this.dataDictionaryService = dataDictionaryService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- private String description;
-
- public void setDescription( String description )
- {
- this.description = description;
- }
-
- private String region;
-
- public void setRegion( String region )
- {
- this.region = region;
- }
-
- private List<String> deSelected = new ArrayList<>();
-
- public void setDeSelected( List<String> deSelected )
- {
- this.deSelected = deSelected;
- }
-
- private List<String> inSelected = new ArrayList<>();
-
- public void setInSelected( List<String> indicators )
- {
- this.inSelected = indicators;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- DataDictionary dictionary = dataDictionaryService.getDataDictionary( id );
-
- dictionary.setName( name );
- dictionary.setDescription( nullIfEmpty( description ) );
- dictionary.setRegion( nullIfEmpty( region ) );
-
- if ( deSelected != null )
- {
- Set<DataElement> members = new HashSet<>( deSelected.size() );
-
- for ( String id : deSelected )
- {
- members.add( dataElementService.getDataElement( id ) );
- }
-
- dictionary.setDataElements( members );
- }
- else
- {
- dictionary.setDataElements( new HashSet<DataElement>() );
- }
-
- if ( inSelected != null )
- {
- Set<Indicator> members = new HashSet<>( inSelected.size() );
-
- for ( String id : inSelected )
- {
- members.add( indicatorService.getIndicator( id ) );
- }
-
- dictionary.setIndicators( members );
- }
- else
- {
- dictionary.setIndicators( new HashSet<Indicator>() );
- }
-
- dataDictionaryService.saveDataDictionary( dictionary );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java 2014-10-15 04:17:05 +0000
@@ -35,7 +35,6 @@
import java.util.List;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.paging.ActionPagingSupport;
@@ -68,29 +67,10 @@
return indicators;
}
- private List<DataDictionary> dataDictionaries;
-
- public List<DataDictionary> getDataDictionaries()
- {
- return dataDictionaries;
- }
-
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
- private Integer dataDictionaryId;
-
- public Integer getDataDictionaryId()
- {
- return dataDictionaryId;
- }
-
- public void setDataDictionaryId( Integer dataDictionaryId )
- {
- this.dataDictionaryId = dataDictionaryId;
- }
-
private String key;
public String getKey()
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2014-09-12 14:17:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2014-10-15 04:17:05 +0000
@@ -337,42 +337,6 @@
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
</bean>
- <!-- DataDictionary -->
-
- <bean id="org.hisp.dhis.dd.action.datadictionary.AddDataDictionaryAction" class="org.hisp.dhis.dd.action.datadictionary.AddDataDictionaryAction"
- scope="prototype">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryAction" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryAction"
- scope="prototype">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryListAction" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryListAction"
- scope="prototype">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryMembersAction" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryMembersAction"
- scope="prototype">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.datadictionary.RemoveDataDictionaryAction" class="org.hisp.dhis.dd.action.datadictionary.RemoveDataDictionaryAction"
- scope="prototype">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.datadictionary.UpdateDataDictionaryAction" class="org.hisp.dhis.dd.action.datadictionary.UpdateDataDictionaryAction"
- scope="prototype">
- <property name="dataDictionaryService" ref="org.hisp.dhis.datadictionary.DataDictionaryService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- </bean>
-
<!-- Category -->
<bean id="org.hisp.dhis.dd.action.category.AddDataElementCategoryAction" class="org.hisp.dhis.dd.action.category.AddDataElementCategoryAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2014-09-26 06:23:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2014-10-15 04:17:05 +0000
@@ -87,11 +87,6 @@
remove_all=Remove all
create_new_data_dictionary=Create new data dictionary
region=Region
-data_dictionary_management=Data dictionary management
-adding_datadictionary_failed=Adding data dictionary failed
-updating_datadictionary_failed=Updating data dictionary failed
-edit_data_dictionary=Edit data dictionary
-select_data_dictionary=Select data dictionary
select_domain_type=Select domain type
current=Current
date=Date
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2014-09-12 14:17:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2014-10-15 04:17:05 +0000
@@ -418,51 +418,6 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <!-- DataDictionary -->
-
- <action name="dataDictionary" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryListAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-datadictionary/dataDictionary.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="javascripts">javascript/dataDictionary.js</param>
- </action>
-
- <action name="getDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryAction">
- <result name="success" type="velocity-json">/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="removeDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.RemoveDataDictionaryAction">
- <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_DATADICTIONARY_DELETE</param>
- </action>
-
- <action name="showAddDataDictionaryForm" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryMembersAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm</param>
- <param name="javascripts">javascript/dataDictionary.js</param>
- <param name="anyAuthorities">F_DATADICTIONARY_PUBLIC_ADD, F_DATADICTIONARY_PRIVATE_ADD</param>
- </action>
-
- <action name="addDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.AddDataDictionaryAction">
- <result name="success" type="redirect">dataDictionary.action</result>
- <param name="anyAuthorities">F_DATADICTIONARY_PUBLIC_ADD, F_DATADICTIONARY_PRIVATE_ADD</param>
- </action>
-
- <action name="showUpdateDataDictionaryForm" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryMembersAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm</param>
- <param name="javascripts">javascript/dataDictionary.js</param>
- <param name="anyAuthorities">F_DATADICTIONARY_PUBLIC_ADD, F_DATADICTIONARY_PRIVATE_ADD</param>
- </action>
-
- <action name="updateDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.UpdateDataDictionaryAction">
- <result name="success" type="redirect">dataDictionary.action?currentPage=${keyCurrentPage}</result>
- <param name="anyAuthorities">F_DATADICTIONARY_PUBLIC_ADD, F_DATADICTIONARY_PRIVATE_ADD</param>
- </action>
-
<!-- Category -->
<action name="showAddDataElementCategoryForm" class="org.hisp.dhis.dd.action.NoAction">
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 2014-09-24 11:57:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-<script type="text/javascript" src="javascript/addDataDictionaryForm.js"></script>
-<script type="text/javascript">
- jQuery(function() {
- $('#deAvailable').selected({
- url: '../api/dataElements.json',
- target: $('#deSelected'),
- search: $('#deAvailableSearch'),
- iterator: 'dataElements'
- });
-
- $('#inAvailable').selected({
- url: '../api/indicators.json',
- target: $('#inSelected'),
- search: $('#inAvailableSearch'),
- iterator: 'indicators'
- });
- });
-</script>
-
-<h3>$i18n.getString( "create_new_data_dictionary" )</h3>
-
-#sharingCreateNotification( "dataDictionary" )
-
-<form id="addDataDictionaryForm" action="addDataDictionary.action" method="post" class="inputForm">
-
-<table>
- <tr>
- <th colspan="2">$i18n.getString( "details" )</th>
- </tr>
-
- <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="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description"></textarea></td>
- </tr>
-
- <tr>
- <td><label for="region">$i18n.getString( "region" )</label></td>
- <td><input type="text" id="region" name="region"></td>
- </tr>
- <tr>
- <td colspan="2" height="15px"></td>
- </tr>
-</table>
-
-#jqSelected({
- "prefix": "de",
- "i18n_available": "available_data_elements",
- "i18n_selected": "selected_data_elements"
-})
-
-#jqSelected({
- "prefix": "in",
- "i18n_available": "available_indicators",
- "i18n_selected": "selected_indicators"
-})
-
-<p>
- <input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataDictionary.action' )" style="width:10em" />
-</p>
-
-</form>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-
-#sharingDialog()
-
-<script type="text/javascript">
- jQuery(document).ready(function(){
- tableSorter( 'listTable' );
- });
-
- var i18n_adding_datadictionary_failed = '$encoder.jsEscape( $i18n.getString( "adding_datadictionary_failed" ), "'")';
- var i18n_updating_datadictionary_failed = '$encoder.jsEscape( $i18n.getString( "updating_datadictionary_failed" ), "'")';
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_dictionary" ), "'")';
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
-</script>
-
-<h3>$i18n.getString( "data_dictionary_management" ) #openHelp( "dataDictionary" )</h3>
-
-<div id="contextMenu" class="contextMenu">
- <ul id="contextMenuItems" class="contextMenuItems">
- <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
- <li data-enabled="canUpdate"><a data-target-fn="showUpdateDataDictionaryForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
- <li data-enabled="canUpdate"><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
- <li data-enabled="canDelete"><a data-target-fn="removeDataDictionary"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
- <li><a data-target-fn="showDataDictionaryDetails"><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>#filterDiv( "dataDictionary" )</td>
- <td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddDataDictionaryForm.action'" style="width:80px"/></td>
- </tr>
- </table>
- <table class="listTable" id="listTable">
- <thead>
- <tr>
- <th>$i18n.getString( "name" )</th>
- </tr>
- </thead>
- <tbody id="list">
- #foreach( $dataDictionary in $dataDictionaries )
- <tr id="tr${dataDictionary.id}" data-id="$!dataDictionary.id" data-uid="$!dataDictionary.uid" data-type="DataDictionary" data-name="$encoder.htmlEncode( $!dataDictionary.displayName )"
- data-can-manage="$security.canManage( $dataDictionary )"
- data-can-update="$security.canUpdate( $dataDictionary )"
- data-can-delete="$security.canDelete( $dataDictionary )">
- <td>$encoder.htmlEncode( $!dataDictionary.displayName )</td>
- </tr>
- #end
- </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/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
- </div>
- <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
- <p><label>$i18n.getString( "description" ):</label><br/><span id="descriptionField"></span></p>
- <p><label>$i18n.getString( "region" ):</label><br/><span id="regionField"></span></p>
- <p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
- </div>
-
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div id="hideDetailsArea">
- <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_warning' )"/></a>
- </div>
- <p><span id="warningField"></span></p>
- </div>
-
- </td>
- </tr>
-</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm 2014-09-12 14:17:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm 2014-10-15 04:17:05 +0000
@@ -11,7 +11,6 @@
#introListImgItem( "categoryCombo.action" "category_combo" "category" )
#introListImgItem( "categoryOptionGroup.action" "category_option_group" "category" )
#introListImgItem( "categoryOptionGroupSet.action" "category_option_group_set" "category" )
- #introListImgItem( "dataDictionary.action" "data_dictionary" "datadictionary" )
#introListImgItem( "indicator.action" "indicator" "indicator" )
#introListImgItem( "indicatorType.action" "indicator_type" "indicator" )
#introListImgItem( "indicatorGroup.action" "indicator_group" "indicator" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2014-07-16 15:41:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2014-10-15 04:17:05 +0000
@@ -33,16 +33,7 @@
<table width="100%">
<tr>
<td>#filterDiv( "indicator" )</td>
- <td>
- <div style="inline">
- <select id="dataDictionaryList" name="dataDictionaryList" onchange="criteriaChanged()" style="width:160px">
- <option value="-1">[ $i18n.getString( "select_data_dictionary" ) ]</option>
- #foreach( $dictionary in $dataDictionaries )
- <option value="$dictionary.id"#if ( $dictionary.id == $dataDictionaryId ) selected="selected"#end>$dictionary.displayName</option>
- #end
- </select>
- </div>
- </td>
+ <td></td>
<td style="text-align:right">
#if ( $dataDictionaryMode == "extended" )
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddExtendedIndicatorForm.action'" style="width:80px"/>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js 2014-09-24 11:57:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-jQuery( document ).ready( function()
-{
- function preSubmit() {
- var $selectedDataElements = $('#deSelected');
- var $selectedIndicators = $('#inSelected');
-
- var hasDataElements = $selectedDataElements.val() != null && $selectedDataElements.val().length > 0;
- var hasIndicators = $selectedIndicators.val() != null && $selectedIndicators.val().length > 0;
-
- if( !hasDataElements && !hasIndicators )
- {
- setHeaderDelayMessage('Data Elements or Indicators are required.')
- return false;
- }
-
- return true;
- }
-
- validation2( 'addDataDictionaryForm', function( form )
- {
- preSubmit() && form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'deValidator', 'deSelected' );
- listValidator( 'inValidator', 'inSelected' );
- $("#deSelected").find("option").attr("selected", "selected");
- $("#inSelected").find("option").attr("selected", "selected");
- },
- 'rules' : getValidationRules( "dataDictionary" )
- } );
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js 1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-
-$(function() {
- dhis2.contextmenu.makeContextMenu({
- menuId: 'contextMenu',
- menuItemActiveClass: 'contextMenuItemActive'
- });
-});
-
-// -----------------------------------------------------------------------------
-// View details
-// -----------------------------------------------------------------------------
-
-function showDataDictionaryDetails( context ) {
- jQuery.post( 'getDataDictionary.action', { id: context.id },
- function ( json ) {
- setInnerHTML( 'nameField', json.dataDictionary.name );
-
- var description = json.dataDictionary.description;
- setInnerHTML( 'descriptionField', description ? description : '[' + i18n_none + ']' );
-
- var region = json.dataDictionary.region;
- setInnerHTML( 'regionField', region ? region : '[' + i18n_none + ']' );
-
- setInnerHTML( 'idField', json.dataDictionary.uid );
-
- showDetails();
- });
-}
-
-// -----------------------------------------------------------------------------
-// Change DataDictionary
-// -----------------------------------------------------------------------------
-
-function dataDictionaryChanged( list ) {
- var id = list.options[list.selectedIndex].value;
-
- var url = "setCurrentDataDictionary.action?id=" + id;
-
- window.location.href = url;
-}
-
-// -----------------------------------------------------------------------------
-// Remove DataDictionary
-// -----------------------------------------------------------------------------
-
-function removeDataDictionary( context ) {
- removeItem( context.id, context.name, i18n_confirm_delete, 'removeDataDictionary.action' );
-}
-
-function showUpdateDataDictionaryForm( context ) {
- location.href = 'showUpdateDataDictionaryForm.action?id=' + context.id;
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2014-06-26 09:29:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2014-10-15 04:17:05 +0000
@@ -21,7 +21,6 @@
function exportPDF( type ) {
var params = "type=" + type;
- params += "&dataDictionaryId=" + jQuery('#dataDictionaryList').val();
exportPdfByType(type, params);
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js 2014-10-15 04:17:05 +0000
@@ -7,9 +7,7 @@
function exportPDF( type )
{
- var params = "type=" + type;
- params += "&dataDictionaryId=" + jQuery( '#dataDictionaryList' ).val();
-
+ var params = "type=" + type;
exportPdfByType( type, params );
}
@@ -41,9 +39,7 @@
function criteriaChanged()
{
- var dataDictionaryId = getListValue( "dataDictionaryList" );
-
- var url = "indicator.action?&dataDictionaryId=" + dataDictionaryId;
+ var url = "indicator.action";
window.location.href = url;
}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js 2014-09-24 11:57:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-jQuery( document ).ready( function()
-{
- function preSubmit() {
- var $selectedDataElements = $('#deSelected');
- var $selectedIndicators = $('#inSelected');
-
- var hasDataElements = $selectedDataElements.val() != null && $selectedDataElements.val().length > 0;
- var hasIndicators = $selectedIndicators.val() != null && $selectedIndicators.val().length > 0;
-
- if( !hasDataElements && !hasIndicators )
- {
- setHeaderDelayMessage('Data Elements or Indicators are required.')
- return false;
- }
-
- return true;
- }
-
- validation2( 'updateDataDictionaryForm', function( form )
- {
- preSubmit() && form.submit();
- }, {
- 'beforeValidateHandler' : function()
- {
- listValidator( 'deValidator', 'deSelected' );
- listValidator( 'inValidator', 'inSelected' );
- $("#deSelected").find("option").attr("selected", "selected");
- $("#inSelected").find("option").attr("selected", "selected");
- },
- 'rules' : getValidationRules( "dataDictionary" )
- } );
-} );
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{ "dataDictionary":
- {
- "id": "$!{dataDictionary.id}",
- "uid": "$!{dataDictionary.uid}",
- "name": "$!encoder.jsonEncode( ${dataDictionary.name} )",
- "description": "$!encoder.jsonEncode( ${dataDictionary.description} )",
- "region": "$!encoder.jsonEncode( ${dataDictionary.region} )"
- }
-}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2014-09-12 14:17:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2014-10-15 04:17:05 +0000
@@ -11,7 +11,6 @@
<li><a href="categoryCombo.action">$i18n.getString( "category_combination" ) </a></li>
<li><a href="categoryOptionGroup.action">$i18n.getString( "category_option_group" ) </a></li>
<li><a href="categoryOptionGroupSet.action">$i18n.getString( "category_option_group_set" ) </a></li>
- <li><a href="dataDictionary.action">$i18n.getString( "data_dictionary" ) </a></li>
</ul>
<h2>$i18n.getString( "indicator" ) </h2>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 2014-09-24 11:57:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-<script type="text/javascript" src="javascript/updateDataDictionaryForm.js"></script>
-<script type="text/javascript">
- jQuery(document).ready( function(){
- $('#deAvailable').selected({
- url: '../api/dataElements.json',
- target: $('#deSelected'),
- search: $('#deAvailableSearch'),
- iterator: 'dataElements'
- });
-
- $('#inAvailable').selected({
- url: '../api/indicators.json',
- target: $('#inSelected'),
- search: $('#inAvailableSearch'),
- iterator: 'indicators'
- });
-
- // checkValueIsExist( "name", "validateDataDictionary.action", {id: $dataDictionary.id});
- });
-</script>
-
-<h3>$i18n.getString( "edit_data_dictionary" )</h3>
-
-<form id="updateDataDictionaryForm" action="updateDataDictionary.action" method="post" class="inputForm">
-
-<div>
- <input type="hidden" id="id" name="id" value="$dataDictionary.id"/>
-</div>
-
-<table>
- <tr>
- <th colspan="2">$i18n.getString( "details" )</th>
- </tr>
- <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( $dataDictionary.name )"></td>
- </tr>
- <tr>
- <td><label for="description">$i18n.getString( "description" )</label></td>
- <td><textarea id="description" name="description">$!encoder.htmlEncode( $dataDictionary.description )</textarea></td>
- </tr>
- <tr>
- <td><label for="region">$i18n.getString( "region" )</label></td>
- <td><input type="text" id="region" name="region" value="$!encoder.htmlEncode( $dataDictionary.region )"></td>
- </tr>
- <tr>
- <td colspan="2" height="15px"></td>
- </tr>
-</table>
-
-#jqSelected({
- "prefix": "de",
- "i18n_available": "available_data_elements",
- "i18n_selected": "selected_data_elements",
- "objects": $dataDictionary.dataElements
-})
-
-#jqSelected({
- "prefix": "in",
- "i18n_available": "available_indicators",
- "i18n_selected": "selected_indicators",
- "objects": $dataDictionary.indicators
-})
-
-<p>
- <input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataDictionary.action' )" style="width:10em" />
-</p>
-
-</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-10-06 12:00:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-10-15 04:17:05 +0000
@@ -73,9 +73,6 @@
F_DATAELEMENTGROUPSET_PUBLIC_ADD=Add/Update Public Data Element Group Sets
F_DATAELEMENTGROUPSET_PRIVATE_ADD=Add/Update Private Data Element Group Sets
F_DATAELEMENTGROUPSET_DELETE=Delete Data Element Group Sets
-F_DATADICTIONARY_PUBLIC_ADD=Add/Update Public Data Dictionary
-F_DATADICTIONARY_PRIVATE_ADD=Add/Update Private Data Dictionary
-F_DATADICTIONARY_DELETE=Delete Data Dictionary
F_DATAELEMENT_MINMAX_ADD=Add/Update Min/max rule
F_DATAELEMENT_MINMAX_DELETE=Delete Min/max rule
F_DATASET_PUBLIC_ADD=Add/Update Public Data Set
