[Dhis2-devs] Is the Android app working right now?

[Jeff R. Allen]

Hello guys,

I started playing with the Android app today, and couldn't get it to work.

Briefly what I did was login to apps.dhis2.org as user "android" (I had to
change the password to be able to do so). The Android app gave an error
(the traceback from adb is below).

I see that the last released version of the Android app is 2.16, so I'm
wondering if maybe the demo server (2.20) is out of sync. I also see
there's a branch called lwuit-tracking which is slightly more active than
tip, wondering if I should build an APK from there?

  -jeff

I/org.dhis2.mobile.WorkService( 1148): onCreate()

I/org.dhis2.mobile.WorkService( 1148): Service started

I/org.dhis2.mobile.WorkService( 1148): loginUser

I/GET ( 1148): https://apps.dhis2.org/demo/api/me/user-account

I/200 ( 1148):
{"username":"android","firstName":"John","surname":"Barnes","email":"
j...@nella.org
","settings":{"keyDbLocale":null,"keyMessageSmsNotification":null,"keyUiLocale":"en","keyAnalysisDisplayProperty":null,"keyMessageEmailNotification":null}}

I/ActivityManager(  348): START u0 {cmp=org.dhis2.mobile/.ui.MenuActivity}
from uid 10058 on display 0

V/WindowManager(  348): addAppToken: AppWindowToken{38e7325d
token=Token{61ee434 ActivityRecord{3b76b07 u0
org.dhis2.mobile/.ui.MenuActivity t6}}} to stack=1 task=6 at 1

I/org.dhis2.mobile.WorkService( 1148): onDestroy()

I/AggregateReportForm - startUpdate()( 1148): Starting update of datasets

V/WindowManager(  348): Adding window Window{2e00fa0 u0
org.dhis2.mobile/org.dhis2.mobile.ui.MenuActivity} at 3 of 6 (after
Window{37460cb8 u0 org.dhis2.mobile/org.dhis2.mobile.ui.LoginActivity})

I/Choreographer( 1148): Skipped 58 frames!  The application may be doing
too much work on its main thread.

W/EGL_emulation( 1148): eglSurfaceAttrib not implemented

W/OpenGLRenderer( 1148): Failed to set EGL_SWAP_BEHAVIOR on surface
0xa5d47260, error=EGL_SUCCESS

I/org.dhis2.mobile.WorkService( 1148): onCreate()

I/org.dhis2.mobile.WorkService( 1148): Service started

I/org.dhis2.mobile.WorkService( 1148): updateDatasets

I/ActivityManager(  348): Displayed org.dhis2.mobile/.ui.MenuActivity:
+1s730ms

I/GET ( 1148): https://apps.dhis2.org/demo/api/me/assignedDataSets

I/art ( 1148): Background sticky concurrent mark sweep GC freed
580(36KB) AllocSpace objects, 1(16KB) LOS objects, 6% free, 2MB/2MB, paused
18.234ms total 336.173ms

I/art ( 1148): Background partial concurrent mark sweep GC freed
2619(160KB) AllocSpace objects, 2(32KB) LOS objects, 25% free, 2MB/3MB,
paused 1.501ms total 233.244ms

I/art ( 1148): Background partial concurrent mark sweep GC freed
2323(164KB) AllocSpace objects, 6(544KB) LOS objects, 24% free, 2MB/3MB,
paused 6.043ms total 195.089ms

W/art ( 1148): Suspending all threads took: 6.933ms

I/art ( 1148): Background sticky concurrent mark sweep GC freed
29(1264B) AllocSpace objects, 0(0B) LOS objects, 0% free, 4MB/4MB, paused
10.661ms total 78.987ms

I/200 ( 1148):
{"organisationUnits":{"DiszpKrYNg8":{"id":"DiszpKrYNg8","label":"Ngelehun
CHC","level":4,"parent":"YuQRtpLP10I","dataSets":[{"id":"pBOMPrpg1QX","label":"Mortality
< 5
years"},{"id":"eZDhcZi6FLP","label":"Morbidity"},{"id":"EDzMBk0RRji","label":"HIV
Peadiatric monthly summary"},{"id":"lyLU2wR22tC","label":"ART monthly
summary"},{"id":"PLq9sJluXvc","label":"Inpatient Morbidity/Mortality
Summary"},{"id":"V8MHeZHIrcP","label":"Facility
Assessment"},{"id":"EKWVBc5C0ms","label":"MNCH Quarterly
Report"},{"id":"TuL8IOPzpHh","label":"EPI
Stock"},{"id":"ULowA8V3ucd","label":"Life-Saving
Commodities"},{"id":"QX4ZTUbOt3a","label":"Reproductive
Health"},{"id":"Rl58JxmKJo2","label":"PMTCT monthly
summary"},{"id":"BfMAe6Itzgt","label":"Child
Health"},{"id":"N4fIX1HL3TQ","label":"Staffing"},{"id":"aLpVgfXiz0f","label":"Population"},{"id":"SF8FDSqw30D","label":"TB
Facility reporting Form"},{"id":"VTdjfLXXmoi","label":"Clinical Monitoring
Checklist "},{"id":"OsPTWNqq26W","label":"TB/HIV (VCCT) monthly
summary"}]}},"forms":{"BfMAe6Itzgt":{"label":"Child
Health","subtitle":"Child
Health","options":{"periodType":"Monthly","openFuturePeriods":0,"expiryDays":0},"groups":[{"label":"Immunization","dataElementCount":15,"fields":[{"label":"BCG
doses given (Fixed,
<1y)","dataElement":"s46m5MS0hxu","categoryOptionCombo":"Prlt0C1RF0s","type":"INTEGER"},{"label":"BCG
doses given (Fixed,
>1y)","dataElement":"s46m5MS0hxu","categoryOptionCombo":"psbwp3CQEhs","type":"INTEGER"},{"label":"BCG
doses given (Outreach,
<1y)","dataElement":"s46m5MS0hxu","categoryOptionCombo":"V6L425pT3A0","type":"INTEGER"},{"label":"BCG
doses given (Outreach,
>1y)","dataElement":"s46m5MS0hxu","categoryOptionCombo":"hEFKSsPV5et","type":"INTEGER"},{"label":"Fully
Immunized child (Fixed,
<1y)","dataElement":"UOlfIjgN8X6","categoryOptionCombo":"Prlt0C1RF0s","type":"NUMBER"},{"label":"Fully
Immunized child (Fixed,
>1y)","dataElement":"UOlfIjgN8X6","categoryOptionCombo":"psbwp3CQEhs","type":"NUMBER"},{"label":"Fully
Immunized child (Outreach,

[Dhis2-devs] Yes/No in Tracker and Event capture

[Markus Bekken]

Hi all.
Working with user testing of the tracker capture app in Palestine, we see a 
possibility for improving the efficiency of data entry. The "Yes/No"(BOOLEAN) 
data types are presented as dropdown lists with three options: "Please select", 
"Yes" and "No". When having a high amount of Nes/No questions to answer, the 
users must do 2 clicks for each of them - one to open the dropdown and one to 
select the option(not counting fumbling with the dropdowns, closing them 
unintentionally). As an effort to speed up the data entry, we could use radio 
buttons instead of dropdowns for Yes/No(BOOLEAN).

It would be good to avoid yet another configuration flag. Can anyone think of a 
reason not to do this change for all of Tracker and Event Capture?

Markus
___
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 20180: minor fix, enable/disable zero/aggregation type depending on selected value type

[noreply]

revno: 20180
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2015-09-16 15:29:58 +0700
message:
  minor fix, enable/disable zero/aggregation type depending on selected value 
type
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2015-09-15 09:54:24 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2015-09-16 08:29:58 +
@@ -25,23 +25,30 @@
   exportPdfByType(type, params);
 }
 
-function changeValueType( value ) {
-  enable('aggregationOperatorSelect');
-  if( value == 'int' ) {
-showById('numberTypeTR');
-hideById('textTypeTR');
-enable('zeroIsSignificant');
+function isValueTypeNumeric(value) {
+  return value === 'INTEGER' ||
+  value === 'INTEGER_POSITIVE' ||
+  value === 'INTEGER_NEGATIVE' ||
+  value === 'INTEGER_ZERO_OR_POSITIVE' ||
+  value === 'NUMBER' ||
+  value === 'UNIT_INTERVAL' ||
+  value === 'PERCENTAGE';
+}
+
+function isValueTypeText(value) {
+  return value === 'TEXT' || value === 'LONG_TEXT';
+}
+
+function changeValueType(value) {
+  showById('aggregationOperatorSelect');
+  if( isValueTypeNumeric(value) ) {
+showById('zeroIsSignificant');
   } else {
-disable('zeroIsSignificant');
-hideById('numberTypeTR');
-hideById('textTypeTR');
-disable('aggregationOperatorSelect');
+hideById('zeroIsSignificant');
+hideById('aggregationOperatorSelect');
 
-if( value == 'string' ) {
-  showById('textTypeTR');
-}
-else if( value == 'bool' ) {
-  enable('aggregationOperatorSelect');
+if( value == 'BOOLEAN' ) {
+  showById('aggregationOperatorSelect');
 }
   }
 
@@ -49,10 +56,10 @@
 }
 
 function updateAggreationOperation( value ) {
-  if( value == 'string' || value == 'date' || value == 'trueOnly' ) {
-hideById("aggregationOperator");
+  if( isValueTypeText(value) || value == 'DATE' || value == 'TRUE_ONLY' ) {
+hideById("aggregationType");
   } else {
-showById("aggregationOperator");
+showById("aggregationType");
   }
 }
 

___
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 1429294] Re: Cannot Delete Users via Web API

[jason.p.pickering]

I can confirm this. Currently, there is no check to see if the user has
associated objects which would prevent the deletion. What should happen
is that the system should check to see if there are any dependent
objects which would prevent the user from being deleted.There are a
large number of objects which are linked to "userinfo", but no checks to
see whether the deletion is possible. From the web interface, the UI
just spins with "Deleting" forever if an exception is encountered.
Better feedback should be provided to users through the web informing
them that the operation was not possible. From the API a 409 Conflict?
should be returned (instead of a stack trace) to inform the client that
the operation could not be executed due to other objects which depend on
the user.

** Changed in: dhis2
   Status: New => Confirmed

** Summary changed:

- Cannot Delete Users via Web API
+ Cannot Delete Users when objects are linked to the user

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

Title:
  Cannot Delete Users when objects are linked to the user

Status in DHIS:
  Confirmed

Bug description:
  I created a User, I then took that user's uid and tried to delete with
  the following.

  curl -X DELETE -u admin:district
  https://apps.dhis2.org/demo/api/users/Ix1ihxTPq4E

  I get an error back 
  org.postgresql.util.PSQLException: ERROR: update or delete on table 
"userinfo" violates foreign key constraint "fk6a68e08f19893da" on table "users"
Detail: Key (userinfoid)=(240277) is still referenced from table "users".

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1429294/+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] Yes/No in Tracker and Event capture

[Markus Bekken]

Only for the option sets it seems. BOOLEANs is always dropdowns.

> 16. sep. 2015 kl. 09.45 skrev Knut Staring :
> 
> I think this exists as an option already in settings?
> 
> On Wed, Sep 16, 2015 at 9:40 AM, Markus Bekken  > wrote:
> Hi all.
> Working with user testing of the tracker capture app in Palestine, we see a 
> possibility for improving the efficiency of data entry. The "Yes/No"(BOOLEAN) 
> data types are presented as dropdown lists with three options: "Please 
> select", "Yes" and "No". When having a high amount of Nes/No questions to 
> answer, the users must do 2 clicks for each of them - one to open the 
> dropdown and one to select the option(not counting fumbling with the 
> dropdowns, closing them unintentionally). As an effort to speed up the data 
> entry, we could use radio buttons instead of dropdowns for Yes/No(BOOLEAN).
> 
> It would be good to avoid yet another configuration flag. Can anyone think of 
> a reason not to do this change for all of Tracker and Event Capture?
> 
> Markus
> ___
> 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

[Dhis2-devs] [Bug 623373] Re: Translation error in delete current user

[jason.p.pickering]

** Changed in: dhis2
   Status: New => Invalid

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

Title:
  Translation error in delete current user

Status in DHIS:
  Invalid

Bug description:
  there is translation error in delete current user

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/623373/+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] DHIS 2 Documentation in French?

[Calle Hedberg]

Lorill,

Excellent - appreciated (btw - interface in English or French?)

Regards
Calle

On 15 September 2015 at 22:40, Lorill Crees  wrote:

> Hi Calle,
>
> Yes - we are working on making it available. It's a standalone Grails
> application that would require server installation and configuration, so we
> are currently investigating options that would be the easiest for others to
> make use of it.
>
> I'll definitely contact the dev list when it is available.
>
> Cheers,
>
> Lorill
>
> On Tue, Sep 15, 2015 at 12:35 PM, Calle Hedberg 
> wrote:
>
>> Lorill,
>>
>> That custom app seems interesting - are you willing to make it available
>> via the app store (or just open source it)?
>>
>> Regards
>> Calle
>>
>> On 15 September 2015 at 21:51, Lorill Crees  wrote:
>>
>>> Hi Matthieu,
>>>
>>> Thanks for your response. We have recently rolled out a DHIS 2 instance
>>> in Mali where staff will be using a custom standalone application we have
>>> built to import survey (program and program stage) data, as well as
>>> aggregate data (datasets) into DHIS 2. They will then use DHIS 2 to do
>>> analysis on the data.
>>>
>>> Prior to this rollout the users have had no exposure to DHIS 2 except
>>> for a 3-5 day training course. A translated User Manual would be invaluable
>>> to them as they get more comfortable using DHIS 2.
>>>
>>> Thanks again for your help.
>>>
>>> Lorill
>>>
>>> On Mon, Sep 14, 2015 at 12:00 PM, Matthieu Pinard 
>>> wrote:
>>>
 Dear Lorill,

 thank you for you message. Yes we plan to get up to speed with French
 Guides (implementation and User Manual). Could you describe a bit more your
 need, so that we can see we have available content already.

 Cheers,
 Matthieu

 Matthieu Pinard
 DHIS 2 Academy & Community Coordinator | University of Oslo

 On 14 September 2015 at 21:43, Lorill Crees  wrote:

> Hi,
>
> We have some French DHIS 2 Users and are wondering if there are plans
> to have the DHIS 2 User Manual translated into French? The users are
> currently using version 2.20.
>
> The only French documentation we see is for the DHIS 2 Implementation
> Guide (which is outdated to 2.17).
>
> 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
>
>

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


-- 

***

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

Re: [Dhis2-devs] [Dhis2-users] Indicators or Validations when using Combination of categories on DataSet

[Adebusoye Anifalaje]

Hi Rodolfo,

Do you know if there’s been any update on this question? I am particularly 
interesting in creating indicators that combine data elements from different 
data set categories.

Please let me know.

Thanks.

Busoye

> On 31 Mar 2015, at 18:13, Rodolfo Melia  wrote:
> 
> Hi Alex - that will work, but we are looking at using Validation Rules, so 
> they can be used for both, data entry and data import. Also, there are some 
> indicators that I need to calculate that only use as numerator a specific 
> DataValue that belong to one of the DataSetAttributes.
> 
> I may need to reverse the decision of using the Dataset Attributes, and 
> instead do it the classic way: just Data Elements and CatCambos.
> 
> R
> 
> 
> On Tue, Mar 31, 2015 at 2:21 PM, Alex Tumwesigye  > wrote:
> Dear Rodolfo,
> 
> How about using a custom form with some jquery enforcing whatever you need?
> 
> 
> Alex
> 
> On Tue, Mar 31, 2015 at 11:23 AM, Rodolfo Melia  > wrote:
> Continuation of my question: 
> 
> Is it possible to write Indicator/ Validation expressions using a syntax that 
> can refer to the DataSet Attribute, even if the UI doesn't expose it?
> 
> Can I refer to a particular DataValue as [DataElement UID].[CatCombo 
> UID].[DataSetAttribute] ?
> 
> Otherwise I cannot use DataSetAttributes in my design: they are visible on 
> analytics, but there are not exposed on Validations or Indicators, making 
> them difficult (sometimes impossible) to use. 
> 
> R
> 
> Rodolfo Meliá
> Principal  |  rme...@knowming.com 
> Skype: rod.melia  |   <>+44 777 576 4090  |   <>+1 708 872 7636 
> 
> www.knowming.com 
>  <>
> 
> On Mon, Mar 30, 2015 at 5:50 PM, Rodolfo Melia  > wrote:
> When using a combination of Categories on a Data Set - how can I write a 
> validation rule that compares values between the categories used by the 
> DataSet, rather than the total?
> 
> Similarly, how can I define an Indicator that uses for the numerator one 
> Combination of Category of the data set, and then a different one for the 
> denominator?
> 
> In neither case the category combination is exposed on the User Interface: 
> only the DataElements and related CatCombos are exposed. 
> 
> 
> Rodolfo
> 
> 
> ___
> Mailing list: https://launchpad.net/~dhis2-users 
> 
> Post to : dhis2-us...@lists.launchpad.net 
> 
> Unsubscribe : https://launchpad.net/~dhis2-users 
> 
> More help   : https://help.launchpad.net/ListHelp 
> 
> 
> 
> 
> 
> -- 
> 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 "
> 
> ___
> Mailing list: https://launchpad.net/~dhis2-users
> Post to : dhis2-us...@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-users
> More help   : https://help.launchpad.net/ListHelp


-- 


*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

Re: [Dhis2-devs] [Dhis2-users] Indicators or Validations when using Combination of categories on DataSet

[Rodolfo Melia]

I don't think there is. At the end, I had to create 2 sets of Data Elements
(200 Data Elements x2=400 Data Elements), as if I used the DataSet
Attribute I couldn't look at an specific one when doing a indicator or
validation. I do think that DHIS needs to expose the DataSet Attribute as
part of the Indicator/ Quality modules at some point soon - having it on
the analytics is not enough. I could be as easier as extending the current
notation DataElementUID.CatComboUID by adding a third .DataSetAttributeIUD.

*Rodolfo Meliá*
*Principal  |  *rme...@knowming.com
Skype: rod.melia  |  +44 777 576 4090  |  +1 708 872 7636
www.knowming.com

On Wed, Sep 16, 2015 at 12:49 PM, Adebusoye Anifalaje 
wrote:

> Hi Rodolfo,
>
> Do you know if there’s been any update on this question? I am particularly
> interesting in creating indicators that combine data elements from
> different data set categories.
>
> Please let me know.
>
> Thanks.
>
> Busoye
>
>
> On 31 Mar 2015, at 18:13, Rodolfo Melia  wrote:
>
> Hi Alex - that will work, but we are looking at using Validation Rules, so
> they can be used for both, data entry and data import. Also, there are some
> indicators that I need to calculate that only use as numerator a specific
> DataValue that belong to one of the DataSetAttributes.
>
> I may need to reverse the decision of using the Dataset Attributes, and
> instead do it the classic way: just Data Elements and CatCambos.
>
> R
>
>
> On Tue, Mar 31, 2015 at 2:21 PM, Alex Tumwesigye 
> wrote:
>
>> Dear Rodolfo,
>>
>> How about using a custom form with some jquery enforcing whatever you
>> need?
>>
>>
>> Alex
>>
>> On Tue, Mar 31, 2015 at 11:23 AM, Rodolfo Melia 
>> wrote:
>>
>>> Continuation of my question:
>>>
>>> Is it possible to write Indicator/ Validation expressions using a syntax
>>> that can refer to the DataSet Attribute, even if the UI doesn't expose it?
>>>
>>> Can I refer to a particular DataValue as [DataElement UID].[CatCombo
>>> UID].[DataSetAttribute] ?
>>>
>>> Otherwise I cannot use DataSetAttributes in my design: they are visible
>>> on analytics, but there are not exposed on Validations or Indicators,
>>> making them difficult (sometimes impossible) to use.
>>>
>>> R
>>>
>>> *Rodolfo Meliá*
>>> *Principal  |  *rme...@knowming.com
>>> Skype: rod.melia  |  +44 777 576 4090  |  +1 708 872 7636
>>> www.knowming.com
>>>
>>> On Mon, Mar 30, 2015 at 5:50 PM, Rodolfo Melia 
>>> wrote:
>>>
 When using a combination of Categories on a Data Set - how can I write
 a validation rule that compares values between the categories used by the
 DataSet, rather than the total?

 Similarly, how can I define an Indicator that uses for the numerator
 one Combination of Category of the data set, and then a different one for
 the denominator?

 In neither case the category combination is exposed on the User
 Interface: only the DataElements and related CatCombos are exposed.


 Rodolfo

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

Re: [Dhis2-devs] ABOUT CREATING ORGANISATION UNIT IN DHIS2 2.19

[Timothy Harding]

Carlos, below is my email I sent to the dev list a couple of days ago on
this very issue, let me know if it solves the problem.

Go to the Settings App and then Access Settings

Check the following box, and hit save:
[image: Inline image 1]

Then you should have those boxes for compulsory org unit group sets and
datasets back!





*Timothy Harding*
BAO Systems
www.baosystems.com
Skype: hardi...@gmail.com
Phone: 1 541 632 6623

On Wed, Sep 16, 2015 at 1:22 PM, Carlos Nyembwe  wrote:

> Hi All,
>
> I have a preoccupation about creating organUnit in DHIS2 2.19.
>
> On the last version under 2.19, We were abble to create organUnit , with
> organUnit Group Set and organUnit group, It was easy to put this organUnit
> in group directly when we're creating that. but now, in this version 2.19
> or 2.20, It's not abble a longer to do that directly. only far, in edit
> organUnit group.
>
> Who can help me?
>
> Regards
>
> --
> *Carlos Nyembwe*
> *I'm just a Computer Scientist*
>
> *Skype: carloscnk1*
> *Cell: (+243)813166381 <%28%2B243%29813166381>*
> *Find me in: | Google Plus  | 
> **Linkedin
>  | Facebook
>  | Twitter
>  |*
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] login issue

[Matthieu Pinard]

Dear Faraz,

let me foward your question to the community of users and developers

Cheers,
Matthieu

On Tuesday, 15 September 2015, Faraz 
wrote:

> Hi
>
> When i installed dhis2 on my tablet pc, its need (enter server URL),
> whats this mean?
> Please help.
>
> Faraz
> --
> This message was sent from Launchpad by
> Faraz (https://launchpad.net/~faraz-siddiqui)
> using the "Contact this team's admins" link on the DHIS 2 Users team page
> (https://launchpad.net/~dhis2-users).
> For more information see
> https://help.launchpad.net/YourAccount/ContactingPeople
>


-- 
Matthieu Pinard
DHIS 2 Academy & Community Coordinator | University of Oslo
___
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] ABOUT CREATING ORGANISATION UNIT IN DHIS2 2.19

[Carlos Nyembwe]

Hi All,

I have a preoccupation about creating organUnit in DHIS2 2.19.

On the last version under 2.19, We were abble to create organUnit , with
organUnit Group Set and organUnit group, It was easy to put this organUnit
in group directly when we're creating that. but now, in this version 2.19
or 2.20, It's not abble a longer to do that directly. only far, in edit
organUnit group.

Who can help me?

Regards

-- 
*Carlos Nyembwe*
*I'm just a Computer Scientist*

*Skype: carloscnk1*
*Cell: (+243)813166381*
*Find me in: | Google Plus  |
**Linkedin
 | Facebook
 | Twitter
 |*
___
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] ABOUT CREATING ORGANISATION UNIT IN DHIS2 2.19

[Carlos Nyembwe]

Thanks Tim

On Wed, Sep 16, 2015 at 3:01 PM, Timothy Harding 
wrote:

> Then you should have those boxes for compulsory org unit group sets and
> datasets back!





-- 
*Carlos Nyembwe*
*I'm just a Computer Scientist*

*Skype: carloscnk1*
*Cell: (+243)813166381*
*Find me in: | Google Plus  |
**Linkedin
 | Facebook
 | Twitter
 |*
___
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 20183: API cleanup

[noreply]

revno: 20183
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-09-16 16:49:50 +0200
message:
  API cleanup
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/CopticCalendar.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/EthiopianCalendar.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianCalendar.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/IslamicCalendar.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/Iso8601Calendar.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/ThaiCalendar.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DeleteNotAllowedException.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitGroupSymbolSerializer.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessEngine.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/ConstantService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisStore.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/FollowupAnalysisService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/DbmsManager.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/configuration/NoConfigurationFoundException.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerException.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/help/HelpManager.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/HierarchyViolationException.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18n.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/MaintenanceService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElement.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java
  

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20182: event-capture: make sure drop-downs are not clipped

[noreply]

revno: 20182
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2015-09-16 16:48:17 +0200
message:
  event-capture: make sure drop-downs are not clipped
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-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-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css	2015-09-09 12:11:18 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css	2015-09-16 14:48:17 +
@@ -98,7 +98,6 @@
 border-radius: 5px;
 padding: 12px;
 margin-bottom: 20px;
-overflow: auto;
 }
 
 .nav, .pagination, .carousel, .panel-title a { 

___
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 20181: tracker-capture: set search field focused by default

[noreply]

revno: 20181
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2015-09-16 16:17:44 +0200
message:
  tracker-capture: set search field focused by default
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2015-09-15 13:51:19 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2015-09-16 14:17:44 +
@@ -53,6 +53,7 @@
 $scope.enrollment = {programStartDate: '', programEndDate: '', operator: $scope.defaultOperators[0]};
 $scope.searchMode = { listAll: 'LIST_ALL', freeText: 'FREE_TEXT', attributeBased: 'ATTRIBUTE_BASED' };
 $scope.optionSets = null;
+$scope.doSearch = true;
 
 //Registration
 $scope.showRegistrationDiv = false;
@@ -97,7 +98,7 @@
 $scope.showHideLabel = $translate.instant('show_hide_columns');
 $scope.listProgramsLabel = $translate.instant('list_programs');
 $scope.settingsLabel = $translate.instant('settings');
-
+
 $scope.loadPrograms($scope.selectedOrgUnit);
 }
 });
@@ -247,6 +248,7 @@
 $scope.searchingOrgUnit = $scope.selectedOrgUnit;
 }
 
