dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28097
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13999: Removed Concept from user interface
------------------------------------------------------------
revno: 13999
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-02-12 17:09:47 +0100
message:
Removed Concept from user interface
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/RemoveConceptAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.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/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptTest.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/converter/DataElementCategoryConverter.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.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/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/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java 2013-12-20 12:55:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java 2014-02-12 16:09:47 +0000
@@ -40,9 +40,7 @@
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.DimensionalView;
import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.concept.Concept;
-import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -68,8 +66,6 @@
private static final long serialVersionUID = 6797241235048185629L;
public static final String DEFAULT_NAME = "default";
-
- private Concept concept;
private String dimensionType;
@@ -97,13 +93,6 @@
this.categoryOptions = categoryOptions;
}
- public DataElementCategory( String name, Concept concept, List<DataElementCategoryOption> categoryOptions )
- {
- this.name = name;
- this.concept = concept;
- this.categoryOptions = categoryOptions;
- }
-
// -------------------------------------------------------------------------
// Logic
// -------------------------------------------------------------------------
@@ -191,21 +180,6 @@
}
@JsonProperty
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( {DetailedView.class, ExportView.class} )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- @JsonInclude( JsonInclude.Include.NON_NULL )
- public Concept getConcept()
- {
- return concept;
- }
-
- public void setConcept( Concept concept )
- {
- this.concept = concept;
- }
-
- @JsonProperty
@JsonView({ DetailedView.class, ExportView.class })
@JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public String getDimensionType()
@@ -255,8 +229,6 @@
{
DataElementCategory dataElementCategory = (DataElementCategory) other;
- concept = dataElementCategory.getConcept() == null ? concept : dataElementCategory.getConcept();
-
removeAllCategoryOptions();
for ( DataElementCategoryOption dataElementCategoryOption : dataElementCategory.getCategoryOptions() )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2014-02-12 16:09:47 +0000
@@ -28,6 +28,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.HashSet;
+import java.util.Set;
+
+import org.hisp.dhis.common.BaseIdentifiableObject;
+import org.hisp.dhis.common.BaseNameableObject;
+import org.hisp.dhis.common.DxfNamespaces;
+import org.hisp.dhis.common.annotation.Scanned;
+import org.hisp.dhis.common.view.DetailedView;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
@@ -35,17 +44,6 @@
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.BaseNameableObject;
-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.concept.Concept;
-
-import java.util.HashSet;
-import java.util.Set;
/**
* @author Abyot Asalefew
@@ -63,8 +61,6 @@
private Set<DataElementCategory> categories = new HashSet<DataElementCategory>();
- private Concept concept;
-
@Scanned
private Set<DataElementCategoryOptionCombo> categoryOptionCombos = new HashSet<DataElementCategoryOptionCombo>();
@@ -146,20 +142,6 @@
@JsonProperty
@JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
- public Concept getConcept()
- {
- return concept;
- }
-
- public void setConcept( Concept concept )
- {
- this.concept = concept;
- }
-
- @JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
@JsonView({ DetailedView.class })
@JacksonXmlElementWrapper(localName = "categoryOptionCombos", namespace = DxfNamespaces.DXF_2_0)
@JacksonXmlProperty(localName = "categoryOptionCombo", namespace = DxfNamespaces.DXF_2_0)
@@ -172,17 +154,4 @@
{
this.categoryOptionCombos = categoryOptionCombos;
}
-
- @Override
- public void mergeWith( IdentifiableObject other )
- {
- super.mergeWith( other );
-
- if ( other.getClass().isInstance( this ) )
- {
- DataElementCategoryOption dataElementCategoryOption = (DataElementCategoryOption) other;
-
- concept = dataElementCategoryOption.getConcept() == null ? concept : dataElementCategoryOption.getConcept();
- }
- }
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDeletionHandler.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDeletionHandler.java 2014-02-12 16:09:47 +0000
@@ -28,12 +28,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
+import java.util.Set;
+
import org.hisp.dhis.system.deletion.DeletionHandler;
-import java.util.Set;
-
/**
* @author Dang Duy Hieu
*/
@@ -51,13 +49,6 @@
this.categoryService = categoryService;
}
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
// -------------------------------------------------------------------------
// DeletionHandler implementation
// -------------------------------------------------------------------------
@@ -69,45 +60,6 @@
}
@Override
- public String allowDeleteConcept( Concept concept )
- {
- for ( DataElementCategory category : categoryService.getAllDataElementCategories() )
- {
- Concept categoryConcept = category.getConcept();
-
- if ( categoryConcept != null )
- {
- if ( categoryConcept.equals( concept ) )
- {
- return category.getName();
- }
- }
- }
-
- return null;
- }
-
- @Override
- public void deleteConcept( Concept concept )
- {
- Concept conceptDefault = conceptService.getConceptByName( Concept.DEFAULT_CONCEPT_NAME );
-
- for ( DataElementCategory category : categoryService.getAllDataElementCategories() )
- {
- Concept categoryConcept = category.getConcept();
-
- if ( categoryConcept != null )
- {
- if ( categoryConcept.equals( concept ) )
- {
- category.setConcept( conceptDefault );
- categoryService.updateDataElementCategory( category );
- }
- }
- }
- }
-
- @Override
public void deleteDataElementCategoryOption( DataElementCategoryOption categoryOption )
{
Set<DataElementCategory> categories = categoryOption.getCategories();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java 2014-02-12 16:09:47 +0000
@@ -109,8 +109,6 @@
log.info( "Added default category" );
}
- defaultCategory.setConcept( defaultConcept );
-
categoryService.updateDataElementCategory( defaultCategory );
String defaultName = DataElementCategoryCombo.DEFAULT_CATEGORY_COMBO_NAME;
=== 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-02-12 10:52:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-02-12 16:09:47 +0000
@@ -1098,7 +1098,6 @@
<bean id="org.hisp.dhis.dataelement.DataElementCategoryDeletionHandler"
class="org.hisp.dhis.dataelement.DataElementCategoryDeletionHandler">
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
<bean id="org.hisp.dhis.dataelement.DataElementGroupSetDeletionHandler"
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml 2013-12-20 12:55:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml 2014-02-12 16:09:47 +0000
@@ -17,9 +17,6 @@
<property name="name" column="name" not-null="true" unique="true" length="230" />
- <many-to-one name="concept" class="org.hisp.dhis.concept.Concept" column="conceptid"
- foreign-key="fk_dataelementcategory_conceptid" />
-
<property name="dimensionType" column="dimensiontype" />
<list name="categoryOptions" table="categories_categoryoptions">
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml 2013-02-25 12:33:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml 2014-02-12 16:09:47 +0000
@@ -17,9 +17,6 @@
<property name="name" column="name" not-null="true" unique="true" length="230" />
- <many-to-one name="concept" class="org.hisp.dhis.concept.Concept" column="conceptid"
- foreign-key="fk_dataelementcategory_conceptid" />
-
<set name="categoryOptionCombos" table="categoryoptioncombos_categoryoptions" inverse="true">
<cache usage="read-write" />
<key column="categoryoptionid" foreign-key="fk_categoryoptioncombos_categoryoptions_categoryoptionid" />
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptServiceTest.java 2014-01-14 11:49:45 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptServiceTest.java 2014-02-12 16:09:47 +0000
@@ -30,7 +30,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.Collection;
@@ -117,24 +116,6 @@
assertNotNull( conceptService.getConcept( idB ) );
assertNotNull( conceptService.getConcept( idC ) );
assertNotNull( conceptService.getConcept( idD ) );
-
- categoryA.setConcept( conceptA );
- categoryB.setConcept( conceptB );
- categoryC.setConcept( conceptC );
- defaultCategory.setConcept( null );
-
- categoryService.updateDataElementCategory( categoryA );
- categoryService.updateDataElementCategory( categoryB );
- categoryService.updateDataElementCategory( categoryC );
- categoryService.updateDataElementCategory( defaultCategory );
-
- conceptService.deleteConcept( defaultConcept );
-
- assertNotNull( conceptService.getConcept( idA ) );
- assertNotNull( conceptService.getConcept( idB ) );
- assertNotNull( conceptService.getConcept( idC ) );
- assertNull( conceptService.getConcept( idD ) );
-
}
@Test
@@ -146,12 +127,9 @@
int idA = conceptService.saveConcept( conceptA );
int idB = conceptService.saveConcept( conceptB );
- int idC = defaultConcept.getId();
assertEquals( conceptService.getConceptByName( "ConceptA" ).getId(), idA );
assertEquals( conceptService.getConceptByName( "ConceptB" ).getId(), idB );
- assertEquals( defaultCategory.getConcept().getId(), idC );
- assertNull( conceptService.getConceptByName( "ConceptC" ) );
}
@Test
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptTest.java 2014-02-12 16:09:47 +0000
@@ -93,20 +93,5 @@
categoryOptions.add( categoryOptionA );
categoryOptions.add( categoryOptionB );
categoryOptions.add( categoryOptionC );
-
- // ---------------------------------------------------------------------
- // Setup Category
- // ---------------------------------------------------------------------
-
- defaultCategory = categoryService.getDataElementCategoryByName( DataElementCategory.DEFAULT_NAME );
-
- categoryA = new DataElementCategory( "CategoryA", defaultConcept, categoryOptions );
- categoryB = new DataElementCategory( "CategoryB", defaultConcept, categoryOptions );
- categoryC = new DataElementCategory( "CategoryC", defaultConcept, categoryOptions );
-
- categoryService.addDataElementCategory( categoryA );
- categoryService.addDataElementCategory( categoryB );
- categoryService.addDataElementCategory( categoryC );
-
}
}
=== 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 2013-10-23 09:12:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java 2014-02-12 16:09:47 +0000
@@ -379,7 +379,7 @@
DataElementCategoryBatchHandler.class ).init();
XMLConverter converter = new DataElementCategoryConverter( batchHandler, importObjectService,
- categoryService, conceptService );
+ categoryService );
converterInvoker.invokeRead( converter, reader, params );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java 2014-02-12 16:09:47 +0000
@@ -28,16 +28,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.MINOR_VERSION_12;
-
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.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.importexport.ExportParams;
@@ -45,7 +41,6 @@
import org.hisp.dhis.importexport.ImportParams;
import org.hisp.dhis.importexport.XMLConverter;
import org.hisp.dhis.importexport.importer.DataElementCategoryImporter;
-import org.hisp.dhis.importexport.mapping.NameMappingUtil;
/**
* @author Lars Helge Overland
@@ -62,11 +57,6 @@
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_CONCEPT_ID = "conceptid";
-
- private static final String BLANK = "";
-
- private ConceptService conceptService;
// -------------------------------------------------------------------------
// Constructor
@@ -89,13 +79,11 @@
* @param conceptService the ConceptService to use.
*/
public DataElementCategoryConverter( BatchHandler<DataElementCategory> batchHandler,
- ImportObjectService importObjectService, DataElementCategoryService categoryService,
- ConceptService conceptService )
+ ImportObjectService importObjectService, DataElementCategoryService categoryService )
{
this.batchHandler = batchHandler;
this.importObjectService = importObjectService;
this.categoryService = categoryService;
- this.conceptService = conceptService;
}
// -------------------------------------------------------------------------
@@ -118,8 +106,6 @@
writer.writeElement( FIELD_UID, category.getUid() );
writer.writeElement( FIELD_CODE, category.getCode() );
writer.writeElement( FIELD_NAME, category.getName() );
- writer.writeElement( FIELD_CONCEPT_ID, String.valueOf( category.getConcept() == null ? BLANK : category
- .getConcept().getId() ) );
writer.closeElement();
}
@@ -130,10 +116,6 @@
public void read( XMLReader reader, ImportParams params )
{
- Map<Object, String> conceptMap = NameMappingUtil.getConceptMap();
-
- Concept defaultConcept = conceptService.getConceptByName( Concept.DEFAULT_CONCEPT_NAME );
-
while ( reader.moveToStartElement( ELEMENT_NAME, COLLECTION_NAME ) )
{
final Map<String, String> values = reader.readElements( ELEMENT_NAME );
@@ -149,19 +131,6 @@
category.setName( values.get( FIELD_NAME ) );
- if ( params.minorVersionGreaterOrEqual( MINOR_VERSION_12 ) && values.get( FIELD_CONCEPT_ID ) != null )
- {
- log.debug( "reading category dxf version >1.2" );
- int conceptid = Integer.parseInt( values.get( FIELD_CONCEPT_ID ) );
- String conceptName = conceptMap.get( conceptid );
- category.setConcept( conceptService.getConceptByName( conceptName ) );
- }
- else
- {
- log.debug( "reading category dxf version 1.0" );
- category.setConcept( defaultConcept );
- }
-
importObject( category, params );
}
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java 2014-02-12 16:09:47 +0000
@@ -90,7 +90,6 @@
statementBuilder.setColumn( "uid" );
statementBuilder.setColumn( "code" );
statementBuilder.setColumn( "name" );
- statementBuilder.setColumn( "conceptid" );
}
protected void setValues( DataElementCategory category )
@@ -98,6 +97,5 @@
statementBuilder.setValue( category.getUid() );
statementBuilder.setValue( category.getCode() );
statementBuilder.setValue( category.getName() );
- statementBuilder.setValue( category.getConcept().getId() );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java 2013-12-20 12:55:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java 2014-02-12 16:09:47 +0000
@@ -28,14 +28,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.concept.ConceptService;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryOption;
import org.hisp.dhis.dataelement.DataElementCategoryService;
-import java.util.ArrayList;
-import java.util.List;
+import com.opensymphony.xwork2.Action;
/**
* @author Selamawit
@@ -55,13 +55,6 @@
this.dataElementCategoryService = dataElementCategoryService;
}
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -80,13 +73,6 @@
this.dataDimension = dataDimension;
}
- private Integer conceptId;
-
- public void setConceptId( Integer conceptId )
- {
- this.conceptId = conceptId;
- }
-
private String dimensionType;
public void setDimensionType( String dimensionType )
@@ -110,7 +96,6 @@
DataElementCategory dataElementCategory = new DataElementCategory();
dataElementCategory.setName( name );
dataElementCategory.setDataDimension( dataDimension );
- dataElementCategory.setConcept( conceptService.getConcept( conceptId ) );
dataElementCategory.setDimensionType( dimensionType );
List<DataElementCategoryOption> options = new ArrayList<DataElementCategoryOption>();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java 2014-02-12 16:09:47 +0000
@@ -29,7 +29,6 @@
*/
import org.apache.commons.lang.StringUtils;
-import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.dataelement.DataElementCategoryOption;
import org.hisp.dhis.dataelement.DataElementCategoryService;
@@ -52,13 +51,6 @@
this.dataElementCategoryService = dataElementCategoryService;
}
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -77,13 +69,6 @@
this.code = code;
}
- private Integer conceptId;
-
- public void setConceptId( Integer conceptId )
- {
- this.conceptId = conceptId;
- }
-
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -105,7 +90,6 @@
dataElementCategoryOption = new DataElementCategoryOption( name );
dataElementCategoryOption.setCode( code );
- dataElementCategoryOption.setConcept( conceptService.getConcept( conceptId ) );
dataElementCategoryService.addDataElementCategoryOption( dataElementCategoryOption );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java 2014-02-12 16:09:47 +0000
@@ -28,13 +28,6 @@
* 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.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryService;
@@ -58,13 +51,6 @@
this.dataElementCategoryService = dataElementCategoryService;
}
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -87,13 +73,6 @@
return dataElementCategory;
}
- private List<Concept> concepts;
-
- public List<Concept> getConcepts()
- {
- return concepts;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -102,10 +81,6 @@
{
dataElementCategory = dataElementCategoryService.getDataElementCategory( id );
- concepts = new ArrayList<Concept>( conceptService.getAllConcepts() );
-
- Collections.sort( concepts, IdentifiableObjectNameComparator.INSTANCE );
-
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionAction.java 2014-02-12 16:09:47 +0000
@@ -58,13 +58,6 @@
this.dataElementCategoryService = dataElementCategoryService;
}
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
// -------------------------------------------------------------------------
// Getters & Setters
// -------------------------------------------------------------------------
@@ -98,11 +91,6 @@
{
dataElementCategoryOption = dataElementCategoryService.getDataElementCategoryOption( id );
- concepts = new ArrayList<Concept>( conceptService.getAllConcepts() );
-
- Collections.sort( concepts, IdentifiableObjectNameComparator.INSTANCE );
-
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java 2014-02-12 16:09:47 +0000
@@ -28,14 +28,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.concept.ConceptService;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryOption;
import org.hisp.dhis.dataelement.DataElementCategoryService;
-import java.util.ArrayList;
-import java.util.List;
+import com.opensymphony.xwork2.Action;
/**
* @author Abyot Asalefew
@@ -55,13 +55,6 @@
this.dataElementCategoryService = dataElementCategoryService;
}
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -87,13 +80,6 @@
this.dataDimension = dataDimension;
}
- private Integer conceptId;
-
- public void setConceptId( Integer conceptId )
- {
- this.conceptId = conceptId;
- }
-
private List<String> selectedList = new ArrayList<String>();
public void setSelectedList( List<String> selectedList )
@@ -110,7 +96,6 @@
DataElementCategory dataElementCategory = dataElementCategoryService.getDataElementCategory( id );
dataElementCategory.setName( name );
dataElementCategory.setDataDimension( dataDimension );
- dataElementCategory.setConcept( conceptService.getConcept( conceptId ) );
List<DataElementCategoryOption> options = new ArrayList<DataElementCategoryOption>();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.java 2014-02-12 16:09:47 +0000
@@ -29,7 +29,6 @@
*/
import org.apache.commons.lang.StringUtils;
-import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.dataelement.DataElementCategoryOption;
import org.hisp.dhis.dataelement.DataElementCategoryService;
@@ -53,13 +52,6 @@
this.dataElementCategoryService = dataElementCategoryService;
}
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -85,13 +77,6 @@
this.code = code;
}
- private Integer conceptId;
-
- public void setConceptId( Integer conceptId )
- {
- this.conceptId = conceptId;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -103,7 +88,6 @@
DataElementCategoryOption categoryOption = dataElementCategoryService.getDataElementCategoryOption( id );
categoryOption.setName( name );
categoryOption.setCode( code );
- categoryOption.setConcept( conceptService.getConcept( conceptId ) );
dataElementCategoryService.updateDataElementCategoryOption( categoryOption );
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java 1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-package org.hisp.dhis.dd.action.concept;
-
-/*
- * Copyright (c) 2004-2013, 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.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class AddConceptAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- Concept concept = new Concept( name );
-
- conceptService.saveConcept( concept );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java 1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-package org.hisp.dhis.dd.action.concept;
-
-/*
- * Copyright (c) 2004-2013, 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.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetConceptAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Concept concept;
-
- public Concept getConcept()
- {
- return concept;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- concept = conceptService.getConcept( id );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java 1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-package org.hisp.dhis.dd.action.concept;
-
-/*
- * Copyright (c) 2004-2013, 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.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
-import org.hisp.dhis.paging.ActionPagingSupport;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetConceptListAction
- extends ActionPagingSupport<Concept>
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private List<Concept> concepts;
-
- public List<Concept> getConcepts()
- {
- return concepts;
- }
-
- private Concept defaultConcept;
-
- public Concept getDefaultConcept()
- {
- return defaultConcept;
- }
-
- private String key;
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- defaultConcept = conceptService.getConceptByName( Concept.DEFAULT_CONCEPT_NAME );
-
- if ( isNotBlank( key ) ) // Filter on key only if set
- {
- this.paging = createPaging( conceptService.getConceptCountByName( key ) );
-
- concepts = new ArrayList<Concept>( conceptService.getConceptsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
- }
- else
- {
- this.paging = createPaging( conceptService.getConceptCount() );
-
- concepts = new ArrayList<Concept>( conceptService.getConceptsBetween( paging.getStartPos(), paging.getPageSize() ) );
- }
-
- Collections.sort( concepts, 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/concept/RemoveConceptAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/RemoveConceptAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/RemoveConceptAction.java 1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-package org.hisp.dhis.dd.action.concept;
-
-/*
- * Copyright (c) 2004-2013, 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.DeleteNotAllowedException;
-import org.hisp.dhis.concept.ConceptService;
-import org.hisp.dhis.i18n.I18n;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class RemoveConceptAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
- // -------------------------------------------------------------------------
- // I18n
- // -------------------------------------------------------------------------
-
- private I18n i18n;
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- try
- {
- conceptService.deleteConcept( conceptService.getConcept( id ) );
- }
- catch ( DeleteNotAllowedException ex )
- {
- if ( ex.getErrorCode().equals( DeleteNotAllowedException.ERROR_ASSOCIATED_BY_OTHER_OBJECTS ) )
- {
- message = i18n.getString( "object_not_deleted_associated_by_objects" ) + " " + ex.getMessage();
-
- return ERROR;
- }
- }
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java 1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-package org.hisp.dhis.dd.action.concept;
-
-/*
- * Copyright (c) 2004-2013, 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.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class UpdateConceptAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- Concept concept = conceptService.getConcept( id );
-
- concept.setName( name );
-
- conceptService.updateConcept( concept );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java 1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-package org.hisp.dhis.dd.action.concept;
-
-/*
- * Copyright (c) 2004-2013, 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.concept.Concept;
-import org.hisp.dhis.concept.ConceptService;
-import org.hisp.dhis.i18n.I18n;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class ValidateAddUpdateConceptAction
- implements Action
-{
- //TODO private static final Pattern conceptNamePattern = Pattern.compile( "^[a-zA-Z][a-zA-Z0-9_]{0,9}$" );
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ConceptService conceptService;
-
- public void setConceptService( ConceptService conceptService )
- {
- this.conceptService = conceptService;
- }
-
- // -------------------------------------------------------------------------
- // I18n
- // -------------------------------------------------------------------------
-
- private I18n i18n;
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- if ( name != null )
- {
-
- Concept match = conceptService.getConceptByName( name );
-
- if ( match != null && (id == null || match.getId() != id) )
- {
- message = i18n.getString( "name_in_use" );
-
- return ERROR;
- }
-
- }
-
- return SUCCESS;
- }
-}
=== 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 2013-12-14 14:04:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2014-02-12 16:09:47 +0000
@@ -398,7 +398,6 @@
<bean id="org.hisp.dhis.dd.action.category.AddDataElementCategoryAction" class="org.hisp.dhis.dd.action.category.AddDataElementCategoryAction"
scope="prototype">
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
<bean id="org.hisp.dhis.dd.action.category.ValidateDataElementCategoryAction" class="org.hisp.dhis.dd.action.category.ValidateDataElementCategoryAction"
@@ -414,13 +413,11 @@
<bean id="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryAction" class="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryAction"
scope="prototype">
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
<bean id="org.hisp.dhis.dd.action.category.GetDataElementCategoryAction" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryAction"
scope="prototype">
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
<bean id="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryAction" class="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryAction"
@@ -428,17 +425,6 @@
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
</bean>
- <!--
- <bean id="org.hisp.dhis.dd.action.category.ShowCategoryEditorAction" class="org.hisp.dhis.dd.action.category.ShowCategoryEditorAction"
- scope="prototype">
- <property name="categoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
- </property>
- <property name="conceptService">
- <ref bean="org.hisp.dhis.concept.ConceptService" />
- </property>
- </bean>-->
-
<!-- CategoryOption -->
<bean id="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionListAction" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionListAction"
@@ -449,13 +435,11 @@
<bean id="org.hisp.dhis.dd.action.category.AddDataElementCategoryOptionAction" class="org.hisp.dhis.dd.action.category.AddDataElementCategoryOptionAction"
scope="prototype">
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
<bean id="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryOptionAction" class="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryOptionAction"
scope="prototype">
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
<bean id="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryOptionAction" class="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryOptionAction"
@@ -466,7 +450,6 @@
<bean id="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionAction" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionAction"
scope="prototype">
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
<!-- CategoryCombo -->
@@ -513,38 +496,6 @@
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
</bean>
- <!-- Concept -->
-
- <bean id="org.hisp.dhis.dd.action.concept.AddConceptAction" class="org.hisp.dhis.dd.action.concept.AddConceptAction"
- scope="prototype">
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.concept.UpdateConceptAction" class="org.hisp.dhis.dd.action.concept.UpdateConceptAction"
- scope="prototype">
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.concept.RemoveConceptAction" class="org.hisp.dhis.dd.action.concept.RemoveConceptAction"
- scope="prototype">
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.concept.GetConceptAction" class="org.hisp.dhis.dd.action.concept.GetConceptAction"
- scope="prototype">
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.concept.GetConceptListAction" class="org.hisp.dhis.dd.action.concept.GetConceptListAction"
- scope="prototype">
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.concept.ValidateAddUpdateConceptAction" class="org.hisp.dhis.dd.action.concept.ValidateAddUpdateConceptAction"
- scope="prototype">
- <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
<!-- Other -->
<bean id="org.hisp.dhis.dd.action.NoAction" class="org.hisp.dhis.dd.action.NoAction" />
=== 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 2013-12-14 14:04:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2014-02-12 16:09:47 +0000
@@ -529,7 +529,7 @@
<!-- Category -->
- <action name="showAddDataElementCategoryForm" class="org.hisp.dhis.dd.action.concept.GetConceptListAction">
+ <action name="showAddDataElementCategoryForm" class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm</param>
<param name="javascripts">javascript/category.js</param>
@@ -586,7 +586,7 @@
<param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
</action>
- <action name="showAddDataElementCategoryOptionForm" class="org.hisp.dhis.dd.action.concept.GetConceptListAction">
+ <action name="showAddDataElementCategoryOptionForm" class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm</param>
<param name="javascripts">javascript/categoryOption.js</param>
@@ -679,61 +679,6 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <!-- Concept Name -->
-
- <action name="getConcept" class="org.hisp.dhis.dd.action.concept.GetConceptAction">
- <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonConcept.vm</result>
- </action>
-
- <action name="concept" class="org.hisp.dhis.dd.action.concept.GetConceptListAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/concept.vm</param>
- <param name="javascripts">javascript/concept.js</param>
- <param name="requiredAuthorities">F_CONCEPT_MANAGEMENT</param>
- </action>
-
- <action name="showAddConceptForm" class="org.hisp.dhis.dd.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm</param>
- <param name="javascripts">javascript/concept.js</param>
- <param name="requiredAuthorities">F_CONCEPT_ADD</param>
- </action>
-
- <action name="showUpdateConceptForm" class="org.hisp.dhis.dd.action.concept.GetConceptAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm</param>
- <param name="javascripts">javascript/concept.js</param>
- <param name="requiredAuthorities">F_CONCEPT_ADD</param>
- </action>
-
- <action name="validateAddUpdateConcept" class="org.hisp.dhis.dd.action.concept.ValidateAddUpdateConceptAction">
- <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>
- </action>
-
- <action name="addConcept" class="org.hisp.dhis.dd.action.concept.AddConceptAction">
- <result name="success" type="redirect">concept.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
- <result name="error" type="redirect">index.action</result>
- <param name="requiredAuthorities">F_CONCEPT_ADD</param>
- </action>
-
- <action name="updateConceptInstance" class="org.hisp.dhis.dd.action.concept.UpdateConceptAction">
- <result name="success" type="redirect">concept.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
- <result name="error" type="redirect">index.action</result>
- <param name="requiredAuthorities">F_CONCEPT_ADD</param>
- </action>
-
- <action name="removeConcept" class="org.hisp.dhis.dd.action.concept.RemoveConceptAction">
- <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_CONCEPT_DELETE</param>
- </action>
-
</package>
</struts>
=== 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 2013-08-16 12:29:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm 2014-02-12 16:09:47 +0000
@@ -9,7 +9,6 @@
#introListImgItem( "category.action" "data_element_category" "category" )
#introListImgItem( "categoryCombo.action" "data_element_category_combo" "category" )
#introListImgItem( "dataDictionary.action" "data_dictionary" "datadictionary" )
- #introListImgItem( "concept.action" "concept" "dataelement" )
#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/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2013-06-28 18:14:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2014-02-12 16:09:47 +0000
@@ -9,7 +9,6 @@
<li><a href="category.action">$i18n.getString( "category" ) </a></li>
<li><a href="categoryCombo.action">$i18n.getString( "category_combination" ) </a></li>
<li><a href="dataDictionary.action">$i18n.getString( "data_dictionary" ) </a></li>
- <li><a href="concept.action">$i18n.getString( "concept" ) </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/multidimensional/addConceptForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<script type="text/javascript">
- jQuery(document).ready( function(){
- var rules = getValidationRules("concept");
- rules["name"].custome_regex = [/^[a-zA-Z][a-zA-Z0-9_]{0,9}$/,'$i18n.getString( 'regex_add_edit_concept' )'];
-
- validation2( 'addConceptForm', function( form ) { form.submit() }, {
- 'rules': rules
- } );
-
- checkValueIsExist( "name", "validateAddUpdateConcept.action" );
- });
-</script>
-
-<h3>$i18n.getString( "create_new_concept" )</h3>
-
-<form id="addConceptForm" action="addConcept.action" method="post" >
-
-<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" style="width:20em"/></td>
- </tr>
- <tr>
- <td></td>
- <td><input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'concept.action' )" style="width:10em"/></td>
- </tr>
-</table>
-
-</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2013-12-20 12:55:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2014-02-12 16:09:47 +0000
@@ -46,18 +46,6 @@
<td><input type="checkbox" id="dataDimension" name="dataDimension" value="true" /></td>
</tr>
<tr>
- <td><label>$i18n.getString( "concept_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3">
- <div style="inline">
- <select id="conceptId" name="conceptId">
- #foreach( $concept in $concepts )
- <option value="$concept.id">$concept.name</option>
- #end
- </select>
- </div>
- </td>
- </tr>
- <tr>
<td><label>$i18n.getString( "dimension_type" )</td>
<td>
<select id="dimensionType" name="dimensionType">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm 2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm 2014-02-12 16:09:47 +0000
@@ -27,19 +27,7 @@
<tr>
<td><label>$i18n.getString( "code" )</td>
<td colspan="3"><input type="text" id="code" name="code"/></td>
- </tr>
- <tr>
- <td><label>$i18n.getString( "concept_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="3">
- <div style="inline">
- <select id="conceptId" name="conceptId" style="width:305px" >
- #foreach( $concept in $concepts )
- <option value="$concept.id">$concept.name</option>
- #end
- </select>
- </div>
- </td>
- </tr>
+ </tr>
<tr>
<td></td>
<td colspan="3">
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2013-12-04 12:58:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-<script type="text/javascript">
- jQuery(document).ready(function() {
- tableSorter( 'listTable' );
- });
-
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_concept" ) , "'")';
- var i18n_adding_concept_failed = '$encoder.jsEscape( $i18n.getString( "adding_concept_failed" ) , "'")';
- var i18n_saving_concept_failed = '$encoder.jsEscape( $i18n.getString( "saving_concept_failed" ) , "'")';
-</script>
-
-<h3>$i18n.getString( "concept_management" ) #openHelp( "concept" )</h3>
-
-<div id="contextMenu" class="contextMenu">
- <ul id="contextMenuItems" class="contextMenuItems">
- <li><a data-target-fn="showUpdateConcept"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
- <li><a data-target-fn="removeConcept"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
- <li><a data-target-fn="showConceptDetails"><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( "concept" )</td>
- <td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddConceptForm.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( $concept in $concepts )
- #if( $concept.id != $defaultConcept.id )
- <tr id="tr${concept.id}" data-id="$!concept.id" data-uid="$!concept.uid" data-type="Concept" data-name="$encoder.htmlEncode( $!concept.displayName )"
- data-can-manage="$security.canManage( $concept )"
- data-can-update="$security.canUpdate( $concept )"
- data-can-delete="$security.canDelete( $concept )">
- <td>$encoder.htmlEncode( $!concept.displayName )</td>
- </tr>
- #end
- #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>
- </div>
-
- <div id="warningArea">
- <div id="hideDetailsArea">
- <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )">
- <img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/>
- </a>
- </div>
- <p><span id="warningField"></span></p>
- </div>
- </td>
- </tr>
-</table>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<script type="text/javascript">
- jQuery(document).ready( function(){
- var rules = getValidationRules("concept");
- rules["name"].custome_regex = [/^[a-zA-Z][a-zA-Z0-9_]{0,9}$/,'$i18n.getString( 'regex_add_edit_concept' )'];
-
- validation2( 'updateConceptForm', function( form ) { form.submit() }, {
- 'rules': rules
- } );
-
- checkValueIsExist( "name", "validateAddUpdateConcept.action", {id: $concept.id});
- });
-</script>
-
-<h3>$i18n.getString( "edit_concept" )</h3>
-
-<form id="updateConceptForm" action="updateConceptInstance.action" method="post" >
-
-<div>
- <input type="hidden" id="id" name="id" value="$concept.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( $concept.name )" style="width:20em"/></td>
- </tr>
- <tr>
- <td></td>
- <td><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'concept.action' )" style="width:10em"/></td>
- </tr>
-</table>
-
-</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2013-12-20 12:55:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2014-02-12 16:09:47 +0000
@@ -49,20 +49,7 @@
<tr>
<td><label for="dataDimension">$i18n.getString( "use_as_data_dimension" )</label></td>
<td><input type="checkbox" id="dataDimension" name="dataDimension" value="true"#if( $dataElementCategory.dataDimension ) checked="checked"#end/></td>
- </tr>
- <tr>
- <td><label>$i18n.getString( "concept_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <div style="inline">
- #set ( $conceptId = $!dataElementCategory.concept.id )
- <select id="conceptId" name="conceptId">
- #foreach( $concept in $concepts )
- <option value="$concept.id" #if ( $concept.id == $conceptId ) selected #end>$concept.name</option>
- #end
- </select>
- </div>
- </td>
- </tr>
+ </tr>
<tr>
<td><label>$i18n.getString( "dimension_type" )</td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm 2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm 2014-02-12 16:09:47 +0000
@@ -33,21 +33,7 @@
<tr>
<td><label>$i18n.getString( "code" )</label></td>
<td colspan="3"><input type="text" id="code" name="code" style="width:25em" value="$!encoder.htmlEncode( $dataElementCategoryOption.code )" /></td>
- </tr>
- <tr>
- <td><label>$i18n.getString( "concept_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td>
- <div style="inline">
- #set ( $conceptId = $!dataElementCategoryOption.concept.id )
- <select id="conceptId" name="conceptId">
- #foreach( $concept in $concepts )
- <option value="$concept.id" #if ( $concept.id == $conceptId ) selected #end>$concept.name</option>
- #end
- </select>
- </div>
- </td>
- <td></td>
- </tr>
+ </tr>
<tr>
<td></td>
<td colspan="3">
