[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20832: ER legend set issue fixed.

2015-10-21 Thread noreply 

revno: 20832
committer: Jan Henrik Overland 
branch nick: dhis2
timestamp: Wed 2015-10-21 17:24:49 +0200
message:
  ER legend set issue fixed.
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js


--
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-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-10-12 18:39:03 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-10-21 15:24:49 +
@@ -171,7 +171,9 @@
 }
 }
 else if (record.filter) {
-this.rangeSetCmp.pendingValue = defaultRangeSetId;
+//this.rangeSetCmp.pendingValue = defaultRangeSetId;
+this.rangeSetCmp.setValue(defaultRangeSetId); //todo?
+this.onRangeSetSelect(defaultRangeSetId);
 
 	var a = record.filter.split(':');
 
@@ -179,7 +181,6 @@
 this.operatorCmp.setValue(a[0]);
 this.valueCmp.setValue(a[1]);
 }
-else {}
 }
 			},
 initComponent: function() {
@@ -419,8 +420,11 @@
 name: 'No range set'
 });
 
-if (container.dataElement.legendSet) {
-var legendSet = ns.core.init.idLegendSetMap[container.dataElement.legendSet.id];
+var de = container.dataElement;
+
+if (de.legendSet || de.storageLegendSet) {
+var id = de.legendSet ? de.legendSet.id : (de.storageLegendSet ? de.storageLegendSet.id : null),
+legendSet = ns.core.init.idLegendSetMap[id];
 
 if (Ext.isObject(legendSet)) {
 cb.store.add(legendSet);
@@ -4507,7 +4511,7 @@
 }
 else {
 Ext.Ajax.request({
-url: ns.core.init.contextPath + '/api/programStages.json?filter=id:eq:' + stageId + '=programStageDataElements[dataElement[id,' + ns.core.init.namePropertyUrl + ',valueType,optionSet[id,name],legendSet[id,name]]]',
+url: ns.core.init.contextPath + '/api/programStages.json?filter=id:eq:' + stageId + '=programStageDataElements[dataElement[id,' + ns.core.init.namePropertyUrl + ',valueType,optionSet[id,name],legendSet|rename(storageLegendSet)[id,name]]]',
 success: function(r) {
 var objects = Ext.decode(r.responseText).programStages,
 dataElements;

___
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 20831: minor

2015-10-21 Thread noreply 

revno: 20831
committer: Halvdan Hoem Grelland 
branch nick: dhis2
timestamp: Wed 2015-10-21 17:08:51 +0200
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.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-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 15:05:41 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 15:08:51 +
@@ -136,7 +136,7 @@
 
 if ( StringUtils.isEmpty( forwardedProto ) )
 {
-localUrl = ServletUriComponentsBuilder.fromContextPath( request ).replacePath("").build().toUriString();
+localUrl = ServletUriComponentsBuilder.fromContextPath( request ).replacePath( "" ).build().toUriString();
 }
 else
 {

___
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 20833: Refactored R 20830 to also work for X-Forwarded-Proto requests.

2015-10-21 Thread noreply 

revno: 20833
committer: Halvdan Hoem Grelland 
branch nick: dhis2
timestamp: Wed 2015-10-21 17:25:55 +0200
message:
  Refactored R 20830 to also work for X-Forwarded-Proto requests.
modified:
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.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-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 15:08:51 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 15:25:55 +
@@ -46,6 +46,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.web.util.UriComponentsBuilder;
 
 /**
  * @author Morten Olav Hansen 
@@ -131,18 +132,16 @@
 
 private boolean isOriginWhitelisted( HttpServletRequest request, String origin )
 {
+UriComponentsBuilder uriBuilder = ServletUriComponentsBuilder.fromContextPath( request ).replacePath( "" );
+
 String forwardedProto = request.getHeader( "X-Forwarded-Proto" );
-String localUrl;
-
-if ( StringUtils.isEmpty( forwardedProto ) )
-{
-localUrl = ServletUriComponentsBuilder.fromContextPath( request ).replacePath( "" ).build().toUriString();
-}
-else
-{
-localUrl = ServletUriComponentsBuilder.fromContextPath( request )
-.scheme( forwardedProto ).build().toUriString();
-}
+
+if ( !StringUtils.isEmpty( forwardedProto ) )
+{
+uriBuilder.scheme( forwardedProto );
+}
+
+String localUrl = uriBuilder.build().toString();
 
 return !StringUtils.isEmpty( origin ) && ( localUrl.equals( origin ) ||
 configurationService.getCorsWhitelist().contains( origin ) );

___
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 20830: Fix origin header issue relating to localUrl and Path

2015-10-21 Thread noreply 

revno: 20830
committer: Mark Polak 
branch nick: dhis2
timestamp: Wed 2015-10-21 17:05:41 +0200
message:
  Fix origin header issue relating to localUrl and Path
modified:
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.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-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 11:33:29 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 15:05:41 +
@@ -136,7 +136,7 @@
 
 if ( StringUtils.isEmpty( forwardedProto ) )
 {
-localUrl = ServletUriComponentsBuilder.fromContextPath( request ).build().toUriString();
+localUrl = ServletUriComponentsBuilder.fromContextPath( request ).replacePath("").build().toUriString();
 }
 else
 {
@@ -144,7 +144,7 @@
 .scheme( forwardedProto ).build().toUriString();
 }
 
-return !StringUtils.isEmpty( origin ) && ( localUrl.equals( origin ) || 
+return !StringUtils.isEmpty( origin ) && ( localUrl.equals( origin ) ||
 configurationService.getCorsWhitelist().contains( origin ) );
 }
 

___
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 20846: updated TEI service/controller, now uses import summary

2015-10-21 Thread noreply 

revno: 20846
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 12:16:58 +0700
message:
  updated TEI service/controller, now uses import summary
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstanceService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.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/events/trackedentity/AbstractTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java	2015-10-08 13:12:38 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java	2015-10-22 05:16:58 +
@@ -28,12 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import com.google.common.collect.Lists;
 import org.hisp.dhis.common.CodeGenerator;
 import org.hisp.dhis.common.IdentifiableObjectManager;
 import org.hisp.dhis.commons.collection.CachingMap;
@@ -57,7 +52,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Morten Olav Hansen 
@@ -107,7 +106,7 @@
 public List getTrackedEntityInstances( TrackedEntityInstanceQueryParams params )
 {
 List teis = entityInstanceService.getTrackedEntityInstances( params );
-
+
 List teiItems = new ArrayList<>();
 
 for ( org.hisp.dhis.trackedentity.TrackedEntityInstance trackedEntityInstance : teis )
@@ -147,20 +146,20 @@
 trackedEntityInstance.setInactive( entityInstance.isInactive() );
 
 if ( includeRelationships )
-{
+{
 //TODO include relationships in data model and void transactional query in for-loop
-
+
 Collection relationships = relationshipService.getRelationshipsForTrackedEntityInstance( entityInstance );
-
+
 for ( Relationship entityRelationship : relationships )
 {
 org.hisp.dhis.dxf2.events.trackedentity.Relationship relationship = new org.hisp.dhis.dxf2.events.trackedentity.Relationship();
 relationship.setDisplayName( entityRelationship.getRelationshipType().getDisplayName() );
 relationship.setTrackedEntityInstanceA( entityRelationship.getEntityInstanceA().getUid() );
 relationship.setTrackedEntityInstanceB( entityRelationship.getEntityInstanceB().getUid() );
-
+
 relationship.setRelationship( entityRelationship.getRelationshipType().getUid() );
-
+
 // we might have cases where A <=> A, so we only include the relative if the UIDs do not match
 if ( !entityRelationship.getEntityInstanceA().getUid().equals( entityInstance.getUid() ) )
 {
@@ -170,7 +169,7 @@
 {
 relationship.setRelative( getTrackedEntityInstance( entityRelationship.getEntityInstanceB(), false ) );
 }
-
+
 trackedEntityInstance.getRelationships().add( relationship );
 }
 }
@@ -352,14 +351,38 @@
 // -
 
 @Override
-public void deleteTrackedEntityInstance( TrackedEntityInstance trackedEntityInstance )
+public ImportSummary deleteTrackedEntityInstance( String uid )
 {
-org.hisp.dhis.trackedentity.TrackedEntityInstance entityInstance = teiService.getTrackedEntityInstance( trackedEntityInstance.getTrackedEntityInstance() );
+org.hisp.dhis.trackedentity.TrackedEntityInstance entityInstance = teiService.getTrackedEntityInstance( uid );
 
 if ( entityInstance != null )
 {
 teiService.deleteTrackedEntityInstance( entityInstance );
-}
+return new ImportSummary(

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20844: block changing from repeatble to non-repeatable program stage

2015-10-21 Thread noreply 

revno: 20844
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 11:10:24 +0700
message:
  block changing from repeatble to non-repeatable program stage
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm


--
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-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm	2015-10-01 18:17:35 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm	2015-10-22 04:10:24 +
@@ -152,8 +152,13 @@
 	
 			
 $i18n.getString( "repeatable" )
-
-		
+#if( $programStage.irregular && $programStage.irregular == 'true' )
+	
+	
+#else
+	
+#end
+			
 			
 			
 $i18n.getString( "period_type" )

___
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] [Bug 1507529] Re: Future period setting for datasets is only valid for the number of future periods from the date of saving the dataset

2015-10-21 Thread Elmarie Claasen 
Hi Lars,

We have since discovered that this "reset" of the dataset future period to 0 
occurs when we restart tomcat on the server.
We are not sure if the change to allow future period is only stored in the 
current session and not saved in the database but probably not likely... 
We are currently doing investigation on local VM if this is only occurring on 
our servers (which would point to some server config issue) or if also on local 
VM then we will have to investigate if it is related to our ZA_branch or 
something in the startup routine that resets the value. 

Any ideas? And can you keep the bug report open until we have done some
further investigation?

Regards,

Elmarie Claasen

Project Manager
Health Information Systems Program
Tel:  041-367 1027
Cell: 082 374 2209
E-mail: elma...@hisp.org
Skype:  elmarie.claasen52 


This message and any attachments are subject to a disclaimer published at 
http://www.hisp.org/policies.html#comms_disclaimer .   Please read the 
disclaimer before opening any attachment or taking any other action in terms of 
this electronic transmission. 
If you cannot access the disclaimer, kindly send an email to 
disclai...@hisp.org and a copy will be provided to you. By replying to this 
e-mail or opening any attachment you agree to be bound by the provisions of the 
disclaimer. 

-Original Message-
From: Elmarie Claasen [mailto:elma...@hisp.org] 
Sent: 20 October 2015 08:18 PM
To: 'Bug 1507529'; 'Lars Helge Øverland'
Subject: RE: [Bug 1507529] Re: Future period setting for datasets is only valid 
for the number of future periods from the date of saving the dataset

Hi Lars,

Yes we are sure - we set those future periods to =1 last month in
September so that we could capture September data but then after 1
October users could no longer open the current month dataset and when we
went to look it was reflecting a 0 value. This happened on more than one
of our provincial instances so pretty sure it was not a once off
possible mistake.

We have set them back to 1 now and will check again on 1 Nov and am
prepared to wait and check then and get back to you on that. Not sure
how else we can test this right now as the system is probably using
server date.

Regards,

Elmarie Claasen

Project Manager
Health Information Systems Program
Tel:  041-367 1027
Cell: 082 374 2209
E-mail: elma...@hisp.org
Skype:  elmarie.claasen52 


This message and any attachments are subject to a disclaimer published at 
http://www.hisp.org/policies.html#comms_disclaimer .   Please read the 
disclaimer before opening any attachment or taking any other action in terms of 
this electronic transmission. 
If you cannot access the disclaimer, kindly send an email to 
disclai...@hisp.org and a copy will be provided to you. By replying to this 
e-mail or opening any attachment you agree to be bound by the provisions of the 
disclaimer. 

-Original Message-
From: boun...@canonical.com [mailto:boun...@canonical.com] On Behalf Of Lars 
Helge Øverland
Sent: 20 October 2015 08:16 AM
To: elma...@hisp.org
Subject: [Bug 1507529] Re: Future period setting for datasets is only valid for 
the number of future periods from the date of saving the dataset

Are you sure this is the case? Could it be that someone just set the
"future periods" back to 0? There is no logic in the system that implies
this should happen...

--
You received this bug notification because you are subscribed to the bug report.
https://bugs.launchpad.net/bugs/1507529

Title:
  Future period setting for datasets is only valid for the number of
  future periods from the date of saving the dataset

Status in DHIS:
  New

Bug description:
  When setting a future period for data entry e.g.

  Dataset = monthly
  Future period  = 1
  It will allow data capturing in the current month but by 1st of the next 
month the future period value is back to zero and you have to reset the future 
period to allow capturing in the current month.

  Future periods should remain valid for the number of periods based on
  the current server date instead of the date on which the change was
  made.

  War file details:

  Version:
  2.20
  Build revision:
  16792
  Build date:
  2015-09-17 18:35

  Can the fix be backported to v2.19 as well if possible

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1507529/+subscriptions


-- 


*This message and any attachments are subject to a disclaimer published at 
http://www.hisp.org/policies.html#comms_disclaimer 
.  Please read the 
disclaimer before opening any attachment or taking any other action in 
terms of this electronic transmission.  If you cannot access the 
disclaimer, kindly send an email to disclai...@hisp.org 
 and a copy will be provided to you. By replying to 
this e-mail or opening any attachment you agree to be bound by the 
provisions of the disclaimer.*

-- 
You received this

Re: [Dhis2-devs] Category Option Combination Craziness

2015-10-21 Thread Jason Pickering 
Hi Craig,

Its hard to say, but it sounds like a lot. The system could probably cope
however, but I am not sure I would design the system this way.

Not knowing anything about the data, is the project code something very
specific? I am thinking that a given project code would have a specific
team and implementing partner.  Is it so that a given project code can have
multiple teams and implementing partners? If the team and partner can be
derived from the project code (and this is managed externally) then you
would only need people to select the project code, then the partner and
team could be "derived". This might also help to improve accuracy of the
data, as it might be very easy for people to select an invalid option when
doing data entry.  If there is a multi-to-multi sort of relationship
between all of this, then I think you could design it similar to the "ART
monthly summary" in the demo database (with one more dimension for team),
but it would be a lot simpler if you could derive partner and team from the
project code.

If you could do it this way (with only project code) , this is quite
similar to another very large system which is using DHIS2, and has
thousands of "project codes" or mechanisms.  These can also can be further
restricted to users using sharing, assigning an organisation unit to the
category option, and specifying a valid start and end date, to decrease the
amount of available options to users.

As for dis-aggregating by target/results, this is really not something you
should do with the data set category combinations unless you are really
careful I think.  The reason is that by default in the analytics, targets
will be added to results, and that is generally not what you want. Likely,
you would need to create two classes of data elements: one for targets and
another for results. You could use the cat combos to do this, but all users
would need to understand that the default action in the analytics would be
to add everything together.



Hope this helps.

Best regards,
Jason


On Thu, Oct 22, 2015 at 12:40 AM, Craig Hollingsworth <
craig.hollingswo...@nrc.no> wrote:

> Hi,
>
> Good work on the new release.  Looks cool!
>
>
> I'm exploring different config options for a possible system for NRC.
> I'm looking at datasets with 4 attributes (project code, team, implementing
> partner and target/actual.
>
> The potential number for each option is (200 new per year, 9, 10, 2).
>  That's a spectacular amount of combinations - especially after a few years
> of use.
>
> Can Dhis2 cope?   Any advice would be greatly appreciated.
>
> I recognise that I could cut some options back and go for a slightly
> different config, but the above would be the preferred/easiest option for
> us.
>
>
> Cheers
>
>
> Craig
>
>
>
> ___
> 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
>
>


-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+46764147049
___
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 20834: CORS filter, fix

2015-10-21 Thread noreply 

revno: 20834
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-10-21 18:02:20 +0200
message:
  CORS filter, fix
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.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/configuration/ConfigurationService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java	2015-10-21 11:30:24 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java	2015-10-21 16:02:20 +
@@ -1,7 +1,5 @@
 package org.hisp.dhis.configuration;
 
-import java.util.Set;
-
 /*
  * Copyright (c) 2004-2015, University of Oslo
  * All rights reserved.
@@ -52,9 +50,10 @@
 Configuration getConfiguration();
 
 /**
- * Gets the CORS white list inside a transaction.
+ * Indicates whether the given origin is CORS white listed.
  * 
- * @return the CORS white list.
+ * @param origin the origin.
+ * @return true if the given origin is CORS white listed.
  */
-Set getCorsWhitelist();
+boolean isCorsWhitelisted( String origin );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2015-10-21 11:33:29 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2015-10-21 16:02:20 +
@@ -29,7 +29,6 @@
  */
 
 import java.util.Iterator;
-import java.util.Set;
 
 import org.hisp.dhis.common.GenericStore;
 import org.springframework.transaction.annotation.Transactional;
@@ -74,8 +73,8 @@
 }
 
 @Override
-public Set getCorsWhitelist()
+public boolean isCorsWhitelisted( String origin )
 {
-return getConfiguration().getCorsWhitelist();
+return getConfiguration().getCorsWhitelist().contains( origin );
 }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 15:25:55 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 16:02:20 +
@@ -144,7 +144,7 @@
 String localUrl = uriBuilder.build().toString();
 
 return !StringUtils.isEmpty( origin ) && ( localUrl.equals( origin ) ||
-configurationService.getCorsWhitelist().contains( origin ) );
+configurationService.isCorsWhitelisted( origin ) );
 }
 
 @Override

___
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 20835: Settings: Add proper validation of URL lists, bug fixes

2015-10-21 Thread noreply 

revno: 20835
committer: Nicolay Ramm 
branch nick: dhis2
timestamp: Wed 2015-10-21 18:10:30 +0200
message:
  Settings: Add proper validation of URL lists, bug fixes
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_en.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/settings-app.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/settings-app.js.map


--
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
Excessively large attachments removed.___
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 20845: minor cleanup in enrollment service/controller

2015-10-21 Thread noreply 

revno: 20845
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 11:57:26 +0700
message:
  minor cleanup in enrollment service/controller
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/EnrollmentService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.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/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2015-10-20 19:03:27 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2015-10-22 04:57:26 +
@@ -62,7 +62,6 @@
 import org.hisp.dhis.user.CurrentUserService;
 import org.hisp.dhis.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -409,30 +408,51 @@
 // -
 
 @Override
-public void deleteEnrollment( Enrollment enrollment )
-{
-ProgramInstance programInstance = programInstanceService.getProgramInstance( enrollment.getEnrollment() );
-Assert.notNull( programInstance );
-
-programInstanceService.deleteProgramInstance( programInstance );
-}
-
-@Override
-public void cancelEnrollment( Enrollment enrollment )
-{
-ProgramInstance programInstance = programInstanceService.getProgramInstance( enrollment.getEnrollment() );
-Assert.notNull( programInstance );
-
+public ImportSummary deleteEnrollment( String uid )
+{
+ProgramInstance programInstance = programInstanceService.getProgramInstance( uid );
+
+if ( programInstance != null )
+{
+programInstanceService.deleteProgramInstance( programInstance );
+return new ImportSummary( ImportStatus.SUCCESS, "Deletion of enrollment " + uid + " was successful." );
+}
+
+return new ImportSummary( ImportStatus.ERROR, "ID " + uid + " does not point to a valid enrollment" );
+}
+
+@Override
+public ImportSummaries deleteEnrollments( List uids )
+{
+ImportSummaries importSummaries = new ImportSummaries();
+int counter = 0;
+
+for ( String uid : uids )
+{
+importSummaries.addImportSummary( deleteEnrollment( uid ) );
+
+if ( counter % FLUSH_FREQUENCY == 0 )
+{
+dbmsManager.clearSession();
+}
+
+counter++;
+}
+
+return importSummaries;
+}
+
+@Override
+public void cancelEnrollment( String uid )
+{
+ProgramInstance programInstance = programInstanceService.getProgramInstance( uid );
 programInstanceService.cancelProgramInstanceStatus( programInstance );
 }
 
 @Override
-public void completeEnrollment( Enrollment enrollment )
+public void completeEnrollment( String uid )
 {
-
-ProgramInstance programInstance = programInstanceService.getProgramInstance( enrollment.getEnrollment() );
-Assert.notNull( programInstance );
-
+ProgramInstance programInstance = programInstanceService.getProgramInstance( uid );
 programInstanceService.completeProgramInstanceStatus( programInstance );
 }
 

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/EnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/EnrollmentService.java	2015-07-08 03:04:42 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/EnrollmentService.java	2015-10-22 04:57:26 +
@@ -82,9 +82,11 @@
 // DELETE
 // -
 
-void deleteEnrollment( Enrollment enrollment );
-
-void cancelEnrollment( Enrollment enrollment );
-
-void completeEnrollment( Enrollment enrollment );
+ImportSummary deleteEnrollment( String uid );
+
+ImportSummaries deleteEnrollments( List uids );
+
+void cancelEnrollment( String uid );
+
+void completeEnrollment( String uid );
 }

=== modified file

Re: [Dhis2-devs] DHIS2 2.15 or 2.18 download link

2015-10-21 Thread Alan Ivey 
Regarding older download links from your original email, you can download
2.18 from https://www.dhis2.org/downloads. However, for 2.15 or another
version you can't find a public war download link, you can build them
locally from the source code:

   - Ensure that you have Java, Maven, and Bzr (Bazaar) on your local
   environment
   - Grab the code for 2.18 (or 2.15): bzr checkout --lightweight
   lp:~dhis2-devs-core/dhis2/2.18
   - cd 2.18/dhis-2
   - ./build.sh

The "dhis.war" file will be
in ./dhis2-code/2.18/dhis-2/dhis-web/dhis-web-portal/target/dhis.war

Alan

On Wed, Oct 21, 2015 at 3:27 AM, Mihayo Mathayo 
wrote:

> Hello Team,
>
> Is it possible to display data element report by using form display name
> instead of real name of data element.
>
> For instance my data element name is TB_Number of received patients
> and form display name Number of received patients.
>
> When running the data element report it appears with the initial TB_
>
> But i want it to display without the initial TB_
>
> Thanks.
>
> On Sat, Aug 22, 2015 at 3:03 PM, Mihayo Mathayo 
> wrote:
>
>> Hello Team,
>> Can any one provide me a link to dhis2 version 2.15 or 2.18 downloads, am
>> trying to upgrade to version 2.20 with no success.I need  to try older
>> version to see whether the problem is on my side or the current version of
>> dhis2(2.20) am trying to upgrade.
>>
>> Best Regards.
>>
>
>
> ___
> 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] dhis version 2.21 is released

2015-10-21 Thread Lars Helge Øverland 
Hi all,

DHIS version 2.21 is out with a lot of great new features and improvements.

Log in with admin/district on the demo  system.

File cloud storage: You can now upload and store large files directly from
data entry forms. Data elements can have a file value type and render as
file upload widgets in forms. Files can be stored either on the Web server
or sent directly to AWS S3  cloud storage,
which in practice provides unlimited storage capacity. This capability
allows you to use DHIS 2 as a general document repository which can be
utilized for project management, documentation, CMS and many other
purposes.

File storage currently works for aggregate data entry forms - tracker
coming up. Have a look at the “Project management” data set in data entry
on the demo:

Demo  | Docs

| Screenshot 


Settings app: The settings front-end has been re-written as a true app. It
features real-time saving, search for settings and a fresh new look.

Demo  | Docs
 | Screenshot



Data import constraints: Several optional constraints for data import can
be enabled to provide stricter control of the data being imported. These
include require period to be of same type as data set, data element to be
assigned to data set through org units, and more. The import constraints
can be enabled in settings app under “data import”.

Docs 



ANALYTICS FEATURES

---

Functions and variables in program indicators: Program indicators support a
range of functions and variables. Functions allows for conditional
statements, calculation of number of days between dates and more. Variables
allows you to insert e.g. event date, enrollment date and value count into
expressions. This is useful for example to calculate “inpatient bed days”
and complex scores.

Docs  | Demo 1
 | 2

| Screenshot
1  | 2
 | 3
 | 4
 |


Custom aggregation types: A program indicator now has an aggregation type
property with the standard options such as sum, avg, count, std dev min,
max. When set to custom, the indicator expression can contain inline
aggregation types, allowing for greater control over aggregation.

Docs  |
Screenshot



Program indicators and data elements in GIS: The GIS app lets you analyse
program indicators, attributes and data elements on maps.

Demo 
| Screenshot 1 
| 2 


Program indicators in event reports: The individual event overview supports
program indicators, which allows you to display calculations per event
directly in the overview.

Demo

| Screenshot



Download data dump: Pivot table lets you download data in CSV format
directly without first rendering the data in the Web browser (which might
lead to the browser freezing for large data volumes). This allows you to
download much larger batches of data which is useful for later offline
analysis.

Screenshot 


Complete events only option: All analysis apps provides an option for only
including completed events in the aggregation process. This is useful e.g.
to exclude partial events in indicator calculations.

Screenshot



Full precision option: Pivot table has an option for “skip rounding” of
values, i.e. full precision of values. This is useful for certain data
types such as financial data, and when doing calculations in external
systems.

Screenshot 


Aggregation type for attributes: Tracked entity attributes have an
aggregation type property which lets you control how

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20836: event-capture: take out ouTree from D2LeftBar directive

2015-10-21 Thread noreply 

revno: 20836
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2015-10-21 22:58:53 +0200
message:
  event-capture: take out ouTree from D2LeftBar directive
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js


--
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-apps/src/main/webapp/dhis-web-event-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html	2015-10-01 10:07:00 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html	2015-10-21 20:58:53 +
@@ -1,4 +1,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{'loading_tree'| translate}}
+
+
+
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html	2015-10-12 14:21:42 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html	2015-10-21 20:58:53 +
@@ -1,25 +1,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{{'loading_tree'| translate}}
-
+
+
+
+
+
+
+
+
+
+
+
 
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-21 10:04:51 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-21 20:58:53 +
@@ -364,6 +364,7 @@
 
 $scope.back = function(){
 $location.path('/').search({program: $scope.selectedProgramId});
+$route.reload();
 };
 
 $scope.displayEnrollment = false;

___
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] [Dhis2-users] dhis version 2.21 is released

2015-10-21 Thread Dayo Adeyomoye 
Great Job as always. BlackBerry: 3114F90C Phone: 08028851441, 08035560463 
emails: deemo...@yahoo.com, addyr...@yahoo.com Yahoo IM: deemoyes Facebook: 
pharael twitter:pharaell 


 On Wednesday, October 21, 2015 9:40 PM, Ese Egerega  
wrote:
   

 Great work! 
On Oct 21, 2015 9:03 PM, "Lars Helge Øverland"  wrote:

Hi all,
DHIS version 2.21 is out with a lot of great new features and improvements. 
Log in with admin/district on the demo system.
File cloud storage: You can now upload and store large files directly from data 
entry forms. Data elements can have a file value type and render as file upload 
widgets in forms. Files can be stored either on the Web server or sent directly 
to AWS S3 cloud storage, which in practice provides unlimited storage capacity. 
This capability allows you to use DHIS 2 as a general document repository which 
can be utilized for project management, documentation, CMS and many other 
purposes. 
File storage currently works for aggregate data entry forms - tracker coming 
up. Have a look at the “Project management” data set in data entry on the demo:
Demo | Docs | Screenshot

Settings app: The settings front-end has been re-written as a true app. It 
features real-time saving, search for settings and a fresh new look.
Demo | Docs | Screenshot

Data import constraints: Several optional constraints for data import can be 
enabled to provide stricter control of the data being imported. These include 
require period to be of same type as data set, data element to be assigned to 
data set through org units, and more. The import constraints can be enabled in 
settings app under “data import”.
Docs


ANALYTICS FEATURES---
Functions and variables in program indicators: Program indicators support a 
range of functions and variables. Functions allows for conditional statements, 
calculation of number of days between dates and more. Variables allows you to 
insert e.g. event date, enrollment date and value count into expressions. This 
is useful for example to calculate “inpatient bed days” and complex scores.
Docs | Demo 1 | 2 | Screenshot 1 | 2 | 3 | 4 |

Custom aggregation types: A program indicator now has an aggregation type 
property with the standard options such as sum, avg, count, std dev min, max. 
When set to custom, the indicator expression can contain inline aggregation 
types, allowing for greater control over aggregation.
Docs | Screenshot

Program indicators and data elements in GIS: The GIS app lets you analyse 
program indicators, attributes and data elements on maps.
Demo | Screenshot 1 | 2

Program indicators in event reports: The individual event overview supports 
program indicators, which allows you to display calculations per event directly 
in the overview.
Demo | Screenshot

Download data dump: Pivot table lets you download data in CSV format directly 
without first rendering the data in the Web browser (which might lead to the 
browser freezing for large data volumes). This allows you to download much 
larger batches of data which is useful for later offline analysis.
Screenshot

Complete events only option: All analysis apps provides an option for only 
including completed events in the aggregation process. This is useful e.g. to 
exclude partial events in indicator calculations.
Screenshot

Full precision option: Pivot table has an option for “skip rounding” of values, 
i.e. full precision of values. This is useful for certain data types such as 
financial data, and when doing calculations in external systems.
Screenshot

Aggregation type for attributes: Tracked entity attributes have an aggregation 
type property which lets you control how attributes are aggregated in pivot 
tables, charts and analytics.
Screenshot

TRACKER FEATURES---

Attribute categories in event capture: Data set categories can be enabled for 
programs without registration and be used in the event capture app. This means 
that events can be attributed to projects and partners just like it can be for 
aggregate data sets. You can enable it by setting a category combination for 
the program. Check it out on the demo for the 
Demo | Screenshot

Sticky right side widgets: In tracker capture, the right-side widgets can be 
made “sticky”, meaning that they remain at the top of the screen when scrolling 
down the page. You can enable this by clicking the “sticky” icon in the 
top-right corner of the dashboard screen. This is useful for example to display 
key patient information while entering data.
Screenshot

Program rule warnings and errors: The program rules let you define warning and 
error messages as actions based on rule evaluation. This is useful e.g. to 
provide assistance and guidance to health workers based on medical best 
practises during consultations. It can also be used for data validation 
purposes, e.g. to provide warnings for values out of range or logical 
violations between data elements. Program rules are supported in tracker

Re: [Dhis2-devs] dhis version 2.21 is released

2015-10-21 Thread Busoye Anifalaje 
Excellent work, dev team!


> On 21 Oct 2015, at 21:03, Lars Helge Øverland  wrote:
> 
> Hi all,
> 
> DHIS version 2.21 is out with a lot of great new features and improvements. 
> 
> Log in with admin/district on the demo  system.
> 
> File cloud storage: You can now upload and store large files directly from 
> data entry forms. Data elements can have a file value type and render as file 
> upload widgets in forms. Files can be stored either on the Web server or sent 
> directly to AWS S3  cloud storage, which in 
> practice provides unlimited storage capacity. This capability allows you to 
> use DHIS 2 as a general document repository which can be utilized for project 
> management, documentation, CMS and many other purposes. 
> 
> File storage currently works for aggregate data entry forms - tracker coming 
> up. Have a look at the “Project management” data set in data entry on the 
> demo:
> 
> Demo  | Docs 
>  
> | Screenshot 
> 
> Settings app: The settings front-end has been re-written as a true app. It 
> features real-time saving, search for settings and a fresh new look.
> 
> Demo  | Docs 
>  | Screenshot 
> 
> 
> Data import constraints: Several optional constraints for data import can be 
> enabled to provide stricter control of the data being imported. These include 
> require period to be of same type as data set, data element to be assigned to 
> data set through org units, and more. The import constraints can be enabled 
> in settings app under “data import”.
> 
> Docs 
> 
> 
> ANALYTICS FEATURES
> ---
> 
> Functions and variables in program indicators: Program indicators support a 
> range of functions and variables. Functions allows for conditional 
> statements, calculation of number of days between dates and more. Variables 
> allows you to insert e.g. event date, enrollment date and value count into 
> expressions. This is useful for example to calculate “inpatient bed days” and 
> complex scores.
> 
> Docs  | Demo 1 
>  | 2 
>  | 
> Screenshot 1 
>  | 2 
>  | 3 
>  | 4 
>  |
> 
> 
> Custom aggregation types: A program indicator now has an aggregation type 
> property with the standard options such as sum, avg, count, std dev min, max. 
> When set to custom, the indicator expression can contain inline aggregation 
> types, allowing for greater control over aggregation.
> 
> Docs  | 
> Screenshot 
> 
> 
> Program indicators and data elements in GIS: The GIS app lets you analyse 
> program indicators, attributes and data elements on maps.
> 
> Demo  
> | Screenshot 1  
> | 2 
> 
> Program indicators in event reports: The individual event overview supports 
> program indicators, which allows you to display calculations per event 
> directly in the overview.
> 
> Demo 
>  
> | Screenshot 
> 
> 
> Download data dump: Pivot table lets you download data in CSV format directly 
> without first rendering the data in the Web browser (which might lead to the 
> browser freezing for large data volumes). This allows you to download much 
> larger batches of data which is useful for later offline analysis.
> 
> Screenshot 
> 
> Complete events only option: All analysis apps provides an option for only 
> including completed events in the aggregation process. This is useful e.g. to 
> exclude partial events in indicator calculations.
> 
> Screenshot 
> 
> 
> Full precision option: Pivot table has an option for “skip rounding” of 
> values,

Re: [Dhis2-devs] [Dhis2-users] dhis version 2.21 is released

2015-10-21 Thread Ese Egerega 
Great work!
On Oct 21, 2015 9:03 PM, "Lars Helge Øverland"  wrote:

> Hi all,
>
> DHIS version 2.21 is out with a lot of great new features and
> improvements.
>
> Log in with admin/district on the demo 
> system.
>
> File cloud storage: You can now upload and store large files directly
> from data entry forms. Data elements can have a file value type and render
> as file upload widgets in forms. Files can be stored either on the Web
> server or sent directly to AWS S3  cloud
> storage, which in practice provides unlimited storage capacity. This
> capability allows you to use DHIS 2 as a general document repository which
> can be utilized for project management, documentation, CMS and many other
> purposes.
>
> File storage currently works for aggregate data entry forms - tracker
> coming up. Have a look at the “Project management” data set in data entry
> on the demo:
>
> Demo  | Docs
> 
> | Screenshot 
>
>
> Settings app: The settings front-end has been re-written as a true app.
> It features real-time saving, search for settings and a fresh new look.
>
> Demo  | Docs
>  | Screenshot
> 
>
>
> Data import constraints: Several optional constraints for data import can
> be enabled to provide stricter control of the data being imported. These
> include require period to be of same type as data set, data element to be
> assigned to data set through org units, and more. The import constraints
> can be enabled in settings app under “data import”.
>
> Docs 
>
>
>
> ANALYTICS FEATURES
>
> ---
>
> Functions and variables in program indicators: Program indicators support
> a range of functions and variables. Functions allows for conditional
> statements, calculation of number of days between dates and more. Variables
> allows you to insert e.g. event date, enrollment date and value count into
> expressions. This is useful for example to calculate “inpatient bed days”
> and complex scores.
>
> Docs  | Demo
> 1  |
> 2  | 
> Screenshot
> 1  | 2
> 
> | 3 
> | 4
> 
> |
>
>
> Custom aggregation types: A program indicator now has an aggregation type
> property with the standard options such as sum, avg, count, std dev min,
> max. When set to custom, the indicator expression can contain inline
> aggregation types, allowing for greater control over aggregation.
>
> Docs  |
> Screenshot
> 
>
>
> Program indicators and data elements in GIS: The GIS app lets you analyse
> program indicators, attributes and data elements on maps.
>
> Demo
>  | 
> Screenshot
> 1  | 2
> 
>
>
> Program indicators in event reports: The individual event overview
> supports program indicators, which allows you to display calculations per
> event directly in the overview.
>
> Demo
> 
> | Screenshot
> 
>
>
> Download data dump: Pivot table lets you download data in CSV format
> directly without first rendering the data in the Web browser (which might
> lead to the browser freezing for large data volumes). This allows you to
> download much larger batches of data which is useful for later offline
> analysis.
>
> Screenshot 
>
>
> Complete events only option: All analysis apps provides an option for
> only including completed events in the aggregation process. This is useful
> e.g. to exclude partial events in indicator calculations.
>
> Screenshot
> 
>
>
> Full precision option: Pivot table has an option for “skip rounding” of
> values, i.e. full precision of values. This is useful for certain

[Dhis2-devs] Rép: [Dhis2-users] dhis version 2.21 is released

2015-10-21 Thread Pepe Ken Mvulu 
Congratulations !

Pepe Ken Mvulu
Tel:+243811515878
Skype : pepe.ken.mvulu
Sent by my Itel smartphone

Lars Helge Øverland  a écrit :

Re: [Dhis2-devs] [Dhis2-users] dhis version 2.21 is released

2015-10-21 Thread Guy Ekani 
Congratulations to the DHIS2 development team for this great job !
 = EKANI Guy 
 Cameroon



  


 Le Mercredi 21 octobre 2015 21h03, Lars Helge Øverland 
 a écrit :
   

 Hi all,
DHIS version 2.21 is out with a lot of great new features and improvements. 
Log in with admin/district on the demo system.
File cloud storage: You can now upload and store large files directly from data 
entry forms. Data elements can have a file value type and render as file upload 
widgets in forms. Files can be stored either on the Web server or sent directly 
to AWS S3 cloud storage, which in practice provides unlimited storage capacity. 
This capability allows you to use DHIS 2 as a general document repository which 
can be utilized for project management, documentation, CMS and many other 
purposes. 
File storage currently works for aggregate data entry forms - tracker coming 
up. Have a look at the “Project management” data set in data entry on the demo:
Demo | Docs | Screenshot

Settings app: The settings front-end has been re-written as a true app. It 
features real-time saving, search for settings and a fresh new look.
Demo | Docs | Screenshot

Data import constraints: Several optional constraints for data import can be 
enabled to provide stricter control of the data being imported. These include 
require period to be of same type as data set, data element to be assigned to 
data set through org units, and more. The import constraints can be enabled in 
settings app under “data import”.
Docs


ANALYTICS FEATURES---
Functions and variables in program indicators: Program indicators support a 
range of functions and variables. Functions allows for conditional statements, 
calculation of number of days between dates and more. Variables allows you to 
insert e.g. event date, enrollment date and value count into expressions. This 
is useful for example to calculate “inpatient bed days” and complex scores.
Docs | Demo 1 | 2 | Screenshot 1 | 2 | 3 | 4 |

Custom aggregation types: A program indicator now has an aggregation type 
property with the standard options such as sum, avg, count, std dev min, max. 
When set to custom, the indicator expression can contain inline aggregation 
types, allowing for greater control over aggregation.
Docs | Screenshot

Program indicators and data elements in GIS: The GIS app lets you analyse 
program indicators, attributes and data elements on maps.
Demo | Screenshot 1 | 2

Program indicators in event reports: The individual event overview supports 
program indicators, which allows you to display calculations per event directly 
in the overview.
Demo | Screenshot

Download data dump: Pivot table lets you download data in CSV format directly 
without first rendering the data in the Web browser (which might lead to the 
browser freezing for large data volumes). This allows you to download much 
larger batches of data which is useful for later offline analysis.
Screenshot

Complete events only option: All analysis apps provides an option for only 
including completed events in the aggregation process. This is useful e.g. to 
exclude partial events in indicator calculations.
Screenshot

Full precision option: Pivot table has an option for “skip rounding” of values, 
i.e. full precision of values. This is useful for certain data types such as 
financial data, and when doing calculations in external systems.
Screenshot

Aggregation type for attributes: Tracked entity attributes have an aggregation 
type property which lets you control how attributes are aggregated in pivot 
tables, charts and analytics.
Screenshot

TRACKER FEATURES---

Attribute categories in event capture: Data set categories can be enabled for 
programs without registration and be used in the event capture app. This means 
that events can be attributed to projects and partners just like it can be for 
aggregate data sets. You can enable it by setting a category combination for 
the program. Check it out on the demo for the 
Demo | Screenshot

Sticky right side widgets: In tracker capture, the right-side widgets can be 
made “sticky”, meaning that they remain at the top of the screen when scrolling 
down the page. You can enable this by clicking the “sticky” icon in the 
top-right corner of the dashboard screen. This is useful for example to display 
key patient information while entering data.
Screenshot

Program rule warnings and errors: The program rules let you define warning and 
error messages as actions based on rule evaluation. This is useful e.g. to 
provide assistance and guidance to health workers based on medical best 
practises during consultations. It can also be used for data validation 
purposes, e.g. to provide warnings for values out of range or logical 
violations between data elements. Program rules are supported in tracker 
capture dashboard and event capture. Try it out on the demo with the “WHO RMNCH 
Tracker” program.
Demo | Docs | Screenshot | 2 | 3

[Dhis2-devs] Category Option Combination Craziness

2015-10-21 Thread Craig Hollingsworth 
Hi,

Good work on the new release.  Looks cool!


I'm exploring different config options for a possible system for NRC.   I'm 
looking at datasets with 4 attributes (project code, team, implementing partner 
and target/actual.

The potential number for each option is (200 new per year, 9, 10, 2).That's 
a spectacular amount of combinations - especially after a few years of use.

Can Dhis2 cope?   Any advice would be greatly appreciated.

I recognise that I could cut some options back and go for a slightly different 
config, but the above would be the preferred/easiest option for us.


Cheers


Craig


___
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 20829: set translation=true to default in web-api, means that if you use translation all calls will be r...

2015-10-21 Thread noreply 

revno: 20829
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2015-10-21 20:15:18 +0700
message:
  set translation=true to default in web-api, means that if you use translation 
all calls will be run through i18nservice.. does not need modification to 
web-api calls, tools need to update from name:like:xyz to displayName:like:xyz
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/TranslateParams.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/common/TranslateParams.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/TranslateParams.java	2015-07-13 09:52:25 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/TranslateParams.java	2015-10-21 13:15:18 +
@@ -37,7 +37,7 @@
  */
 public class TranslateParams
 {
-private boolean translate;
+private boolean translate = true;
 
 private String locale;
 

___
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 20837: minor fix

2015-10-21 Thread noreply 

revno: 20837
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 09:38:41 +0700
message:
  minor fix
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.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/trackedentity/DefaultTrackedEntityAttributeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.java	2015-10-19 14:51:03 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.java	2015-10-22 02:38:41 +
@@ -205,7 +205,7 @@
 {
 Assert.notNull( trackedEntityAttribute, "trackedEntityAttribute is required." );
 
-if ( !trackedEntityAttribute.isUnique() )
+if ( !trackedEntityAttribute.isUnique() || value == null )
 {
 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

Re: [Dhis2-devs] [Dhis2-users] dhis version 2.21 is released

2015-10-21 Thread Dapo Adejumo 
Great work Team!
Pretty excited about the pivot data dump!!!

……… 
Regards, 
Dapo Adejumo 
+2348033683677 
Skype : dapojorge 

- Original Message -
From: "Guy Ekani" 
To: "Lars Helge Øverland" , "DHIS 2 Users list" 
, "DHIS 2 Developers list" 

Sent: Wednesday, October 21, 2015 10:39:10 PM
Subject: Re: [Dhis2-devs] [Dhis2-users] dhis version 2.21 is released




Congratulations to the DHIS2 development team for this great job ! 





= 
EKANI Guy 


Cameroon 














Le Mercredi 21 octobre 2015 21h03, Lars Helge Øverland  a 
écrit : 






Hi all, 


DHIS version 2.21 is out with a lot of great new features and improvements. 

Log in with admin/district on the demo system. 

File cloud storage: You can now upload and store large files directly from data 
entry forms. Data elements can have a file value type and render as file upload 
widgets in forms. Files can be stored either on the Web server or sent directly 
to AWS S3 cloud storage, which in practice provides unlimited storage capacity. 
This capability allows you to use DHIS 2 as a general document repository which 
can be utilized for project management, documentation, CMS and many other 
purposes. 

File storage currently works for aggregate data entry forms - tracker coming 
up. Have a look at the “Project management” data set in data entry on the demo: 

Demo | Docs | Screenshot 


Settings app: The settings front-end has been re-written as a true app. It 
features real-time saving, search for settings and a fresh new look. 

Demo | Docs | Screenshot 


Data import constraints: Several optional constraints for data import can be 
enabled to provide stricter control of the data being imported. These include 
require period to be of same type as data set, data element to be assigned to 
data set through org units, and more. The import constraints can be enabled in 
settings app under “data import”. 

Docs 



ANALYTICS FEATURES 
--- 

Functions and variables in program indicators: Program indicators support a 
range of functions and variables. Functions allows for conditional statements, 
calculation of number of days between dates and more. Variables allows you to 
insert e.g. event date, enrollment date and value count into expressions. This 
is useful for example to calculate “inpatient bed days” and complex scores. 

Docs | Demo 1 | 2 | Screenshot 1 | 2 | 3 | 4 | 


Custom aggregation types: A program indicator now has an aggregation type 
property with the standard options such as sum, avg, count, std dev min, max. 
When set to custom , the indicator expression can contain inline aggregation 
types, allowing for greater control over aggregation. 

Docs | Screenshot 


Program indicators and data elements in GIS: The GIS app lets you analyse 
program indicators, attributes and data elements on maps. 

Demo | Screenshot 1 | 2 


Program indicators in event reports: The individual event overview supports 
program indicators, which allows you to display calculations per event directly 
in the overview. 

Demo | Screenshot 


Download data dump: Pivot table lets you download data in CSV format directly 
without first rendering the data in the Web browser (which might lead to the 
browser freezing for large data volumes). This allows you to download much 
larger batches of data which is useful for later offline analysis. 

Screenshot 


Complete events only option: All analysis apps provides an option for only 
including completed events in the aggregation process. This is useful e.g. to 
exclude partial events in indicator calculations. 

Screenshot 


Full precision option: Pivot table has an option for “skip rounding” of values, 
i.e. full precision of values. This is useful for certain data types such as 
financial data, and when doing calculations in external systems. 

Screenshot 


Aggregation type for attributes: Tracked entity attributes have an aggregation 
type property which lets you control how attributes are aggregated in pivot 
tables, charts and analytics. 

Screenshot 


TRACKER FEATURES 
--- 


Attribute categories in event capture: Data set categories can be enabled for 
programs without registration and be used in the event capture app. This means 
that events can be attributed to projects and partners just like it can be for 
aggregate data sets. You can enable it by setting a category combination for 
the program. Check it out on the demo for the 

Demo | Screenshot 


Sticky right side widgets: In tracker capture, the right-side widgets can be 
made “sticky”, meaning that they remain at the top of the screen when scrolling 
down the page. You can enable this by clicking the “sticky” icon in the 
top-right corner of the dashboard screen. This is useful for example to display 
key patient information while entering data. 

Screenshot 


Program rule

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20838: remove unused addEvent method, updated tests

2015-10-21 Thread noreply 

revno: 20838
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 10:05:41 +0700
message:
  remove unused addEvent method, updated tests
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.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/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-20 08:14:51 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-22 03:05:41 +
@@ -237,12 +237,6 @@
 }
 
 @Override
-public ImportSummary addEvent( Event event )
-{
-return addEvent( event, null );
-}
-
-@Override
 public ImportSummary addEvent( Event event, ImportOptions importOptions )
 {
 return addEvent( event, currentUserService.getCurrentUser(), importOptions );

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java	2015-10-01 10:05:20 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java	2015-10-22 03:05:41 +
@@ -70,8 +70,6 @@
 // CREATE
 // -
 
-ImportSummary addEvent( Event event );
-
 ImportSummary addEvent( Event event, ImportOptions importOptions );
 
 ImportSummaries addEvents( List events, ImportOptions importOptions );

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2015-09-11 11:54:53 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2015-10-22 03:05:41 +
@@ -133,7 +133,7 @@
 {
 Event event = createEvent( programA.getUid(), organisationUnitA.getUid() );
 
-ImportSummary importSummary = eventService.addEvent( event );
+ImportSummary importSummary = eventService.addEvent( event, null );
 assertEquals( ImportStatus.SUCCESS, importSummary.getStatus() );
 assertNotNull( importSummary.getReference() );
 
@@ -148,7 +148,7 @@
 {
 Event event = createEvent( programA.getUid(), organisationUnitA.getUid() );
 
-ImportSummary importSummary = eventService.addEvent( event );
+ImportSummary importSummary = eventService.addEvent( event, null );
 assertEquals( ImportStatus.SUCCESS, importSummary.getStatus() );
 assertNotNull( importSummary.getReference() );
 
@@ -159,7 +159,7 @@
 public void testSaveEvent()
 {
 Event event = createEvent( programA.getUid(), organisationUnitA.getUid() );
-ImportSummary importSummary = eventService.addEvent( event );
+ImportSummary importSummary = eventService.addEvent( event, null );
 assertEquals( ImportStatus.SUCCESS, importSummary.getStatus() );
 assertEquals( 0, importSummary.getConflicts().size() );
 assertNotNull( importSummary.getReference() );
@@ -174,7 +174,7 @@
 {
 Event event = createEvent( programA.getUid(), organisationUnitA.getUid() );
 
-ImportSummary importSummary = eventService.addEvent( event );
+ImportSummary importSummary = eventService.addEvent( event, null );
 
 assertEquals( ImportStatus.SUCCESS, importSummary.getStatus() );
 assertNotNull( importSummary.getReference() );
@@ -193,7 +193,7 @@
 {
 Event event = createEvent( programA.getUid(), organisationUnitA.getUid() );
 
-ImportSummary importSummary = eventService.addEvent( event );
+ImportSummary importSummary = eventService.addEvent( event, null );
 assertEquals( ImportStatus.SUCCESS, importSummary.getStatus() );

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20839: minor API updates in deleteEvent, now returns import summary

2015-10-21 Thread noreply 

revno: 20839
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 10:37:00 +0700
message:
  minor API updates in deleteEvent, now returns import summary
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.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/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-22 03:05:41 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-22 03:37:00 +
@@ -805,14 +805,38 @@
 // -
 
 @Override
-public void deleteEvent( Event event )
+public ImportSummary deleteEvent( String uid )
 {
-ProgramStageInstance programStageInstance = programStageInstanceService.getProgramStageInstance( event.getEvent() );
+ProgramStageInstance programStageInstance = programStageInstanceService.getProgramStageInstance( uid );
 
 if ( programStageInstance != null )
 {
 programStageInstanceService.deleteProgramStageInstance( programStageInstance );
-}
+return new ImportSummary( ImportStatus.SUCCESS, "Deletion of event " + uid + " was successful." );
+}
+
+return new ImportSummary( ImportStatus.ERROR, "ID " + uid + " does not point to a valid event" );
+}
+
+@Override
+public ImportSummaries deleteEvents( List uids )
+{
+ImportSummaries importSummaries = new ImportSummaries();
+int counter = 0;
+
+for ( String uid : uids )
+{
+importSummaries.addImportSummary( deleteEvent( uid ) );
+
+if ( counter % FLUSH_FREQUENCY == 0 )
+{
+dbmsManager.clearSession();
+}
+
+counter++;
+}
+
+return importSummaries;
 }
 
 // -

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java	2015-10-22 03:05:41 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java	2015-10-22 03:37:00 +
@@ -28,11 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.List;
-
 import org.hisp.dhis.common.OrganisationUnitSelectionMode;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dxf2.common.IdSchemes;
@@ -45,6 +40,11 @@
 import org.hisp.dhis.program.ProgramStatus;
 import org.hisp.dhis.scheduling.TaskId;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author Morten Olav Hansen 
  */
@@ -55,13 +55,13 @@
 // -
 
 Events getEvents( EventSearchParams params );
-
+
 EventRows getEventRows( EventSearchParams params );
 
 EventSearchParams getFromUrl( String program, String programStage, ProgramStatus programStatus, Boolean followUp, String orgUnit,
-OrganisationUnitSelectionMode orgUnitSelectionMode, String trackedEntityInstance, Date startDate, Date endDate, 
+OrganisationUnitSelectionMode orgUnitSelectionMode, String trackedEntityInstance, Date startDate, Date endDate,
 EventStatus status, Date lastUpdated, DataElementCategoryOptionCombo attributeCoc, IdSchemes idSchemes, Integer page, Integer pageSize, boolean totalPages, boolean skipPaging, boolean includeAttributes );
-
+
 Event getEvent( String uid );
 
 Event getEvent( ProgramStageInstance programStageInstance );
@@ -102,5 +102,7 @@
 // DELETE
 // -
 
-void deleteEvent( Event event );
+ImportSummary deleteEvent( String uid );
+
+ImportSummaries deleteEvents( List uids );
 }

=== modified file

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20840: use programStageInstanceService.programStageInstanceExists to check for existence of event UID, s...

2015-10-21 Thread noreply 

revno: 20840
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 10:40:22 +0700
message:
  use programStageInstanceService.programStageInstanceExists to check for 
existence of event UID, should perform better as we don't have to both fetch 
the PSI and then convert it to an event (just to check for valid event uid)
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.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/controller/event/EventController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java	2015-10-22 03:37:00 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java	2015-10-22 03:40:22 +
@@ -446,9 +446,7 @@
 @PreAuthorize( "hasRole('ALL') or hasRole('F_TRACKED_ENTITY_DATAVALUE_ADD')" )
 public void putXmlEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid, ImportOptions importOptions ) throws IOException, WebMessageException
 {
-Event event = eventService.getEvent( uid );
-
-if ( event == null )
+if ( !programStageInstanceService.programStageInstanceExists( uid ) )
 {
 throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
 }
@@ -464,9 +462,7 @@
 @PreAuthorize( "hasRole('ALL') or hasRole('F_TRACKED_ENTITY_DATAVALUE_ADD')" )
 public void putJsonEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid, ImportOptions importOptions ) throws IOException, WebMessageException
 {
-Event event = eventService.getEvent( uid );
-
-if ( event == null )
+if ( !programStageInstanceService.programStageInstanceExists( uid ) )
 {
 throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
 }
@@ -482,9 +478,7 @@
 @PreAuthorize( "hasRole('ALL') or hasRole('F_TRACKED_ENTITY_DATAVALUE_ADD')" )
 public void putJsonEventSingleValue( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid, @PathVariable( "dataElementUid" ) String dataElementUid ) throws IOException, WebMessageException
 {
-Event event = eventService.getEvent( uid );
-
-if ( event == null )
+if ( !programStageInstanceService.programStageInstanceExists( uid ) )
 {
 throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
 }
@@ -507,9 +501,7 @@
 @PreAuthorize( "hasRole('ALL') or hasRole('F_TRACKED_ENTITY_DATAVALUE_ADD')" )
 public void putJsonEventForNote( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid, ImportOptions importOptions ) throws IOException, WebMessageException
 {
-Event event = eventService.getEvent( uid );
-
-if ( event == null )
+if ( !programStageInstanceService.programStageInstanceExists( uid ) )
 {
 throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
 }

___
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 20841: minor

2015-10-21 Thread noreply 

revno: 20841
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 10:42:30 +0700
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.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/controller/event/EventController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java	2015-10-22 03:40:22 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java	2015-10-22 03:42:30 +
@@ -517,9 +517,7 @@
 @PreAuthorize( "hasRole('ALL') or hasRole('F_TRACKED_ENTITY_DATAVALUE_ADD')" )
 public void putJsonEventForEventDate( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid, ImportOptions importOptions ) throws IOException, WebMessageException
 {
-Event event = eventService.getEvent( uid );
-
-if ( event == null )
+if ( !programStageInstanceService.programStageInstanceExists( uid ) )
 {
 throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
 }

___
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 20842: minor bugfix, check for both lat/lng in convertProgramStageInstance

2015-10-21 Thread noreply 

revno: 20842
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 10:52:17 +0700
message:
  minor bugfix, check for both lat/lng in convertProgramStageInstance
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-22 03:37:00 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-22 03:52:17 +
@@ -884,7 +884,7 @@
 {
 Coordinate coordinate = null;
 
-if ( programStageInstance.getLongitude() != null && programStageInstance.getLongitude() != null )
+if ( programStageInstance.getLongitude() != null && programStageInstance.getLatitude() != null )
 {
 coordinate = new Coordinate( programStageInstance.getLongitude(), programStageInstance.getLatitude() );
 

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

2015-10-21 Thread noreply 

revno: 20843
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-10-22 10:54:06 +0700
message:
  Minor fix
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.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/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2015-10-22 03:05:41 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2015-10-22 03:54:06 +
@@ -199,7 +199,7 @@
 
 event = eventService.getEvent( importSummary.getReference() );
 assertNotNull( event );
-eventService.deleteEvent( event );
+eventService.deleteEvent( event.getEvent() );
 event = eventService.getEvent( importSummary.getReference() );
 assertNull( event );
 }

___
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 20819: Unused classes

2015-10-21 Thread noreply 

revno: 20819
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-10-21 11:06:21 +0200
message:
  Unused classes
removed:
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java
  
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.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
=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java	2015-01-17 07:41:26 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java	1970-01-01 00:00:00 +
@@ -1,63 +0,0 @@
-package org.hisp.dhis.util;
-
-/*
- * Copyright (c) 2004-2015, 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.util.SessionUtils;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class InternalProcessUtil
-{
-public static final String PROCESS_KEY_DATAMART = "CurrentRunningDataMartInternalProcess";
-public static final String PROCESS_KEY_IMPORT = "CurrentRunningImportInternalProcess";
-public static final String PROCESS_KEY_EXPORT = "CurrentRunningExportInternalProcess";
-public static final String PROCESS_KEY_REPORT = "CurrentRunningReportInternalProcess";
-
-public static String getCurrentRunningProcess( String processKey )
-{
-return String.valueOf( SessionUtils.getSessionVar( processKey ) );
-}
-
-public static void setCurrentRunningProcess(  String processKey , String id )
-{
-SessionUtils.setSessionVar( processKey, id );
-}
-
-public static boolean processIsRunning( String processKey )
-{
-return SessionUtils.containsSessionVar( processKey );
-}
-
-public static void removeCurrentRunningProcess( String processKey )
-{
-SessionUtils.removeSessionVar( processKey );
-}
-}

=== removed file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java	2015-01-17 07:41:26 +
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java	1970-01-01 00:00:00 +
@@ -1,94 +0,0 @@
-package org.hisp.dhis.importexport.action.util;
-
-/*
- * Copyright (c) 2004-2015, 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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20820: I18n, minor

2015-10-21 Thread noreply 

revno: 20820
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-10-21 11:23:15 +0200
message:
  I18n, minor
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.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/i18n/DefaultI18nService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java	2015-10-19 11:25:31 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java	2015-10-21 09:23:15 +
@@ -31,7 +31,6 @@
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.common.NameableObject;
 import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.i18n.locale.LocaleManager;
 import org.hisp.dhis.translation.Translation;
 import org.hisp.dhis.translation.TranslationService;
 import org.hisp.dhis.user.UserSettingService;
@@ -103,7 +102,7 @@
 
 private void internationaliseObject( Object object, Locale locale )
 {
-if ( locale == null || object == null || locale.equals( LocaleManager.DEFAULT_LOCALE ) )
+if ( locale == null || object == null )
 {
 return;
 }
@@ -128,7 +127,7 @@
 
 private void internationaliseCollection( Collection objects, Locale locale )
 {
-if ( locale == null || objects == null || locale.equals( LocaleManager.DEFAULT_LOCALE ) || objects.size() == 0 )
+if ( locale == null || objects == null || objects.size() == 0 )
 {
 return;
 }

___
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 20821: upgrade to spring 4.1.8, jackson 2.6.3

2015-10-21 Thread noreply 

revno: 20821
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2015-10-21 16:51:51 +0700
message:
  upgrade to spring 4.1.8, jackson 2.6.3
modified:
  dhis-2/pom.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/pom.xml'
--- dhis-2/pom.xml	2015-10-21 01:48:45 +
+++ dhis-2/pom.xml	2015-10-21 09:51:51 +
@@ -1032,7 +1032,7 @@
   
 
 UTF-8
-4.1.7.RELEASE
+4.1.8.RELEASE
 3.2.8.RELEASE
 2.0.5.RELEASE
 2.3.16.3
@@ -1041,7 +1041,7 @@
 1.9.1
 3.18.1-GA
 
-2.6.1
+2.6.3
 1.6.6
 9.3
   

___
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 20822: tracker-capture: keept ouTree out of D2LeftBar directive

2015-10-21 Thread noreply 

revno: 20822
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2015-10-21 12:04:51 +0200
message:
  tracker-capture: keept ouTree out of D2LeftBar directive
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/left-bar.html
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-21 08:56:32 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-21 10:04:51 +
@@ -361,9 +361,9 @@
 }, function(){
 });
 };
+
 $scope.back = function(){
 $location.path('/').search({program: $scope.selectedProgramId});
-$route.reload();
 };
 
 $scope.displayEnrollment = false;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-10-21 08:17:13 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-10-21 10:04:51 +
@@ -27,7 +27,26 @@
 });
 
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{'loading_tree'| translate}}
+
+
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/left-bar.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/left-bar.html	2015-10-12 14:21:42 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/left-bar.html	2015-10-21 10:04:51 +
@@ -1,31 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-{{'registration_and_data_entry'| translate}}
-{{'reports'| translate}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{{'loading_tree'| translate}}
-
+
+
+
+
+
+
+
+{{'registration_and_data_entry'| translate}}
+{{'reports'| translate}}
+
+
+
+
+
+
+
+
 
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2015-10-20 14:01:57 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2015-10-21 10:04:51 +
@@ -67,7 +67,7 @@
 });
 }
 else{
-$(document).one("ouwtLoaded", function () {
+	 $( '#orgUnitTree' ).one( 'ouwtLoaded', function( event, ids, names ){
 console.log('Finished loading orgunit tree');
 //Disable ou selection until meta-data has downloaded
 $("#orgUnitTree").addClass("disable-clicks");

___
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 20826: Dialog when trying to complete an event with errors

2015-10-21 Thread noreply 

revno: 20826
committer: Markus Bekken 
branch nick: dhis2
timestamp: Wed 2015-10-21 14:12:37 +0200
message:
  Dialog when trying to complete an event with errors
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_ar.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/dialog.html


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-20 12:18:23 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-21 12:12:37 +
@@ -18,6 +18,7 @@
 ProgramStageFactory,
 DHIS2EventFactory,
 ModalService,
+DialogService,
 CurrentSelection,
 TrackerRulesExecutionService,
 CustomFormService,
@@ -122,23 +123,29 @@
 $log.warn("ProgramRuleAction " + effect.id + " is of type HIDEFIELD, bot does not have a dataelement defined");
 }
 } else if (effect.action === "SHOWERROR") {
-if (effect.dataElement) {
+if (effect.ineffect) {
 
-if(effect.ineffect) {
-$scope.errorMessages[effect.dataElement.id] = effect.content + (effect.data ? effect.data : "");
-} else {
-$scope.errorMessages[effect.dataElement.id] = false;
+if(effect.dataElement) {
+var message = effect.content + (effect.data ? effect.data : "");
+$scope.errorMessages[effect.dataElement.id] = message;
+$scope.errorMessages.push($translate.instant($scope.prStDes[effect.dataElement.id].dataElement.name) + ": " + message);
+}
+else
+{
+$scope.errorMessages.push(message);
 }
 }
 else {
-$log.warn("ProgramRuleAction " + effect.id + " is of type HIDEFIELD, bot does not have a dataelement defined");
+
 }
 } else if (effect.action === "SHOWWARNING") {
-if (effect.dataElement) {
-if(effect.ineffect) {
-$scope.warningMessages[effect.dataElement.id] = effect.content + (effect.data ? effect.data : "");
+if (effect.ineffect) {
+if(effect.dataElement) {
+var message = effect.content + (effect.data ? effect.data : "");
+$scope.warningMessages[effect.dataElement.id] = effect.content + message;
+$scope.warningMessages.push($translate.instant($scope.prStDes[effect.dataElement.id].dataElement.name) + ": " + message);
 } else {
-$scope.warningMessages[effect.dataElement.id] = false;
+$scope.warningMessages.push(message);
 }
 }
 else {
@@ -819,17 +826,33 @@
 dhis2Event.status = 'ACTIVE';
 }
 else {//complete event
-modalOptions = {
-closeButtonText: 'cancel',
-actionButtonText: 'complete',
-headerText: 'complete',
-bodyText: 'are_you_sure_to_complete_event'
-};
-dhis2Event.status = 'COMPLETED';
+
+if($scope.errorMessages && $scope.errorMessages.length > 0) {
+//There is unresolved program rule errors - show error message.
+var dialogOptions = {
+headerText: 'errors',
+bodyText: 'please_fix_errors_before_completing',
+bodyList: $scope.errorMessages
+};
+
+DialogService.showDialog({}, dialogOptions);
+
+return;
+}
+else
+{
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20827: Minor

2015-10-21 Thread noreply 

revno: 20827
committer: Markus Bekken 
branch nick: dhis2
timestamp: Wed 2015-10-21 14:20:16 +0200
message:
  Minor
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-21 12:12:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-21 12:20:16 +
@@ -148,9 +148,6 @@
 $scope.warningMessages.push(message);
 }
 }
-else {
-$log.warn("ProgramRuleAction " + effect.id + " is of type HIDEFIELD, bot does not have a dataelement defined");
-}
 } else if (effect.action === "HIDESECTION"){
 if(effect.programStageSection){
 if(effect.ineffect){

___
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 20828: Minor wording update

2015-10-21 Thread noreply 

revno: 20828
committer: Markus Bekken 
branch nick: dhis2
timestamp: Wed 2015-10-21 14:50:22 +0200
message:
  Minor wording update
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-21 12:20:16 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-21 12:50:22 +
@@ -816,8 +816,8 @@
 if ($scope.currentEvent.status === 'COMPLETED') {//activiate event
 modalOptions = {
 closeButtonText: 'cancel',
-actionButtonText: 'incomplete',
-headerText: 'incomplete',
+actionButtonText: 'edit',
+headerText: 'edit',
 bodyText: 'are_you_sure_to_incomplete_event'
 };
 dhis2Event.status = 'ACTIVE';

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-10-21 12:12:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-10-21 12:50:22 +
@@ -303,7 +303,7 @@
 are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
 are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
 do_you_want_to_proceed=Do you want to proceed with invalid criteria?
-are_you_sure_to_proceed=Are you sure to proceed?
+are_you_sure_to_proceed=Are you sure you want to proceed?
 more=More
 under_construction=Under construction
 advanced_search=Advanced search

___
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 20824: Fetching CORS whitelist config inside transaction in CORSFilter

2015-10-21 Thread noreply 

revno: 20824
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-10-21 13:33:29 +0200
message:
  Fetching CORS whitelist config inside transaction in CORSFilter
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.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/configuration/DefaultConfigurationService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2015-01-17 07:41:26 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2015-10-21 11:33:29 +
@@ -29,6 +29,7 @@
  */
 
 import java.util.Iterator;
+import java.util.Set;
 
 import org.hisp.dhis.common.GenericStore;
 import org.springframework.transaction.annotation.Transactional;
@@ -71,4 +72,10 @@
 
 return iterator.hasNext() ? iterator.next() : new Configuration();
 }
+
+@Override
+public Set getCorsWhitelist()
+{
+return getConfiguration().getCorsWhitelist();
+}
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-13 09:51:30 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java	2015-10-21 11:33:29 +
@@ -145,7 +145,7 @@
 }
 
 return !StringUtils.isEmpty( origin ) && ( localUrl.equals( origin ) || 
-configurationService.getConfiguration().getCorsWhitelist().contains( origin ) );
+configurationService.getCorsWhitelist().contains( origin ) );
 }
 
 @Override

___
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 20825: tracker-capture: left-bar show/hide menu for report pages

2015-10-21 Thread noreply 

revno: 20825
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2015-10-21 14:04:23 +0200
message:
  tracker-capture: left-bar show/hide menu for report pages
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js	2015-05-18 17:05:23 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js	2015-10-21 12:04:23 +
@@ -12,7 +12,7 @@
 AttributesFactory,
 ProgramFactory,
 CurrentSelection,
-OptionSetService) {
+MetaDataFactory) {
 $scope.today = DateUtils.getToday();
 
 $scope.selectedOuMode = 'SELECTED';
@@ -24,11 +24,10 @@
 $scope.optionSets = CurrentSelection.getOptionSets();
 if(!$scope.optionSets){
 $scope.optionSets = [];
-OptionSetService.getAll().then(function(optionSets){
-angular.forEach(optionSets, function(optionSet){
+MetaDataFactory.getAll('optionSets').then(function(optionSets){
+angular.forEach(optionSets, function(optionSet){  
 $scope.optionSets[optionSet.id] = optionSet;
 });
-
 CurrentSelection.setOptionSets($scope.optionSets);
 });
 }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2015-09-15 16:03:55 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2015-10-21 12:04:23 +
@@ -1,15 +1,22 @@
-   
-
-
-{{'registration_and_data_entry'| translate}}
-{{'reports'| translate}}
-
-  
-
+
+
+
+
+
+
+
+
+
 
 
 
-
+
+
+
+
+{{'loading_tree'| translate}}
+
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html	2015-03-06 16:52:13 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html	2015-10-21 12:04:23 +
@@ -1,18 +1,22 @@
-   
-
-
-{{'registration_and_data_entry'| translate}}
-{{'reports'| translate}}
-
-  
-
+
+
+
+
+
+
+
+
+
 
 
 
-
-
-
-
+
+
+
+
+{{'loading_tree'| translate}}
+
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js	2015-05-18 17:05:23 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js	2015-10-21 12:04:23 +
@@ -2,18 +2,15 @@
 
 trackerCapture.controller('ProgramSummaryController',
 function($scope,
-$modal,
 DateUtils,
 EventUtils,
-TEIService,
 TEIGridService,
 AttributesFactory,
 ProgramFactory,
 ProgramStageFactory,
 CurrentSelection,
-OptionSetService,
-EventReportService,
-DHIS2EventFactory) {
+MetaDataFactory,
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20823: Enums, minor

2015-10-21 Thread noreply 

revno: 20823
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-10-21 13:30:24 +0200
message:
  Enums, minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayDensity.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.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/common/DisplayDensity.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayDensity.java	2015-09-15 11:43:48 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayDensity.java	2015-10-21 11:30:24 +
@@ -33,5 +33,5 @@
  */
 public enum DisplayDensity
 {
-COMFORTABLE, NORMAL, COMPACT, NONE;
+COMFORTABLE, NORMAL, COMPACT, NONE
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java	2015-09-15 10:40:23 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java	2015-10-21 11:30:24 +
@@ -33,5 +33,5 @@
  */
 public enum FontSize
 {
-LARGE, NORMAL, SMALL;
+LARGE, NORMAL, SMALL
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java	2015-09-16 14:49:50 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java	2015-10-21 11:30:24 +
@@ -1,5 +1,7 @@
 package org.hisp.dhis.configuration;
 
+import java.util.Set;
+
 /*
  * Copyright (c) 2004-2015, University of Oslo
  * All rights reserved.
@@ -35,7 +37,24 @@
 {
 String ID = ConfigurationService.class.getName();
 
+/**
+ * Sets the configuration.
+ * 
+ * @param configuration the configuration.
+ */
 void setConfiguration( Configuration configuration );
 
+/**
+ * Gets the configuration.
+ * 
+ * @return the configuration.
+ */
 Configuration getConfiguration();
+
+/**
+ * Gets the CORS white list inside a transaction.
+ * 
+ * @return the CORS white list.
+ */
+Set getCorsWhitelist();
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java	2015-09-15 10:26:47 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java	2015-10-21 11:30:24 +
@@ -33,5 +33,5 @@
  */
 public enum DashboardItemShape
 {
-NORMAL, DOUBLE_WIDTH, FULL_WIDTH;
+NORMAL, DOUBLE_WIDTH, FULL_WIDTH
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java	2015-09-15 10:15:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java	2015-10-21 11:30:24 +
@@ -33,7 +33,7 @@
  */
 public enum DashboardItemType
 {
-CHART, EVENT_CHART, MAP, REPORT_TABLE, EVENT_REPORT, USERS, 
-REPORTS, RESOURCES, MESSAGES;
-
+CHART, EVENT_CHART, MAP, REPORT_TABLE, 
+EVENT_REPORT, USERS, REPORTS, 
+RESOURCES, MESSAGES
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.java	2015-09-14 10:33:55 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.java	2015-10-21 11:30:24 +
@@ -33,5 +33,5 @@
  */
 public enum ReportType
 {
-JASPER_REPORT_TABLE, JASPER_JDBC, HTML;
+JASPER_REPORT_TABLE, JASPER_JDBC, HTML
 }

___
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] Use of Sub-unit and sub-x2-unit

2015-10-21 Thread Prosper BT 
Dear developers,

In using the sub-unit and sub-x2-unit I would imagine that if you use say
sub-x2-uint and the use is assigned to an Orgunit in hierarchy that has
only one level below it would assume the sub-unit level.

An example is where on the learning land:-

We have (National, Region, District, and Facility)

While at national we want to use sub-x2-unit so that the national user sees
districts and use the same charts for a district user to see facilities

For this chart using sub-x2-unit, the national user sees districts, but its
blank for a district user, is it because the districts has no sub-x2-unit?
[image: Inline image 1]

-- 
Prosper Behumbiize, MPH
Global HISP| University Of Oslo/HISP Uganda
+256 752 751 776 | +256 776 139 139
ptb3...@gmail.com | pros...@dhis2.org | Skype: prospertb
___
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] DHIS2 2.15 or 2.18 download link

2015-10-21 Thread Mihayo Mathayo 
Hello Team,

Is it possible to display data element report by using form display name
instead of real name of data element.

For instance my data element name is TB_Number of received patients
and form display name Number of received patients.

When running the data element report it appears with the initial TB_

But i want it to display without the initial TB_

Thanks.

On Sat, Aug 22, 2015 at 3:03 PM, Mihayo Mathayo 
wrote:

> Hello Team,
> Can any one provide me a link to dhis2 version 2.15 or 2.18 downloads, am
> trying to upgrade to version 2.20 with no success.I need  to try older
> version to see whether the problem is on my side or the current version of
> dhis2(2.20) am trying to upgrade.
>
> Best Regards.
>
___
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 20817: minor

2015-10-21 Thread noreply 

revno: 20817
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2015-10-21 10:17:13 +0200
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html


--
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-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-10-01 13:52:52 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-10-21 08:17:13 +
@@ -31,8 +31,8 @@
 
 
 
-
-
+
+
 {{'loading_metadata'| translate}}
  
 

___
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 20818: minor

2015-10-21 Thread noreply 

revno: 20818
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2015-10-21 10:56:32 +0200
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-05 08:58:13 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-21 08:56:32 +
@@ -5,6 +5,7 @@
 function($rootScope,
 $scope,
 $location,
+$route,
 $modal,
 $timeout,
 $filter,
@@ -361,7 +362,8 @@
 });
 };
 $scope.back = function(){
-$location.path('/').search({program: $scope.selectedProgramId});   
+$location.path('/').search({program: $scope.selectedProgramId});
+$route.reload();
 };
 
 $scope.displayEnrollment = false;

___
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