dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43225
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21952: Fixes for DataEntryForm id-object conversion, added schemadescriptor, importer, controller, and u...
------------------------------------------------------------
revno: 21952
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-02-12 12:38:40 +0700
message:
Fixes for DataEntryForm id-object conversion, added schemadescriptor, importer, controller, and upgraded DataEntryFormStore to GenericIdObjectStore
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataEntryFormSchemaDescriptor.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataEntryFormController.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java
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/importers/DefaultIdentifiableObjectImporter.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml
--
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/dataentryform/DataEntryForm.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java 2016-02-12 05:38:40 +0000
@@ -75,23 +75,25 @@
public DataEntryForm()
{
+ this.setAutoFields();
}
public DataEntryForm( String name )
{
- this(name,null);
+ this();
+ this.name = name;
}
public DataEntryForm( String name, String htmlCode )
{
- this(name,null,htmlCode);
+ this( name );
+ this.htmlCode = htmlCode;
}
public DataEntryForm( String name, DisplayDensity style, String htmlCode )
{
- this.name = name;
+ this( name, htmlCode );
this.style = style;
- this.htmlCode = htmlCode;
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java 2016-02-12 05:38:40 +0000
@@ -28,12 +28,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.common.GenericIdentifiableObjectStore;
+
import java.util.List;
-import org.hisp.dhis.common.GenericStore;
-
public interface DataEntryFormStore
- extends GenericStore<DataEntryForm>
+ extends GenericIdentifiableObjectStore<DataEntryForm>
{
String ID = DataEntryFormStore.class.getName();
@@ -43,13 +43,13 @@
/**
* Returns a DataEntryForm with the given name.
- *
+ *
* @param name The name.
* @return A DataEntryForm with the given name.
*/
DataEntryForm getDataEntryFormByName( String name );
-
+
List<DataEntryForm> listDistinctDataEntryFormByProgramStageIds( List<Integer> programStageIds );
-
+
List<DataEntryForm> listDistinctDataEntryFormByDataSetIds( List<Integer> dataSetIds );
}
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataEntryFormSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataEntryFormSchemaDescriptor.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataEntryFormSchemaDescriptor.java 2016-02-12 05:38:40 +0000
@@ -0,0 +1,58 @@
+package org.hisp.dhis.schema.descriptors;
+
+/*
+ * Copyright (c) 2004-2016, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.dataentryform.DataEntryForm;
+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 DataEntryFormSchemaDescriptor implements SchemaDescriptor
+{
+ public static final String SINGULAR = "dataEntryForm";
+
+ public static final String PLURAL = "dataEntryForms";
+
+ public static final String API_ENDPOINT = "/" + PLURAL;
+
+ @Override
+ public Schema getSchema()
+ {
+ Schema schema = new Schema( DataEntryForm.class, SINGULAR, PLURAL );
+ schema.setRelativeApiEndpoint( API_ENDPOINT );
+ schema.setShareable( false );
+ schema.setOrder( 1300 );
+
+ return schema;
+ }
+}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java 2016-02-12 05:38:40 +0000
@@ -28,24 +28,23 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.List;
-
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
+import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataentryform.DataEntryFormStore;
import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.hibernate.HibernateGenericStore;
import org.hisp.dhis.program.ProgramStage;
+import java.util.List;
+
/**
* @author Bharath Kumar
- * @version $Id$
*/
public class HibernateDataEntryFormStore
- extends HibernateGenericStore<DataEntryForm>
+ extends HibernateIdentifiableObjectStore<DataEntryForm>
implements DataEntryFormStore
{
// -------------------------------------------------------------------------
=== 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 2016-02-02 06:34:22 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Metadata.java 2016-02-12 05:38:40 +0000
@@ -56,6 +56,7 @@
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.dataelement.DataElementOperand;
+import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.document.Document;
@@ -209,6 +210,8 @@
private List<MapLayer> mapLayers = new ArrayList<>();
+ private List<DataEntryForm> dataEntryForms = new ArrayList<>();
+
private List<Section> sections = new ArrayList<>();
private List<DataSet> dataSets = new ArrayList<>();
@@ -664,6 +667,19 @@
}
@JsonProperty
+ @JacksonXmlElementWrapper( localName = "dataEntryForms", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "dataEntryForm", namespace = DxfNamespaces.DXF_2_0 )
+ public List<DataEntryForm> getDataEntryForms()
+ {
+ return dataEntryForms;
+ }
+
+ public void setDataEntryForms( List<DataEntryForm> dataEntryForms )
+ {
+ this.dataEntryForms = dataEntryForms;
+ }
+
+ @JsonProperty
@JacksonXmlElementWrapper( localName = "sections", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "section", namespace = DxfNamespaces.DXF_2_0 )
public List<Section> getSections()
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2016-02-11 09:27:02 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2016-02-12 05:38:40 +0000
@@ -50,7 +50,6 @@
import org.hisp.dhis.dataelement.DataElementCategoryOption;
import org.hisp.dhis.dataelement.DataElementOperand;
import org.hisp.dhis.dataelement.DataElementOperandService;
-import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataentryform.DataEntryFormService;
import org.hisp.dhis.dxf2.common.ImportOptions;
import org.hisp.dhis.dxf2.importsummary.ImportConflict;
@@ -949,8 +948,6 @@
private Expression leftSide;
private Expression rightSide;
- private DataEntryForm dataEntryForm;
-
private Set<DataElementOperand> compulsoryDataElementOperands = new HashSet<>();
private Set<DataElementOperand> greyedFields = new HashSet<>();
private List<DataElementOperand> dataElementOperands = new ArrayList<>();
@@ -998,7 +995,6 @@
attributeValues = extractAttributeValues( object );
leftSide = extractExpression( object, "leftSide" );
rightSide = extractExpression( object, "rightSide" );
- dataEntryForm = extractDataEntryForm( object, "dataEntryForm" );
compulsoryDataElementOperands = Sets.newHashSet( extractDataElementOperands( object, "compulsoryDataElementOperands" ) );
greyedFields = Sets.newHashSet( extractDataElementOperands( object, "greyedFields" ) );
dataElementOperands = Lists.newArrayList( extractDataElementOperands( object, "dataElementOperands" ) );
@@ -1014,7 +1010,6 @@
{
deleteExpression( object, "leftSide" );
deleteExpression( object, "rightSide" );
- deleteDataEntryForm( object, "dataEntryForm" );
if ( options.getImportStrategy().isDelete() )
{
@@ -1032,7 +1027,6 @@
saveAttributeValues( object, attributeValues );
saveExpression( object, "leftSide", leftSide );
saveExpression( object, "rightSide", rightSide );
- saveDataEntryForm( object, "dataEntryForm", dataEntryForm );
saveDataElementOperands( object, "compulsoryDataElementOperands", compulsoryDataElementOperands );
saveDataElementOperands( object, "greyedFields", greyedFields );
saveDataElementOperands( object, "dataElementOperands", dataElementOperands );
@@ -1040,48 +1034,6 @@
saveDataDimensionItems( object, dataDimensionItems );
}
- private void saveDataEntryForm( T object, String fieldName, DataEntryForm dataEntryForm )
- {
- if ( dataEntryForm != null )
- {
- Map<Field, Collection<Object>> identifiableObjectCollections = detachCollectionFields( dataEntryForm );
- reattachCollectionFields( dataEntryForm, identifiableObjectCollections, user );
-
- dataEntryForm.setId( 0 );
- dataEntryFormService.addDataEntryForm( dataEntryForm );
-
- ReflectionUtils.invokeSetterMethod( fieldName, object, dataEntryForm );
- }
- }
-
- private DataEntryForm extractDataEntryForm( T object, String fieldName )
- {
- DataEntryForm dataEntryForm = null;
-
- if ( ReflectionUtils.findGetterMethod( fieldName, object ) != null )
- {
- dataEntryForm = ReflectionUtils.invokeGetterMethod( fieldName, object );
-
- if ( dataEntryForm != null )
- {
- ReflectionUtils.invokeSetterMethod( fieldName, object, new Object[]{ null } );
- }
- }
-
- return dataEntryForm;
- }
-
- private void deleteDataEntryForm( T object, String fieldName )
- {
- DataEntryForm dataEntryForm = extractDataEntryForm( object, fieldName );
-
- if ( dataEntryForm != null )
- {
- dataEntryFormService.deleteDataEntryForm( dataEntryForm );
- sessionFactory.getCurrentSession().flush();
- }
- }
-
private Expression extractExpression( T object, String fieldName )
{
if ( !ValidationRule.class.isInstance( object ) )
=== 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 2016-02-01 07:36:06 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2016-02-12 05:38:40 +0000
@@ -141,6 +141,10 @@
<constructor-arg name="importerClass" type="java.lang.Class" value="org.hisp.dhis.dataset.DataSet" />
</bean>
+ <bean id="dataEntryFormImporter" class="org.hisp.dhis.dxf2.metadata.importers.DefaultIdentifiableObjectImporter" scope="prototype">
+ <constructor-arg name="importerClass" type="java.lang.Class" value="org.hisp.dhis.dataentryform.DataEntryForm" />
+ </bean>
+
<bean id="dataApprovalLevelImporter" class="org.hisp.dhis.dxf2.metadata.importers.DefaultIdentifiableObjectImporter" scope="prototype">
<constructor-arg name="importerClass" type="java.lang.Class" value="org.hisp.dhis.dataapproval.DataApprovalLevel" />
</bean>
=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataEntryFormController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataEntryFormController.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataEntryFormController.java 2016-02-12 05:38:40 +0000
@@ -0,0 +1,44 @@
+package org.hisp.dhis.webapi.controller;
+
+/*
+ * Copyright (c) 2004-2016, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.dataentryform.DataEntryForm;
+import org.hisp.dhis.schema.descriptors.DataEntryFormSchemaDescriptor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+@Controller
+@RequestMapping( value = DataEntryFormSchemaDescriptor.API_ENDPOINT )
+public class DataEntryFormController
+ extends AbstractCrudController<DataEntryForm>
+{
+}
