[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15557: [mobile] update org unit controller for J2ME tracker

2014-06-05 Thread noreply 

revno: 15557
committer: Hong Em 
branch nick: dhis2
timestamp: Thu 2014-06-05 14:16:25 +0700
message:
  [mobile] update org unit controller for J2ME tracker
modified:
  
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.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-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2014-06-04 10:34:54 +
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2014-06-05 07:16:25 +
@@ -672,4 +672,44 @@
 return activityReportingService.sendMessage( message );
 }
 
+@RequestMapping( method = RequestMethod.GET, value = "{clientVersion}/LWUIT/orgUnits/{id}/downloadMessageConversation" )
+@ResponseBody
+public Conversation downloadConversationTracker( String clientVersion )
+throws NotAllowedException
+{
+
+Conversation conversation = new Conversation();
+conversation.setClientVersion( clientVersion );
+conversation.setConversations( activityReportingService.downloadMessageConversation() );
+
+return conversation;
+
+}
+
+@RequestMapping( method = RequestMethod.GET, value = "{clientVersion}/LWUIT/orgUnits/{id}/getMessage" )
+@ResponseBody
+public Conversation getMessageTracker( String clientVersion, @PathVariable
+int id, @RequestHeader( "id" )
+String conversationId )
+throws NotAllowedException
+{
+
+Conversation conversation = new Conversation();
+conversation.setMessages( activityReportingService.getMessage( conversationId ) );
+
+return conversation;
+
+}
+
+@RequestMapping( method = RequestMethod.POST, value = "{clientVersion}/LWUIT/orgUnits/{id}/replyMessage" )
+@ResponseBody
+public String replyMessageTracker( @PathVariable
+int id, @RequestBody
+Message message )
+throws NotAllowedException
+{
+return activityReportingService.replyMessage( message );
+
+}
+
 }

___
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 15558: Minor fix

2014-06-05 Thread noreply 

revno: 15558
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2014-06-05 10:36:58 +0200
message:
  Minor fix
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.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-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.java	2014-06-04 16:22:56 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.java	2014-06-05 08:36:58 +
@@ -80,7 +80,7 @@
 {
 if ( nodeSerializerMap.containsKey( contentType ) )
 {
-nodeSerializerMap.get( contentType );
+return nodeSerializerMap.get( contentType );
 }
 
 return null;

___
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 15559: revert to using list instead of map for children list

2014-06-05 Thread noreply 

revno: 15559
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2014-06-05 11:09:03 +0200
message:
  revert to using list instead of map for children list
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.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/node/AbstractNode.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java	2014-06-04 18:33:34 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java	2014-06-05 09:09:03 +
@@ -28,13 +28,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
  */
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import org.hisp.dhis.node.exception.DuplicateNodeException;
 import org.hisp.dhis.node.exception.InvalidTypeException;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Morten Olav Hansen 
@@ -49,7 +47,7 @@
 
 private String comment;
 
-private Map children = Maps.newHashMap();
+private List children = Lists.newArrayList();
 
 protected AbstractNode( String name, NodeType nodeType )
 {
@@ -75,6 +73,30 @@
 }
 
 @Override
+public boolean is( NodeType type )
+{
+return type.equals( nodeType );
+}
+
+@Override
+public boolean isSimple()
+{
+return is( NodeType.SIMPLE );
+}
+
+@Override
+public boolean isComplex()
+{
+return is( NodeType.COMPLEX );
+}
+
+@Override
+public boolean isCollection()
+{
+return is( NodeType.COLLECTION );
+}
+
+@Override
 public String getNamespace()
 {
 return namespace;
@@ -104,12 +126,7 @@
 return null;
 }
 
-if ( children.containsKey( child.getName() ) )
-{
-throw new DuplicateNodeException();
-}
-
-children.put( child.getName(), child );
+children.add( child );
 return child;
 }
 
@@ -123,20 +140,9 @@
 }
 
 @Override
