Re: [Dhis2-devs] [Bug 1522695] Re: Getting problem with moving organisation unit in PSI Application

2015-12-08 Thread Knut Staring 
With Mysql?

On Tue, Dec 8, 2015 at 7:36 AM, Neeraj  wrote:

> Hi Lars,
>
> I was using Hierarchy operations in Org unit module.
> I tried to reproduce the same on demo but it is working fine on demo. The
> problem is being faced only with PSI application.
>
> Thanks,
> Neeraj
>
> On Mon, Dec 7, 2015 at 6:06 PM, Lars Helge Øverland 
> wrote:
>
> > Hi Neeraj,
> >
> > we need a more information from you. Are you using the API or using the
> > "hierarchy operations" part of the org unit module? Can you reproduce on
> > demo?
> >
> > --
> > You received this bug notification because you are subscribed to the bug
> > report.
> > https://bugs.launchpad.net/bugs/1522695
> >
> > Title:
> >   Getting problem with moving organisation unit in PSI Application
> >
> > Status in DHIS:
> >   New
> >
> > Bug description:
> >   we are facing an issue with PSI application.
> >
> >   One of the user is trying to move the organisationunit from one
> >   facility to another but it does not seem to work. User is getting '504
> >   Gateway Time-out' message. However the timeout on server has been
> >   increased to 10 minutes.
> >
> >   Can you please help to check this?
> >
> > To manage notifications about this bug go to:
> > https://bugs.launchpad.net/dhis2/+bug/1522695/+subscriptions
> >
>
>
> --
> Thanks,
> Neeraj Gupta
>
> --
> You received this bug notification because you are a member of DHIS 2
> developers, which is subscribed to DHIS.
> https://bugs.launchpad.net/bugs/1522695
>
> Title:
>   Getting problem with moving organisation unit in PSI Application
>
> Status in DHIS:
>   New
>
> Bug description:
>   we are facing an issue with PSI application.
>
>   One of the user is trying to move the organisationunit from one
>   facility to another but it does not seem to work. User is getting '504
>   Gateway Time-out' message. However the timeout on server has been
>   increased to 10 minutes.
>
>   Can you please help to check this?
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/dhis2/+bug/1522695/+subscriptions
>
> ___
> 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
>



-- 
Knut Staring
Dept. of Informatics, University of Oslo
Norway: +4791880522
Skype: knutstar
http://dhis2.org
___
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-core] Attributes for Option Sets

2015-12-08 Thread Rodolfo Melia 
Hi Lars - thanks for creating the blueprint.

I want to make sure that we are talking about the same: we need this
attribute for EACH value in the Options, not just the Option Set.

R

On Mon, Dec 7, 2015 at 2:07 PM, Lars Helge Øverland 
wrote:

> Hi Rodolfo,
>
> yes makes sense, we will try to get that done for 2.22. Blueprint:
>
> https://blueprints.launchpad.net/dhis2/+spec/more-dynamic-attributes
>
> regards,
>
> Lars
>
>
> On Sun, Dec 6, 2015 at 7:28 AM, Rodolfo Melia  wrote:
>
>> Hi - we are developing some android apps, and we will benefit a lot by
>> being able to extend the options sets with some extra attributes. At the
>> moment we need to store a value (weight) that we associate to each value in
>> an option set, and then we use to calculated scores.
>>
>> Would it be possible to offer custom attributes to option set for 2.22?
>>
>> https://play.dhis2.org/dev/dhis-web-maintenance-dataadmin/showAddAttributeForm.action
>>
>> Ideally, later on, we would like to use that factor when calculating
>> indicators
>>
>> *Rodolfo*
>>
>
>
>
> --
> Lars Helge Øverland
> Lead developer, DHIS 2
> University of Oslo
> Skype: larshelgeoverland
> http://www.dhis2.org 
>
>
-- 
Mailing list: https://launchpad.net/~dhis2-devs-core
Post to : dhis2-devs-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs-core
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Bug 1523838] [NEW] Decimal numbers lost in Event Capture

2015-12-08 Thread Simen Skogly Russnes 
Public bug reported:

After storing decimal numbers in Event Capture, if you reload the Event
Capture list of Events, the decimal value is lost.

To recreate:
- Create a single event program with a number data element as "display in list".
- Create an event, and save a decimal value in the data element.
- Save and go back.
- Now you should see your event in the list, with the decimal value.
- Reload the page. (The page refers to the page where you see a list of events, 
and where you select the program/org unit)
- Now you will see the decimal number is lost, and only the integer is left.

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/1523838

Title:
  Decimal numbers lost in Event Capture

Status in DHIS:
  New

Bug description:
  After storing decimal numbers in Event Capture, if you reload the
  Event Capture list of Events, the decimal value is lost.

  To recreate:
  - Create a single event program with a number data element as "display in 
list".
  - Create an event, and save a decimal value in the data element.
  - Save and go back.
  - Now you should see your event in the list, with the decimal value.
  - Reload the page. (The page refers to the page where you see a list of 
events, and where you select the program/org unit)
  - Now you will see the decimal number is lost, and only the integer is left.

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

___
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 1522695] Re: Getting problem with moving organisation unit in PSI Application

2015-12-08 Thread Neeraj Gupta 
No this is running with Postgres.

On Tue, Dec 8, 2015 at 3:27 PM, Knut Staring  wrote:

> With Mysql?
>
> On Tue, Dec 8, 2015 at 7:36 AM, Neeraj  wrote:
>
>> Hi Lars,
>>
>> I was using Hierarchy operations in Org unit module.
>> I tried to reproduce the same on demo but it is working fine on demo. The
>> problem is being faced only with PSI application.
>>
>> Thanks,
>> Neeraj
>>
>> On Mon, Dec 7, 2015 at 6:06 PM, Lars Helge Øverland 
>> wrote:
>>
>> > Hi Neeraj,
>> >
>> > we need a more information from you. Are you using the API or using the
>> > "hierarchy operations" part of the org unit module? Can you reproduce on
>> > demo?
>> >
>> > --
>> > You received this bug notification because you are subscribed to the bug
>> > report.
>> > https://bugs.launchpad.net/bugs/1522695
>> >
>> > Title:
>> >   Getting problem with moving organisation unit in PSI Application
>> >
>> > Status in DHIS:
>> >   New
>> >
>> > Bug description:
>> >   we are facing an issue with PSI application.
>> >
>> >   One of the user is trying to move the organisationunit from one
>> >   facility to another but it does not seem to work. User is getting '504
>> >   Gateway Time-out' message. However the timeout on server has been
>> >   increased to 10 minutes.
>> >
>> >   Can you please help to check this?
>> >
>> > To manage notifications about this bug go to:
>> > https://bugs.launchpad.net/dhis2/+bug/1522695/+subscriptions
>> >
>>
>>
>> --
>> Thanks,
>> Neeraj Gupta
>>
>> --
>> You received this bug notification because you are a member of DHIS 2
>> developers, which is subscribed to DHIS.
>> https://bugs.launchpad.net/bugs/1522695
>>
>> Title:
>>   Getting problem with moving organisation unit in PSI Application
>>
>> Status in DHIS:
>>   New
>>
>> Bug description:
>>   we are facing an issue with PSI application.
>>
>>   One of the user is trying to move the organisationunit from one
>>   facility to another but it does not seem to work. User is getting '504
>>   Gateway Time-out' message. However the timeout on server has been
>>   increased to 10 minutes.
>>
>>   Can you please help to check this?
>>
>> To manage notifications about this bug go to:
>> https://bugs.launchpad.net/dhis2/+bug/1522695/+subscriptions
>>
>> ___
>> 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
>>
>
>
>
> --
> Knut Staring
> Dept. of Informatics, University of Oslo
> Norway: +4791880522
> Skype: knutstar
> http://dhis2.org
>
> ___
> 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
>
>


-- 
Thanks,
Neeraj Gupta
___
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] [Bug 1523879] [NEW] Generating system identifiers using the api limits itself to one (1)

2015-12-08 Thread Alex Tumwesigye 
Public bug reported:

Generating system identifiers using the api limits itself to one (1)
when the api/system resource is used.

For example, the link below only generates one UID instead of 10.

https://play.dhis2.org/dev/api/system/id.json?n=10

This affects the versions below

Build: 20953
Verison:2.21

Build: 21367
Version: 2.22 -SNAPSHOT

** Affects: dhis2
 Importance: Undecided
 Status: New


** Tags: api identifier system uid

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/1523879

Title:
  Generating system identifiers using the api limits itself to one (1)

Status in DHIS:
  New

Bug description:
  Generating system identifiers using the api limits itself to one (1)
  when the api/system resource is used.

  For example, the link below only generates one UID instead of 10.

  https://play.dhis2.org/dev/api/system/id.json?n=10

  This affects the versions below

  Build: 20953
  Verison:2.21

  Build: 21367
  Version: 2.22 -SNAPSHOT

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

___
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 21371: Changes for adding print functionality

2015-12-08 Thread noreply 

revno: 21371
committer: jijukjose 
branch nick: dhis2
timestamp: Tue 2015-12-08 13:51:21 +0100
message:
  Changes for adding print functionality
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.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.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html	2015-12-07 14:56:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html	2015-12-08 12:51:21 +
@@ -1,4 +1,4 @@
-
+
 
 {{dataentryWidget.title| translate}}
 
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 
@@ -183,7 +183,7 @@
 {{'delete'| translate}}
