=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationService.java 2014-06-23 21:31:31 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationService.java 2014-07-09 07:19:02 +0000 @@ -28,12 +28,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; - import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; +import java.util.Collection; +import java.util.List; + /** * @author Lars Helge Overland * @version $Id$ @@ -41,52 +42,67 @@ public interface CompleteDataSetRegistrationService { String ID = CompleteDataSetRegistrationService.class.getName(); - + /** * Saves a CompleteDataSetRegistration. - * + * * @param registration the CompleteDataSetRegistration to save. */ void saveCompleteDataSetRegistration( CompleteDataSetRegistration registration ); /** * Saves a CompleteDataSetRegistration. - * + * * @param registration the CompleteDataSetRegistration to save. - * @param notify indicates whether a notification should be sent. - */ + * @param notify indicates whether a notification should be sent. + */ void saveCompleteDataSetRegistration( CompleteDataSetRegistration registration, boolean notify ); /** + * Saves multiple CompleteDataSetRegistration. + * + * @param registrations List of CompleteDataSetRegistrations to save. + * @param notify indicates whether a notification should be sent. + */ + void saveCompleteDataSetRegistrations( List registrations, boolean notify ); + + /** * Updates a CompleteDataSetRegistration. - * + * * @param registration the CompleteDataSetRegistration to update. */ void updateCompleteDataSetRegistration( CompleteDataSetRegistration registration ); - + /** * Retrieves the CompleteDataSetRegistration for the given DataSet, Period * and Source. - * - * @param dataSet the DataSet. - * @param period the Period. - * @param source the Source. + * + * @param dataSet the DataSet. + * @param period the Period. + * @param source the Source. * @param attributeOptionCombo the attribute option combo. * @return the CompleteDataSetRegistration. */ - CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, + CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source, DataElementCategoryOptionCombo attributeOptionCombo ); - + /** * Deletes a CompleteDataSetRegistration. - * + * * @param registration the CompleteDataSetRegistration to delete. */ void deleteCompleteDataSetRegistration( CompleteDataSetRegistration registration ); - + + /** + * Deletes multiple CompleteDataSetRegistration. + * + * @param registrations the list of CompleteDataSetRegistration to delete. + */ + void deleteCompleteDataSetRegistrations( List registrations ); + /** * Retrieves all CompleteDataSetRegistrations. - * + * * @return a Collection of CompleteDataSetRegistrations. */ Collection getAllCompleteDataSetRegistrations(); @@ -94,25 +110,25 @@ /** * Retrieves the CompleteDataSetRegistrations for the given Collections of * DataSets, Sources and Periods. - * + * * @param dataSets the Collection of DataSets. - * @param sources the Collection of Sources. - * @param periods the Collection of Periods. + * @param sources the Collection of Sources. + * @param periods the Collection of Periods. * @return a Collection of CompleteDataSetRegistrations. */ - Collection getCompleteDataSetRegistrations( + Collection getCompleteDataSetRegistrations( Collection dataSets, Collection sources, Collection periods ); - + /** * Deletes the CompleteDataSetRegistrations associated with the given DataSet. - * + * * @param dataSet the DataSet. */ void deleteCompleteDataSetRegistrations( DataSet dataSet ); /** * Deletes the CompleteDataSetRegistrations associated with the given OrganisationUnit. - * + * * @param unit the OrganisationUnit. */ void deleteCompleteDataSetRegistrations( OrganisationUnit unit ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java 2014-06-23 21:31:31 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java 2014-07-09 07:19:02 +0000 @@ -28,8 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; - import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.message.MessageService; @@ -37,6 +35,9 @@ import org.hisp.dhis.period.Period; import org.springframework.transaction.annotation.Transactional; +import java.util.Collection; +import java.util.List; + /** * @author Lars Helge Overland * @version $Id$ @@ -62,7 +63,7 @@ { this.messageService = messageService; } - + private DataElementCategoryService categoryService; public void setCategoryService( DataElementCategoryService categoryService ) @@ -87,45 +88,61 @@ public void saveCompleteDataSetRegistration( CompleteDataSetRegistration registration, boolean notify ) { saveCompleteDataSetRegistration( registration ); - + if ( notify ) { messageService.sendCompletenessMessage( registration ); } } - + + public void saveCompleteDataSetRegistrations( List registrations, boolean notify ) + { + for ( CompleteDataSetRegistration registration : registrations ) + { + saveCompleteDataSetRegistration( registration, notify ); + } + } + public void updateCompleteDataSetRegistration( CompleteDataSetRegistration registration ) { completeDataSetRegistrationStore.updateCompleteDataSetRegistration( registration ); } - + public void deleteCompleteDataSetRegistration( CompleteDataSetRegistration registration ) { completeDataSetRegistrationStore.deleteCompleteDataSetRegistration( registration ); } - public CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, + public void deleteCompleteDataSetRegistrations( List registrations ) + { + for ( CompleteDataSetRegistration registration : registrations ) + { + completeDataSetRegistrationStore.deleteCompleteDataSetRegistration( registration ); + } + } + + public CompleteDataSetRegistration getCompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source, DataElementCategoryOptionCombo attributeOptionCombo ) { return completeDataSetRegistrationStore.getCompleteDataSetRegistration( dataSet, period, source, attributeOptionCombo ); } - + public Collection getAllCompleteDataSetRegistrations() { return completeDataSetRegistrationStore.getAllCompleteDataSetRegistrations(); - } + } - public Collection getCompleteDataSetRegistrations( + public Collection getCompleteDataSetRegistrations( Collection dataSets, Collection sources, Collection periods ) { return completeDataSetRegistrationStore.getCompleteDataSetRegistrations( dataSets, sources, periods ); - } - + } + public void deleteCompleteDataSetRegistrations( DataSet dataSet ) { completeDataSetRegistrationStore.deleteCompleteDataSetRegistrations( dataSet ); } - + public void deleteCompleteDataSetRegistrations( OrganisationUnit unit ) { completeDataSetRegistrationStore.deleteCompleteDataSetRegistrations( unit ); === modified file 'dhis-2/dhis-web/pom.xml' --- dhis-2/dhis-web/pom.xml 2014-06-30 14:54:09 +0000 +++ dhis-2/dhis-web/pom.xml 2014-07-09 07:19:02 +0000 @@ -49,7 +49,7 @@ ${useWarCompression} - + org.mortbay.jetty maven-jetty-plugin @@ -58,6 +58,12 @@ 10000000 + + + 8080 + 600000 + + /