-public Node getChild( String name )
-{
-if ( children.containsKey( name ) )
-{
-return children.get( name );
-}
-
-return null;
-}
-
-@Override
 public List getChildren()
 {
-return Lists.newArrayList( children.values() );
+return ImmutableList.copyOf( children );
 }
 
 @Override

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java	2014-06-04 18:33:34 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java	2014-06-05 09:09:03 +
@@ -51,6 +51,37 @@
 NodeType getType();
 
 /**
+ * @param type Type to check for
+ * @return True if node is of this type
+ */
+boolean is( NodeType type );
+
+/**
+ * Helper that checks if node is of simple type, useful to checking if
+ * you are allowed to add children to this node.
+ *
+ * @return true if type is simple
+ * @see org.hisp.dhis.node.NodeType
+ */
+boolean isSimple();
+
+/**
+ * Helper that checks if node is of complex type.
+ *
+ * @return true if type is complex
+ * @see org.hisp.dhis.node.NodeType
+ */
+boolean isComplex();
+
+/**
+ * Helper that checks if node is of collection type.
+ *
+ * @return true if type is collection
+ * @see org.hisp.dhis.node.NodeType
+ */
+boolean isCollection();
+
+/**
  * Namespace for this node. Not all serializers support this, and its up to the
  * NodeSerializer implementation to decide what to do with this.
  *
@@ -84,14 +115,6 @@
  void addChildren( Iterable children );
 
 /**
- * Returns child with name, or null if it doesn't exist.
- *
- * @param name Name to search for
- * @return A node with that name if it exists, or null
- */
-Node getChild( String name );
-
-/**
  * Get all child notes associated with this node. Please note that the returned list is a copy
  * of the internal list, and changes to the list will not be reflected in the node.
  *

___
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 15560: changed parameter parsing in inclusion/exclusion filter

2014-06-05 Thread noreply 

revno: 15560
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2014-06-05 13:11:33 +0200
message:
  changed parameter parsing in inclusion/exclusion filter
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java	2014-06-04 10:49:04 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java	2014-06-05 11:11:33 +
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.hisp.dhis.common.IdentifiableObject;
@@ -81,8 +82,11 @@
 
 @Override
 public  CollectionNode filterProperties( Class klass, List objects,
-String include, String exclude )
+List includes, List excludes )
 {
+String include = includes == null ? "" : Joiner.on( "," ).join( includes );
+String exclude = excludes == null ? "" : Joiner.on( "," ).join( excludes );
+
 Schema rootSchema = schemaService.getDynamicSchema( klass );
 CollectionNode collectionNode = new CollectionNode( rootSchema.getPlural() ); // replace with 'xml' collection name
 

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java	2014-06-03 14:33:29 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java	2014-06-05 11:11:33 +
@@ -60,5 +60,5 @@
  * @return List of objects with only wanted properties
  */
  CollectionNode filterProperties( Class klass, List objects,
-String include, String exclude );
+List include, List exclude );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java	2014-06-04 10:49:04 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java	2014-06-05 11:11:33 +
@@ -28,7 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import org.hisp.dhis.acl.Access;
 import org.hisp.dhis.acl.AclService;
@@ -46,7 +45,6 @@
 import org.hisp.dhis.hibernate.exception.DeleteAccessDeniedException;
 import org.hisp.dhis.hibernate.exception.UpdateAccessDeniedException;
 import org.hisp.dhis.importexport.ImportStrategy;
-import org.hisp.dhis.node.NodeService;
 import org.hisp.dhis.node.types.ComplexNode;
 import org.hisp.dhis.node.types.RootNode;
 import org.hisp.dhis.node.types.SimpleNode;
@@ -54,6 +52,7 @@
 import org.hisp.dhis.system.util.ReflectionUtils;
 import org.hisp.dhis.user.CurrentUserService;
 import org.hisp.dhis.webapi.controller.exception.NotFoundException;
+import org.hisp.dhis.webapi.utils.ContextService;
 import org.hisp.dhis.webapi.utils.ContextUtils;
 import org.hisp.dhis.webapi.utils.LinkService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +64,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 import javax.servlet.http.HttpServletRequest;