-{{'print_form'| translate}}
+{{'print_form'| 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 21369: Renamed db column programrule.condition to programrule.rulecondition

2015-12-08 Thread noreply 

revno: 21369
committer: Markus Bekken 
branch nick: dhis2
timestamp: Tue 2015-12-08 12:38:38 +0200
message:
  Renamed db column programrule.condition to programrule.rulecondition
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRule.hbm.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/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2015-11-30 03:36:54 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2015-12-08 10:38:38 +
@@ -771,7 +771,11 @@
 
 //update programruleaction:
 executeSql( "ALTER TABLE programruleaction DROP COLUMN name" );
-
+
+//update programrule
+executeSql( "UPDATE programrule SET rulecondition = condition WHERE rulecondition IS NULL" );
+executeSql( "ALTER TABLE programrule DROP COLUMN condition" );
+
 // data approval
 executeSql( "UPDATE dataapproval SET accepted=false WHERE accepted IS NULL" );
 executeSql( "ALTER TABLE dataapproval ALTER COLUMN accepted SET NOT NULL" );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRule.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRule.hbm.xml	2015-06-23 15:59:19 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRule.hbm.xml	2015-12-08 10:38:38 +
@@ -30,7 +30,7 @@
   
 
 
-
+
 
 
 

___
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] Password/security related code in DHIS2

2015-12-08 Thread Calle Hedberg 
Hi

We have an urgent request from the SA Auditor General for a copy of the
software code controlling/defining the password/security setup in DHIS2.

1. Is all of that code in one file or set of files, and if yes which/where
can I quickly find it?

2. Is there a document available that provides a more conceptual
description of the DHIS2 access/security features?

Sorry to push, but this is urgent - I was only made aware of the request 2
minutes ago, and the deadline was 9am this morning  (it's habitual for
the AG to give extremely short deadlines, regrettably - and while I don't
see them actually doing an in-depth assessment of that code, that seems to
be what they want...)

Regards
Calle

***

Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedb...@gmail.com

Skype: calle_hedberg

***
___
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 21374: Reverted changes for printing

2015-12-08 Thread noreply 

revno: 21374
committer: jijukjose 
branch nick: dhis2
timestamp: Tue 2015-12-08 13:54:50 +0100
message:
  Reverted changes for printing
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css


--
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/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-12-07 14:54:23 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-12-08 12:54:50 +
@@ -1216,7 +1216,3 @@
 .wrap-text {
 word-wrap: break-word;
 }
-
-.print-div {
-
-}
\ No newline at end of file

___
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 21375: data-entry: booleans are now changed from drop-down to radio

2015-12-08 Thread noreply 

revno: 21375
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2015-12-08 14:14:21 +0100
message:
  data-entry: booleans are now changed from drop-down to radio
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.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-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2015-10-19 22:23:02 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2015-12-08 13:14:21 +
@@ -346,15 +346,22 @@
 
 if ( ValueType.BOOLEAN == valueType )
 {
-inputHtml = inputHtml.replace( "input", "select" );
-inputHtml = inputHtml.replaceAll( "value=\".*?\"", "" );
-
-appendCode += " name=\"entryselect\" class=\"entryselect\" tabindex=\"" + i++ + "\">";
-
-appendCode += "" + i18n.getString( "no_value" ) + "";
-appendCode += "" + i18n.getString( "yes" ) + "";
-appendCode += "" + i18n.getString( "no" ) + "";
-appendCode += "";
+inputHtml = inputHtml.replaceAll(inputHtml, TAG_CLOSE);
+
+appendCode += "";
+appendCode += "";
+appendCode += i18n.getString( "no_value" );
+appendCode += "";
+
+appendCode += "";
+appendCode += "";
+appendCode += i18n.getString( "yes" );
+appendCode += "";
+
+appendCode += "";
+appendCode += "";
+appendCode += i18n.getString( "no" );
+appendCode += "";
 }
 else if ( ValueType.TRUE_ONLY == valueType )
 {

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2015-10-01 10:26:37 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2015-12-08 13:14:21 +
@@ -262,11 +262,11 @@
 }
 }
 
-function saveBoolean( dataElementId, optionComboId, fieldId )
+function saveBoolean( dataElementId, optionComboId, _fieldId )
 {
-fieldId = '#' + fieldId;
+var fieldId = '#' + _fieldId;
 
-var value = $( fieldId + ' option:selected' ).val();
+var value = $('input[id=' + _fieldId + ']:checked').val();
 
 $( fieldId ).css( 'background-color', dhis2.de.cst.colorYellow );
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2015-10-19 14:07:54 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2015-12-08 13:14:21 +
@@ -565,12 +565,12 @@
 var dataElementId = split.dataElementId;
 var optionComboId = split.optionComboId;
 
-$( this ).unbind( 'focus' );
+/*$( this ).unbind( 'focus' );
 $( this ).unbind( 'change' );
 
 $( this ).focus( valueFocus );
 
-$( this ).blur( valueBlur );
+$( this ).blur( valueBlur );*/
 
 $( this ).change( function()
 {
@@ -1553,7 +1553,7 @@
 // Clear existing values and colors, grey disabled fields
 
 $( '.entryfield' ).val( '' );
-$( '.entryselect' ).val( '' );
+$( '.entryselect' ).removeAttr( 'checked' );
 $( '.entrytrueonly' ).removeAttr( 'checked' );
 $( '.entryoptionset' ).val( '' );
 
@@ -1675,6 +1675,22 @@
 {
 dhis2.de.setOptionNameInField( fieldId, value );
 }
+else if ( $( fieldId ).attr( 'class' ) == 'entryselect' )
+{
+var fId = fieldId.substring(1, fieldId.length);
+
+if( value.val == 'true' )
+{
+$('input[id=' + fId + ']')[1].checked = true;
+

Re: [Dhis2-devs] [Bug 1523879] [NEW] Generating system identifiers using the api limits itself to one (1)

2015-12-08 Thread Morten Olav Hansen 
Hi

This parameter name has changed, its now limit. Will update docs later.

--
Morten

On Tue, Dec 8, 2015 at 6:12 PM, Alex Tumwesigye 
wrote:

> Public bug reported:
>
> Generating system identifiers using the api limits itself to one (1)
> when the api/system resource is used.
>
> For example, the link below only generates one UID instead of 10.
>
> https://play.dhis2.org/dev/api/system/id.json?n=10
>
> This affects the versions below
>
> Build: 20953
> Verison:2.21
>
> Build: 21367
> Version: 2.22 -SNAPSHOT
>
> ** Affects: dhis2
>  Importance: Undecided
>  Status: New
>
>
> ** Tags: api identifier system uid
>
> --
> You received this bug notification because you are subscribed to DHIS.
> https://bugs.launchpad.net/bugs/1523879
>
> Title:
>   Generating system identifiers using the api limits itself to one (1)
>
> Status in DHIS:
>   New
>
> Bug description:
>   Generating system identifiers using the api limits itself to one (1)
>   when the api/system resource is used.
>
>   For example, the link below only generates one UID instead of 10.
>
>   https://play.dhis2.org/dev/api/system/id.json?n=10
>
>   This affects the versions below
>
>   Build: 20953
>   Verison:2.21
>
>   Build: 21367
>   Version: 2.22 -SNAPSHOT
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/dhis2/+bug/1523879/+subscriptions
>

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/1523879

Title:
  Generating system identifiers using the api limits itself to one (1)

Status in DHIS:
  New

Bug description:
  Generating system identifiers using the api limits itself to one (1)
  when the api/system resource is used.

  For example, the link below only generates one UID instead of 10.

  https://play.dhis2.org/dev/api/system/id.json?n=10

  This affects the versions below

  Build: 20953
  Verison:2.21

  Build: 21367
  Version: 2.22 -SNAPSHOT

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

___
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] Category combination set to default won't let me change it

2015-12-08 Thread Crizelle Nel 
Dear all,

It's 1 year on from when this shortcoming in DHIS2 was identified. Is the
use of Category Combo supported in the Tracker now? If not, how did you
manage to get around this requirement Anne (or anyone else)?

I have to enable the user to make multiple selections from a
lookup/drop-down list. Since this is not supported in OptionSets I opted to
use Categories Combinations linked to Data Elements of type "Yes Only". The
problem is that this is a single event without registration and hence the
Domain Type is Tracker. Any suggestions?

-- 

Regards,
Crizelle Nel

[image: HISP_Logo_sm]
Software Development and Information Systems


*Health Information Systems Program (HISP) -
SA--*
Email:   crize...@hisp.org 
Cell:  +27 84 580 3342
Fax:  0866 509 502
Skype:  crizelle_nel
Website:   http://www.hisp.org

66 Rigel Avenue North, Waterkloof Ridge
Pretoria, 0181, South Africa
E -25.7847787 S 28.2347984


On Wed, Dec 3, 2014 at 11:44 PM, Adebusoye Anifalaje 
wrote:

> Hi Anne,
>
> Your Domain Type is Tracker and this is not yet supported. You can only
> have Category Combinations in Aggregate.
>
> best regards,
>
> Busoye
>
>
>
>
> On 27 Nov 2014, at 10:37, Anne Grace  wrote:
>
>
>
> Dear All,
>
> I hope you are well.
>
> I am trying to edit a category combination that is set to default…I would
> like to add a new combination.
> attached is the screenshot.
>
> Thanks,
>
> Anne-grace
> 
>
> On 25 Nov 2014, at 13:28, Abyot Gizaw  wrote:
>
> I see... are you sure any of the data elements listed there are of type
> date? When defining data elements there is an option to specify value type.
> -
> Thank you,
> Abyot.
>
> (sent from mobile)
> On Nov 25, 2014 12:20 PM, "Anne Grace"  wrote:
>
>> Dear Abyot,
>>
>> Thanks for your prompt answer,
>> unfortunately i don't have access to date in future,see attached picture.
>> 
>> On 25 Nov 2014, at 12:00, Abyot Gizaw  wrote:
>>
>> Hi,
>>
>> To enable capturing of future dates, go to your Program --> View program
>> stages --> Edit then check "Date in future" for those data elements you
>> wanted to capture future date.
>>
>> I am not sure what you mean by "to be able to edit some fields names" ?
>>
>> If you are in default form, field name is data element "Form name" (if
>> you have set this one) or "Name" and it is always possible to edit this. If
>> you are in custom form, you can put whatever name you want in your form -
>> both data element "Form name" and "Name" have no effect.
>>
>>
>> ---
>> Thank you,
>> Abyot.
>>
>> On Tue, Nov 25, 2014 at 10:43 AM, Anne Grace 
>> wrote:
>>
>>> Dear Admin,
>>>
>>> I am a new devoloper in DHIS.
>>> I need to make changes on an existing "new event form" I need to allow
>>> future dates and years also to be able to edit some fields names .
>>>
>>> Please help me out and guide me through.
>>>
>>> Thanks
>>>
>>> ___
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to : dhis2-devs@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>
>>
>>
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>
>
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>
___
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 21372: Reverted changes for printing

2015-12-08 Thread noreply 

revno: 21372
committer: jijukjose 
branch nick: dhis2
timestamp: Tue 2015-12-08 13:52:59 +0100
message:
  Reverted changes for printing
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.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/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-07 15:55:40 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-08 12:52:59 +
@@ -1,4 +1,4 @@
-
+
 
 
 

___
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 21373: Reverted changes for printing

2015-12-08 Thread noreply 

revno: 21373
committer: jijukjose 
branch nick: dhis2
timestamp: Tue 2015-12-08 13:53:59 +0100
message:
  Reverted changes for printing
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.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/profile/profile.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html	2015-12-07 15:57:52 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html	2015-12-08 12:53:59 +
@@ -1,4 +1,4 @@
-
+
 
 {{profileWidget.title| 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] [Bug 1523882] [NEW] Getting exception when upgraded application from Version 2.16 to 2.21 with Mysql dataase

2015-12-08 Thread Neeraj 
Public bug reported:

Dear All,

We recently upgraded DHIS 2.16 to 2.21 where database is Mysql some of
the errors are listed below.(We are using aggregated data not tracker)

Basically we are getting 3 errors 
- Error1: In mysql programrule table is not created automatically

- Error2: While generating resource tables got the error, think the
query should be DROP TABLE IF EXISTS orgunitstructure;  Same applies for
all resource tables.

- Error3: Tried to copy resource table structures from old db and tried
generate resource table option, this time got the error:

The details of errors are given below.

While upgrading we ran all the sql update scripts.

Error1: 
In mysql programrule table is not created automatically. While starting getting 
the below error:


* ERROR 2015-12-07 17:36:56,864 Problem updating: programrule, id column: 
programruleid (IdentityPopulator.java [localho
st-startStop-1])
org.springframework.jdbc.BadSqlGrammarException: StatementCallback; bad SQL 
grammar [SELECT * from programrule WHERE uid
 IS NULL]; nested exception is 
com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Table 
'dhis.programrule'
 doesn't exist
at 
org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator.doTranslate(SQLErrorCodeSQLExceptionTrans
lator.java:231)
at 
org.springframework.jdbc.support.AbstractFallbackSQLExceptionTranslator.translate(AbstractFallbackSQLExceptio
nTranslator.java:73)
at 
org.springframework.jdbc.core.JdbcTemplate.execute(JdbcTemplate.java:416)
at 
org.springframework.jdbc.core.JdbcTemplate.query(JdbcTemplate.java:471)
at 
org.springframework.jdbc.core.JdbcTemplate.queryForRowSet(JdbcTemplate.java:526)
at 
org.hisp.dhis.common.IdentityPopulator.execute(IdentityPopulator.java:86)
at 
org.hisp.dhis.system.startup.DefaultStartupRoutineExecutor.execute(DefaultStartupRoutineExecutor.java:117)
at 
org.hisp.dhis.system.startup.DefaultStartupRoutineExecutor.execute(DefaultStartupRoutineExecutor.java:86)
at 
org.hisp.dhis.system.startup.StartupListener.contextInitialized(StartupListener.java:71)
at 
org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4729)
at 
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5167)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at 
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:725)
at 
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:701)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:717)
at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:945)
at 
org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1768)
at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
at java.util.concurrent.FutureTask.run(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at java.lang.Thread.run(Unknown Source)
Caused by: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Table 
'dhis.programrule' doesn't exist
at sun.reflect.GeneratedConstructorAccessor53.newInstance(Unknown 
Source)
at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(Unknown 
Source)
at java.lang.reflect.Constructor.newInstance(Unknown Source)
at com.mysql.jdbc.Util.handleNewInstance(Util.java:377)
at com.mysql.jdbc.Util.getInstance(Util.java:360)
at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:978)
at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3887)
at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3823)
at com.mysql.jdbc.MysqlIO.sendCommand(MysqlIO.java:2435)
at com.mysql.jdbc.MysqlIO.sqlQueryDirect(MysqlIO.java:2582)
at com.mysql.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2526)
at com.mysql.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2484)
at com.mysql.jdbc.StatementImpl.executeQuery(StatementImpl.java:1446)
at 
com.mchange.v2.c3p0.impl.NewProxyStatement.executeQuery(NewProxyStatement.java:35)
at 
org.springframework.jdbc.core.JdbcTemplate$1QueryStatementCallback.doInStatement(JdbcTemplate.java:455)
at 
org.springframework.jdbc.core.JdbcTemplate.execute(JdbcTemplate.java:405)
... 19 more
* INFO  2015-12-07 17:36:57,144 Executing startup routine [6 of 13, runlevel 
5]: TableCreator (DefaultStartupRoutineExec
utor.java [localhost-startStop-1])

