dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33446
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17067: bulk completeDataSetRegistrations, wip
------------------------------------------------------------
revno: 17067
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-10-13 12:01:18 +0700
message:
bulk completeDataSetRegistrations, wip
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java
--
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/DataElementCategoryOptionCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2014-10-13 05:01:18 +0000
@@ -53,7 +53,7 @@
/**
* @author Abyot Aselefew
*/
-@JacksonXmlRootElement(localName = "categoryOptionCombo", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "categoryOptionCombo", namespace = DxfNamespaces.DXF_2_0 )
public class DataElementCategoryOptionCombo
extends BaseNameableObject
{
@@ -364,9 +364,9 @@
}
@JsonProperty
- @JsonSerialize(as = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( as = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public DataElementCategoryCombo getCategoryCombo()
{
return categoryCombo;
@@ -378,10 +378,10 @@
}
@JsonProperty
- @JsonSerialize(contentAs = BaseIdentifiableObject.class)
- @JsonView({ DetailedView.class, ExportView.class })
- @JacksonXmlElementWrapper(localName = "categoryOptions", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty(localName = "categoryOption", namespace = DxfNamespaces.DXF_2_0)
+ @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlElementWrapper( localName = "categoryOptions", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "categoryOption", namespace = DxfNamespaces.DXF_2_0 )
public Set<DataElementCategoryOption> getCategoryOptions()
{
return categoryOptions;
@@ -401,7 +401,8 @@
{
DataElementCategoryOptionCombo dataElementCategoryOptionCombo = (DataElementCategoryOptionCombo) other;
- categoryCombo = dataElementCategoryOptionCombo.getCategoryCombo() == null ? categoryCombo : dataElementCategoryOptionCombo.getCategoryCombo();
+ categoryCombo = dataElementCategoryOptionCombo.getCategoryCombo() == null ? categoryCombo : dataElementCategoryOptionCombo
+ .getCategoryCombo();
removeAllCategoryOptions();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2014-08-12 05:22:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2014-10-13 05:01:18 +0000
@@ -32,6 +32,7 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.google.common.base.Objects;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.ImportableObject;
@@ -177,12 +178,6 @@
return true;
}
- @Override
- public String toString()
- {
- return "[" + dataSet + ", " + period + ", " + source + ", " + attributeOptionCombo + ", " + date + "]";
- }
-
public String getName()
{
throw new UnsupportedOperationException();
@@ -278,4 +273,18 @@
{
this.periodName = periodName;
}
+
+ @Override
+ public String toString()
+ {
+ return Objects.toStringHelper( this )
+ .add( "dataSet", dataSet )
+ .add( "period", period )
+ .add( "source", source )
+ .add( "attributeOptionCombo", attributeOptionCombo )
+ .add( "date", date )
+ .add( "storedBy", storedBy )
+ .add( "periodName", periodName )
+ .toString();
+ }
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java 2014-10-12 10:32:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java 2014-10-13 05:01:18 +0000
@@ -32,6 +32,7 @@
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.google.common.base.Objects;
import org.hisp.dhis.common.DxfNamespaces;
import java.util.ArrayList;
@@ -61,4 +62,12 @@
{
this.completeDataSetRegistrations = completeDataSetRegistrations;
}
+
+ @Override
+ public String toString()
+ {
+ return Objects.toStringHelper( this )
+ .add( "completeDataSetRegistrations", completeDataSetRegistrations )
+ .toString();
+ }
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java 2014-10-12 10:32:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java 2014-10-13 05:01:18 +0000
@@ -39,6 +39,7 @@
import org.hisp.dhis.dataset.CompleteDataSetRegistrations;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.dxf2.render.RenderService;
import org.hisp.dhis.dxf2.utils.JacksonUtils;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.i18n.I18nManager;
@@ -52,12 +53,14 @@
import org.hisp.dhis.webapi.utils.InputUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
@@ -104,6 +107,9 @@
@Autowired
private I18nManager i18nManager;
+ @Autowired
+ private RenderService renderService;
+
@RequestMapping( method = RequestMethod.GET, produces = CONTENT_TYPE_XML )
public void getCompleteDataSetRegistrationsXml(
@RequestParam Set<String> dataSet,
@@ -173,6 +179,28 @@
return completeDataSetRegistrations;
}
+ @RequestMapping( method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE )
+ public void saveCompleteDataSetRegistrationsJson( HttpServletRequest request, HttpServletResponse response ) throws IOException
+ {
+ CompleteDataSetRegistrations completeDataSetRegistrations = renderService.fromJson( request.getInputStream(),
+ CompleteDataSetRegistrations.class );
+
+ saveCompleteDataSetRegistrations( completeDataSetRegistrations );
+ }
+
+ @RequestMapping( method = RequestMethod.POST, consumes = MediaType.APPLICATION_XML_VALUE )
+ public void saveCompleteDataSetRegistrationsXml( HttpServletRequest request, HttpServletResponse response ) throws IOException
+ {
+ CompleteDataSetRegistrations completeDataSetRegistrations = renderService.fromXml( request.getInputStream(),
+ CompleteDataSetRegistrations.class );
+
+ saveCompleteDataSetRegistrations( completeDataSetRegistrations );
+ }
+
+ private void saveCompleteDataSetRegistrations( CompleteDataSetRegistrations completeDataSetRegistrations )
+ {
+ }
+
@RequestMapping( method = RequestMethod.POST, produces = "text/plain" )
public void saveCompleteDataSetRegistration(
@RequestParam String ds,
@@ -268,7 +296,6 @@
@RequestBody CompleteDataSetRegistrationRequests completeDataSetRegistrationRequests,
HttpServletResponse response )
{
-
List<CompleteDataSetRegistration> registrations = new ArrayList<>();
for ( CompleteDataSetRegistrationRequest completeDataSetRegistrationRequest : completeDataSetRegistrationRequests )