@@ -81,7 +81,7 @@
  */
 public abstract class AbstractCrudController
 {
-private static final String DEFAULT_LIST_INCLUDE = Joiner.on( "," ).join( FilterService.IDENTIFIABLE_PROPERTIES );
+private static final List DEFAULT_LIST_INCLUDES = Lists.newArrayList( FilterService.IDENTIFIABLE_PROPERTIES );
 
 //---

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15561: Minor javadoc update

2014-06-05 Thread noreply 

revno: 15561
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2014-06-05 13:22:46 +0200
message:
  Minor javadoc update
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextService.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-api/src/main/java/org/hisp/dhis/webapi/utils/ContextService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextService.java	2014-06-05 11:11:33 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextService.java	2014-06-05 11:22:46 +
@@ -60,9 +60,12 @@
 HttpServletRequest getRequest();
 
 /**
- * Returns a list of parameters with a given name, if the parameter doesn't exist, it will
+ * Returns a list of values from a parameter, if the parameter doesn't exist, it will
  * return a empty list.
  *
+ * Values will be split on comma, in normal Spring MVC style:
+ * include=id,name&include=created,lastUpdated => [id,name,created,lastUpdated]
+ *
  * @param name Parameter to get
  * @return List of parameter values, or empty if not found
  */

___
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 15562: minor fixes to nodeService

2014-06-05 Thread noreply 

revno: 15562
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2014-06-05 13:56:44 +0200
message:
  minor fixes to nodeService
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.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/node/NodeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeService.java	2014-06-04 16:22:56 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeService.java	2014-06-05 11:56:44 +
@@ -39,11 +39,37 @@
  */
 public interface NodeService
 {
+/**
+ * Find a nodeSerializer that supports contentType or return null.
+ *
+ * @param contentType NodeSerializer contentType
+ * @return NodeSerializer that support contentType, or null if not match was found
+ * @see org.hisp.dhis.node.NodeSerializer
+ */
 NodeSerializer getNodeSerializer( String contentType );
 
+/**
+ * Write out rootNode to a nodeSerializer that matches the contentType.
+ *
+ * @param rootNode RootNode to write
+ * @param contentType  NodeSerializer contentType
+ * @param outputStream Write to this outputStream
+ */
 void serialize( RootNode rootNode, String contentType, OutputStream outputStream ) throws IOException;
 
+/**
+ * Find a nodeDeserializer that supports contentType or return null.
+ *
+ * @param contentType NodeDeserializer contentType
+ * @return NodeDeserializer that support contentType, or null if not match was found
+ * @see org.hisp.dhis.node.NodeDeserializer
+ */
 NodeDeserializer getNodeDeserializer( String contentType );
 
-RootNode deserialize( RootNode rootNode, String contentType, InputStream inputStream ) throws IOException;
+/**
+ * @param contentType NodeDeserializer contentType
+ * @param inputStream Read RootNode from this stream
+ * @return RootNode deserialized from inputStream
+ */
+RootNode deserialize( String contentType, InputStream inputStream ) throws IOException;
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.java	2014-06-05 08:36:58 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.java	2014-06-05 11:56:44 +
@@ -111,7 +111,7 @@
 }
 
 @Override
-public RootNode deserialize( RootNode rootNode, String contentType, InputStream inputStream ) throws IOException
+public RootNode deserialize( String contentType, InputStream inputStream ) throws IOException
 {
 NodeDeserializer nodeDeserializer = getNodeDeserializer( contentType );
 

___
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] Data entry form longtext with new line

2014-06-05 Thread James Chang 
The data entry form does not seem to handle 'new line' character.
If the 'new line' character ('Enter' key) is entered, it failed to load the
saved data.
This is because of JSON not able to handle 'new line' character.

However, with Data elements Text type as 'long text', we have 'textarea'
(multi-line box), which kind of tells us that the we can enter multiple
lines of text with new lines.
___
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-documenters/dhis2/dhis2-docbook-docs] Rev 1097: Installation docs, install apps in nginx/outside tomcat webapps

