[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13851: minor fixes to lastUpdated dep updater
revno: 13851
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-01-27 10:27:46 +0700
message:
minor fixes to lastUpdated dep updater
modified:
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.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-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java 2014-01-25 09:38:07 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java 2014-01-27 03:27:46 +
@@ -65,7 +65,7 @@
private SetIdentifiableObject identifiableObjects = new HashSetIdentifiableObject();
@PostConstruct
-@SuppressWarnings( unchecked )
+@SuppressWarnings(unchecked)
public void registerListeners()
{
EventListenerRegistry registry = ((SessionFactoryImpl) sessionFactory).getServiceRegistry()
@@ -80,6 +80,7 @@
{
if ( event.getAffectedOwnerOrNull() instanceof IdentifiableObject )
{
+System.err.println( is true: + event.getAffectedOwnerEntityName() );
identifiableObjects.add( (IdentifiableObject) event.getAffectedOwnerOrNull() );
}
}
@@ -93,6 +94,16 @@
if ( Collection.class.isInstance( newValue ) )
{
newCol = new ArrayList( (Collection) newValue );
+
+if ( !newCol.isEmpty() )
+{
+Object next = newCol.iterator().next();
+
+if ( !(next instanceof IdentifiableObject) )
+{
+newCol = new ArrayList();
+}
+}
}
if ( Map.class.isInstance( oldValue ) )
@@ -138,7 +149,7 @@
return;
}
-//objectManager.update( new ArrayListIdentifiableObject( identifiableObjects ) );
+// objectManager.update( new ArrayListIdentifiableObject( identifiableObjects ) );
identifiableObjects.clear();
}
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java 2013-08-23 16:05:01 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java 2014-01-27 03:27:46 +
@@ -141,6 +141,8 @@
organisationUnitGroup.setCode( code );
organisationUnitGroup.setSymbol( symbol );
+organisationUnitGroupService.addOrganisationUnitGroup( organisationUnitGroup );
+
CollectionOrganisationUnit selectedOrganisationUnits = selectionTreeManager
.getReloadedSelectedOrganisationUnits();
@@ -163,7 +165,7 @@
}
}
-organisationUnitGroupService.addOrganisationUnitGroup( organisationUnitGroup );
+organisationUnitGroupService.updateOrganisationUnitGroup( organisationUnitGroup );
return SUCCESS;
}
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13852: minor
revno: 13852
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-01-27 11:34:27 +0700
message:
minor
modified:
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.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-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java 2014-01-27 03:27:46 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java 2014-01-27 04:34:27 +
@@ -80,7 +80,6 @@
{
if ( event.getAffectedOwnerOrNull() instanceof IdentifiableObject )
{
-System.err.println( is true: + event.getAffectedOwnerEntityName() );
identifiableObjects.add( (IdentifiableObject) event.getAffectedOwnerOrNull() );
}
}
@@ -134,7 +133,7 @@
return;
}
-//objectManager.update( new ArrayListIdentifiableObject( identifiableObjects ) );
+// objectManager.update( new ArrayListIdentifiableObject( identifiableObjects ) );
identifiableObjects.clear();
}
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java 2013-08-23 16:05:01 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java 2014-01-27 04:34:27 +
@@ -28,17 +28,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import com.opensymphony.xwork2.Action;
import org.hisp.dhis.attribute.AttributeService;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-
-import com.opensymphony.xwork2.Action;
import org.hisp.dhis.system.util.AttributeUtils;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* @author Torgeir Lorange Ostby
* @version $Id: AddIndicatorGroupAction.java 3305 2007-05-14 18:55:52Z larshelg $
@@ -81,9 +80,9 @@
{
this.groupMembers = groupMembers;
}
-
+
private IndicatorGroup indicatorGroup;
-
+
public IndicatorGroup getIndicatorGroup()
{
return indicatorGroup;
@@ -99,11 +98,13 @@
// -
// Action implementation
// -
-
+
public String execute()
{
indicatorGroup = new IndicatorGroup( name );
-
+
+indicatorService.addIndicatorGroup( indicatorGroup );
+
for ( String id : groupMembers )
{
indicatorGroup.addIndicator( indicatorService.getIndicator( Integer.parseInt( id ) ) );
@@ -115,7 +116,7 @@
attributeService );
}
-indicatorService.addIndicatorGroup( indicatorGroup );
+indicatorService.updateIndicatorGroup( indicatorGroup );
return SUCCESS;
}
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13853: rename hibernate eventlistener wiring class
revno: 13853
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-01-27 11:59:20 +0700
message:
rename hibernate eventlistener wiring class
removed:
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java
added:
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java
modified:
dhis-2/dhis-support/dhis-support-hibernate/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
=== removed file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java 2014-01-27 04:34:27 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEntityInterceptorWiring.java 1970-01-01 00:00:00 +
@@ -1,156 +0,0 @@
-package org.hisp.dhis.hibernate;
-
-/*
- * 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.apache.commons.collections.CollectionUtils;
-import org.hibernate.SessionFactory;
-import org.hibernate.event.service.spi.EventListenerRegistry;
-import org.hibernate.event.spi.EventType;
-import org.hibernate.event.spi.PostInsertEvent;
-import org.hibernate.event.spi.PostInsertEventListener;
-import org.hibernate.event.spi.PostUpdateEvent;
-import org.hibernate.event.spi.PostUpdateEventListener;
-import org.hibernate.event.spi.PreCollectionUpdateEvent;
-import org.hibernate.event.spi.PreCollectionUpdateEventListener;
-import org.hibernate.internal.SessionFactoryImpl;
-import org.hisp.dhis.common.IdentifiableObject;
-import org.hisp.dhis.common.IdentifiableObjectManager;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.annotation.PostConstruct;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Morten Olav Hansen morte...@gmail.com
- */
-public class HibernateEntityInterceptorWiring
-{
-@Autowired
-private SessionFactory sessionFactory;
-
-@Autowired
-private IdentifiableObjectManager objectManager;
-
-private SetIdentifiableObject identifiableObjects = new HashSetIdentifiableObject();
-
-@PostConstruct
-@SuppressWarnings(unchecked)
-public void registerListeners()
-{
-EventListenerRegistry registry = ((SessionFactoryImpl) sessionFactory).getServiceRegistry()
-.getService( EventListenerRegistry.class );
-
-registry.getEventListenerGroup( EventType.PRE_COLLECTION_UPDATE ).appendListener( new PreCollectionUpdateEventListener()
-{
-@Override
-public void onPreUpdateCollection( PreCollectionUpdateEvent event )
-{
-if ( event.getAffectedOwnerOrNull() != null )
-{
-if ( event.getAffectedOwnerOrNull() instanceof IdentifiableObject )
-{
-identifiableObjects.add( (IdentifiableObject)
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13854: minor fix to hibernate eventlistener
revno: 13854
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-01-27 12:23:09 +0700
message:
minor fix to hibernate eventlistener
modified:
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.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-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java 2014-01-27 04:59:20 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java 2014-01-27 05:23:09 +
@@ -65,7 +65,7 @@
private SetIdentifiableObject identifiableObjects = new HashSetIdentifiableObject();
@PostConstruct
-@SuppressWarnings(unchecked)
+@SuppressWarnings( unchecked )
public void registerListeners()
{
EventListenerRegistry registry = ((SessionFactoryImpl) sessionFactory).getServiceRegistry()
@@ -105,11 +105,11 @@
}
}
-if ( Map.class.isInstance( oldValue ) )
+Map map = (Map) oldValue;
+
+for ( Object o : map.keySet() )
{
-Map map = (Map) oldValue;
-
-for ( Object o : map.keySet() )
+if ( o instanceof IdentifiableObject )
{
oldCol.add( o );
}
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] Send notification once dataset is complete
Dear Dev team, Thanks for the great work, just wanted to get some clarification on this functionality. When you create a group and turn on Receive notification - Complete notification recipients; after dataset completion in edit dataset, as if the notification is also sent to the person completing the dataset. Is this right and if so is there an option to turn it off for the user completing the dataset if they dont wish to receive the notification?, Otherwise it seem to be sending so many messages to the entrants and they end up missing important DHIS2 messages. Regards -- Prosper Behumbiize, MPH Phone:+256 414 320076 Cell: +256 772 139037 +256 752 751776 ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] OpenMRS to DHIS2
Hi All, Is there a tool/module that automates data transfer from OpenMRS to DHIS2? I need such a tool for some work that I am doing. Thanks. Edwin ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13855: csd: use 'Status' orgunitgroupset for setting record status
revno: 13855
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-01-27 14:30:28 +0700
message:
csd: use 'Status' orgunitgroupset for setting record status
modified:
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.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-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-23 16:54:20 +
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-27 07:30:28 +
@@ -28,20 +28,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import org.hisp.dhis.attribute.AttributeValue;
import org.hisp.dhis.attribute.comparator.AttributeValueSortOrderComparator;
import org.hisp.dhis.dataset.DataSet;
@@ -78,20 +66,34 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @author Morten Olav Hansen morte...@gmail.com
*/
@Controller
-@RequestMapping( value = /csd )
+@RequestMapping(value = /csd)
public class CsdController
{
private static final String SOAP_CONTENT_TYPE = application/soap+xml;
// Name of group
-private static final String FACILITY_TYPE_DISCRIMINATOR = Health Facility;
+private static final String FACILITY_DISCRIMINATOR = Health Facility;
+
+private static final String FACILITY_TYPE_DISCRIMINATOR = Type;
+
+private static final String FACILITY_STATUS_DISCRIMINATOR = Status;
// -
// Dependencies
@@ -128,7 +130,7 @@
// POST
// -
-@RequestMapping( value = , method = RequestMethod.POST, consumes = MediaType.ALL_VALUE, produces = MediaType.ALL_VALUE )
+@RequestMapping(value = , method = RequestMethod.POST, consumes = MediaType.ALL_VALUE, produces = MediaType.ALL_VALUE)
public void careServicesRequest( HttpServletRequest request, HttpServletResponse response ) throws IOException, JAXBException
{
Object o = unmarshaller.unmarshal( request.getInputStream() );
@@ -235,7 +237,7 @@
for ( OrganisationUnitGroup group : organisationUnit.getGroups() )
{
-if ( group.getName().equals( FACILITY_TYPE_DISCRIMINATOR ) )
+if ( group.getName().equals( FACILITY_DISCRIMINATOR ) )
{
isFacility = true;
break;
@@ -283,8 +285,16 @@
facility.getContacts().add( contact );
}
+String facilityStatus = Open;
+
for ( OrganisationUnitGroup organisationUnitGroup : organisationUnit.getGroups() )
{
+if ( organisationUnitGroup.getGroupSet().getName().equals( FACILITY_STATUS_DISCRIMINATOR ) )
+{
+facilityStatus = organisationUnitGroup.getName();
+continue;
+}
+
if ( organisationUnitGroup.getCode() == null )
{
continue;
@@ -294,6 +304,7 @@
codedType.setCode( organisationUnitGroup.getCode() );
codedType.setCodingSchema( Unknown );
+
for ( AttributeValue attributeValue : organisationUnitGroup.getAttributeValues() )
{
if ( attributeValue.getAttribute().getName().equals( code_system ) )
@@ -314,25 +325,25 @@
for ( DataSet dataSet :
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13856: csd: removed check for code != null in orgUnitGroup loop, now exposes all groups
revno: 13856
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-01-27 14:34:00 +0700
message:
csd: removed check for code != null in orgUnitGroup loop, now exposes all
groups
modified:
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.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-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-27 07:30:28 +
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-27 07:34:00 +
@@ -295,11 +295,6 @@
continue;
}
-if ( organisationUnitGroup.getCode() == null )
-{
-continue;
-}
-
CodedType codedType = new CodedType();
codedType.setCode( organisationUnitGroup.getCode() );
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13857: csd: minor
revno: 13857 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Mon 2014-01-27 14:36:07 +0700 message: csd: minor modified: dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.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-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java' --- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-27 07:34:00 + +++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-27 07:36:07 + @@ -91,8 +91,6 @@ // Name of group private static final String FACILITY_DISCRIMINATOR = Health Facility; -private static final String FACILITY_TYPE_DISCRIMINATOR = Type; - private static final String FACILITY_STATUS_DISCRIMINATOR = Status; // - ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13858: csd: change to using code for facility status
revno: 13858
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2014-01-27 14:48:42 +0700
message:
csd: change to using code for facility status
modified:
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.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-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-27 07:36:07 +
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java 2014-01-27 07:48:42 +
@@ -289,7 +289,7 @@
{
if ( organisationUnitGroup.getGroupSet().getName().equals( FACILITY_STATUS_DISCRIMINATOR ) )
{
-facilityStatus = organisationUnitGroup.getName();
+facilityStatus = organisationUnitGroup.getCode();
continue;
}
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