--

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 21370: Updated the print function

2015-12-08 Thread noreply 

revno: 21370
committer: jijukjose 
branch nick: dhis2
timestamp: Tue 2015-12-08 13:40:25 +0100
message:
  Updated the print function
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-12-07 20:24:47 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-12-08 12:40:25 +
@@ -97,14 +97,22 @@
 
 $scope.model= {};
 
-$scope.printDiv = function( divName ) {
-var elements = document.getElementsByClassName(divName);
-var printContents = elements[3].innerHTML + elements[0].innerHTML + elements[1].innerHTML + elements[2].innerHTML;
-var popupWin = window.open('', '_blank', 'width=800,height=800');
-//popupWin.document.open();
-popupWin.document.write('' + printContents + '');
+$scope.print = function(divName){
+$scope.showProgramReportDetailsDiv = false;
+var printContents = document.getElementById(divName).innerHTML;
+var popupWin = window.open('', '_blank', 'fullscreen=1');
+popupWin.document.open();
+popupWin.document.write('\n\
+ \n\
+ \n\
+ \n\
+ \n\
+ \n\
+ \n\
+ ' + printContents +
+'');
 popupWin.document.close();
-}
+};
 
 
 var processRuleEffect = function(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

Re: [Dhis2-devs] Category combination set to default won't let me change it

2015-12-08 Thread Lars Helge Øverland 
Hi Crizelle,

we do not plan to support categories for tracker. The "tracker" domain type
includes both single event and tracker programs. I know it is a bit
misleading, we could potentially use "events" instead.

As mentioned before, we do not plan to support multiple selection within an
option set, mainly because it will limit the analysis which can be done at
a later stage.

regards,

Lars


On Tue, Dec 8, 2015 at 1:35 PM, Crizelle Nel  wrote:

> Dear all,
>
> It's 1 year on from when this shortcoming in DHIS2 was identified. Is the
> use of Category Combo supported in the Tracker now? If not, how did you
> manage to get around this requirement Anne (or anyone else)?
>
> I have to enable the user to make multiple selections from a
> lookup/drop-down list. Since this is not supported in OptionSets I opted to
> use Categories Combinations linked to Data Elements of type "Yes Only". The
> problem is that this is a single event without registration and hence the
> Domain Type is Tracker. Any suggestions?
>
> --
>
> Regards,
> Crizelle Nel
>
> [image: HISP_Logo_sm]
> Software Development and Information Systems
>
>
> *Health Information Systems Program (HISP) -
> SA--*
> Email:   crize...@hisp.org 
> Cell:  +27 84 580 3342
> Fax:  0866 509 502
> Skype:  crizelle_nel
> Website:   http://www.hisp.org
>
> 66 Rigel Avenue North, Waterkloof Ridge
> Pretoria, 0181, South Africa
> E -25.7847787 S 28.2347984
>
>
> On Wed, Dec 3, 2014 at 11:44 PM, Adebusoye Anifalaje 
> wrote:
>
>> Hi Anne,
>>
>> Your Domain Type is Tracker and this is not yet supported. You can only
>> have Category Combinations in Aggregate.
>>
>> best regards,
>>
>> Busoye
>>
>>
>>
>>
>> On 27 Nov 2014, at 10:37, Anne Grace  wrote:
>>
>>
>>
>> Dear All,
>>
>> I hope you are well.
>>
>> I am trying to edit a category combination that is set to default…I would
>> like to add a new combination.
>> attached is the screenshot.
>>
>> Thanks,
>>
>> Anne-grace
>> 
>>
>> On 25 Nov 2014, at 13:28, Abyot Gizaw  wrote:
>>
>> I see... are you sure any of the data elements listed there are of type
>> date? When defining data elements there is an option to specify value type.
>> -
>> Thank you,
>> Abyot.
>>
>> (sent from mobile)
>> On Nov 25, 2014 12:20 PM, "Anne Grace"  wrote:
>>
>>> Dear Abyot,
>>>
>>> Thanks for your prompt answer,
>>> unfortunately i don't have access to date in future,see attached picture.
>>> 
>>> On 25 Nov 2014, at 12:00, Abyot Gizaw  wrote:
>>>
>>> Hi,
>>>
>>> To enable capturing of future dates, go to your Program --> View program
>>> stages --> Edit then check "Date in future" for those data elements you
>>> wanted to capture future date.
>>>
>>> I am not sure what you mean by "to be able to edit some fields names" ?
>>>
>>> If you are in default form, field name is data element "Form name" (if
>>> you have set this one) or "Name" and it is always possible to edit this. If
>>> you are in custom form, you can put whatever name you want in your form -
>>> both data element "Form name" and "Name" have no effect.
>>>
>>>
>>> ---
>>> Thank you,
>>> Abyot.
>>>
>>> On Tue, Nov 25, 2014 at 10:43 AM, Anne Grace 
>>> wrote:
>>>
 Dear Admin,

 I am a new devoloper in DHIS.
 I need to make changes on an existing "new event form" I need to allow
 future dates and years also to be able to edit some fields names .

 Please help me out and guide me through.

 Thanks

 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp

>>>
>>>
>>>
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>>
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>
>
> ___
> 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
>
>


-- 
Lars Helge Øverland
Lead developer, DHIS 2
University of Oslo
Skype: larshelgeoverland
http://www.dhis2.org 
___
Mailing list:

Re: [Dhis2-devs] Category combination set to default won't let me change it

2015-12-08 Thread Crizelle Nel 
Hi Lars,

Thanks for the quick response.

Noted that multiple selections within an option set won't be supported.

It would make sense to include "Event" as a separate option for the "Domain
Type". Would categories then possibly be supported for Events if then not
for Tracker?

The only other alternative is to create multiple Data Elements with Data
Type "Yes Only" and possbly add some Program Sections to make it more
user-friendly. This is OK, but really lengthens and clutters the data entry
form.

-- 

Regards,
Crizelle Nel

[image: HISP_Logo_sm]
Software Development and Information Systems


*Health Information Systems Program (HISP) -
SA--*
Email:   crize...@hisp.org 
Cell:  +27 84 580 3342
Fax:  0866 509 502
Skype:  crizelle_nel
Website:   http://www.hisp.org

66 Rigel Avenue North, Waterkloof Ridge
Pretoria, 0181, South Africa
E -25.7847787 S 28.2347984



On Tue, Dec 8, 2015 at 2:41 PM, Lars Helge Øverland 
wrote:

> Hi Crizelle,
>
> we do not plan to support categories for tracker. The "tracker" domain
> type includes both single event and tracker programs. I know it is a bit
> misleading, we could potentially use "events" instead.
>
> As mentioned before, we do not plan to support multiple selection within
> an option set, mainly because it will limit the analysis which can be done
> at a later stage.
>
> regards,
>
> Lars
>
>
> On Tue, Dec 8, 2015 at 1:35 PM, Crizelle Nel 
> wrote:
>
>> Dear all,
>>
>> It's 1 year on from when this shortcoming in DHIS2 was identified. Is the
>> use of Category Combo supported in the Tracker now? If not, how did you
>> manage to get around this requirement Anne (or anyone else)?
>>
>> I have to enable the user to make multiple selections from a
>> lookup/drop-down list. Since this is not supported in OptionSets I opted to
>> use Categories Combinations linked to Data Elements of type "Yes Only". The
>> problem is that this is a single event without registration and hence the
>> Domain Type is Tracker. Any suggestions?
>>
>> --
>>
>> Regards,
>> Crizelle Nel
>>
>> [image: HISP_Logo_sm]
>> Software Development and Information Systems
>>
>>
>> *Health Information Systems Program (HISP) -
>> SA--*
>> Email:   crize...@hisp.org 
>> Cell:  +27 84 580 3342
>> Fax:  0866 509 502
>> Skype:  crizelle_nel
>> Website:   http://www.hisp.org
>>
>> 66 Rigel Avenue North, Waterkloof Ridge
>> Pretoria, 0181, South Africa
>> E -25.7847787 S 28.2347984
>>
>>
>> On Wed, Dec 3, 2014 at 11:44 PM, Adebusoye Anifalaje 
>> wrote:
>>
>>> Hi Anne,
>>>
>>> Your Domain Type is Tracker and this is not yet supported. You can only
>>> have Category Combinations in Aggregate.
>>>
>>> best regards,
>>>
>>> Busoye
>>>
>>>
>>>
>>>
>>> On 27 Nov 2014, at 10:37, Anne Grace  wrote:
>>>
>>>
>>>
>>> Dear All,
>>>
>>> I hope you are well.
>>>
>>> I am trying to edit a category combination that is set to default…I
>>> would like to add a new combination.
>>> attached is the screenshot.
>>>
>>> Thanks,
>>>
>>> Anne-grace
>>> 
>>>
>>> On 25 Nov 2014, at 13:28, Abyot Gizaw  wrote:
>>>
>>> I see... are you sure any of the data elements listed there are of type
>>> date? When defining data elements there is an option to specify value type.
>>> -
>>> Thank you,
>>> Abyot.
>>>
>>> (sent from mobile)
>>> On Nov 25, 2014 12:20 PM, "Anne Grace"  wrote:
>>>
 Dear Abyot,

 Thanks for your prompt answer,
 unfortunately i don't have access to date in future,see attached
 picture.
 
 On 25 Nov 2014, at 12:00, Abyot Gizaw  wrote:

 Hi,

 To enable capturing of future dates, go to your Program --> View
 program stages --> Edit then check "Date in future" for those data elements
 you wanted to capture future date.

 I am not sure what you mean by "to be able to edit some fields names" ?

 If you are in default form, field name is data element "Form name" (if
 you have set this one) or "Name" and it is always possible to edit this. If
 you are in custom form, you can put whatever name you want in your form -
 both data element "Form name" and "Name" have no effect.


 ---
 Thank you,
 Abyot.

 On Tue, Nov 25, 2014 at 10:43 AM, Anne Grace 
 wrote:

> Dear Admin,
>
> I am a new devoloper in DHIS.
> I need to make changes on an existing "new event form" I need to allow
> future dates and years also to be able to edit some fields names .
>
> Please help me out and guide me through.
>
> Thanks
>
> ___
> Mailing

Re: [Dhis2-devs] Password/security related code in DHIS2

2015-12-08 Thread Calle Hedberg 
Lars,

Thanks - much appreciated

Regards
Calle

On 8 December 2015 at 14:12, Lars Helge Øverland 
wrote:

> Hi Calle,
>
> security isn't really confined to a few files and we don't have a document
> specifically on that.
>
> Since you need an urgent reply what you could say is:
>
> - Main security config files are found here:
>
>
> http://bazaar.launchpad.net/~dhis2-devs-core/dhis2/trunk/view/head:/dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml
>
> http://bazaar.launchpad.net/~dhis2-devs-core/dhis2/trunk/view/head:/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml
>
> - DHIS 2 is using a fairly standard security setup based on Spring
> Security. Web site  |
> reference
> 
> | overview 
>
> - DHIS 2 uses Bcrypt adaptive hashing of passwords. Read more
> .
>
> - DHIS 2 can authenticate against the local database, using OpenID
> 
> (from 2.19) and LDAP
> 
> server (from 2.21)
>
> - DHIS 2 supports OAuth2
> 
>  and
> basic
> 
> authentication for Web API requests / integration with other systems,
>
> - DHIS 2 lets you configure password expiration under settings
> .
>
> - DHIS 2 allows for user account recovery / password reset with recaptcha
> under settings
> .
>
> - DHIS 2 access control is based on a standard solution with user roles
> with authorities.
>
>
> regards,
>
> Lars
>
>
>
> On Tue, Dec 8, 2015 at 12:48 PM, Calle Hedberg 
> wrote:
>
>> Hi
>>
>> We have an urgent request from the SA Auditor General for a copy of the
>> software code controlling/defining the password/security setup in DHIS2.
>>
>> 1. Is all of that code in one file or set of files, and if yes
>> which/where can I quickly find it?
>>
>> 2. Is there a document available that provides a more conceptual
>> description of the DHIS2 access/security features?
>>
>> Sorry to push, but this is urgent - I was only made aware of the request
>> 2 minutes ago, and the deadline was 9am this morning  (it's habitual
>> for the AG to give extremely short deadlines, regrettably - and while I
>> don't see them actually doing an in-depth assessment of that code, that
>> seems to be what they want...)
>>
>> Regards
>> Calle
>>
>> ***
>>
>> Calle Hedberg
>>
>> 46D Alma Road, 7700 Rosebank, SOUTH AFRICA
>>
>> Tel/fax (home): +27-21-685-6472
>>
>> Cell: +27-82-853-5352
>>
>> Iridium SatPhone: +8816-315-19119
>>
>> Email: calle.hedb...@gmail.com
>>
>> Skype: calle_hedberg
>>
>> ***
>>
>>
>> ___
>> 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
>>
>>
>
>
> --
> Lars Helge Øverland
> Lead developer, DHIS 2
> University of Oslo
> Skype: larshelgeoverland
> http://www.dhis2.org 
>
>


-- 

***

Calle Hedberg

46D Alma Road, 7700 Rosebank, SOUTH AFRICA

Tel/fax (home): +27-21-685-6472

Cell: +27-82-853-5352

Iridium SatPhone: +8816-315-19119

Email: calle.hedb...@gmail.com

Skype: calle_hedberg

***
___
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] Documentation on CSV Meta Data Import for Data Elements (DHIS 2.21)