2014-06-05 Thread noreply 

revno: 1097
committer: Lars Helge Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2014-06-05 19:29:58 +0200
message:
  Installation docs, install apps in nginx/outside tomcat webapps
modified:
  src/docbkx/en/dhis2_implementation_guide_installation.xml


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch 
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription
=== modified file 'src/docbkx/en/dhis2_implementation_guide_installation.xml'
--- src/docbkx/en/dhis2_implementation_guide_installation.xml	2014-05-06 11:16:52 +
+++ src/docbkx/en/dhis2_implementation_guide_installation.xml	2014-06-05 17:29:58 +
@@ -445,6 +445,41 @@
 }
 
 
+  App setup with nginx
+  DHIS 2 supports installation of apps. To avoid having to re-install your apps every time
+you update and replace DHIS 2, it is beneficial to deploy apps on the server file system
+outside the DHIS 2 webapp directory. To install apps directly in nginx you can follow the
+following steps. First create a directory which will be used as the app installation
+folder.
+  sudo mkdir /usr/share/nginx/apps
+  Make sure that the directory is owned by the user which runs Tomcat, in order to allow
+the Tomcat process to save apps to this directory when they are uploaded. If the user
+running Tomcat is dhis you can use the below
+command.
+  sudo chown dhis:dhis /usr/share/nginx/apps
+  You must add an apps location in the nginx.conf
+configuration file like below. Note that we omit the apps directory itself in the root
+directive. 
+  server {
+  ...
+  location /apps/ {
+root  /usr/share/nginx;
+expires   max;
+  }
+  ...
+}  
+  Finally navigate to the app configuration screen in your DHIS 2 instance by going to App
+management > Settings and adjust the settings accordingly.
+  The app installation folder should point to the path on the server file system to the
+base directory:
+  /usr/share/nginx/apps
+  The app base URL should point to the URL where DHIS 2 can find the apps. Replace
+www.domain.com with your real domain and according to how you have deployed DHIS 2.
+  http://www.domain.com/apps
+  You should now be ready to upload apps from the App management screen. Remember to
+reload the nginx configuration. 
+
+
   Basic reverse proxy setup with Apache
   The Apache HTTP server is the most common 
   

___
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 15563: minor fix to contextService

2014-06-05 Thread noreply 

revno: 15563
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2014-06-05 19:37:56 +0200
message:
  minor fix to contextService
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.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-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.java	2014-06-05 11:11:33 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.java	2014-06-05 17:37:56 +
@@ -28,14 +28,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
  */
 
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -44,8 +43,6 @@
 @Service
 public class DefaultContextService implements ContextService
 {
-private static final Splitter COMMA_SPLITTER = Splitter.on( "," );
-
 @Override
 public String getServletPath()
 {
@@ -109,11 +106,7 @@
 
 Set parameter = Sets.newHashSet();
 String[] parameterValues = getRequest().getParameterValues( name );
-
-for ( String value : parameterValues )
-{
-parameter.addAll( Lists.newArrayList( COMMA_SPLITTER.split( value ) ) );
-}
+Collections.addAll( parameter, parameterValues );
 
 return parameter;
 }

___
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-documenters/dhis2/dhis2-docbook-docs] Rev 1098: Minor

2014-06-05 Thread noreply 

revno: 1098
committer: Lars Helge Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2014-06-05 19:40:46 +0200
message:
  Minor
modified:
  src/docbkx/en/dhis2_implementation_guide_installation.xml


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch 
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription
=== modified file 'src/docbkx/en/dhis2_implementation_guide_installation.xml'
--- src/docbkx/en/dhis2_implementation_guide_installation.xml	2014-06-05 17:29:58 +
+++ src/docbkx/en/dhis2_implementation_guide_installation.xml	2014-06-05 17:40:46 +
@@ -447,12 +447,12 @@
 
   App setup with nginx
   DHIS 2 supports installation of apps. To avoid having to re-install your apps every time