+$scope.doSearch = false;
 $scope.fetchTeis();
 };
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-09-15 13:51:19 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-09-16 14:17:44 +
@@ -125,7 +125,7 @@
 
 
 
-
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2015-09-15 13:51:19 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2015-09-16 14:17:44 +
@@ -7,6 +7,22 @@
 var d2Directives = angular.module('d2Directives', [])
 
 
+.directive('d2SetFocus', function ($timeout) {
+
+return {
+scope: { trigger: '@d2SetFocus' },
+link: function(scope, element) {
+scope.$watch('trigger', function(value) {
+if(value === "true") { 
+$timeout(function() {
+element[0].focus(); 
+});
+}
+});
+}
+};
+})
+
 .directive('d2OuSearch', function () {
 
 return {

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20184: Cleanup

[noreply]

revno: 20184
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-09-16 16:51:59 +0200
message:
  Cleanup
modified:
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/AggregationOperatorTypeHandler.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/AggregationOperatorTypeHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/AggregationOperatorTypeHandler.java	2015-09-15 09:54:24 +
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/AggregationOperatorTypeHandler.java	2015-09-16 14:51:59 +
@@ -28,14 +28,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.sql.SQLException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hisp.dhis.analytics.AggregationType;
+
 import com.ibatis.sqlmap.client.extensions.ParameterSetter;
 import com.ibatis.sqlmap.client.extensions.ResultGetter;
 import com.ibatis.sqlmap.client.extensions.TypeHandlerCallback;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.dataelement.DataElement;
-
-import java.sql.SQLException;
 
 /**
  * @author Lars Helge Overland
@@ -48,7 +49,7 @@
 private static final String JDBC_AVERAGE = "Avg";
 private static final String JDBC_COUNT = "Count";
 
-private static final Integer NON_EXISTING = -1;
+//private static final Integer NON_EXISTING = -1;
 
 private static final Log log = LogFactory.getLog( AggregationOperatorTypeHandler.class );
 
@@ -59,40 +60,36 @@
 @Override
 public Object getResult( ResultGetter getter )
 throws SQLException
-{
-return null;
-
-/*
+{
 String result = getter.getString();
 
 if ( result != null )
 {
 if ( result.equalsIgnoreCase( JDBC_SUM ) )
 {
-return DataElement.AGGREGATION_OPERATOR_SUM;
+return AggregationType.SUM;
 }
 else if ( result.equalsIgnoreCase( JDBC_AVERAGE ) )
 {
-return DataElement.AGGREGATION_OPERATOR_AVERAGE_SUM;
+return AggregationType.AVERAGE;
 }
 else if ( result.equalsIgnoreCase( JDBC_COUNT ) )
 {
-return DataElement.AGGREGATION_OPERATOR_COUNT;
+return AggregationType.COUNT;
 }
 else
 {
 log.warn( "Unknow aggregation operator, returning sum " + result );
 
-return DataElement.AGGREGATION_OPERATOR_SUM;
+return AggregationType.SUM;
 }
 }
 else
 {
 log.warn( "Aggregation operator is null, returning sum " + result );
 
-return DataElement.AGGREGATION_OPERATOR_SUM;
+return AggregationType.SUM;
 }
-*/
 }
 
 @Override

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java	2015-09-15 09:54:24 +
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java	2015-09-16 14:51:59 +
@@ -36,7 +36,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.dataelement.DataElement;
 
 /**
  * @author Lars Helge Overland

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java	2015-09-15 09:54:24 +
+++ 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20185: Removed unused classes

[noreply]

revno: 20185
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-09-16 16:59:37 +0200
message:
  Removed unused classes
removed:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedOrgUnitDataValueService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedOrgUnitDataValueStore.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregationService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregationStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/StoreIterator.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataSetCompletenessRowMapper.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataValueRowMapper.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitDataValueRowMapper.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitIndicatorValueRowMapper.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-api/src/main/java/org/hisp/dhis/aggregation'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java	2015-01-17 07:41:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java	1970-01-01 00:00:00 +
@@ -1,195 +0,0 @@
-package org.hisp.dhis.aggregation;
-
-/*
- * Copyright (c) 2004-2015, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.common.AggregatedValue;
-
-/**
- * @author Lars Helge Overland
- */
-public class AggregatedDataValue
-extends AggregatedValue
-{
-private int dataElementId;
-
-private int categoryOptionComboId;
-
-private transient String dataElementName;
-
-// --
-// Constructors
-// --
-
-public AggregatedDataValue()
-{   
-}
-
-/**
- * @param dataElementId data element id
- * @param categoryOptionComboId category option combo id
- * @param periodId period id
- * @param periodTypeId period type id
- * @param organisationUnitId organisation unit id
- * @param level level level
- * @param value value value
- */
-public AggregatedDataValue( int dataElementId, int categoryOptionComboId, int periodId, 
-int periodTypeId, 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20186: API, cleanup

[noreply]

revno: 20186
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-09-16 17:14:04 +0200
message:
  API, cleanup
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/BaseIdentifiableObjectXmlAdapter.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitGroupSymbolSerializer.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodDeserializer.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ParametersMapXmlAdapter.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardSearchResult.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevel.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java
  dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/AccessStringHelperTest.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/appmanager/AppManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java	2015-09-16 14:49:50 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java	2015-09-16 15:14:04 +
@@ -39,7 +39,7 @@
  */
 public interface AppManager
 {
-final String ID = AppManager.class.getName();
+String ID = AppManager.class.getName();
 
 String KEY_APP_FOLDER_PATH = "appFolderPath";
 String KEY_APP_BASE_URL = "appBaseUrl";

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/BaseIdentifiableObjectXmlAdapter.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/BaseIdentifiableObjectXmlAdapter.java	2015-01-17 07:41:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/BaseIdentifiableObjectXmlAdapter.java	2015-09-16 15:14:04 +
@@ -38,13 +38,13 @@
 public class BaseIdentifiableObjectXmlAdapter extends XmlAdapter
 {
 @Override
-public BaseIdentifiableObject unmarshal( BaseIdentifiableObject baseIdentifiableObject ) throws Exception
+public BaseIdentifiableObject unmarshal( BaseIdentifiableObject baseIdentifiableObject )
 {
 return baseIdentifiableObject;
 }
 
 @Override
-public BaseIdentifiableObject marshal( BaseIdentifiableObject baseIdentifiableObject ) throws Exception
+public BaseIdentifiableObject marshal( BaseIdentifiableObject baseIdentifiableObject )
 {
 if ( baseIdentifiableObject != null )
 {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java	2015-09-16 14:49:50 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java	2015-09-16 15:14:04 +
@@ -48,7 +48,7 @@
  */
 public class JacksonOrganisationUnitChildrenSerializer extends JsonSerializer
 {
-private static DateFormat format = new SimpleDateFormat( "-MM-dd'T'HH:mm:ssZ" );
+private static DateFormat DATE_FORMAT = new SimpleDateFormat( "-MM-dd'T'HH:mm:ssZ" );
 
 @Override
 public void serialize( OrganisationUnit value, JsonGenerator jgen, SerializerProvider provider ) throws IOException
@@ -64,8 +64,8 @@
 staxWriter.writeStartElement( DxfNamespaces.DXF_2_0, "child" );
 staxWriter.writeAttribute( "id", value.getUid() );
 staxWriter.writeAttribute( "name", value.getName() );
-staxWriter.writeAttribute( "created", format.format( value.getCreated() ) );
-staxWriter.writeAttribute( "lastUpdated", format.format( value.getLastUpdated() ) );
+staxWriter.writeAttribute( "created", DATE_FORMAT.format( value.getCreated() ) );
+staxWriter.writeAttribute( "lastUpdated", DATE_FORMAT.format( value.getLastUpdated() ) );
 
 if ( value.getHref() != null )
 {

=== modified file 

[Dhis2-devs] uploading dataValues with category combo

[moses mwale]

hello
how do I upload dataValues connected to category combo.
any reference?
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] DHIS 2 Documentation in French?

[Lorill Crees]

Hi Calle,

The interface is available in English, French and Portuguese.

Cheers,

Lorill

On Wed, Sep 16, 2015 at 4:38 AM, Calle Hedberg 
wrote:

> Lorill,
>
> Excellent - appreciated (btw - interface in English or French?)
>
> Regards
> Calle
>
> On 15 September 2015 at 22:40, Lorill Crees  wrote:
>
>> Hi Calle,
>>
>> Yes - we are working on making it available. It's a standalone Grails
>> application that would require server installation and configuration, so we
>> are currently investigating options that would be the easiest for others to
>> make use of it.
>>
>> I'll definitely contact the dev list when it is available.
>>
>> Cheers,
>>
>> Lorill
>>
>> On Tue, Sep 15, 2015 at 12:35 PM, Calle Hedberg 
>> wrote:
>>
>>> Lorill,
>>>
>>> That custom app seems interesting - are you willing to make it available
>>> via the app store (or just open source it)?
>>>
>>> Regards
>>> Calle
>>>
>>> On 15 September 2015 at 21:51, Lorill Crees  wrote:
>>>
 Hi Matthieu,

 Thanks for your response. We have recently rolled out a DHIS 2 instance
 in Mali where staff will be using a custom standalone application we have
 built to import survey (program and program stage) data, as well as
 aggregate data (datasets) into DHIS 2. They will then use DHIS 2 to do
 analysis on the data.

 Prior to this rollout the users have had no exposure to DHIS 2 except
 for a 3-5 day training course. A translated User Manual would be invaluable
 to them as they get more comfortable using DHIS 2.

 Thanks again for your help.

 Lorill

 On Mon, Sep 14, 2015 at 12:00 PM, Matthieu Pinard 
 wrote:

> Dear Lorill,
>
> thank you for you message. Yes we plan to get up to speed with French
> Guides (implementation and User Manual). Could you describe a bit more 
> your
> need, so that we can see we have available content already.
>
> Cheers,
> Matthieu
>
> Matthieu Pinard
> DHIS 2 Academy & Community Coordinator | University of Oslo
>
> On 14 September 2015 at 21:43, Lorill Crees  wrote:
>
>> Hi,
>>
>> We have some French DHIS 2 Users and are wondering if there are plans
>> to have the DHIS 2 User Manual translated into French? The users are
>> currently using version 2.20.
>>
>> The only French documentation we see is for the DHIS 2 Implementation
>> Guide (which is outdated to 2.17).
>>
>> 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
>>
>>
>

 ___
 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


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

Re: [Dhis2-devs] Uploading Data values

[Olav Poppe]

You would use the catogoryoptionbombo for the categorycombo, which is what you 
see in the fourth column in the manual. 

Olav

> Den 16. sep. 2015 kl. 17.12 skrev moses mwale :
> 
> But Couldn't come across any example combining to category combination, any 
> help on that, on how to inter link them
> 
> 
>> On Wed, Sep 16, 2015 at 2:20 PM, Olav Poppe  wrote:
>> Hi,
>> you can upload CSV files in the Import-Export module.
>> 
>> The CSV format is described here: 
>> https://www.dhis2.org/doc/snapshot/en/developer/html/ch01s11.html#d5e1291
>> 
>> Olav
>> 
>> 
>> 
>>> 16. sep. 2015 kl. 13.54 skrev moses mwale :
>>> 
>>> Hello Devs
>>> how do I upload data Values into DHIS2 using csv format?
>>> 
>>> ___
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to : dhis2-devs@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
> 
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Is the Android app working right now?

[Lars Helge Øverland]

Hi Jeff,

sorry you can get a more recent APK from here:

https://github.com/dhis2/dhis2-android-datacapture/releases

I have updated the link on dhis2.org now.

regards,

Lars


On Wed, Sep 16, 2015 at 8:01 PM, Jeff R. Allen  wrote:

> I am running the APK I downloaded from
> https://www.dhis2.org/download/android/data-capture-apk.zip
>
>   -jeff
>
> On Wed, Sep 16, 2015 at 1:22 PM, Araz Abishov  > wrote:
>
>> Hello Jeff,
>>
>> Which version of data capture application are you running? (From google
>> play or launchpad)
>>
>> Best Regards,
>> Araz
>>
>> On Wed, Sep 16, 2015 at 8:29 AM, Jeff R. Allen  wrote:
>>
>>> Hello guys,
>>>
>>> I started playing with the Android app today, and couldn't get it to
>>> work.
>>>
>>> Briefly what I did was login to apps.dhis2.org as user "android" (I had
>>> to change the password to be able to do so). The Android app gave an error
>>> (the traceback from adb is below).
>>>
>>> I see that the last released version of the Android app is 2.16, so I'm
>>> wondering if maybe the demo server (2.20) is out of sync. I also see
>>> there's a branch called lwuit-tracking which is slightly more active than
>>> tip, wondering if I should build an APK from there?
>>>
>>>   -jeff
>>>
>>> I/org.dhis2.mobile.WorkService( 1148): onCreate()
>>>
>>> I/org.dhis2.mobile.WorkService( 1148): Service started
>>>
>>> I/org.dhis2.mobile.WorkService( 1148): loginUser
>>>
>>> I/GET ( 1148): https://apps.dhis2.org/demo/api/me/user-account
>>>
>>> I/200 ( 1148):
>>> {"username":"android","firstName":"John","surname":"Barnes","email":"
>>> j...@nella.org
>>> ","settings":{"keyDbLocale":null,"keyMessageSmsNotification":null,"keyUiLocale":"en","keyAnalysisDisplayProperty":null,"keyMessageEmailNotification":null}}
>>>
>>> I/ActivityManager(  348): START u0
>>> {cmp=org.dhis2.mobile/.ui.MenuActivity} from uid 10058 on display 0
>>>
>>> V/WindowManager(  348): addAppToken: AppWindowToken{38e7325d
>>> token=Token{61ee434 ActivityRecord{3b76b07 u0
>>> org.dhis2.mobile/.ui.MenuActivity t6}}} to stack=1 task=6 at 1
>>>
>>> I/org.dhis2.mobile.WorkService( 1148): onDestroy()
>>>
>>> I/AggregateReportForm - startUpdate()( 1148): Starting update of datasets
>>>
>>> V/WindowManager(  348): Adding window Window{2e00fa0 u0
>>> org.dhis2.mobile/org.dhis2.mobile.ui.MenuActivity} at 3 of 6 (after
>>> Window{37460cb8 u0 org.dhis2.mobile/org.dhis2.mobile.ui.LoginActivity})
>>>
>>> I/Choreographer( 1148): Skipped 58 frames!  The application may be doing
>>> too much work on its main thread.
>>>
>>> W/EGL_emulation( 1148): eglSurfaceAttrib not implemented
>>>
>>> W/OpenGLRenderer( 1148): Failed to set EGL_SWAP_BEHAVIOR on surface
>>> 0xa5d47260, error=EGL_SUCCESS
>>>
>>> I/org.dhis2.mobile.WorkService( 1148): onCreate()
>>>
>>> I/org.dhis2.mobile.WorkService( 1148): Service started
>>>
>>> I/org.dhis2.mobile.WorkService( 1148): updateDatasets
>>>
>>> I/ActivityManager(  348): Displayed org.dhis2.mobile/.ui.MenuActivity:
>>> +1s730ms
>>>
>>> I/GET ( 1148): https://apps.dhis2.org/demo/api/me/assignedDataSets
>>>
>>> I/art ( 1148): Background sticky concurrent mark sweep GC freed
>>> 580(36KB) AllocSpace objects, 1(16KB) LOS objects, 6% free, 2MB/2MB, paused
>>> 18.234ms total 336.173ms
>>>
>>> I/art ( 1148): Background partial concurrent mark sweep GC freed
>>> 2619(160KB) AllocSpace objects, 2(32KB) LOS objects, 25% free, 2MB/3MB,
>>> paused 1.501ms total 233.244ms
>>>
>>> I/art ( 1148): Background partial concurrent mark sweep GC freed
>>> 2323(164KB) AllocSpace objects, 6(544KB) LOS objects, 24% free, 2MB/3MB,
>>> paused 6.043ms total 195.089ms
>>>
>>> W/art ( 1148): Suspending all threads took: 6.933ms
>>>
>>> I/art ( 1148): Background sticky concurrent mark sweep GC freed
>>> 29(1264B) AllocSpace objects, 0(0B) LOS objects, 0% free, 4MB/4MB, paused
>>> 10.661ms total 78.987ms
>>>
>>> I/200 ( 1148):
>>> {"organisationUnits":{"DiszpKrYNg8":{"id":"DiszpKrYNg8","label":"Ngelehun
>>> CHC","level":4,"parent":"YuQRtpLP10I","dataSets":[{"id":"pBOMPrpg1QX","label":"Mortality
>>> < 5
>>> years"},{"id":"eZDhcZi6FLP","label":"Morbidity"},{"id":"EDzMBk0RRji","label":"HIV
>>> Peadiatric monthly summary"},{"id":"lyLU2wR22tC","label":"ART monthly
>>> summary"},{"id":"PLq9sJluXvc","label":"Inpatient Morbidity/Mortality
>>> Summary"},{"id":"V8MHeZHIrcP","label":"Facility
>>> Assessment"},{"id":"EKWVBc5C0ms","label":"MNCH Quarterly
>>> Report"},{"id":"TuL8IOPzpHh","label":"EPI
>>> Stock"},{"id":"ULowA8V3ucd","label":"Life-Saving
>>> Commodities"},{"id":"QX4ZTUbOt3a","label":"Reproductive
>>> Health"},{"id":"Rl58JxmKJo2","label":"PMTCT monthly
>>> summary"},{"id":"BfMAe6Itzgt","label":"Child
>>> Health"},{"id":"N4fIX1HL3TQ","label":"Staffing"},{"id":"aLpVgfXiz0f","label":"Population"},{"id":"SF8FDSqw30D","label":"TB
>>> Facility reporting Form"},{"id":"VTdjfLXXmoi","label":"Clinical Monitoring
>>> Checklist 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20187: Re-implemented getOrganisationUnitWithChildren using getOrganisationUnits( OrganisationUnitQueryP...

[noreply]

revno: 20187
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-09-16 20:31:45 +0200
message:
  Re-implemented getOrganisationUnitWithChildren using getOrganisationUnits( 
OrganisationUnitQueryParams ). Re-implemented OrganisationUnit.getLevel using 
the path property. Improves performance since we can rely on path property 
directly in regex and HQL queries instead of fetching org units one by one from 
database.
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitByLevelComparator.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/JDBCDataBrowserStore.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsUtils.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/test/java/org/hisp/dhis/analytics/event/data/EventQueryPlannerTest.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.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/mapping/DefaultMappingService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/OrganisationUnitExtended.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/dataapproval/DataApprovalServiceTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitAboveOrEqualToLevelFilter.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapViewController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java
  
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/FredSpringWebTest.java
  
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/controller/FacilityController.java
  
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/OrganisationUnitToFacilityConverter.java
  
dhis-2/dhis-web/dhis-web-ohie/src/test/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/OrganisationUnitToFacilityConverterTest.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/organisationunit/OrganisationUnit.java'
--- 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20188: POM, moved comment to description tag

[noreply]

revno: 20188
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2015-09-16 20:32:40 +0200
message:
  POM, moved comment to description tag
modified:
  dhis-2/dhis-support/dhis-support-commons/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-commons/pom.xml'
--- dhis-2/dhis-support/dhis-support-commons/pom.xml	2015-07-20 02:01:37 +
+++ dhis-2/dhis-support/dhis-support-commons/pom.xml	2015-09-16 18:32:40 +
@@ -14,13 +14,13 @@
   jar
   DHIS Support Commons
 
-  
+choice).
+  
 
   
 

___
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] "Patching" events

[Olav Poppe]

Hi, I was looking at ways to update existing events over the API, by 
adding/updating a couple of data values. I was hoping I could simply do some 
sort of "add or update" operation, but this does not seem to be possible.

Could someone please help me
1) confirm whether this is not possible, or if I have just missed it?
2) consider adding support for this in the future?

Even better, if it was possible to do this on a large set of events at the same 
time.

Thanks
Olav



___
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 1496631] [NEW] Program Rules and Validation Criteria does not work in Tracker Capture

[Alex Tumwesigye]

Public bug reported:

When you go to a program, create a validation criteria to restrict
enrollment of females only (gender = Female), then register a person in
the tracker capture. It does not show the pop up error. Instead, it
registers and enroll the male person to the program.

When you try to enroll the same person in the individual records, it
works as expected. In other words, it does not allow you to enroll a
male to PMTCT program

The above apply for program rules too.

** 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/1496631

Title:
  Program Rules and Validation Criteria does not work in Tracker Capture

Status in DHIS:
  New

Bug description:
  When you go to a program, create a validation criteria to restrict
  enrollment of females only (gender = Female), then register a person
  in the tracker capture. It does not show the pop up error. Instead, it
  registers and enroll the male person to the program.

  When you try to enroll the same person in the individual records, it
  works as expected. In other words, it does not allow you to enroll a
  male to PMTCT program

  The above apply for program rules too.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1496631/+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] [Bug 1496631] Re: Program Rules and Validation Criteria does not work in Tracker Capture

[Alex Tumwesigye]

Build revision:19865
version:2.20

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

Title:
  Program Rules and Validation Criteria does not work in Tracker Capture

Status in DHIS:
  New

Bug description:
  When you go to a program, create a validation criteria to restrict
  enrollment of females only (gender = Female), then register a person
  in the tracker capture. It does not show the pop up error. Instead, it
  registers and enroll the male person to the program.

  When you try to enroll the same person in the individual records, it
  works as expected. In other words, it does not allow you to enroll a
  male to PMTCT program

  The above apply for program rules too.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1496631/+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] [Dhis2-users] login issue

[gerald thomas]

Morten,
I am sure it the android app and I am having the same issue. Now is it
because my DHIS2 is running on 2.18 because whether way I had tried it
saying "wrong URL"

Regards,
Gerald
On Sep 17, 2015 2:30 AM, "Morten Olav Hansen"  wrote:

> Hi Faraz
>
> I think we need a bit more information here. Are you trying to install
> DHIS 2 live on your pc?
>
> You mentioned "enter server URL", is this an Android device? and you want
> to try out our app?
>
> --
> Morten
>
> On Wed, Sep 16, 2015 at 7:52 PM, Matthieu Pinard 
> wrote:
>
>>
>> Dear Faraz,
>>
>> let me foward your question to the community of users and developers
>>
>> Cheers,
>> Matthieu
>>
>> On Tuesday, 15 September 2015, Faraz 
>> wrote:
>>
>>> Hi
>>>
>>> When i installed dhis2 on my tablet pc, its need (enter server URL),
>>> whats this mean?
>>> Please help.
>>>
>>> Faraz
>>> --
>>> This message was sent from Launchpad by
>>> Faraz (https://launchpad.net/~faraz-siddiqui)
>>> using the "Contact this team's admins" link on the DHIS 2 Users team page
>>> (https://launchpad.net/~dhis2-users).
>>> For more information see
>>> https://help.launchpad.net/YourAccount/ContactingPeople
>>>
>>
>>
>> --
>> Matthieu Pinard
>> DHIS 2 Academy & Community Coordinator | University of Oslo
>>
>>
>> ___
>> 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-users
> Post to : dhis2-us...@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-users
> 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 20193: Minor

[noreply]

revno: 20193
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-09-17 12:02:11 +0700
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.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/dataset/FormType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.java	2015-09-17 05:01:46 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.java	2015-09-17 05:02:11 +
@@ -33,7 +33,7 @@
  */
 public enum FormType
 {
-STANDARD,
+DEFAULT,
 SECTION,
 CUSTOM,
 SECTION_MULTIORG;

___
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 20192: add FormType enum, will be used in DataSet and ProgramStage

[noreply]

revno: 20192
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-09-17 12:01:46 +0700
message:
  add FormType enum, will be used in DataSet and ProgramStage
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.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/dataset/FormType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.java	2015-09-17 05:01:46 +
@@ -0,0 +1,45 @@
+package org.hisp.dhis.dataset;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author Morten Olav Hansen 
+ */
+public enum FormType
+{
+STANDARD,
+SECTION,
+CUSTOM,
+SECTION_MULTIORG;
+
+public boolean isSection()
+{
+return this == SECTION || this == SECTION_MULTIORG;
+}
+}

___
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 1496631] Re: Program Rules and Validation Criteria does not work in Tracker Capture

[Abyot Asalefew Gizaw]

This is not a bug, rather a new feature which is implemented in 2.21.

** Changed in: dhis2
   Status: New => Invalid

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

Title:
  Program Rules and Validation Criteria does not work in Tracker Capture

Status in DHIS:
  Invalid

Bug description:
  When you go to a program, create a validation criteria to restrict
  enrollment of females only (gender = Female), then register a person
  in the tracker capture. It does not show the pop up error. Instead, it
  registers and enroll the male person to the program.

  When you try to enroll the same person in the individual records, it
  works as expected. In other words, it does not allow you to enroll a
  male to PMTCT program

  The above apply for program rules too.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1496631/+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 20189: switched to field access for de.valueType

[noreply]

revno: 20189
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-09-17 09:28:01 +0700
message:
  switched to field access for de.valueType
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.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/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2015-09-15 09:54:24 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2015-09-17 02:28:01 +
@@ -22,7 +22,7 @@
 
 
 
-
+
   
 org.hisp.dhis.common.ValueType
 true

___
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 20191: minor, dont need not-null=false on ou.featuretype since default is NONE

[noreply]

revno: 20191
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-09-17 11:30:35 +0700
message:
  minor, dont need not-null=false on ou.featuretype since default is NONE
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.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/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2015-09-17 04:29:29 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2015-09-17 04:30:35 +
@@ -40,7 +40,7 @@
 
 
 
-
+
   
 org.hisp.dhis.organisationunit.FeatureType
 true

___
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 20194: switch dataSet.dataSetType and programStage.dataEntryType to dataSet.formType programStage.formTy...

[noreply]

revno: 20194
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2015-09-17 12:52:20 +0700
message:
  switch dataSet.dataSetType and programStage.dataEntryType to dataSet.formType 
programStage.formType, wip
removed:
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataSetTypeFilter.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
  
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/responseMetaData.vm
  
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetSectionFormAction.java
  
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.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-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java	2015-09-13 16:04:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java	2015-09-17 05:52:20 +
@@ -28,9 +28,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.HashSet;
-import java.util.Set;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.google.common.collect.Sets;
 import org.hisp.dhis.attribute.AttributeValue;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.BaseNameableObject;
@@ -57,14 +62,8 @@
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.user.UserGroup;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.google.common.collect.Sets;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * This class is used for defining the standardized DataSets. A DataSet consists
@@ -77,11 +76,6 @@
 extends BaseNameableObject
 implements VersionedObject
 {
-public static final String TYPE_DEFAULT = "default";
-public static final String TYPE_SECTION = "section";
-public static final String TYPE_CUSTOM = "custom";
-public static final String TYPE_SECTION_MULTIORG = "multiorg_section";
-
 public static final int NO_EXPIRY = 0;
 
 /**
@@ -186,7 +180,7 @@
  * not allowed for current period.
  */
 private int openFuturePeriods;
-
+
 /**
  * Property indicating that all fields for a data element must be filled.
  */
@@ -292,10 +286,10 @@
 {
 Set toRemove = Sets.difference( sources, updates );
 Set toAdd = Sets.difference( updates, sources );
-
+
 toRemove.parallelStream().forEach( u -> u.getDataSets().remove( this ) );
 toAdd.parallelStream().forEach( u -> u.getDataSets().add( this ) );
-
+
 sources.clear();
 sources.addAll( updates );
 }
@@ -316,10 +310,10 @@
 {
 Set toRemove = Sets.difference( dataElements, updates );
 Set toAdd = Sets.difference( updates, dataElements );
-
+
 toRemove.parallelStream().forEach( d -> d.getDataSets().remove( this ) );
 toAdd.parallelStream().forEach( d -> d.getDataSets().add( this ) );
-
+
 dataElements.clear();
 

Re: [Dhis2-devs] [Dhis2-users] login issue

[Morten Olav Hansen]

Ok, I will let one our the guys from our Android team answer your question,
but please make sure you are using the latest release, and that your server
is running DHIS 2.20 (I'm not sure if this is a requirement or not to be
honest).

It should be able to successfully work against https://apps.dhis2.org/demo
at least (which is our server running the latest 2.20)

--
Morten

On Thu, Sep 17, 2015 at 9:55 AM, gerald thomas 
wrote:

> Morten,
> I am sure it the android app and I am having the same issue. Now is it
> because my DHIS2 is running on 2.18 because whether way I had tried it
> saying "wrong URL"
>
> Regards,
> Gerald
> On Sep 17, 2015 2:30 AM, "Morten Olav Hansen"  wrote:
>
>> Hi Faraz
>>
>> I think we need a bit more information here. Are you trying to install
>> DHIS 2 live on your pc?
>>
>> You mentioned "enter server URL", is this an Android device? and you want
>> to try out our app?
>>
>> --
>> Morten
>>
>> On Wed, Sep 16, 2015 at 7:52 PM, Matthieu Pinard 
>> wrote:
>>
>>>
>>> Dear Faraz,
>>>
>>> let me foward your question to the community of users and developers
>>>
>>> Cheers,
>>> Matthieu
>>>
>>> On Tuesday, 15 September 2015, Faraz 
>>> wrote:
>>>
 Hi

 When i installed dhis2 on my tablet pc, its need (enter server URL),
 whats this mean?
 Please help.

 Faraz
 --
 This message was sent from Launchpad by
 Faraz (https://launchpad.net/~faraz-siddiqui)
 using the "Contact this team's admins" link on the DHIS 2 Users team
 page
 (https://launchpad.net/~dhis2-users).
 For more information see
 https://help.launchpad.net/YourAccount/ContactingPeople

>>>
>>>
>>> --
>>> Matthieu Pinard
>>> DHIS 2 Academy & Community Coordinator | University of Oslo
>>>
>>>
>>> ___
>>> 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-users
>> Post to : dhis2-us...@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-users
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] uploading dataValues with category combo

[Jason Pickering]

Hi Moses,

Have you read our documentation? It may help.

https://www.dhis2.org/documentation

Specifically this section
https://www.dhis2.org/doc/snapshot/en/developer/html/ch01s11.html#d5e1291

Regards,
Jason

On Wed, Sep 16, 2015, 17:02 moses mwale  wrote:

> hello
> how do I upload dataValues connected to category combo.
> any reference?
>
> ___
> 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