2015-12-08 Thread Adebusoye Anifalaje 
Hi devs,

With the change in data element value types, I am having issues importing data 
elements using csv. 

At the moment I am able to import using the following columns:

DE Name, UID, Code, Shortname,  Description, Formname,  domaintype, Unknown, 
Unknown, catcomboUID

I think the option set column after catcomboUID also works. However, can’t set 
valuetypes and aggregator operator. 

Tried on the demo site as well with no joy.

Any chance you could update the documentation to reflect the new required 
columns?

Thanks

Busoye

DHIS 2.21
Build: 20876


  
-- 


*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.*

___
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] [Bug 1523882] Re: Getting exception when upgraded application from Version 2.16 to 2.21 with Mysql dataase

2015-12-08 Thread John Francis Mukulu 
Hellow Neeraj,
With such a huge leap between version, I recommend, before deploying 2.21 on 
the 2.16 database,  you go through upgrade notes between each version and 
effect all database changes step wise.


i.e.
>From 2.16 to 2.17 you can visit:
https://www.dhis2.org/217-upgrade

>From 2.17 to 2.18 and above, the upgrade notes are are available on 
>https://www.dhis2.org/downloads
Goodluck.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/1523882

Title:
  Getting exception when upgraded application from Version 2.16 to 2.21
  with Mysql dataase

Status in DHIS:
  New

Bug description:
  Dear All,

  We recently upgraded DHIS 2.16 to 2.21 where database is Mysql some of
  the errors are listed below.(We are using aggregated data not tracker)

  Basically we are getting 3 errors 
  - Error1: In mysql programrule table is not created automatically

  - Error2: While generating resource tables got the error, think the
  query should be DROP TABLE IF EXISTS orgunitstructure;  Same applies
  for all resource tables.

  - Error3: Tried to copy resource table structures from old db and
  tried generate resource table option, this time got the error:

  The details of errors are given below.

  While upgrading we ran all the sql update scripts.

  Error1: 
  In mysql programrule table is not created automatically. While starting 
getting the below error:

  
  * ERROR 2015-12-07 17:36:56,864 Problem updating: programrule, id column: 
programruleid (IdentityPopulator.java [localho
  st-startStop-1])
  org.springframework.jdbc.BadSqlGrammarException: StatementCallback; bad SQL 
grammar [SELECT * from programrule WHERE uid
   IS NULL]; nested exception is 
com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Table 
'dhis.programrule'
   doesn't exist
  at 
org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator.doTranslate(SQLErrorCodeSQLExceptionTrans
  lator.java:231)
  at 
org.springframework.jdbc.support.AbstractFallbackSQLExceptionTranslator.translate(AbstractFallbackSQLExceptio
  nTranslator.java:73)
  at 
org.springframework.jdbc.core.JdbcTemplate.execute(JdbcTemplate.java:416)
  at 
org.springframework.jdbc.core.JdbcTemplate.query(JdbcTemplate.java:471)
  at 
org.springframework.jdbc.core.JdbcTemplate.queryForRowSet(JdbcTemplate.java:526)
  at 
org.hisp.dhis.common.IdentityPopulator.execute(IdentityPopulator.java:86)
  at 
org.hisp.dhis.system.startup.DefaultStartupRoutineExecutor.execute(DefaultStartupRoutineExecutor.java:117)
  at 
org.hisp.dhis.system.startup.DefaultStartupRoutineExecutor.execute(DefaultStartupRoutineExecutor.java:86)
  at 
org.hisp.dhis.system.startup.StartupListener.contextInitialized(StartupListener.java:71)
  at 
org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4729)
  at 
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5167)
  at 
org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
  at 
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:725)
  at 
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:701)
  at 
org.apache.catalina.core.StandardHost.addChild(StandardHost.java:717)
  at 
org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:945)
  at 
org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1768)
  at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
  at java.util.concurrent.FutureTask.run(Unknown Source)
  at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
  at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
  at java.lang.Thread.run(Unknown Source)
  Caused by: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Table 
'dhis.programrule' doesn't exist
  at sun.reflect.GeneratedConstructorAccessor53.newInstance(Unknown 
Source)
  at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(Unknown 
Source)
  at java.lang.reflect.Constructor.newInstance(Unknown Source)
  at com.mysql.jdbc.Util.handleNewInstance(Util.java:377)
  at com.mysql.jdbc.Util.getInstance(Util.java:360)
  at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:978)
  at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3887)
  at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3823)
  at com.mysql.jdbc.MysqlIO.sendCommand(MysqlIO.java:2435)
  at com.mysql.jdbc.MysqlIO.sqlQueryDirect(MysqlIO.java:2582)
  at com.mysql.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2526)
  at com.mysql.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2484)
  at

[Dhis2-devs] DataSet and/or Programs not appearing on Data Entry screens

2015-12-08 Thread Crizelle Nel 
Hi devs,

Is anyone aware of a bug relating to the standard data entry forms not
rendering for Aggregated, Tracker and Events? I've done all allocations (DE
to DS, DS to OU for Aggregated data and DE to Stage to Program to OU for
Event and Tracker). I've also checked the Sharing Settings. But the DataSet
and/or Program is not appearing on the respective data entry screen when
selecting the OrgUnit.

I'm using
Version:2.21Build revision:20934

I also tried on the Siera Leone demo db without success. Am I missing
something?

PS: Apologies if this has been posted already, did a search and couldn't
find anything on the subject

-- 

Regards,
Crizelle Nel

[image: HISP_Logo_sm]
Software Development and Information Systems


*Health Information Systems Program (HISP) -
SA--*
Email:   crize...@hisp.org 
Cell:  +27 84 580 3342
Fax:  0866 509 502
Skype:  crizelle_nel
Website:   http://www.hisp.org

66 Rigel Avenue North, Waterkloof Ridge
Pretoria, 0181, South Africa
E -25.7847787 S 28.2347984
___
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] Category combination set to default won't let me change it

2015-12-08 Thread Crizelle Nel 
Hi Knut,

(1) If unable to use use Categories for Event data elements then yes, we
have to be able to save each data value against a separate data element for
analysis. The ability to reuse Category Options though (i.e assigning them
to multiple Categories), greatly reduces the database configuration work
required. For the current database I'm configuring I would have needed 24
Category Options, 4 Categories and 4 Cat Combos to enable each "Yes' data
value to be uniquely stored for analysis. Because Categories cannot be used
for Event data elements, I had to create 93 Data Elements instead.

(2) If we have to live without Categories for Events, then it would be
great to have a grouping feature beyond sections like the multiple
selection box you suggested.

-- 

Regards,
Crizelle Nel

[image: HISP_Logo_sm]
Software Development and Information Systems