-you update and replace DHIS 2, it is beneficial to deploy apps on the server file system
-outside the DHIS 2 webapp directory. To install apps directly in nginx you can follow the
-following steps. First create a directory which will be used as the app installation
+you update and replace the DHIS 2 WAR file it is beneficial to deploy apps on the server
+file system outside the DHIS 2 webapp directory. To install apps directly in nginx you can
+follow these steps. First create a directory which will be used as the app installation
 folder.
   sudo mkdir /usr/share/nginx/apps
-  Make sure that the directory is owned by the user which runs Tomcat, in order to allow
+  Make sure that the directory is owned by the user which runs Tomcat in order to allow
 the Tomcat process to save apps to this directory when they are uploaded. If the user
 running Tomcat is dhis you can use the below
 command.
@@ -470,11 +470,12 @@
 }  
   Finally navigate to the app configuration screen in your DHIS 2 instance by going to App
 management > Settings and adjust the settings accordingly.
-  The app installation folder should point to the path on the server file system to the
-base directory:
+  The app installation folder should point to the base
+directory path on the server file system:
   /usr/share/nginx/apps
-  The app base URL should point to the URL where DHIS 2 can find the apps. Replace
-www.domain.com with your real domain and according to how you have deployed DHIS 2.
+  The app base URL should point to the URL where DHIS 2
+can find the apps. Replace www.domain.com with your real domain name and according to how
+you have deployed DHIS 2.
   http://www.domain.com/apps
   You should now be ready to upload apps from the App management screen. Remember to
 reload the nginx configuration. 

___
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] DHIS - arabic translation

2014-06-05 Thread Rodolfo Melia 
Hi - as far as I know DHIS is not in arabic at the moment.

Would DHIS support the rendering on the arabic character set, including
right/ left flow of the text on screen and data entry, as well as the
rendering of the sub-menu to render on the right?

Rodolfo
___
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

Re: [Dhis2-devs] DHIS - arabic translation

2014-06-05 Thread Lars Helge Øverland 
Hi Rodolfo,

this requirement came up from WHO EMRO not long ago. It is something we
would like to implement in not too distant future but had no time for it
yet.

This will require that we

- create a new DHIS 2 "style", where we flip sides of menus etc. Text
direction  is
supported in css.
- translate all strings to arabic

regards,

Lars




On Thu, Jun 5, 2014 at 9:46 PM, Rodolfo Melia  wrote:

> Hi - as far as I know DHIS is not in arabic at the moment.
>
> Would DHIS support the rendering on the arabic character set, including
> right/ left flow of the text on screen and data entry, as well as the
> rendering of the sub-menu to render on the right?
>
> Rodolfo
>
> ___
> 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
>
>
___
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

Re: [Dhis2-devs] DHIS - arabic translation

2014-06-05 Thread Rodolfo Melia 
Thanks Lars for the prompt answer. There is an NGO that may be able to help 
with the translation part, as part of the collaboration. 

Rodolfo Meliá
+44 777 576 4090 | +1 708 872-7636

Please ignore any typos on this email sent from my mobile, probably written 
while I was at the park with the kids, at the airport walking to the gate, or 
sleepless (although exhausted). Grammatical faults? I'm sorry- I do my best

> On 5 Jun 2014, at 21:00, Lars Helge Øverland  wrote:
> 
> Hi Rodolfo,
> 
> this requirement came up from WHO EMRO not long ago. It is something we would 
> like to implement in not too distant future but had no time for it yet.
> 
> This will require that we 
> 
> - create a new DHIS 2 "style", where we flip sides of menus etc. Text 
> direction is supported in css.
> - translate all strings to arabic
> 
> regards,
> 
> Lars
> 
> 
> 
> 
>> On Thu, Jun 5, 2014 at 9:46 PM, Rodolfo Melia  wrote:
>> Hi - as far as I know DHIS is not in arabic at the moment.
>> 
>> Would DHIS support the rendering on the arabic character set, including 
>> right/ left flow of the text on screen and data entry, as well as the 
>> rendering of the sub-menu to render on the right?
>> 
>> Rodolfo
>> 
>> ___
>> 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
> 
___
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