*Health Information Systems Program (HISP) -
SA--*
Email:   crize...@hisp.org 
Cell:  +27 84 580 3342
Fax:  0866 509 502
Skype:  crizelle_nel
Website:   http://www.hisp.org

66 Rigel Avenue North, Waterkloof Ridge
Pretoria, 0181, South Africa
E -25.7847787 S 28.2347984


On Tue, Dec 8, 2015 at 3:46 PM, Knut Staring  wrote:

> Isn't this two different things?
>
> 1) We need to register Yes (or Yes/No) for each selected item in order to
> analyse on each of them, thus we need a number of data elements
>
> 2) It would be nice to have a way of grouping data elements in the user
> interface even beyond sections, i.e. to use one widget for multiple data
> elements, like a multiple selection list box:
> http://www.dummies.com/how-to/content/how-to-create-a-multiple-selection-list-box-in-jav.html
>
>
>
> On Tue, Dec 8, 2015 at 2:40 PM, Crizelle Nel 
> wrote:
>
>> Hi Lars,
>>
>> Thanks for the quick response.
>>
>> Noted that multiple selections within an option set won't be supported.
>>
>> It would make sense to include "Event" as a separate option for the
>> "Domain Type". Would categories then possibly be supported for Events if
>> then not for Tracker?
>>
>> The only other alternative is to create multiple Data Elements with Data
>> Type "Yes Only" and possbly add some Program Sections to make it more
>> user-friendly. This is OK, but really lengthens and clutters the data entry
>> form.
>>
>> --
>>
>> Regards,
>> Crizelle Nel
>>
>> [image: HISP_Logo_sm]
>> Software Development and Information Systems
>>
>>
>> *Health Information Systems Program (HISP) -
>> SA--*
>> Email:   crize...@hisp.org 
>> Cell:  +27 84 580 3342
>> Fax:  0866 509 502
>> Skype:  crizelle_nel
>> Website:   http://www.hisp.org
>>
>> 66 Rigel Avenue North, Waterkloof Ridge
>> Pretoria, 0181, South Africa
>> E -25.7847787 S 28.2347984
>>
>>
>>
>> On Tue, Dec 8, 2015 at 2:41 PM, Lars Helge Øverland 
>> wrote:
>>
>>> Hi Crizelle,
>>>
>>> we do not plan to support categories for tracker. The "tracker" domain
>>> type includes both single event and tracker programs. I know it is a bit
>>> misleading, we could potentially use "events" instead.
>>>
>>> As mentioned before, we do not plan to support multiple selection within
>>> an option set, mainly because it will limit the analysis which can be done
>>> at a later stage.
>>>
>>> regards,
>>>
>>> Lars
>>>
>>>
>>> On Tue, Dec 8, 2015 at 1:35 PM, Crizelle Nel 
>>> wrote:
>>>
 Dear all,

 It's 1 year on from when this shortcoming in DHIS2 was identified. Is
 the use of Category Combo supported in the Tracker now? If not, how did you
 manage to get around this requirement Anne (or anyone else)?

 I have to enable the user to make multiple selections from a
 lookup/drop-down list. Since this is not supported in OptionSets I opted to
 use Categories Combinations linked to Data Elements of type "Yes Only". The
 problem is that this is a single event without registration and hence the
 Domain Type is Tracker. Any suggestions?

 --

 Regards,
 Crizelle Nel

 [image: HISP_Logo_sm]
 Software Development and Information Systems


 *Health Information Systems Program (HISP) -
 SA--*
 Email:   crize...@hisp.org 
 Cell:  +27 84 580 3342
 Fax:  0866 509 502
 Skype:  crizelle_nel
 Website:   http://www.hisp.org

 66 Rigel Avenue North, Waterkloof Ridge
 Pretoria, 0181, South Africa
 E -25.7847787 S 28.2347984


 On Wed, Dec 3, 2014 at 11:44 PM, Adebusoye Anifalaje 
 wrote:

> Hi Anne,
>
> Your Domain Type is Tracker and this is not yet supported.

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 21377: Added enum UserSettingKey

2015-12-08 Thread noreply 

revno: 21377
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2015-12-08 20:36:21 +0100
message:
  Added enum UserSettingKey
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.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
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java	2015-12-08 19:36:21 +
@@ -0,0 +1,152 @@
+package org.hisp.dhis.user;
+
+/*
+ * 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 java.io.Serializable;
+import java.util.Locale;
+import java.util.Optional;
+
+import org.hisp.dhis.setting.SettingKey;
+
+/**
+ * @author Lars Helge Overland
+ */
+public enum UserSettingKey
+{
+STYLE( "stylesheet" ),
+STYLE_DIRECTORY( "stylesheetDirectory" ),
+MESSAGE_EMAIL_NOTIFICATION( "keyMessageEmailNotification", Boolean.FALSE, Boolean.class ),
+MESSAGE_SMS_NOTIFICATION( "keyMessageSmsNotification", Boolean.FALSE, Boolean.class ),
+UI_LOCALE( "keyUiLocale", Locale.class ),
+DB_LOCALE( "keyDbLocale", Locale.class ),
+ANALYSIS_DISPLAY_PROPERTY( "keyAnalysisDisplayProperty", "name", String.class ),
+KEY_CURRENT_DOMAIN_TYPE( "currentDomainType" ),
+AUTO_SAVE_CASE_ENTRY_FORM( "autoSaveCaseEntryForm", Boolean.FALSE, Boolean.class ),
+AUTO_SAVE_TRACKED_ENTITY_REGISTRATION_ENTRY_FORM( "autoSavetTrackedEntityForm", Boolean.FALSE, Boolean.class ),
+AUTO_SAVE_DATA_ENTRY_FORM( "autoSaveDataEntryForm", Boolean.FALSE, Boolean.class );
+
+private final String name;
+
+private final Serializable defaultValue;
+
+private final Class clazz;
+
+// -
+// Constructors
+// -
+
+private UserSettingKey( String name )
+{
+this.name = name;
+this.defaultValue = null;
+this.clazz = String.class;
+}
+
+private UserSettingKey( String name, Class clazz )
+{
+this.name = name;
+this.defaultValue = null;
+this.clazz = clazz;
+}
+
+private UserSettingKey( String name, Serializable defaultValue, Class clazz )
+{
+this.name = name;
+this.defaultValue = defaultValue;
+this.clazz = clazz;
+}
+
+// -
+// Logic
+// -
+
+public static Optional getByName( String name )
+{
+for ( SettingKey setting : SettingKey.values() )
+{
+if ( setting.getName().equals( name ) )
+{
+return Optional.of( setting );
+}
+}
+
+return Optional.empty();
+}
+
+public static Serializable getAsRealClass( String name, String

Re: [Dhis2-devs] Category combination set to default won't let me change it

2015-12-08 Thread Knut Staring 
Hi Crizelle,
It could be quite instructive if you could share the details of this
example with us.

Knut
On 8 Dec 2015 7:09 pm, "Crizelle Nel"  wrote:

> Hi Knut,
>
> (1) If unable to use use Categories for Event data elements then yes, we
> have to be able to save each data value against a separate data element for
> analysis. The ability to reuse Category Options though (i.e assigning them
> to multiple Categories), greatly reduces the database configuration work
> required. For the current database I'm configuring I would have needed 24
> Category Options, 4 Categories and 4 Cat Combos to enable each "Yes' data
> value to be uniquely stored for analysis. Because Categories cannot be used
> for Event data elements, I had to create 93 Data Elements instead.
>
> (2) If we have to live without Categories for Events, then it would be
> great to have a grouping feature beyond sections like the multiple
> selection box you suggested.
>
> --
>
> Regards,
> Crizelle Nel
>
> [image: HISP_Logo_sm]
> Software Development and Information Systems
>
>
> *Health Information Systems Program (HISP) -
> SA--*
> Email:   crize...@hisp.org 
> Cell:  +27 84 580 3342
> Fax:  0866 509 502
> Skype:  crizelle_nel
> Website:   http://www.hisp.org
>
> 66 Rigel Avenue North, Waterkloof Ridge
> Pretoria, 0181, South Africa
> E -25.7847787 S 28.2347984
>
>
> On Tue, Dec 8, 2015 at 3:46 PM, Knut Staring  wrote:
>
>> Isn't this two different things?
>>
>> 1) We need to register Yes (or Yes/No) for each selected item in order to
>> analyse on each of them, thus we need a number of data elements
>>
>> 2) It would be nice to have a way of grouping data elements in the user
>> interface even beyond sections, i.e. to use one widget for multiple data
>> elements, like a multiple selection list box:
>> http://www.dummies.com/how-to/content/how-to-create-a-multiple-selection-list-box-in-jav.html
>>
>>
>>
>> On Tue, Dec 8, 2015 at 2:40 PM, Crizelle Nel 
>> wrote:
>>
>>> Hi Lars,
>>>
>>> Thanks for the quick response.
>>>
>>> Noted that multiple selections within an option set won't be supported.
>>>
>>> It would make sense to include "Event" as a separate option for the
>>> "Domain Type". Would categories then possibly be supported for Events if
>>> then not for Tracker?
>>>
>>> The only other alternative is to create multiple Data Elements with Data
>>> Type "Yes Only" and possbly add some Program Sections to make it more
>>> user-friendly. This is OK, but really lengthens and clutters the data entry
>>> form.
>>>
>>> --
>>>
>>> Regards,
>>> Crizelle Nel
>>>
>>> [image: HISP_Logo_sm]
>>> Software Development and Information Systems
>>>
>>>
>>> *Health Information Systems Program (HISP) -
>>> SA--*
>>> Email:   crize...@hisp.org 
>>> Cell:  +27 84 580 3342
>>> Fax:  0866 509 502
>>> Skype:  crizelle_nel
>>> Website:   http://www.hisp.org
>>>
>>> 66 Rigel Avenue North, Waterkloof Ridge
>>> Pretoria, 0181, South Africa
>>> E -25.7847787 S 28.2347984
>>>
>>>
>>>
>>> On Tue, Dec 8, 2015 at 2:41 PM, Lars Helge Øverland >> > wrote:
>>>
 Hi Crizelle,

 we do not plan to support categories for tracker. The "tracker" domain
 type includes both single event and tracker programs. I know it is a bit
 misleading, we could potentially use "events" instead.

 As mentioned before, we do not plan to support multiple selection
 within an option set, mainly because it will limit the analysis which can
 be done at a later stage.

 regards,

 Lars


 On Tue, Dec 8, 2015 at 1:35 PM, Crizelle Nel 
 wrote:

> Dear all,
>
> It's 1 year on from when this shortcoming in DHIS2 was identified. Is
> the use of Category Combo supported in the Tracker now? If not, how did 
> you
> manage to get around this requirement Anne (or anyone else)?
>
> I have to enable the user to make multiple selections from a
> lookup/drop-down list. Since this is not supported in OptionSets I opted 
> to
> use Categories Combinations linked to Data Elements of type "Yes Only". 
> The
> problem is that this is a single event without registration and hence the
> Domain Type is Tracker. Any suggestions?
>
> --
>
> Regards,
> Crizelle Nel
>
> [image: HISP_Logo_sm]
> Software Development and Information Systems
>
>
> *Health Information Systems Program (HISP) -
> SA--*
> Email:   crize...@hisp.org 
> Cell:  +27 84 580 3342
> Fax:  0866 509 502
>

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 21376: Renamed Setting to SettingKey

2015-12-08 Thread noreply 

revno: 21376
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2015-12-08 20:33:06 +0100
message:
  Renamed Setting to SettingKey
renamed:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/Setting.java => 
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SettingKey.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/scheduling/ResourceTableTask.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventQueryPlanner.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/security/DefaultAnalyticsSecurityManager.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/scheduling/AnalyticsTableTask.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultStyleManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/config/DefaultSmsConfigurationManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/scheduling/MonitoringTask.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/setting/SystemSettingManagerTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserServiceTest.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java
  
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/CaseAggregateConditionTask.java
  
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/DefaultCaseAggregateConditionSchedulingManager.java
  
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/DefaultProgramSchedulingManager.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/DefaultSchedulingManager.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/StaticContentController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/RedirectAction.java

[Dhis2-devs] Tracked Entity Attributes filter not working in API

2015-12-08 Thread Lorill Crees 
Hi,

With 2.22 rev 21368, filters no longer appear to work with tracked entity
attributes in the API.

We are using this via GET for example:

api/trackedEntityAttributes?filter=code:eq:v008

but the entire list of tracked entity attributes is being returned instead
of being filtered by the specified code.

The filter was working in 2.21 - has something changed?

Thanks,

Lorill
___
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 21378: Data integrity, simplification

2015-12-08 Thread noreply 

revno: 21378
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2015-12-08 21:41:02 +0100
message:
  Data integrity, simplification
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.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/expression/ExpressionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java	2015-12-06 23:17:32 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java	2015-12-08 20:41:02 +
@@ -289,20 +289,6 @@
 String expressionIsValid( String formula );
 
 /**
- * Tests whether the expression is valid. Returns a positive value if the
- * expression is valid, or a negative value if not.
- * 
- * @param formula the expression formula.
- * @return VALID if the expression is valid.
- * EXPRESSION_IS_EMPTY if the expression is empty.
- * DATAELEMENT_DOES_NOT_EXIST if the data element does not exist.
- * CATEGORYOPTIONCOMBO_DOES_NOT_EXIST if the category option combo does not exist.
- * CONSTANT_DOES_NOT_EXIST if the constant does not exist.
- * EXPRESSION_NOT_WELL_FORMED if the expression is not well-formed.
- */
-String expressionIsValid( String formula, Set dataElements, Set categoryOptionCombos, Set constants, Set orgUnitGroups );
-
-/**
  * Creates an expression string containing DataElement names and the names of
  * the CategoryOptions in the CategoryOptionCombo from a string consisting
  * of identifiers.

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java	2015-09-17 05:52:20 +
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java	2015-12-08 20:41:02 +
@@ -35,7 +35,6 @@
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.commons.filter.Filter;
 import org.hisp.dhis.commons.filter.FilterUtils;
-import org.hisp.dhis.constant.ConstantService;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryService;
@@ -75,7 +74,6 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import static org.hisp.dhis.common.IdentifiableObjectUtils.getUids;
 import static org.hisp.dhis.commons.collection.ListUtils.getDuplicates;
 
 /**
@@ -163,13 +161,6 @@
 this.categoryService = categoryService;
 }
 
-private ConstantService constantService;
-
-public void setConstantService( ConstantService constantService )
-{
-this.constantService = constantService;
-}
-
 private PeriodService periodService;
 
 public void setPeriodService( PeriodService periodService )
@@ -419,14 +410,9 @@
 {
 SortedMap invalids = new TreeMap<>( IdentifiableObjectNameComparator.INSTANCE );
 
-Set dataElements = new HashSet<>( getUids( dataElementService.getAllDataElements() ) );
-Set categoryOptionCombos = new HashSet<>( getUids( categoryService.getAllDataElementCategoryOptionCombos() ) );
-Set constants = new HashSet<>( getUids( constantService.getAllConstants() ) );
-Set orgUnitGroups = new HashSet<>( getUids( organisationUnitGroupService.getAllOrganisationUnitGroups() ) );
-
 for ( Indicator indicator : indicatorService.getAllIndicators() )
 {
-String result = expressionService.expressionIsValid( indicator.getNumerator(), dataElements, categoryOptionCombos, constants, orgUnitGroups );
+String result = expressionService.expressionIsValid( indicator.getNumerator() );
 
 if ( !result.equals( ExpressionService.VALID ) )
 {
@@ -442,14 +428,9 @@
 {
 SortedMap invalids = new TreeMap<>( IdentifiableObjectNameComparator.INSTANCE );
 
-Set dataElements = new HashSet<>( getUids( dataElementService.getAllDataElements() ) );
-Set categoryOptionCombos = new HashSet<>(

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

2015-12-08 Thread noreply 

revno: 21379
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2015-12-08 21:59:18 +0100
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.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/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java	2015-11-26 14:31:40 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java	2015-12-08 20:59:18 +
@@ -106,10 +106,6 @@
 extends BaseIdentifiableObject
 implements AnalyticalObject
 {
-public static final String NUMBER_FORMATTING_COMMA = "comma";
-public static final String NUMBER_FORMATTING_SPACE = "space";
-public static final String NUMBER_FORMATTING_NONE = "none";
-
 public static final int ASC = -1;
 public static final int DESC = 1;
 public static final int NONE = 0;

___
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 21382: Centralized code through DimensionService.getDataDimensionalItemObject

2015-12-08 Thread noreply 

revno: 21382
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2015-12-08 23:49:42 +0100
message:
  Centralized code through DimensionService.getDataDimensionalItemObject
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DataDimensionItem.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dimension/DimensionServiceTest.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/DataDimensionItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DataDimensionItem.java	2015-11-20 15:20:20 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DataDimensionItem.java	2015-12-08 22:49:42 +
@@ -57,8 +57,8 @@
 public class DataDimensionItem
 {
 public static final Set DATA_DIMENSION_CLASSES = ImmutableSet.builder().
-add( Indicator.class ).add( DataElement.class ).add( DataElementOperand.class ).
-add( DataSet.class ).add( ProgramIndicator.class ).add( ProgramDataElement.class ).add( ProgramTrackedEntityAttribute.class ).build();
+add( Indicator.class ).add( DataElement.class ).add( DataElementOperand.class ).add( DataSet.class ).
+add( ProgramIndicator.class ).add( ProgramDataElement.class ).add( ProgramTrackedEntityAttribute.class ).build();
 
 public static final Map DATA_DIMENSION_TYPE_CLASS_MAP = ImmutableMap.builder().
 put( DataDimensionItemType.INDICATOR, Indicator.class ).put( DataDimensionItemType.AGGREGATE_DATA_ELEMENT, DataElement.class ).

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java	2015-11-26 18:17:05 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java	2015-12-08 22:49:42 +
@@ -54,4 +54,12 @@
 void mergeAnalyticalObject( BaseAnalyticalObject object );
 
 void mergeEventAnalyticalObject( EventAnalyticalObject object );
+
+/**
+ * Gets a dimension item object which are among the data dimension item objects.
+ * 
+ * @param dimensionItem the dimension item identifier.
+ * @return a dimensional item object.
+ */
+DimensionalItemObject getDataDimensionalItemObject( String dimensionItem );
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java	2015-11-22 11:20:29 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java	2015-12-08 22:49:42 +
@@ -58,7 +58,8 @@
 public static final String COMPOSITE_DIM_OBJECT_ESCAPED_SEP = "\\.";
 public static final String COMPOSITE_DIM_OBJECT_PLAIN_SEP = ".";
 public static final String TITLE_ITEM_SEP = ", ";
-public static final String NULL_REPLACEMENT = "[n/a]";
+
+private static final String NULL_REPLACEMENT = "[n/a]";
 
 private static final Pattern INT_PATTERN = Pattern.compile( "^(0|-?[1-9]\\d*)$" );
 private static final Pattern COMPOSITE_DIM_OBJECT_PATTERN = Pattern.compile( "([a-zA-Z]\\w{10})\\.([a-zA-Z]\\w{10})" );

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java	2015-11-22 17:08:47 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java	2015-12-08 22:49:42 +
@@ -48,13 +48,11 @@
 import static org.hisp.dhis.common.DimensionalObjectUtils.asTypedList;
 import static org.hisp.dhis.common.DimensionalObjectUtils.getDimensionalItemIds;
 import static org.hisp.dhis.commons.collection.ListUtils.sort;
-import static org.hisp.dhis.commons.util.TextUtils.splitSafe;
 import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_LEVEL;
 import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_ORGUNIT_GROUP;
 import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT;
 import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT_CHILDREN;

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

2015-12-08 Thread noreply 

revno: 21383
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-12-09 00:24:36 +0100
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.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/DimensionalObjectUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java	2015-12-08 22:49:42 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java	2015-12-08 23:24:36 +
@@ -58,8 +58,7 @@
 public static final String COMPOSITE_DIM_OBJECT_ESCAPED_SEP = "\\.";
 public static final String COMPOSITE_DIM_OBJECT_PLAIN_SEP = ".";
 public static final String TITLE_ITEM_SEP = ", ";
-
-private static final String NULL_REPLACEMENT = "[n/a]";
+public static final String NULL_REPLACEMENT = "[n/a]";
 
 private static final Pattern INT_PATTERN = Pattern.compile( "^(0|-?[1-9]\\d*)$" );
 private static final Pattern COMPOSITE_DIM_OBJECT_PATTERN = Pattern.compile( "([a-zA-Z]\\w{10})\\.([a-zA-Z]\\w{10})" );

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] Data Approval for Programmes

2015-12-08 Thread Pamod Amarakoon 
Dear All,

Is there a provision to add data accept/approval for program data. The use
case is facility manager should approve data entered for a program stage by
data entry operator prior to be viewed by district manager or province
manager.

Thanx.

-- 
Regards,
Pamod Amarakoon

Confidentiality Notice: the information contained in this email and any
attachments may be legally privileged and confidential. If you are not an
intended recipient, you are hereby notified that any dissemination,
distribution, or copying of this e-mail is strictly prohibited. If you have
received this e-mail in error, please notify the sender and permanently
delete the e-mail and any attachments immediately. You should not retain,
copy or use this e-mail or any attachments for any purpose, nor disclose
all or any part of the contents to any other person.
___
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] Category combination set to default won't let me change it

2015-12-08 Thread Knut Staring 
Hi Alex,
Could you provide the details of your use case?
Knut
On 9 Dec 2015 07:09, "Alex Tumwesigye"  wrote:

> Dear Knut,
>
> Thanks for this insight.
>  I agree with Crizelle, I am building an Inventory System using the
> tracker (2.21) and I am facing the same challenge. There is need to see how
> we can achieve similar "category Options - categories" functionality for
> events to avoid unnecessary hacks to the system.
>
> Thanks.
>
> Alex
>
> On Tue, Dec 8, 2015 at 9:40 PM, Knut Staring  wrote:
>
>> Hi Crizelle,
>> It could be quite instructive if you could share the details of this
>> example with us.
>>
>> Knut
>> On 8 Dec 2015 7:09 pm, "Crizelle Nel"  wrote:
>>
>>> Hi Knut,
>>>
>>> (1) If unable to use use Categories for Event data elements then yes, we
>>> have to be able to save each data value against a separate data element for
>>> analysis. The ability to reuse Category Options though (i.e assigning them
>>> to multiple Categories), greatly reduces the database configuration work
>>> required. For the current database I'm configuring I would have needed 24
>>> Category Options, 4 Categories and 4 Cat Combos to enable each "Yes' data
>>> value to be uniquely stored for analysis. Because Categories cannot be used
>>> for Event data elements, I had to create 93 Data Elements instead.
>>>
>>> (2) If we have to live without Categories for Events, then it would be
>>> great to have a grouping feature beyond sections like the multiple
>>> selection box you suggested.
>>>
>>> --
>>>
>>> Regards,
>>> Crizelle Nel
>>>
>>> [image: HISP_Logo_sm]
>>> Software Development and Information Systems
>>>
>>>
>>> *Health Information Systems Program (HISP) -
>>> SA--*
>>> Email:   crize...@hisp.org 
>>> Cell:  +27 84 580 3342
>>> Fax:  0866 509 502
>>> Skype:  crizelle_nel
>>> Website:   http://www.hisp.org
>>>
>>> 66 Rigel Avenue North, Waterkloof Ridge
>>> Pretoria, 0181, South Africa
>>> E -25.7847787 S 28.2347984
>>>
>>>
>>> On Tue, Dec 8, 2015 at 3:46 PM, Knut Staring  wrote:
>>>
 Isn't this two different things?

 1) We need to register Yes (or Yes/No) for each selected item in order
 to analyse on each of them, thus we need a number of data elements

 2) It would be nice to have a way of grouping data elements in the user
 interface even beyond sections, i.e. to use one widget for multiple data
 elements, like a multiple selection list box:
 http://www.dummies.com/how-to/content/how-to-create-a-multiple-selection-list-box-in-jav.html



 On Tue, Dec 8, 2015 at 2:40 PM, Crizelle Nel 
 wrote:

> Hi Lars,
>
> Thanks for the quick response.
>
> Noted that multiple selections within an option set won't be supported.
>
> It would make sense to include "Event" as a separate option for the
> "Domain Type". Would categories then possibly be supported for Events if
> then not for Tracker?
>
> The only other alternative is to create multiple Data Elements with
> Data Type "Yes Only" and possbly add some Program Sections to make it more
> user-friendly. This is OK, but really lengthens and clutters the data 
> entry
> form.
>
> --
>
> Regards,
> Crizelle Nel
>
> [image: HISP_Logo_sm]
> Software Development and Information Systems
>
>
> *Health Information Systems Program (HISP) -
> SA--*
> Email:   crize...@hisp.org 
> Cell:  +27 84 580 3342
> Fax:  0866 509 502
> Skype:  crizelle_nel
> Website:   http://www.hisp.org
>
> 66 Rigel Avenue North, Waterkloof Ridge
> Pretoria, 0181, South Africa
> E -25.7847787 S 28.2347984
>
>
>
> On Tue, Dec 8, 2015 at 2:41 PM, Lars Helge Øverland <
> larshe...@gmail.com> wrote:
>
>> Hi Crizelle,
>>
>> we do not plan to support categories for tracker. The "tracker"
>> domain type includes both single event and tracker programs. I know it 
>> is a
>> bit misleading, we could potentially use "events" instead.
>>
>> As mentioned before, we do not plan to support multiple selection
>> within an option set, mainly because it will limit the analysis which can
>> be done at a later stage.
>>
>> regards,
>>
>> Lars
>>
>>
>> On Tue, Dec 8, 2015 at 1:35 PM, Crizelle Nel 
>> wrote:
>>
>>> Dear all,
>>>
>>> It's 1 year on from when this shortcoming in DHIS2 was identified.
>>> Is the use of Category Combo supported in the Tracker now? If not, how 
>>> did
>>> you manage to get around this requirement Anne (or

Re: [Dhis2-devs] Category combination set to default won't let me change it

2015-12-08 Thread Alex Tumwesigye 
Dear Knut,

Attached is the use case and comments of how it is implemented.


Alex

On Wed, Dec 9, 2015 at 9:33 AM, Knut Staring  wrote:

> Hi Alex,
> Could you provide the details of your use case?
> Knut
> On 9 Dec 2015 07:09, "Alex Tumwesigye"  wrote:
>
>> Dear Knut,
>>
>> Thanks for this insight.
>>  I agree with Crizelle, I am building an Inventory System using the
>> tracker (2.21) and I am facing the same challenge. There is need to see how
>> we can achieve similar "category Options - categories" functionality for
>> events to avoid unnecessary hacks to the system.
>>
>> Thanks.
>>
>> Alex
>>
>> On Tue, Dec 8, 2015 at 9:40 PM, Knut Staring  wrote:
>>
>>> Hi Crizelle,
>>> It could be quite instructive if you could share the details of this
>>> example with us.
>>>
>>> Knut
>>> On 8 Dec 2015 7:09 pm, "Crizelle Nel"  wrote:
>>>
 Hi Knut,

 (1) If unable to use use Categories for Event data elements then yes,
 we have to be able to save each data value against a separate data element
 for analysis. The ability to reuse Category Options though (i.e assigning
 them to multiple Categories), greatly reduces the database configuration
 work required. For the current database I'm configuring I would have needed
 24 Category Options, 4 Categories and 4 Cat Combos to enable each "Yes'
 data value to be uniquely stored for analysis. Because Categories cannot be
 used for Event data elements, I had to create 93 Data Elements instead.

 (2) If we have to live without Categories for Events, then it would be
 great to have a grouping feature beyond sections like the multiple
 selection box you suggested.

 --

 Regards,
 Crizelle Nel

 [image: HISP_Logo_sm]
 Software Development and Information Systems


 *Health Information Systems Program (HISP) -
 SA--*
 Email:   crize...@hisp.org 
 Cell:  +27 84 580 3342
 Fax:  0866 509 502
 Skype:  crizelle_nel
 Website:   http://www.hisp.org

 66 Rigel Avenue North, Waterkloof Ridge
 Pretoria, 0181, South Africa
 E -25.7847787 S 28.2347984


 On Tue, Dec 8, 2015 at 3:46 PM, Knut Staring  wrote:

> Isn't this two different things?
>
> 1) We need to register Yes (or Yes/No) for each selected item in order
> to analyse on each of them, thus we need a number of data elements
>
> 2) It would be nice to have a way of grouping data elements in the
> user interface even beyond sections, i.e. to use one widget for multiple
> data elements, like a multiple selection list box:
> http://www.dummies.com/how-to/content/how-to-create-a-multiple-selection-list-box-in-jav.html
>
>
>
> On Tue, Dec 8, 2015 at 2:40 PM, Crizelle Nel 
> wrote:
>
>> Hi Lars,
>>
>> Thanks for the quick response.
>>
>> Noted that multiple selections within an option set won't be
>> supported.
>>
>> It would make sense to include "Event" as a separate option for the
>> "Domain Type". Would categories then possibly be supported for Events if
>> then not for Tracker?
>>
>> The only other alternative is to create multiple Data Elements with
>> Data Type "Yes Only" and possbly add some Program Sections to make it 
>> more
>> user-friendly. This is OK, but really lengthens and clutters the data 
>> entry
>> form.
>>
>> --
>>
>> Regards,
>> Crizelle Nel
>>
>> [image: HISP_Logo_sm]
>> Software Development and Information Systems
>>
>>
>> *Health Information Systems Program (HISP) -
>> SA--*
>> Email:   crize...@hisp.org 
>> Cell:  +27 84 580 3342
>> Fax:  0866 509 502
>> Skype:  crizelle_nel
>> Website:   http://www.hisp.org
>>
>> 66 Rigel Avenue North, Waterkloof Ridge
>> Pretoria, 0181, South Africa
>> E -25.7847787 S 28.2347984
>>
>>
>>
>> On Tue, Dec 8, 2015 at 2:41 PM, Lars Helge Øverland <
>> larshe...@gmail.com> wrote:
>>
>>> Hi Crizelle,
>>>
>>> we do not plan to support categories for tracker. The "tracker"
>>> domain type includes both single event and tracker programs. I know it 
>>> is a
>>> bit misleading, we could potentially use "events" instead.
>>>
>>> As mentioned before, we do not plan to support multiple selection
>>> within an option set, mainly because it will limit the analysis which 
>>> can
>>> be done at a later stage.
>>>
>>> regards,
>>>
>>> Lars
>>>
>>>
>>> On Tue, Dec 8, 2015

Re: [Dhis2-devs] [Bug 1523879] [NEW] Generating system identifiers using the api limits itself to one (1)

2015-12-08 Thread Alex Tumwesigye 
Thanks Morten,

I should have looked deep in code first.

Alex

On Tue, Dec 8, 2015 at 3:06 PM, Morten Olav Hansen <
1523...@bugs.launchpad.net> wrote:

> Hi
>
> This parameter name has changed, its now limit. Will update docs later.
>
> --
> Morten
>
> On Tue, Dec 8, 2015 at 6:12 PM, Alex Tumwesigye 
> wrote:
>
> > Public bug reported:
> >
> > Generating system identifiers using the api limits itself to one (1)
> > when the api/system resource is used.
> >
> > For example, the link below only generates one UID instead of 10.
> >
> > https://play.dhis2.org/dev/api/system/id.json?n=10
> >
> > This affects the versions below
> >
> > Build: 20953
> > Verison:2.21
> >
> > Build: 21367
> > Version: 2.22 -SNAPSHOT
> >
> > ** Affects: dhis2
> >  Importance: Undecided
> >  Status: New
> >
> >
> > ** Tags: api identifier system uid
> >
> > --
> > You received this bug notification because you are subscribed to DHIS.
> > https://bugs.launchpad.net/bugs/1523879
> >
> > Title:
> >   Generating system identifiers using the api limits itself to one (1)
> >
> > Status in DHIS:
> >   New
> >
> > Bug description:
> >   Generating system identifiers using the api limits itself to one (1)
> >   when the api/system resource is used.
> >
> >   For example, the link below only generates one UID instead of 10.
> >
> >   https://play.dhis2.org/dev/api/system/id.json?n=10
> >
> >   This affects the versions below
> >
> >   Build: 20953
> >   Verison:2.21
> >
> >   Build: 21367
> >   Version: 2.22 -SNAPSHOT
> >
> > To manage notifications about this bug go to:
> > https://bugs.launchpad.net/dhis2/+bug/1523879/+subscriptions
> >
>
> --
> You received this bug notification because you are subscribed to the bug
> report.
> https://bugs.launchpad.net/bugs/1523879
>
> Title:
>   Generating system identifiers using the api limits itself to one (1)
>
> Status in DHIS:
>   New
>
> Bug description:
>   Generating system identifiers using the api limits itself to one (1)
>   when the api/system resource is used.
>
>   For example, the link below only generates one UID instead of 10.
>
>   https://play.dhis2.org/dev/api/system/id.json?n=10
>
>   This affects the versions below
>
>   Build: 20953
>   Verison:2.21
>
>   Build: 21367
>   Version: 2.22 -SNAPSHOT
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/dhis2/+bug/1523879/+subscriptions
>


-- 
Alex Tumwesigye

Technical Advisor - DHIS2 (Consultant),
Ministry of Health/AFENET
Kampala
Uganda

IT Consultant - BarefootPower Uganda Ltd, SmartSolar, Kenya

IT Specialist (Servers, Networks and Security, Health Information Systems -
DHIS2 ) & Solar Consultant