Re: [Dhis2-devs] DHIS - arabic translation

2014-06-05 Thread Lars Helge Øverland 
That sounds great - much appreciated. I am sure we can facilitate the
translation, just let us know.

regards,

Lars



On Thu, Jun 5, 2014 at 10:04 PM, Rodolfo Melia  wrote:

> Thanks Lars for the prompt answer. There is an NGO that may be able to
> help with the translation part, as part of the collaboration.
>
> Rodolfo Meliá
> +44 777 576 4090 | +1 708 872-7636 <+1%20708%20872-7636>
>
> Please ignore any typos on this email sent from my mobile, probably
> written while I was at the park with the kids, at the airport walking to
> the gate, or sleepless (although exhausted). Grammatical faults? I'm sorry-
> I do my best
>
> On 5 Jun 2014, at 21:00, Lars Helge Øverland  wrote:
>
> Hi Rodolfo,
>
> this requirement came up from WHO EMRO not long ago. It is something we
> would like to implement in not too distant future but had no time for it
> yet.
>
> This will require that we
>
> - create a new DHIS 2 "style", where we flip sides of menus etc. Text
> direction  is
> supported in css.
> - translate all strings to arabic
>
> regards,
>
> Lars
>
>
>
>
> On Thu, Jun 5, 2014 at 9:46 PM, Rodolfo Melia  wrote:
>
>> Hi - as far as I know DHIS is not in arabic at the moment.
>>
>> Would DHIS support the rendering on the arabic character set, including
>> right/ left flow of the text on screen and data entry, as well as the
>> rendering of the sub-menu to render on the right?
>>
>> Rodolfo
>>
>> ___
>> 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
>>
>>
>
___
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

Re: [Dhis2-devs] DHIS - arabic translation

2014-06-05 Thread Knut Staring 
Arabic translation has begun at our online translation  server.  It would
be great  to  have more help.
On 5 Jun 2014 22:29, "Rodolfo Melia"  wrote:

> Thanks Lars for the prompt answer. There is an NGO that may be able to
> help with the translation part, as part of the collaboration.
>
> Rodolfo Meliá
> +44 777 576 4090 | +1 708 872-7636 <+1%20708%20872-7636>
>
> Please ignore any typos on this email sent from my mobile, probably
> written while I was at the park with the kids, at the airport walking to
> the gate, or sleepless (although exhausted). Grammatical faults? I'm sorry-
> I do my best
>
> On 5 Jun 2014, at 21:00, Lars Helge Øverland  wrote:
>
> Hi Rodolfo,
>
> this requirement came up from WHO EMRO not long ago. It is something we
> would like to implement in not too distant future but had no time for it
> yet.
>
> This will require that we
>
> - create a new DHIS 2 "style", where we flip sides of menus etc. Text
> direction  is
> supported in css.
> - translate all strings to arabic
>
> regards,
>
> Lars
>
>
>
>
> On Thu, Jun 5, 2014 at 9:46 PM, Rodolfo Melia  wrote:
>
>> Hi - as far as I know DHIS is not in arabic at the moment.
>>
>> Would DHIS support the rendering on the arabic character set, including
>> right/ left flow of the text on screen and data entry, as well as the
>> rendering of the sub-menu to render on the right?
>>
>> Rodolfo
>>
>> ___
>> 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
>>
>>
>
> ___
> 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
>
>
___
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] [Merge] lp:dhis2 into lp:~tw-msf/dhis2/dhis2

2014-06-05 Thread noreply 
The proposal to merge lp:dhis2 into lp:~tw-msf/dhis2/dhis2 has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+merge/219164
-- 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+merge/219164
Your team DHIS 2 developers is subscribed to branch lp:dhis2.

___
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