+256 774149 775, + 256 759 800161

"I don't want to be anything other than what I have been - one tree hill
"

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/1523879

Title:
  Generating system identifiers using the api limits itself to one (1)

Status in DHIS:
  New

Bug description:
  Generating system identifiers using the api limits itself to one (1)
  when the api/system resource is used.

  For example, the link below only generates one UID instead of 10.

  https://play.dhis2.org/dev/api/system/id.json?n=10

  This affects the versions below

  Build: 20953
  Verison:2.21

  Build: 21367
  Version: 2.22 -SNAPSHOT

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

___
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] Category combination set to default won't let me change it

2015-12-08 Thread Alex Tumwesigye 
Dear Knut,

Thanks for this insight.
 I agree with Crizelle, I am building an Inventory System using the tracker
(2.21) and I am facing the same challenge. There is need to see how we can
achieve similar "category Options - categories" functionality for events to
avoid unnecessary hacks to the system.

Thanks.

Alex

On Tue, Dec 8, 2015 at 9:40 PM, Knut Staring  wrote:

> Hi Crizelle,
> It could be quite instructive if you could share the details of this
> example with us.
>
> Knut
> On 8 Dec 2015 7:09 pm, "Crizelle Nel"  wrote:
>
>> Hi Knut,
>>
>> (1) If unable to use use Categories for Event data elements then yes, we
>> have to be able to save each data value against a separate data element for
>> analysis. The ability to reuse Category Options though (i.e assigning them
>> to multiple Categories), greatly reduces the database configuration work
>> required. For the current database I'm configuring I would have needed 24
>> Category Options, 4 Categories and 4 Cat Combos to enable each "Yes' data
>> value to be uniquely stored for analysis. Because Categories cannot be used
>> for Event data elements, I had to create 93 Data Elements instead.
>>
>> (2) If we have to live without Categories for Events, then it would be
>> great to have a grouping feature beyond sections like the multiple
>> selection box you suggested.
>>
>> --
>>
>> Regards,
>> Crizelle Nel
>>
>> [image: HISP_Logo_sm]
>> Software Development and Information Systems
>>
>>
>> *Health Information Systems Program (HISP) -
>> SA--*
>> Email:   crize...@hisp.org 
>> Cell:  +27 84 580 3342
>> Fax:  0866 509 502
>> Skype:  crizelle_nel
>> Website:   http://www.hisp.org
>>
>> 66 Rigel Avenue North, Waterkloof Ridge
>> Pretoria, 0181, South Africa
>> E -25.7847787 S 28.2347984
>>
>>
>> On Tue, Dec 8, 2015 at 3:46 PM, Knut Staring  wrote:
>>
>>> Isn't this two different things?
>>>
>>> 1) We need to register Yes (or Yes/No) for each selected item in order
>>> to analyse on each of them, thus we need a number of data elements
>>>
>>> 2) It would be nice to have a way of grouping data elements in the user
>>> interface even beyond sections, i.e. to use one widget for multiple data
>>> elements, like a multiple selection list box:
>>> http://www.dummies.com/how-to/content/how-to-create-a-multiple-selection-list-box-in-jav.html
>>>
>>>
>>>
>>> On Tue, Dec 8, 2015 at 2:40 PM, Crizelle Nel 
>>> wrote:
>>>
 Hi Lars,

 Thanks for the quick response.

 Noted that multiple selections within an option set won't be supported.

 It would make sense to include "Event" as a separate option for the
 "Domain Type". Would categories then possibly be supported for Events if
 then not for Tracker?

 The only other alternative is to create multiple Data Elements with
 Data Type "Yes Only" and possbly add some Program Sections to make it more
 user-friendly. This is OK, but really lengthens and clutters the data entry
 form.

 --

 Regards,
 Crizelle Nel

 [image: HISP_Logo_sm]
 Software Development and Information Systems


 *Health Information Systems Program (HISP) -
 SA--*
 Email:   crize...@hisp.org 
 Cell:  +27 84 580 3342
 Fax:  0866 509 502
 Skype:  crizelle_nel
 Website:   http://www.hisp.org

 66 Rigel Avenue North, Waterkloof Ridge
 Pretoria, 0181, South Africa
 E -25.7847787 S 28.2347984



 On Tue, Dec 8, 2015 at 2:41 PM, Lars Helge Øverland <
 larshe...@gmail.com> wrote:

> Hi Crizelle,
>
> we do not plan to support categories for tracker. The "tracker" domain
> type includes both single event and tracker programs. I know it is a bit
> misleading, we could potentially use "events" instead.
>
> As mentioned before, we do not plan to support multiple selection
> within an option set, mainly because it will limit the analysis which can
> be done at a later stage.
>
> regards,
>
> Lars
>
>
> On Tue, Dec 8, 2015 at 1:35 PM, Crizelle Nel 
> wrote:
>
>> Dear all,
>>
>> It's 1 year on from when this shortcoming in DHIS2 was identified. Is
>> the use of Category Combo supported in the Tracker now? If not, how did 
>> you
>> manage to get around this requirement Anne (or anyone else)?
>>
>> I have to enable the user to make multiple selections from a
>> lookup/drop-down list. Since this is not supported in OptionSets I opted 
>> to
>> use Categories Combinations linked to Data Elements of type "Yes Only". 
>> The
>> problem is that this

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 21381: Moved DimensionService from service-analytics to service-core

2015-12-08 Thread noreply 

revno: 21381
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2015-12-08 23:12:59 +0100
message:
  Moved DimensionService from service-analytics to service-core
removed:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/dimension/
  
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/dimension/
added:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dimension/
renamed:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/dimension/DefaultDimensionService.java
 => 
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java
  
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/dimension/DimensionServiceTest.java
 => 
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dimension/DimensionServiceTest.java
modified:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dimension/DimensionServiceTest.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 directory 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/dimension'
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml	2015-11-05 02:57:57 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml	2015-12-08 22:12:59 +
@@ -58,10 +58,6 @@
 
   
 
-  
-
-  
-
   
   
   

=== removed directory 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/dimension'
=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension'
=== renamed file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/dimension/DefaultDimensionService.java' => 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/dimension/DefaultDimensionService.java	2015-11-26 18:17:05 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java	2015-12-08 22:12:59 +
@@ -1,4 +1,4 @@
-package org.hisp.dhis.analytics.dimension;
+package org.hisp.dhis.dimension;
 
 /*
  * Copyright (c) 2004-2015, University of Oslo

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2015-12-08 21:44:36 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2015-12-08 22:12:59 +
@@ -858,7 +858,7 @@
 }
 
 @Override
-@Transactional
+@Transactional //TODO remove?
 public String generateExpression( String expression, Map valueMap, 
 Map constantMap, Map orgUnitCountMap, Integer days, MissingValueStrategy missingValueStrategy )
 {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-12-07 12:46:19 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-12-08 22:12:59 +
@@ -632,6 +632,8 @@
 
   
 
+  
+
   
 
 

=== added directory 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dimension'
=== renamed file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/dimension/DimensionServiceTest.java' => 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dimension/DimensionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/dimension/DimensionServiceTest.java	2015-11-26 18:17:05 +
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dimension/DimensionServiceTest.java	2015-12-08 22:12:59 +
@@

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 21380: Using enum ExpressionValidationOutcome to indicate outcome of expression validation

2015-12-08 Thread noreply 

revno: 21380
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2015-12-08 22:44:36 +0100
message:
  Using enum ExpressionValidationOutcome to indicate outcome of expression 
validation
added:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionValidationOutcome.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/expression/ExpressionServiceTest.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ExpressionController.java
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetTextualExpressionAction.java
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleAction.java
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ShowUpdateValidationRuleFormAction.java
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.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-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java	2015-12-08 20:41:02 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java	2015-12-08 21:44:36 +
@@ -65,14 +65,6 @@
 {
 String ID = ExpressionService.class.getName();
 
-String VALID = "valid";
-String EXPRESSION_IS_EMPTY = "expression_is_empty";
-String DATAELEMENT_DOES_NOT_EXIST = "data_element_does_not_exist";
-String CATEGORYOPTIONCOMBO_DOES_NOT_EXIST = "category_option_combo_does_not_exist";
-String CONSTANT_DOES_NOT_EXIST = "constant_does_not_exist";
-String OU_GROUP_DOES_NOT_EXIST = "org_unit_group_does_not_exist";
-String EXPRESSION_NOT_WELL_FORMED = "expression_not_well_formed";
-
 String DAYS_DESCRIPTION = "[Number of days]";
 String NULL_REPLACEMENT = "0";
 String SPACE = " ";
@@ -279,14 +271,9 @@
  * expression is valid, or a negative value if not.
  * 
  * @param formula the expression formula.
- * @return VALID if the expression is valid.
- * 	   EXPRESSION_IS_EMPTY if the expression is empty.
- * 	   DATAELEMENT_DOES_NOT_EXIST if the data element does not exist.
- * CATEGORYOPTIONCOMBO_DOES_NOT_EXIST if the category option combo does not exist.
- * CONSTANT_DOES_NOT_EXIST if the constant does not exist.
- * EXPRESSION_NOT_WELL_FORMED if the expression is not well-formed.
+ * @return the ExpressionValidationOutcome of the validation.
  */
-String expressionIsValid( String formula );
+ExpressionValidationOutcome expressionIsValid( String formula );
 
 /**
  * Creates an expression string containing DataElement names and the names of

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionValidationOutcome.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionValidationOutcome.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionValidationOutcome.java	2015-12-08 21:44:36 +
@@ -0,0 +1,61 @@
+package org.hisp.dhis.expression;
+
+/*
+ * 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
+ *

[Dhis2-devs] NPE for category option combos

2015-12-08 Thread Lorill Crees 
Hi,

After upgrading to v 2.22 r 21368 I am getting a NullPointerException back
from DHIS 2 (pasted below) when attempting to create a Category Option
Combo via the API.

URL via POST:
http://localhost:8090/dhis/api/categoryOptionCombos

with json:
{"name":"MALE","categoryCombo":{"id":"bZ8GuALBl4r"}}

Has something changed with Category Option Combos in v 2.22 that I need to
accommodate? I do notice that we hadn't ever been setting the code field
for these and it has never been a problem. Is that now a requirement? The
schema doesn't appear to require it.

Let me know.

Thanks,

Lorill

HTTP Status 500 - Request processing failed; nested exception is
java.lang.NullPointerException

*type* Exception report

*message* *Request processing failed; nested exception is
java.lang.NullPointerException*

*description* *The server encountered an internal error that prevented it
from fulfilling this request.*

*exception*

org.springframework.web.util.NestedServletException: Request
processing failed; nested exception is java.lang.NullPointerException

org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:979)

org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:869)
javax.servlet.http.HttpServlet.service(HttpServlet.java:648)

org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:843)
javax.servlet.http.HttpServlet.service(HttpServlet.java:729)
org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330)

org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118)

org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:154)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilter(BasicAuthenticationFilter.java:201)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
org.hisp.dhis.security.filter.CorsFilter.doFilter(CorsFilter.java:95)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.hisp.dhis.security.filter.CustomAuthenticationFilter.doFilter(CustomAuthenticationFilter.java:64)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter.doFilter(OAuth2AuthenticationProcessingFilter.java:140)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)

org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:110)

org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)