Re: [Dhis2-devs] Events API - content length mismatch

2016-02-17 Thread Pierre Dane
hey

I haven't run into this but you may have to page:( or you could try a
sqlview which won't have a size restriction (you would have to use a
function as tracker events can't be accessed with raw sql).

On Thursday, 18 February 2016, Olav Poppe  wrote:

> Hi devs,
> I’m trying to fetch events from the API (DHIS 2.22 build 21829). For a
> small number of events, everything works fine. However, for larger
> datasets, it fails to load the full "events" object.
>
> This is the request (should return about 700 events):
>
> api/events.json?orgUnit=M4nRM5O3mH8&ouMode=DESCENDANTS&programStage=wmSb9TmevMn&startDate=2013-02-17&endDate=2016-02-17&status=COMPLETED&skipPaging=true
>
> These are the error messages:
> Chrome: "ERR_CONTENT_LENGTH_MISMATCH"
> Curl: curl: (18) transfer closed with 1557104 bytes remaining to read
> node.js request.get: simply loads the first part of the events object as a
> string
>
> Any advice?
>
> Olav
>


-- 
*Pierre Dane*

Jembi Health Systems
Software Development Manager
tel: +27 (0)21 701 0939
cel: +27 (0)83 680 8274
email: pie...@jembi.org
web: www.jembi.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] Events API - content length mismatch

2016-02-17 Thread Olav Poppe
Hi devs, 
I’m trying to fetch events from the API (DHIS 2.22 build 21829). For a small 
number of events, everything works fine. However, for larger datasets, it fails 
to load the full "events" object. 

This is the request (should return about 700 events):
api/events.json?orgUnit=M4nRM5O3mH8&ouMode=DESCENDANTS&programStage=wmSb9TmevMn&startDate=2013-02-17&endDate=2016-02-17&status=COMPLETED&skipPaging=true

These are the error messages:
Chrome: "ERR_CONTENT_LENGTH_MISMATCH"
Curl: curl: (18) transfer closed with 1557104 bytes remaining to read
node.js request.get: simply loads the first part of the events object as a 
string

Any advice?

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] Obsolete analytics tables are not deleted during analytics update

2016-02-17 Thread Uwe Wahser
Dear devs,

it seems like the analytics table update does not remove data/tables of years,
that are no longer valid.

Since dataValues can be deleted via api in batch, it can happen that dataValues
for a whole year get deleted. Of course these years should not show up in the
analytics (pivot, chart etc...) any more. However, those obsolete tables seem to
remain in the database after running the analytics update. Of course they could
be remove manually, but this is not applicable in a nightly load scenario. 

I did empty the cache and checked catalina.out, but I can't find an error. In
the database the dataValues table remains with only the years, that were not
deleted, so the deletion obviously worked. But the obsolete analytics tables
(e.g. analytics_2012) are still there and populated. You can verify in the
attached excerpt from catalina.out: only years >= 2016 were (correctly) updated,
deleted years <= 2015 remained untouched.

This is quite serious as it results into wrong statistics, if not detected. I
just discovered this because of a major clean-up activity - if there are only
very few years affected, users might not even notice that they are reporting
deleted data.

Currently running on 2.22, build 21765, Standard Ubuntu 14.04 & OracleJava 8.

Thanks for checking on that,

Uwe

catalina.out.2016-02-18
Description: Binary data
___
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] Upgrade from 2.20 to 2.22

2016-02-17 Thread gerald thomas
Boss
https://www.dhis2.org/220-upgrade
https://www.dhis2.org/221-upgrade
https://www.dhis2.org/222-upgrade

Did you run the script:
https://github.com/dhis2/dhis2-utils/blob/master/resources/sql/upgrade-220.sql
When upgrading to 2.20?

There is not too much for version 2.21 but you need pay attention to
the changes for version 2.22. Kindly go through the links again.

On Thursday, February 18, 2016, Furqonuddin Ramdhani 
wrote:

>
> I didn't find any upgrade procedures documents for dhis 2.22, maybe
> someone can send me the link or explain a little bit about the procedures.
> I'm aware there are some changes in table structures but how to migrate it
> properly I still doing trial and error here. In previous version usually
> have upgrade scripts  like this one :
>
> https://github.com/dhis2/dhis2-utils/blob/master/resources/sql/upgrade-220.sql
>
> Thanks
>
> Regards,
> Dhani
>
>
>
> On Thu, Feb 18, 2016 at 11:50 AM, gerald thomas  > wrote:
>
>> Boss,
>> I think you should upgrade the data structures of postgresql database
>> 2.20 before migrating them to 2.22. Please read the upgrade procedures
>> again because there are steps you should have done. I think it will always
>> fail if your want to move them directly from 2.20 to 2.22
>>
>> Regards,
>> Gerald
>> On Feb 18, 2016 2:38 AM, "Furqonuddin Ramdhani" > > wrote:
>>
>>> Hi,
>>>
>>> I already installed dhis 2.22 and want to migrate all my data from dhis
>>> 2.20, how the best way to do it, I already tried import the metadata from
>>> 2.20 to 2.22 but failed. Any suggestion ?
>>>
>>> Thanks
>>>
>>> --
>>> Regards,
>>> *Furqonuddin Ramdhani*
>>>
>>> ___
>>> 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
>>>
>>>
>
>
> --
> Salam
> *Furqonuddin Ramdhani*
>


-- 
Regards,

Gerald
___
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] Upgrade from 2.20 to 2.22

2016-02-17 Thread Morten Olav Hansen
A few people have had issues with systemsettings and sms config, if you
have any issues.. you should try and run:
delete from systemsetting where name='SMS_CONFIG' or name='keySmsConfig';

On Thu, Feb 18, 2016 at 12:58 PM, Knut Staring  wrote:

> Hi Dhani,
>
> Basically you should stop DHIS,  take a backup of your 2.20 database, then
> replace the 2.20 .war file with 2.21 and start DHIS. Then stop, put in the
> 2.22 war file and start again. Theoretically that should be it. You do not
> have to run scripts for these upgrades, otherwise it would have been listed
> here:
> https://www.dhis2.org/221-upgrade
> https://www.dhis2.org/222-upgrade
>
> Knut
>
> On Thu, Feb 18, 2016 at 6:51 AM, Furqonuddin Ramdhani 
> wrote:
>
>>
>> I didn't find any upgrade procedures documents for dhis 2.22, maybe
>> someone can send me the link or explain a little bit about the procedures.
>> I'm aware there are some changes in table structures but how to migrate
>> it properly I still doing trial and error here. In previous version usually
>> have upgrade scripts  like this one :
>>
>> https://github.com/dhis2/dhis2-utils/blob/master/resources/sql/upgrade-220.sql
>>
>> Thanks
>>
>> Regards,
>> Dhani
>>
>>
>>
>> On Thu, Feb 18, 2016 at 11:50 AM, gerald thomas 
>> wrote:
>>
>>> Boss,
>>> I think you should upgrade the data structures of postgresql database
>>> 2.20 before migrating them to 2.22. Please read the upgrade procedures
>>> again because there are steps you should have done. I think it will always
>>> fail if your want to move them directly from 2.20 to 2.22
>>>
>>> Regards,
>>> Gerald
>>> On Feb 18, 2016 2:38 AM, "Furqonuddin Ramdhani" 
>>> wrote:
>>>
 Hi,

 I already installed dhis 2.22 and want to migrate all my data from dhis
 2.20, how the best way to do it, I already tried import the metadata from
 2.20 to 2.22 but failed. Any suggestion ?

 Thanks

 --
 Regards,
 *Furqonuddin Ramdhani*

 ___
 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


>>
>>
>> --
>> Salam
>> *Furqonuddin Ramdhani*
>>
>> ___
>> 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
>>
>>
>
>
> --
> Knut Staring
> Dept. of Informatics, University of Oslo
> Norway: +4791880522
> Skype: knutstar
> http://dhis2.org
>
> ___
> 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
>
>


-- 
Morten
___
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] Upgrade from 2.20 to 2.22

2016-02-17 Thread Knut Staring
Hi Dhani,

Basically you should stop DHIS,  take a backup of your 2.20 database, then
replace the 2.20 .war file with 2.21 and start DHIS. Then stop, put in the
2.22 war file and start again. Theoretically that should be it. You do not
have to run scripts for these upgrades, otherwise it would have been listed
here:
https://www.dhis2.org/221-upgrade
https://www.dhis2.org/222-upgrade

Knut

On Thu, Feb 18, 2016 at 6:51 AM, Furqonuddin Ramdhani 
wrote:

>
> I didn't find any upgrade procedures documents for dhis 2.22, maybe
> someone can send me the link or explain a little bit about the procedures.
> I'm aware there are some changes in table structures but how to migrate it
> properly I still doing trial and error here. In previous version usually
> have upgrade scripts  like this one :
>
> https://github.com/dhis2/dhis2-utils/blob/master/resources/sql/upgrade-220.sql
>
> Thanks
>
> Regards,
> Dhani
>
>
>
> On Thu, Feb 18, 2016 at 11:50 AM, gerald thomas 
> wrote:
>
>> Boss,
>> I think you should upgrade the data structures of postgresql database
>> 2.20 before migrating them to 2.22. Please read the upgrade procedures
>> again because there are steps you should have done. I think it will always
>> fail if your want to move them directly from 2.20 to 2.22
>>
>> Regards,
>> Gerald
>> On Feb 18, 2016 2:38 AM, "Furqonuddin Ramdhani" 
>> wrote:
>>
>>> Hi,
>>>
>>> I already installed dhis 2.22 and want to migrate all my data from dhis
>>> 2.20, how the best way to do it, I already tried import the metadata from
>>> 2.20 to 2.22 but failed. Any suggestion ?
>>>
>>> Thanks
>>>
>>> --
>>> Regards,
>>> *Furqonuddin Ramdhani*
>>>
>>> ___
>>> 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
>>>
>>>
>
>
> --
> Salam
> *Furqonuddin Ramdhani*
>
> ___
> 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
>
>


-- 
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] [Dhis2-users] Upgrade from 2.20 to 2.22

2016-02-17 Thread Furqonuddin Ramdhani
I didn't find any upgrade procedures documents for dhis 2.22, maybe someone
can send me the link or explain a little bit about the procedures.
I'm aware there are some changes in table structures but how to migrate it
properly I still doing trial and error here. In previous version usually
have upgrade scripts  like this one :
https://github.com/dhis2/dhis2-utils/blob/master/resources/sql/upgrade-220.sql

Thanks

Regards,
Dhani



On Thu, Feb 18, 2016 at 11:50 AM, gerald thomas 
wrote:

> Boss,
> I think you should upgrade the data structures of postgresql database 2.20
> before migrating them to 2.22. Please read the upgrade procedures again
> because there are steps you should have done. I think it will always fail
> if your want to move them directly from 2.20 to 2.22
>
> Regards,
> Gerald
> On Feb 18, 2016 2:38 AM, "Furqonuddin Ramdhani" 
> wrote:
>
>> Hi,
>>
>> I already installed dhis 2.22 and want to migrate all my data from dhis
>> 2.20, how the best way to do it, I already tried import the metadata from
>> 2.20 to 2.22 but failed. Any suggestion ?
>>
>> Thanks
>>
>> --
>> Regards,
>> *Furqonuddin Ramdhani*
>>
>> ___
>> 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
>>
>>


-- 
Salam
*Furqonuddin Ramdhani*
___
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] Upgrade from 2.20 to 2.22

2016-02-17 Thread gerald thomas
Boss,
I think you should upgrade the data structures of postgresql database 2.20
before migrating them to 2.22. Please read the upgrade procedures again
because there are steps you should have done. I think it will always fail
if your want to move them directly from 2.20 to 2.22

Regards,
Gerald
On Feb 18, 2016 2:38 AM, "Furqonuddin Ramdhani"  wrote:

> Hi,
>
> I already installed dhis 2.22 and want to migrate all my data from dhis
> 2.20, how the best way to do it, I already tried import the metadata from
> 2.20 to 2.22 but failed. Any suggestion ?
>
> Thanks
>
> --
> Regards,
> *Furqonuddin Ramdhani*
>
> ___
> 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 21994: minor fix, add DataElementCategoryOptionCombo to list of defaults

2016-02-17 Thread noreply

revno: 21994
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Thu 2016-02-18 10:43:11 +0700
message:
  minor fix, add DataElementCategoryOptionCombo to list of defaults
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2016-02-17 09:17:36 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2016-02-18 03:43:11 +
@@ -39,6 +39,7 @@
 import org.hisp.dhis.dataelement.DataElementCategory;
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryOption;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.user.UserCredentials;
@@ -1081,6 +1082,7 @@
 defaults.put( DataElementCategory.class, getByName( DataElementCategory.class, "default" ) );
 defaults.put( DataElementCategoryCombo.class, getByName( DataElementCategoryCombo.class, "default" ) );
 defaults.put( DataElementCategoryOption.class, getByName( DataElementCategoryOption.class, "default" ) );
+defaults.put( DataElementCategoryOptionCombo.class, getByName( DataElementCategoryOptionCombo.class, "default" ) );
 
 return defaults;
 }

___
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] Upgrade from 2.20 to 2.22

2016-02-17 Thread Furqonuddin Ramdhani
Hi,

I already installed dhis 2.22 and want to migrate all my data from dhis
2.20, how the best way to do it, I already tried import the metadata from
2.20 to 2.22 but failed. Any suggestion ?

Thanks

-- 
Regards,
*Furqonuddin Ramdhani*
___
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] App Installation - SSL issue

2016-02-17 Thread Lorill Crees
Thanks all for your help with this. I will take a look at the config pieces
you mentioned.

Cheers,

Lorill

On Wed, Feb 17, 2016 at 4:08 AM, Lars Helge Øverland  wrote:

>
> Hi Lorill,
>
> DHIS 2 is looking at a header in the web request called X-Forwarded-Proto
> when determining the protocol.
>
> Are you running behind nginx? Could you check that this directive is part
> of the location block which proxy passes to Tomcat? Or, at least make sure
> this directive is not set to https (defaults to http).
>
> proxy_set_header  X-Forwarded-Proto  http;
>
> best regards,
>
> Lars
>
> On Wed, Feb 17, 2016 at 1:27 AM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Hi Lorill,
>> I think you need to modify the Tomcat server.xml file to get this to work
>> properly.
>>
>> I usually add an additional connector
>>
>>  > scheme="https"
>>connectionTimeout="2"
>>URIEncoding="UTF-8"
>>redirectPort="8443" />
>>
>>
>> and then point the reverse proxy to that.
>>
>> Regards
>> Jason
>>
>>
>> On Wed, Feb 17, 2016 at 6:40 AM, Morten Olav Hansen 
>> wrote:
>>
>>> Ok, sounds like you have a misconfigured reverse proxy? How is the
>>> internal instance set up? is it directly tomcat, or do you have apache or
>>> nginx in front of it?
>>>
>>> On Wed, Feb 17, 2016 at 12:35 PM, Lorill Crees 
>>> wrote:
>>>
 Yes - I can go directly to the app if I change the url to http, but
 within the apps other things related to urls are messed up. The icons in
 the app menu for manually installed apps also point to https so they don't
 show up, but I can manually navigate to the icons by using the url with
 http. The native DHIS 2 apps are all fine and properly reference http.

 Another thing I've just noticed is that when pulling up 
 http://[server]/api/resources,
 all the "href" resource elements are incorrectly referencing https.

 On Tue, Feb 16, 2016 at 9:20 PM, Morten Olav Hansen 
 wrote:

> Hm, ok. I haven't seen that issue before. So the app shows up, just
> that the link in the menu is wrong? What if you go there directly,
> /api/apps/{app-name} ?
>
> On Wed, Feb 17, 2016 at 12:08 PM, Lorill Crees 
> wrote:
>
>> Hi Morten,
>>
>> Yes - the baseUrl is set to *.
>>
>> Lorill
>>
>> On Tue, Feb 16, 2016 at 6:17 PM, Morten Olav Hansen > > wrote:
>>
>>> Hi
>>>
>>> Could you have a look at your manifest file and see what the baseUrl
>>> is set to? for 2.22 it should just be *
>>>
>>> On Wed, Feb 17, 2016 at 7:03 AM, Lorill Crees 
>>> wrote:
>>>
 Hi,

 We have set up an internal test instance of DHIS 2 that is not
 running via ssl. When installing apps into the instance, it is not 
 able to
 load any of the apps or resources because it is redirecting to a path 
 of
 https instead of http.

 eg:

 our website:
 http://[server]

 installed app is attempting to navigate to:

 https://[server]/api/apps/customjscss/index.html

 Is there somewhere where we need to configure this to use http?
 I've looked around but not sure if I'm missing something.

 I went into the settings and set the Server Base URL for 
 http://[server],
 restarted and reinstalled the apps but this didn't fix it.

 I also saw in the database there is an appBaseUrl setting in the
 systemsetting table but it is not in clear text so I'm not sure what 
 it's
 set to. This db was copied from another instance that is running under 
 ssl
 so maybe that is the issue? I tried deleting this property, restarting 
 and
 reinstalling the app but it still defaults to https.

 How can we fix this?

 We are using 2.22 r 21832.

 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


>>>
>>>
>>> --
>>> Morten
>>>
>>
>>
>
>
> --
> Morten
>


>>>
>>>
>>> --
>>> Morten
>>>
>>> ___
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to : dhis2-devs@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>>
>>
>>
>> --
>> Jason P. Pickering
>> email: jason.p.picker...@gmail.com
>> tel:+46764147049
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> P

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

2016-02-17 Thread noreply

revno: 21993
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2016-02-17 17:18:13 -0500
message:
  Minor
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2016-02-11 04:11:46 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2016-02-17 22:18:13 +
@@ -29,7 +29,6 @@
  */
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

___
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 21992: Approval, UI fix

2016-02-17 Thread noreply

revno: 21992
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2016-02-17 16:16:20 -0500
message:
  Approval, UI fix
modified:
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.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-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2016-02-17 19:02:47 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2016-02-17 21:16:20 +
@@ -318,8 +318,10 @@
 /**
  * Gets an approval payload object based on the given state.
  * @param ui the ui state.
+ * @param permissionProperty name of permission property which must be
+ *true for the approval record to be included.
  */
-dhis2.appr.getApprovalPayload = function( ui ) {
+dhis2.appr.getApprovalPayload = function( ui, permissionProperty ) {
 	
 	var json = {
 		ds: [ui.ds],
@@ -328,10 +330,13 @@
 	};
 	
 	$.each( ui.approvals, function( inx, ap ) {
-		json.approvals.push( {
-			ou: ap.ou,
-			aoc: ap.aoc
-		} );
+		
+		if ( ap.permissions && ap.permissions[permissionProperty] ) {
+			json.approvals.push( {
+ou: ap.ou,
+aoc: ap.aoc
+			} );
+		}
 	} );
 	
 	return json;
@@ -617,7 +622,7 @@
 	
 	var ui = dhis2.appr.getUiState(),
 		ds = dhis2.appr.dataSets[ui.ds],
-		json = dhis2.appr.getApprovalPayload( ui );
+		json = dhis2.appr.getApprovalPayload( ui, "mayApprove" );
 	
 	if ( ds.hasCategoryCombo ) {
 		$.ajax( {
@@ -658,7 +663,7 @@
 
 	var ui = dhis2.appr.getUiState(),
 		ds = dhis2.appr.dataSets[ui.ds],
-		json = dhis2.appr.getApprovalPayload( ui );
+		json = dhis2.appr.getApprovalPayload( ui, "mayUnapprove" );
 	
 	if ( ds.hasCategoryCombo ) {
 		$.ajax( {
@@ -699,7 +704,7 @@
 
 	var ui = dhis2.appr.getUiState(),
 		ds = dhis2.appr.dataSets[ui.ds],
-		json = dhis2.appr.getApprovalPayload( ui );
+		json = dhis2.appr.getApprovalPayload( ui, "mayAccept" );
 	
 	if ( ds.hasCategoryCombo ) {
 		$.ajax( {
@@ -740,7 +745,7 @@
 
 	var ui = dhis2.appr.getUiState(),
 		ds = dhis2.appr.dataSets[ui.ds],
-		json = dhis2.appr.getApprovalPayload( ui );
+		json = dhis2.appr.getApprovalPayload( ui, "mayUnaccept" );
 		
 	if ( ds.hasCategoryCombo ) {
 		$.ajax( {

___
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 1546620] Re: Resource added to dashboard display as "undefined"

2016-02-17 Thread Lars Helge Øverland
Fixed in 2.22 and trunk.

** Changed in: dhis2
Milestone: None => 2.23

** Changed in: dhis2
 Assignee: (unassigned) => Lars Helge Øverland (larshelge)

** Changed in: dhis2
   Importance: Undecided => Medium

** Changed in: dhis2
   Status: New => Fix Released

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

Title:
  Resource added to dashboard display as "undefined"

Status in DHIS:
  Fix Released

Bug description:
  Dear Developers,

  If a resource is added under Reports > Resources and then added to a
  dashboard it shows on the dashboard as name "Undefined" instead of
  displaying the resource name.

  Affects DHIS v2.22 on Chrome and Firefox browsers

  Replicated on Stable Demo 
  Version:
  2.22
  Build revision:
  21832
  Build date:
  2016-02-17 02:04

  by adding the current resource "Pivot presentation" to a dashboard and
  it displays with name "Undefined"

  
  Thanks

  Elmarie Claasen
  HISP-SA

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1546620/+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 21991: Dashboard, fixed bug, resource names were not rendered.

2016-02-17 Thread noreply

revno: 21991
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2016-02-17 14:32:19 -0500
message:
  Dashboard, fixed bug, resource names were not rendered.
modified:
  
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2016-01-21 09:39:46 +
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2016-02-17 19:32:19 +
@@ -534,7 +534,7 @@
 
 $( "#dashboard-" + dhis2.db.current() ).addClass( "currentDashboard" );
 
-$.getJSON( "../api/dashboards/" + id + "?fields=:all,dashboardItems[:all,reports[id,displayName],chart[id,displayName],map[id,displayName],reportTable[id,displayName]]&" + dhis2.util.cacheBust(), function( data )
+$.getJSON( "../api/dashboards/" + id + "?fields=:all,dashboardItems[:all,reports[id,displayName],chart[id,displayName],map[id,displayName],reportTable[id,displayName],resources[id,displayName]]&" + dhis2.util.cacheBust(), function( data )
 {
 		$d = $( "#contentList" ).empty();
 

___
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 21990: Approval. Fix for cat option combo approval UI.

2016-02-17 Thread noreply

revno: 21990
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2016-02-17 14:02:47 -0500
message:
  Approval. Fix for cat option combo approval UI.
modified:
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.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-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2016-02-16 21:19:35 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2016-02-17 19:02:47 +
@@ -46,6 +46,8 @@
 var i18n_accept = '$encoder.jsEscape( $i18n.getString( "accept" ), "'")';
 var i18n_unaccept = '$encoder.jsEscape( $i18n.getString( "unaccept" ), "'")';
 var i18n_items = '$encoder.jsEscape( $i18n.getString( "items" ), "'")';
+var i18n_please_make_selection = '$encoder.jsEscape( $i18n.getString( "please_make_selection" ), "'")';
+var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ), "'")';
 
 
 

[Dhis2-devs] [Bug 1546620] [NEW] Resource added to dashboard display as "undefined"

2016-02-17 Thread Elmarie Claasen
Public bug reported:

Dear Developers,

If a resource is added under Reports > Resources and then added to a
dashboard it shows on the dashboard as name "Undefined" instead of
displaying the resource name.

Affects DHIS v2.22 on Chrome and Firefox browsers

Replicated on Stable Demo 
Version:
2.22
Build revision:
21832
Build date:
2016-02-17 02:04

by adding the current resource "Pivot presentation" to a dashboard and
it displays with name "Undefined"


Thanks

Elmarie Claasen
HISP-SA

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

Title:
  Resource added to dashboard display as "undefined"

Status in DHIS:
  New

Bug description:
  Dear Developers,

  If a resource is added under Reports > Resources and then added to a
  dashboard it shows on the dashboard as name "Undefined" instead of
  displaying the resource name.

  Affects DHIS v2.22 on Chrome and Firefox browsers

  Replicated on Stable Demo 
  Version:
  2.22
  Build revision:
  21832
  Build date:
  2016-02-17 02:04

  by adding the current resource "Pivot presentation" to a dashboard and
  it displays with name "Undefined"

  
  Thanks

  Elmarie Claasen
  HISP-SA

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1546620/+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 1544528] Re: DataSet PUT request fails with 500 error

2016-02-17 Thread Mark Polak
Great! Thanks Morten!

On Fri, Feb 12, 2016 at 12:40 AM, Morten Olav Hansen <
1544...@bugs.launchpad.net> wrote:

> This have now been fixed in 2.22 and trunk. Please remember that
> DataEntryForm is a normal id object now, which means it -must- be
> created prior to saving the data set.
>
> ** Changed in: dhis2
>Status: Confirmed => Fix Released
>
> --
> You received this bug notification because you are a member of DHIS 2
> developers, which is subscribed to DHIS.
> https://bugs.launchpad.net/bugs/1544528
>
> Title:
>   DataSet PUT request fails with 500 error
>
> Status in DHIS:
>   Fix Released
>
> Bug description:
>   When trying to update a dataset through the API the request fails with
>   a 500 error. (Additionally the request takes quite a long time, about
>   18 seconds on the demo)
>
>   To reproduce:
>
>   GET Request
>   http://play.dhis2.org/dev/api/dataSets/lyLU2wR22tC.json?fields=:owner
>
>   Either change or don't change one of the properties
>
>   Send a PUT request using the same structure back to the server
>
>   When changing the `name` propery the request fails with:
>
>   org.postgresql.util.PSQLException: ERROR: null value in column "name"
> violates not-null constraint
> Detail: Failing row contains (424442, null, null, null, 2,
> rV5Un1vizeD, null, 2016-02-11 12:10:18.122, 2016-02-11 12:10:18.122).
>
> org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:2198)
>
> org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1927)
>
> org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:255)
>
> org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:561)
>
> org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:419)
>
> org.postgresql.jdbc2.AbstractJdbc2Statement.executeUpdate(AbstractJdbc2Statement.java:365)
>
> com.mchange.v2.c3p0.impl.NewProxyPreparedStatement.executeUpdate(NewProxyPreparedStatement.java:105)
>
> org.hibernate.engine.jdbc.internal.ResultSetReturnImpl.executeUpdate(ResultSetReturnImpl.java:186)
>
> org.hibernate.engine.jdbc.batch.internal.NonBatchingBatch.addToBatch(NonBatchingBatch.java:59)
>
> org.hibernate.persister.entity.AbstractEntityPersister.insert(AbstractEntityPersister.java:3079)
>
> org.hibernate.persister.entity.AbstractEntityPersister.insert(AbstractEntityPersister.java:3521)
>
> org.hibernate.action.internal.EntityInsertAction.execute(EntityInsertAction.java:88)
> org.hibernate.engine.spi.ActionQueue.execute(ActionQueue.java:395)
>
> org.hibernate.engine.spi.ActionQueue.executeActions(ActionQueue.java:387)
>
> org.hibernate.engine.spi.ActionQueue.executeActions(ActionQueue.java:303)
>
> org.hibernate.event.internal.AbstractFlushingEventListener.performExecutions(AbstractFlushingEventListener.java:349)
>
> org.hibernate.event.internal.DefaultFlushEventListener.onFlush(DefaultFlushEventListener.java:56)
> org.hibernate.internal.SessionImpl.flush(SessionImpl.java:1195)
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/dhis2/+bug/1544528/+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
>
___
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] Custom form translation

2016-02-17 Thread Olav Poppe
Thanks, Lars - blueprint here: 
https://blueprints.launchpad.net/dhis2/+spec/translatable-de-names-custom-forms

My initial thinking was to see if the translated names were stored/cached 
somewhere and avoid API-calls for the sake of offline support (e.g. it would 
work even if the user went offline before a specific form was opened), but in 
most cases it should not be a problem.

Regards
Olav


> 17. feb. 2016 kl. 13.20 skrev Lars Helge Øverland :
> 
> Hi Olav,
> 
> 
> 
>> On Mon, Feb 15, 2016 at 4:57 AM, Olav Poppe  wrote:
>> Hi all,
>> I’m looking at ways to support translation in a custom form (aggregate). I 
>> would like to be able to use the "built in" translation of data elements if 
>> possible, using IDs when designing the form and having a javascript function 
>> triggered by "dhis2.de.event.formReady" to put in the correct translations. 
>> I was thinking the formName, displayName or similar would be available in 
>> the dhis2 object, but I’m having difficult figuring out where.
>> 
>> Can any of the dev advice on where to read the translated names/formNames, 
>> if possible?
>> 
>> Does anyone else have any experience with something like this?
>> 
>> Thinking of it now, this might even be an idea for a general feature: just 
>> like you can add the data entry fields, totals and indicators when designing 
>> custom forms, there could be an option to add "name" label that would 
>> display the name/form name of an element, with translation when applicable.
> 
> that sounds like a great idea. Something like a variable, e.g. ${.name} 
> , which can be substituted based on the selected locale of the current user.
> 
> Feel free to write a blueprint.
> 
> You can load this from the API, which in 2.22 lets you use the "displayName" 
> property of objects which are translated to the appropriate language.
> 
> So something like this:
> 
> https://play.dhis2.org/demo/api/dataSets/BfMAe6Itzgt.json?fields=dataElements[id,displayName]
> 
> will give you the translated name of all data elements in a data set.
> 
> You could potentially load this once when data entry page is loaded from 
> within a custom form, and then substitute labels yourself.
> 
> Overview of callback events:
> 
> http://dhis2.github.io/dhis2-docs/master/en/user/html/ch06s02.html#d5e1369
> 
> 
> regards,
> 
> Lars
> 
> 
>> 
>> Regards
>> Olav
>> 
>> 
>> 
>> 
>> ___
>> 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
> 
> 
> 
> -- 
> Lars Helge Øverland
> Lead developer, DHIS 2
> University of Oslo
> Skype: larshelgeoverland
> http://www.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] Demo instance admin/district login not working

2016-02-17 Thread Elmarie Claasen
Thanks Knut

 

Regards,

 

Elmarie Claasen

Hisp logo

Project Manager

Health Information Systems Program

Tel:  041-367 1027

Cell: 082 374 2209

E-mail:   elma...@hisp.org

Skype:  elmarie.claasen52 

 

 

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

 

From: Knut Staring [mailto:knu...@gmail.com] 
Sent: 17 February 2016 03:02 PM
To: Elmarie Claasen
Cc: DHIS 2 developers
Subject: Re: [Dhis2-devs] Demo instance admin/district login not working

 

You can log in as admin with District1 as password. The other password will be 
reset tonight.

 

On Wed, Feb 17, 2016 at 1:56 PM, Elmarie Claasen  wrote:

Hi all,

 

The admin/district password is not working on https://play.dhis2.org/demo/ 

Can it be sorted out. 

For what we need to test it doesn’t work to create own user as we then don’t 
have access to what we need. 

 

Regards,

 

Elmarie Claasen

Hisp logo

Project Manager

Health Information Systems Program

Tel:  041-367 1027

Cell: 082 374 2209

E-mail:   elma...@hisp.org

Skype:  elmarie.claasen52 

 

 

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

 

 

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





 

-- 

Knut Staring

Dept. of Informatics, University of Oslo

Norway: +4791880522

Skype: knutstar

http://dhis2.org 


-- 


*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] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 21989: tracker-capture: make sure relevant information is displayed in event boxes under data entry widget

2016-02-17 Thread noreply

revno: 21989
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2016-02-17 14:08:44 +0100
message:
  tracker-capture: make sure relevant information is displayed in event boxes 
under data entry widget
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html
  
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/components/dataentry/event-layout.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html	2016-02-15 09:46:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html	2016-02-17 13:08:44 +
@@ -4,20 +4,22 @@
 
 {{'previous'| translate}}
 
-
-
-
-{{dhis2Event.sortingDate}}
-
-{{dhis2Event.orgUnitName.length > 15 ? dhis2Event.orgUnitName.substring(0,15).concat('...') : dhis2Event.orgUnitName}}
-{{dhis2Event.name.length > 15 ? dhis2Event.name.substring(0,15).concat('...') : dhis2Event.name}}
-
-{{getEventStyleLabel(dhis2Event)}}
-
-
-
-
-
+
+
+
+{{dhis2Event.sortingDate}}
+
+
+{{dhis2Event.orgUnitName}}
+
+
+{{dhis2Event.name}}
+
+{{getEventStyleLabel(dhis2Event)}}
+
+
+
+   
 
 {{'next'| translate}}
 
@@ -132,5 +134,4 @@
 
 
 
-
-
+
\ No newline at end of file

=== 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	2016-02-15 09:46:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2016-02-17 13:08:44 +
@@ -248,10 +248,13 @@
 font-weight: bold;
 }
 
-.event-container-item{
-align-self: center;
-margin: auto;
-text-align: center;
+.event-container-item {
+overflow: hidden;
+text-overflow: ellipsis;
+white-space: nowrap;
+width: inherit;
+padding-left: 5px;
+padding-right: 5px;
 }
 
 .event-container-footer{

___
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] Demo instance admin/district login not working

2016-02-17 Thread Knut Staring
Alternatively, use the snapshot demo

On Wed, Feb 17, 2016 at 2:01 PM, Knut Staring  wrote:

> You can log in as admin with District1 as password. The other password
> will be reset tonight.
>
> On Wed, Feb 17, 2016 at 1:56 PM, Elmarie Claasen  wrote:
>
>> Hi all,
>>
>>
>>
>> The admin/district password is not working on
>> https://play.dhis2.org/demo/
>>
>> Can it be sorted out.
>>
>> For what we need to test it doesn’t work to create own user as we then
>> don’t have access to what we need.
>>
>>
>>
>> Regards,
>>
>>
>>
>> *Elmarie Claasen*
>>
>> [image: Hisp logo]
>>
>> Project Manager
>>
>> Health Information Systems Program
>>
>> Tel:  041-367 1027
>>
>> Cell: 082 374 2209
>>
>> E-mail: elma...@hisp.org
>>
>> Skype:  elmarie.claasen52
>>
>>
>>
>>
>>
>> This message and any attachments are subject to a disclaimer published at 
>> http://www.hisp.org/policies.html#comms_disclaimer
>> .   Please read the disclaimer before opening any attachment or taking
>> any other action in terms of this electronic transmission.
>> If you cannot access the disclaimer, kindly send an email to 
>> disclai...@hisp.org
>> and a copy will be provided to you. By replying to this e-mail or opening
>> any attachment you agree to be bound by the provisions of the disclaimer.
>>
>>
>>
>> *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
>>
>>
>
>
> --
> Knut Staring
> Dept. of Informatics, University of Oslo
> Norway: +4791880522
> Skype: knutstar
> http://dhis2.org
>



-- 
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] Demo instance admin/district login not working

2016-02-17 Thread Knut Staring
You can log in as admin with District1 as password. The other password will
be reset tonight.

On Wed, Feb 17, 2016 at 1:56 PM, Elmarie Claasen  wrote:

> Hi all,
>
>
>
> The admin/district password is not working on https://play.dhis2.org/demo/
>
> Can it be sorted out.
>
> For what we need to test it doesn’t work to create own user as we then
> don’t have access to what we need.
>
>
>
> Regards,
>
>
>
> *Elmarie Claasen*
>
> [image: Hisp logo]
>
> Project Manager
>
> Health Information Systems Program
>
> Tel:  041-367 1027
>
> Cell: 082 374 2209
>
> E-mail: elma...@hisp.org
>
> Skype:  elmarie.claasen52
>
>
>
>
>
> This message and any attachments are subject to a disclaimer published at 
> http://www.hisp.org/policies.html#comms_disclaimer
> .   Please read the disclaimer before opening any attachment or taking any
> other action in terms of this electronic transmission.
> If you cannot access the disclaimer, kindly send an email to 
> disclai...@hisp.org
> and a copy will be provided to you. By replying to this e-mail or opening
> any attachment you agree to be bound by the provisions of the disclaimer.
>
>
>
> *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
>
>


-- 
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] Demo instance admin/district login not working

2016-02-17 Thread Elmarie Claasen
Hi all,

 

The admin/district password is not working on https://play.dhis2.org/demo/ 

Can it be sorted out. 

For what we need to test it doesn't work to create own user as we then don't
have access to what we need. 

 

Regards,

 

Elmarie Claasen

Hisp logo

Project Manager

Health Information Systems Program

Tel:  041-367 1027

Cell: 082 374 2209

E-mail:   elma...@hisp.org

Skype:  elmarie.claasen52 

 

 

This message and any attachments are subject to a disclaimer published at

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

 


-- 


*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] Custom form translation

2016-02-17 Thread Lars Helge Øverland
Hi Olav,



On Mon, Feb 15, 2016 at 4:57 AM, Olav Poppe  wrote:

> Hi all,
> I’m looking at ways to support translation in a custom form (aggregate). I
> would like to be able to use the "built in" translation of data elements if
> possible, using IDs when designing the form and having a javascript
> function triggered by "dhis2.de.event.formReady" to put in the correct
> translations. I was thinking the formName, displayName or similar would be
> available in the dhis2 object, but I’m having difficult figuring out where.
>
> Can any of the dev advice on where to read the translated names/formNames,
> if possible?
>
> Does anyone else have any experience with something like this?
>
> Thinking of it now, this might even be an idea for a general feature: just
> like you can add the data entry fields, totals and indicators when
> designing custom forms, there could be an option to add "name" label that
> would display the name/form name of an element, with translation when
> applicable.
>

that sounds like a great idea. Something like a variable, e.g.
${.name} , which can be substituted based on the selected locale of
the current user.

Feel free to write a blueprint.

You can load this from the API, which in 2.22 lets you use the
"displayName" property of objects which are translated to the appropriate
language.

So something like this:

https://play.dhis2.org/demo/api/dataSets/BfMAe6Itzgt.json?fields=dataElements[id,displayName]

will give you the translated name of all data elements in a data set.

You could potentially load this once when data entry page is loaded from
within a custom form, and then substitute labels yourself.

Overview of callback events:

http://dhis2.github.io/dhis2-docs/master/en/user/html/ch06s02.html#d5e1369


regards,

Lars



> Regards
> Olav
>
>
>
>
> ___
> 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
>



-- 
Lars Helge Øverland
Lead developer, DHIS 2
University of Oslo
Skype: larshelgeoverland
http://www.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] App Installation - SSL issue

2016-02-17 Thread Lars Helge Øverland
Hi Lorill,

DHIS 2 is looking at a header in the web request called X-Forwarded-Proto
when determining the protocol.

Are you running behind nginx? Could you check that this directive is part
of the location block which proxy passes to Tomcat? Or, at least make sure
this directive is not set to https (defaults to http).

proxy_set_header  X-Forwarded-Proto  http;

best regards,

Lars

On Wed, Feb 17, 2016 at 1:27 AM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> Hi Lorill,
> I think you need to modify the Tomcat server.xml file to get this to work
> properly.
>
> I usually add an additional connector
>
>   scheme="https"
>connectionTimeout="2"
>URIEncoding="UTF-8"
>redirectPort="8443" />
>
>
> and then point the reverse proxy to that.
>
> Regards
> Jason
>
>
> On Wed, Feb 17, 2016 at 6:40 AM, Morten Olav Hansen 
> wrote:
>
>> Ok, sounds like you have a misconfigured reverse proxy? How is the
>> internal instance set up? is it directly tomcat, or do you have apache or
>> nginx in front of it?
>>
>> On Wed, Feb 17, 2016 at 12:35 PM, Lorill Crees  wrote:
>>
>>> Yes - I can go directly to the app if I change the url to http, but
>>> within the apps other things related to urls are messed up. The icons in
>>> the app menu for manually installed apps also point to https so they don't
>>> show up, but I can manually navigate to the icons by using the url with
>>> http. The native DHIS 2 apps are all fine and properly reference http.
>>>
>>> Another thing I've just noticed is that when pulling up 
>>> http://[server]/api/resources,
>>> all the "href" resource elements are incorrectly referencing https.
>>>
>>> On Tue, Feb 16, 2016 at 9:20 PM, Morten Olav Hansen 
>>> wrote:
>>>
 Hm, ok. I haven't seen that issue before. So the app shows up, just
 that the link in the menu is wrong? What if you go there directly,
 /api/apps/{app-name} ?

 On Wed, Feb 17, 2016 at 12:08 PM, Lorill Crees 
 wrote:

> Hi Morten,
>
> Yes - the baseUrl is set to *.
>
> Lorill
>
> On Tue, Feb 16, 2016 at 6:17 PM, Morten Olav Hansen 
> wrote:
>
>> Hi
>>
>> Could you have a look at your manifest file and see what the baseUrl
>> is set to? for 2.22 it should just be *
>>
>> On Wed, Feb 17, 2016 at 7:03 AM, Lorill Crees 
>> wrote:
>>
>>> Hi,
>>>
>>> We have set up an internal test instance of DHIS 2 that is not
>>> running via ssl. When installing apps into the instance, it is not able 
>>> to
>>> load any of the apps or resources because it is redirecting to a path of
>>> https instead of http.
>>>
>>> eg:
>>>
>>> our website:
>>> http://[server]
>>>
>>> installed app is attempting to navigate to:
>>>
>>> https://[server]/api/apps/customjscss/index.html
>>>
>>> Is there somewhere where we need to configure this to use http? I've
>>> looked around but not sure if I'm missing something.
>>>
>>> I went into the settings and set the Server Base URL for 
>>> http://[server],
>>> restarted and reinstalled the apps but this didn't fix it.
>>>
>>> I also saw in the database there is an appBaseUrl setting in the
>>> systemsetting table but it is not in clear text so I'm not sure what 
>>> it's
>>> set to. This db was copied from another instance that is running under 
>>> ssl
>>> so maybe that is the issue? I tried deleting this property, restarting 
>>> and
>>> reinstalling the app but it still defaults to https.
>>>
>>> How can we fix this?
>>>
>>> We are using 2.22 r 21832.
>>>
>>> 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
>>>
>>>
>>
>>
>> --
>> Morten
>>
>
>


 --
 Morten

>>>
>>>
>>
>>
>> --
>> Morten
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>


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

Re: [Dhis2-devs] Tracker Capture in Android Studio

2016-02-17 Thread Marriette Katarahweire
Thanks, Arthur.

Let me try that and get back to you all.


Kind regards,
Marriette Katarahweire

On Wed, Feb 17, 2016 at 1:09 PM, Arthur Gwatidzo  wrote:

>
> Hi Marriette,
>
>
> A. In your git local repos, make sure that you do "git checkout
> 2.22-legacy" just after cloning & before building...like what Erling has
> mentioned
>
> B. Before building, make sure when you open your "dhis2-android-sdk"
> project in Android Studio, you end up with a project folder arrangement
> similar to what is in the attached picture :
>
> If A & B has been done then you can try each one of the following
> solutions  at a time:
>
> 1.Add the following IML file (attached) into your parent trackercapture
> app folder , like this:
> =>Parent folder name: trackercapture
> => Subfolder name : dhis2-android-sdk
> => Subfolder name : dhis2-android-trackercapture
> => .iml
>
> Then build your project
>
> 2.In your Android Studio, from the menu click "Run", "Edit Configurations"
> - then ensure you have configured your target device and/or added
> your emulator
>
> Then build your project
>
> 3. Ensure that you have something like this :
> =>Parent folder name: trackercapture
> => Subfolder name : dhis2-android-sdk(with cloned contents)
> => Subfolder name : dhis2-android-trackercapture (with cloned contents)
> Do not change the names of the sub-folders.The gradle scripts are
> referencing the two project folders by the names  "dhis2-android-sdk" &
> "dhis2-android-trackercapture"
> Then build your project
>
> 4. Make sure when you clone the two repos dhis2-android-sdk and
> dhis2-android-trackercapture, you dont add the repos in other folders.
> By this I mean do not have a folder structure like:
> =>dhis2-android-sdk
> => dhis2-android-sdk (with cloned contents)
> =>dhis2-android-trackercapture
> => dhis2-android-trackercapture (with cloned contents)
>
> The scenario above will cause problems and Gradle  build will fail
>
>
>
>
>  Regards,
>
>
>
> Arthur  Gwatidzo
>
>
>
>  [image: Description: cid:image001.png@01CCADE7.1D5397D0]
>
> Software Development and Information Systems
>
> *Software Developer*
>
> *Health Information Systems Program - SA*
>
> ---
>
> Email:   arthu...@hisp.org
>
> Cell:  +27(0)768983930
>
> Skype:  Arthur.Gwatidzo
>
> Web*: *   http://www.hisp.org
>
>
>
> 66 Rigel Avenue North, Waterkloof Ridge
> Pretoria, 0181
> South Africa
> E -25.7847787 S 28.2347984
>
> 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.
>
>
> On Wed, Feb 17, 2016 at 10:46 AM, Marriette Katarahweire <
> kmarrie...@gmail.com> wrote:
>
>> Hello all,
>> I am trying to load the Tracker Capture app in Android studio but I get
>> the following error:
>>
>> Gradle sync failed: Configuration with name 'default' not found.
>>  Consult IDE log for more details (Help | Show Log)
>>
>> Is there anything I am not doing right?
>>
>> Thanks
>>
>> Kind regards,
>> Marriette Katarahweire
>>
>> ___
>> 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
>>
>>
>
>
> --
>
>
>
>
>
> Kind Regards,
>
>
>
> Arthur  Gwatidzo
>
>
>
>  [image: Description: cid:image001.png@01CCADE7.1D5397D0]
>
> Software Development and Information Systems
>
> *Health Information Systems Program*
>
> ---
>
> Email:   arthu...@hisp.org
>
> Cell:  +27(0)768983930
>
> Skype:  Arthur.Gwatidzo
>
> Web*: *   http://www.hisp.org
>
>
>
> 66 Rigel Avenue North, Waterkloof Ridge
> Pretoria, 0181
> South Africa
> E -25.7847787 S 28.2347984
>
> 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.
>
> *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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 21988: SMS Scheduler moved to Administration

2016-02-17 Thread noreply

revno: 21988
committer: Zubair Asghar
branch nick: dhis2
timestamp: Wed 2016-02-17 11:10:29 +0100
message:
  SMS Scheduler moved to Administration
added:
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/scheduling/
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/scheduling/SendScheduledMessageTask.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SettingKey.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/SchedulingManager.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/Scheduler.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/ScheduleTasksAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.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-api/src/main/java/org/hisp/dhis/setting/SettingKey.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SettingKey.java	2016-02-09 15:26:32 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SettingKey.java	2016-02-17 10:10:29 +
@@ -100,6 +100,7 @@
 LAST_SUCCESSFUL_ANALYTICS_TABLES_UPDATE( "keyLastSuccessfulAnalyticsTablesUpdate", Date.class ),
 LAST_SUCCESSFUL_RESOURCE_TABLES_UPDATE( "keyLastSuccessfulResourceTablesUpdate", Date.class ),
 LAST_SUCCESSFUL_MONITORING( "keyLastSuccessfulMonitoring", Date.class ),
+LAST_SUCCESSFUL_SMS_SCHEDULING( "lastSuccessfulSmsScheduling", Date.class ),
 HELP_PAGE_LINK( "helpPageLink", "../dhis-web-commons-about/help.action", String.class ),
 ACCEPTANCE_REQUIRED_FOR_APPROVAL( "keyAcceptanceRequiredForApproval", Boolean.FALSE, Boolean.class ),
 SYSTEM_NOTIFICATIONS_EMAIL( "keySystemNotificationsEmail" ),

=== added directory 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms'
=== added directory 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/scheduling'
=== added file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/scheduling/SendScheduledMessageTask.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/scheduling/SendScheduledMessageTask.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/scheduling/SendScheduledMessageTask.java	2016-02-17 10:10:29 +
@@ -0,0 +1,294 @@
+package org.hisp.dhis.sms.scheduling;
+
+/*
+ * Copyright (c) 2004-2016, 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 DAMAG

Re: [Dhis2-devs] Tracker Capture in Android Studio

2016-02-17 Thread Arthur Gwatidzo
Hi Marriette,


A. In your git local repos, make sure that you do "git checkout
2.22-legacy" just after cloning & before building...like what Erling has
mentioned

B. Before building, make sure when you open your "dhis2-android-sdk"
project in Android Studio, you end up with a project folder arrangement
similar to what is in the attached picture :

If A & B has been done then you can try each one of the following solutions
 at a time:

1.Add the following IML file (attached) into your parent trackercapture app
folder , like this:
=>Parent folder name: trackercapture
=> Subfolder name : dhis2-android-sdk
=> Subfolder name : dhis2-android-trackercapture
=> .iml

Then build your project

2.In your Android Studio, from the menu click "Run", "Edit Configurations"
- then ensure you have configured your target device and/or added
your emulator

Then build your project

3. Ensure that you have something like this :
=>Parent folder name: trackercapture
=> Subfolder name : dhis2-android-sdk(with cloned contents)
=> Subfolder name : dhis2-android-trackercapture (with cloned contents)
Do not change the names of the sub-folders.The gradle scripts are
referencing the two project folders by the names  "dhis2-android-sdk" &
"dhis2-android-trackercapture"
Then build your project

4. Make sure when you clone the two repos dhis2-android-sdk and
dhis2-android-trackercapture, you dont add the repos in other folders.
By this I mean do not have a folder structure like:
=>dhis2-android-sdk
=> dhis2-android-sdk (with cloned contents)
=>dhis2-android-trackercapture
=> dhis2-android-trackercapture (with cloned contents)

The scenario above will cause problems and Gradle  build will fail




 Regards,



Arthur  Gwatidzo



 [image: Description: cid:image001.png@01CCADE7.1D5397D0]

Software Development and Information Systems

*Software Developer*

*Health Information Systems Program - SA*

---

Email:   arthu...@hisp.org

Cell:  +27(0)768983930

Skype:  Arthur.Gwatidzo

Web*: *   http://www.hisp.org



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

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.


On Wed, Feb 17, 2016 at 10:46 AM, Marriette Katarahweire <
kmarrie...@gmail.com> wrote:

> Hello all,
> I am trying to load the Tracker Capture app in Android studio but I get
> the following error:
>
> Gradle sync failed: Configuration with name 'default' not found.
>  Consult IDE log for more details (Help | Show Log)
>
> Is there anything I am not doing right?
>
> Thanks
>
> Kind regards,
> Marriette Katarahweire
>
> ___
> 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
>
>


-- 





Kind Regards,



Arthur  Gwatidzo



 [image: Description: cid:image001.png@01CCADE7.1D5397D0]

Software Development and Information Systems

*Health Information Systems Program*

---

Email:   arthu...@hisp.org

Cell:  +27(0)768983930

Skype:  Arthur.Gwatidzo

Web*: *   http://www.hisp.org



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

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.

-- 


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


...iml
Description: Binary data
___
Mailing list: https://launchpad.net/~dhis2-devs

Re: [Dhis2-devs] Tracker Capture in Android Studio

2016-02-17 Thread Erling Fjeldstad
If you're using Linux or Mac you can do it from the terminal with 'git
checkout 2.22-legacy'.If you're using Windows you need to download a tool
for that. Go to Google and search for 'git for Windows' and select the
first result. Remember that you'll need to be in the dhis2-android-sdk (and
-trackercapture) folder when you're typing this command).

Regards,
Erling - DHIS2 -Android Team

On Wed, Feb 17, 2016 at 10:48 AM, Marriette Katarahweire <
kmarrie...@gmail.com> wrote:

> Sorry, but where do I switch from?
>
> Thanks
>
>
> Kind regards,
> Marriette Katarahweire
>
> On Wed, Feb 17, 2016 at 12:44 PM, Erling Fjeldstad 
> wrote:
>
>> Okay, nice. Did you try to switch to the branch 2.22-legacy in both
>> projects?
>>
>> Regards,
>> Erling - DHIS2 - Android Team
>>
>> On Wed, Feb 17, 2016 at 10:15 AM, Marriette Katarahweire <
>> kmarrie...@gmail.com> wrote:
>>
>>> Thanks for the response, Erling.
>>> Yes, I cloned both and they are in one folder. I downloaded and
>>> following instructions from this link
>>>
>>> https://github.com/dhis2/dhis2-android-trackercapture
>>>
>>>
>>>
>>>
>>> Kind regards,
>>> Marriette Katarahweire
>>>
>>> On Wed, Feb 17, 2016 at 11:52 AM, Erling Fjeldstad 
>>> wrote:
>>>
 Hi Marriette,
 Did you clone both the tracker capture project and the sdk project from
 Github?
 Also, try to do a 'git checkout 2.22-legacy' on both projects.

 Regards,
 Erling - DHIS 2 Android Team

 On Wed, Feb 17, 2016 at 9:46 AM, Marriette Katarahweire <
 kmarrie...@gmail.com> wrote:

> Hello all,
> I am trying to load the Tracker Capture app in Android studio but I
> get the following error:
>
> Gradle sync failed: Configuration with name 'default' not found.
>  Consult IDE log for more details (Help | Show Log)
>
> Is there anything I am not doing right?
>
> Thanks
>
> Kind regards,
> Marriette Katarahweire
>
> ___
> 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] Tracker Capture in Android Studio

2016-02-17 Thread Marriette Katarahweire
Sorry, but where do I switch from?

Thanks


Kind regards,
Marriette Katarahweire

On Wed, Feb 17, 2016 at 12:44 PM, Erling Fjeldstad  wrote:

> Okay, nice. Did you try to switch to the branch 2.22-legacy in both
> projects?
>
> Regards,
> Erling - DHIS2 - Android Team
>
> On Wed, Feb 17, 2016 at 10:15 AM, Marriette Katarahweire <
> kmarrie...@gmail.com> wrote:
>
>> Thanks for the response, Erling.
>> Yes, I cloned both and they are in one folder. I downloaded and
>> following instructions from this link
>>
>> https://github.com/dhis2/dhis2-android-trackercapture
>>
>>
>>
>>
>> Kind regards,
>> Marriette Katarahweire
>>
>> On Wed, Feb 17, 2016 at 11:52 AM, Erling Fjeldstad 
>> wrote:
>>
>>> Hi Marriette,
>>> Did you clone both the tracker capture project and the sdk project from
>>> Github?
>>> Also, try to do a 'git checkout 2.22-legacy' on both projects.
>>>
>>> Regards,
>>> Erling - DHIS 2 Android Team
>>>
>>> On Wed, Feb 17, 2016 at 9:46 AM, Marriette Katarahweire <
>>> kmarrie...@gmail.com> wrote:
>>>
 Hello all,
 I am trying to load the Tracker Capture app in Android studio but I get
 the following error:

 Gradle sync failed: Configuration with name 'default' not found.
  Consult IDE log for more details (Help | Show Log)

 Is there anything I am not doing right?

 Thanks

 Kind regards,
 Marriette Katarahweire

 ___
 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] Tracker Capture in Android Studio

2016-02-17 Thread Erling Fjeldstad
Okay, nice. Did you try to switch to the branch 2.22-legacy in both
projects?

Regards,
Erling - DHIS2 - Android Team

On Wed, Feb 17, 2016 at 10:15 AM, Marriette Katarahweire <
kmarrie...@gmail.com> wrote:

> Thanks for the response, Erling.
> Yes, I cloned both and they are in one folder. I downloaded and following
> instructions from this link
>
> https://github.com/dhis2/dhis2-android-trackercapture
>
>
>
>
> Kind regards,
> Marriette Katarahweire
>
> On Wed, Feb 17, 2016 at 11:52 AM, Erling Fjeldstad 
> wrote:
>
>> Hi Marriette,
>> Did you clone both the tracker capture project and the sdk project from
>> Github?
>> Also, try to do a 'git checkout 2.22-legacy' on both projects.
>>
>> Regards,
>> Erling - DHIS 2 Android Team
>>
>> On Wed, Feb 17, 2016 at 9:46 AM, Marriette Katarahweire <
>> kmarrie...@gmail.com> wrote:
>>
>>> Hello all,
>>> I am trying to load the Tracker Capture app in Android studio but I get
>>> the following error:
>>>
>>> Gradle sync failed: Configuration with name 'default' not found.
>>>  Consult IDE log for more details (Help | Show Log)
>>>
>>> Is there anything I am not doing right?
>>>
>>> Thanks
>>>
>>> Kind regards,
>>> Marriette Katarahweire
>>>
>>> ___
>>> 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 21987: wip, create for object bundle commits

2016-02-17 Thread noreply

revno: 21987
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2016-02-17 16:17:36 +0700
message:
  wip, create for object bundle commits
added:
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.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/IdentifiableObjectManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java	2016-01-08 16:32:09 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java	2016-02-17 09:17:36 +
@@ -169,6 +169,8 @@
 
  boolean isAttributeValueUnique( Class klass, T object, Attribute attribute, String value );
 
+Map, IdentifiableObject> getDefaults();
+
 // -
 // NO ACL
 // -

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-02-17 05:33:53 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-02-17 09:17:36 +
@@ -29,6 +29,9 @@
  */
 
 import org.hisp.dhis.common.IdentifiableObject;
+import org.hisp.dhis.dataelement.DataElementCategory;
+import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryOption;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -43,6 +46,8 @@
 {
 private Map, Map>> map = new HashMap<>();
 
+private Map, IdentifiableObject> defaults = new HashMap<>();
+
 public Preheat()
 {
 }
@@ -160,4 +165,20 @@
 
 return this;
 }
+
+public Map, IdentifiableObject> getDefaults()
+{
+return defaults;
+}
+
+public void setDefaults( Map, IdentifiableObject> defaults )
+{
+this.defaults = defaults;
+}
+
+public static boolean isDefault( IdentifiableObject object )
+{
+return (DataElementCategory.class.isInstance( object ) || DataElementCategoryOption.class.isInstance( object )
+|| DataElementCategoryCombo.class.isInstance( object )) && "default".equals( object.getName() );
+}
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2016-01-08 16:32:09 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2016-02-17 09:17:36 +
@@ -36,6 +36,9 @@
 import org.hisp.dhis.common.NameableObject.NameableProperty;
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.common.exception.InvalidIdentifierReferenceException;
+import org.hisp.dhis.dataelement.DataElementCategory;
+import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryOption;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.user.UserCredentials;
@@ -383,10 +386,10 @@
 
 return (List) store.getByUid( uids );
 }
-
+
 @Override
 @SuppressWarnings( "unchecked" )
-public  List getByCode(Class clazz, Collection codes) 
+public  List getByCode( Class clazz, Collection codes )
 {
 GenericIdentifiableObjectStore store = getIdentifiableObjectStore( clazz );
 
@@ -1071,6 +1074,17 @@
 return store != null && store.isAttributeValueUnique( object, attribute, value );
 }
 
+@Override
+public Map, IdentifiableObject> getDefaults()
+{
+Map, IdentifiableObject> defaults = new HashMap<>();
+defaults.put( DataElementCategory.class, getByName( DataElementCategory.class, "default" ) );
+defaults.put( DataElementCategoryCombo.class, getByName( DataElementCategoryComb

Re: [Dhis2-devs] [Dhis2-users] Issue with the new data entry form in tracker capture

2016-02-17 Thread Ese Egerega
Thanks Markus

On Wed, Feb 17, 2016 at 8:56 AM,  wrote:

> Hi Ese, thanks for reporting.
> This is a bug. It was fixed in trunk earlier, and will be backported.
>
> Markus
>
> Den 17. feb. 2016 kl. 07.39 skrev Ese Egerega :
>
> Hello Devs,
>
> Many thanks for the new improvements in the tracker but there is something
> you may want to look into.
>
> With the new design of the data entry form, the name of the program stage
> is listed after "date" and "Org unit". This may cause problems during data
> entry because the person entering data may not see the name of the program
> stage in cases where you have a long org unit name (see snapshot below).
>
> The snapshot below is supposed to display "Birth" and "Baby Postnatal" but
> as you can see, the program stage does not show up because of the length of
> the org unit name.
>
> In my opinion, the old design is better for the following reasons:
>
>- The name of the program stage is displayed clearly
>- Program stages are in different "boxes" so you can navigate events
>in a program stage separate from other stages
>
> Thanks,
> Ese
>
> 
>
>
> ___
> 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] Tracker Capture in Android Studio

2016-02-17 Thread Marriette Katarahweire
Thanks for the response, Erling.
Yes, I cloned both and they are in one folder. I downloaded and following
instructions from this link

https://github.com/dhis2/dhis2-android-trackercapture




Kind regards,
Marriette Katarahweire

On Wed, Feb 17, 2016 at 11:52 AM, Erling Fjeldstad  wrote:

> Hi Marriette,
> Did you clone both the tracker capture project and the sdk project from
> Github?
> Also, try to do a 'git checkout 2.22-legacy' on both projects.
>
> Regards,
> Erling - DHIS 2 Android Team
>
> On Wed, Feb 17, 2016 at 9:46 AM, Marriette Katarahweire <
> kmarrie...@gmail.com> wrote:
>
>> Hello all,
>> I am trying to load the Tracker Capture app in Android studio but I get
>> the following error:
>>
>> Gradle sync failed: Configuration with name 'default' not found.
>>  Consult IDE log for more details (Help | Show Log)
>>
>> Is there anything I am not doing right?
>>
>> Thanks
>>
>> Kind regards,
>> Marriette Katarahweire
>>
>> ___
>> 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] [Dhis2-users] Search and list entities by program incidence date

2016-02-17 Thread Abyot Asalefew Gizaw
Sure, will have this. But you have to wait until the next release (2.23).

---
Thank you,
Abyot.

On Wed, Feb 17, 2016 at 10:13 AM, Nayeem Al Mifthah 
wrote:

> Dear Abyot and others
> Please have a look in this issue. It is very important for us.
> On 17 Feb 2016 15:08, "Abyot Asalefew Gizaw"  wrote:
>
>> Hi Nayeem,
>>
>> What we have currently is search by program enrollment date. You can see
>> this from advanced search.
>>
>> We will try to add search by program incidence data for the upcoming
>> release.
>>
>> ---
>> Thank you,
>> Abyot.
>>
>> On Wed, Feb 17, 2016 at 9:44 AM, Nayeem Al Mifthah 
>> wrote:
>>
>>> Dear All
>>> Is it possible to search and list entities by program incidence date. It
>>> is a very important for our tracking..
>>>
>>>
>>> *Nayeem Al Mifthah*
>>> Consultant (Team Leader of HMIS)
>>> Management Information System
>>> Directorate General of Health Services (DGHS), Bangladesh
>>> Supported by: UNICEF-Bangladesh
>>> Email: n.mift...@gmail.com  | nay...@mis.dghs.gov.bd
>>> Cell:+8801914030574
>>> Skype: nayeem.a.m
>>>
>>> ___
>>> 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] [Bug 1546416] [NEW] cannot login to play.dhis2.org/demo/ with "admin/district"

2016-02-17 Thread Knut Staring
Seems like someone (probably Hassan Abdirizak) has changed the password.

It will be restored to "district" tonight, but for now I have set it to
"District1" (because of the restrictions, which the default password does
not respect...)

Knut

On Wed, Feb 17, 2016 at 9:49 AM, Knut Staring  wrote:

> Seems to affect only the "stable demo", not the snapshot demo
>
> On Wed, Feb 17, 2016 at 9:48 AM, Knut Staring  wrote:
>
>> Same here
>>
>> On Wed, Feb 17, 2016 at 9:12 AM, Brian O'Donnell 
>> wrote:
>>
>>> Public bug reported:
>>>
>>> Two computers tried and failed to login using default credentials,
>>> admin=user, district=pw
>>> Each one with cache cleared, no caps, and incognito mode.
>>> We can access by creating a unique account,but that does not grant
>>> access to all demo apps.
>>> Please advise.
>>>
>>> Brian
>>>
>>> ** Affects: dhis2
>>>  Importance: Undecided
>>>  Status: New
>>>
>>>
>>> ** Tags: login
>>>
>>> --
>>> You received this bug notification because you are a member of DHIS 2
>>> developers, which is subscribed to DHIS.
>>> https://bugs.launchpad.net/bugs/1546416
>>>
>>> Title:
>>>   cannot login to play.dhis2.org/demo/ with "admin/district"
>>>
>>> Status in DHIS:
>>>   New
>>>
>>> Bug description:
>>>   Two computers tried and failed to login using default credentials,
>>> admin=user, district=pw
>>>   Each one with cache cleared, no caps, and incognito mode.
>>>   We can access by creating a unique account,but that does not grant
>>> access to all demo apps.
>>>   Please advise.
>>>
>>>   Brian
>>>
>>> To manage notifications about this bug go to:
>>> https://bugs.launchpad.net/dhis2/+bug/1546416/+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
>>
>
>
>
> --
> Knut Staring
> Dept. of Informatics, University of Oslo
> Norway: +4791880522
> Skype: knutstar
> http://dhis2.org
>



-- 
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] [Dhis2-users] Search and list entities by program incidence date

2016-02-17 Thread Nayeem Al Mifthah
Dear Abyot and others
Please have a look in this issue. It is very important for us.
On 17 Feb 2016 15:08, "Abyot Asalefew Gizaw"  wrote:

> Hi Nayeem,
>
> What we have currently is search by program enrollment date. You can see
> this from advanced search.
>
> We will try to add search by program incidence data for the upcoming
> release.
>
> ---
> Thank you,
> Abyot.
>
> On Wed, Feb 17, 2016 at 9:44 AM, Nayeem Al Mifthah 
> wrote:
>
>> Dear All
>> Is it possible to search and list entities by program incidence date. It
>> is a very important for our tracking..
>>
>>
>> *Nayeem Al Mifthah*
>> Consultant (Team Leader of HMIS)
>> Management Information System
>> Directorate General of Health Services (DGHS), Bangladesh
>> Supported by: UNICEF-Bangladesh
>> Email: n.mift...@gmail.com  | nay...@mis.dghs.gov.bd
>> Cell:+8801914030574
>> Skype: nayeem.a.m
>>
>> ___
>> 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] [Dhis2-users] Search and list entities by program incidence date

2016-02-17 Thread Abyot Asalefew Gizaw
Hi Nayeem,

What we have currently is search by program enrollment date. You can see
this from advanced search.

We will try to add search by program incidence data for the upcoming
release.

---
Thank you,
Abyot.

On Wed, Feb 17, 2016 at 9:44 AM, Nayeem Al Mifthah 
wrote:

> Dear All
> Is it possible to search and list entities by program incidence date. It
> is a very important for our tracking..
>
>
> *Nayeem Al Mifthah*
> Consultant (Team Leader of HMIS)
> Management Information System
> Directorate General of Health Services (DGHS), Bangladesh
> Supported by: UNICEF-Bangladesh
> Email: n.mift...@gmail.com  | nay...@mis.dghs.gov.bd
> Cell:+8801914030574
> Skype: nayeem.a.m
>
> ___
> 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] Tracker Capture in Android Studio

2016-02-17 Thread Erling Fjeldstad
Hi Marriette,
Did you clone both the tracker capture project and the sdk project from
Github?
Also, try to do a 'git checkout 2.22-legacy' on both projects.

Regards,
Erling - DHIS 2 Android Team

On Wed, Feb 17, 2016 at 9:46 AM, Marriette Katarahweire <
kmarrie...@gmail.com> wrote:

> Hello all,
> I am trying to load the Tracker Capture app in Android studio but I get
> the following error:
>
> Gradle sync failed: Configuration with name 'default' not found.
>  Consult IDE log for more details (Help | Show Log)
>
> Is there anything I am not doing right?
>
> Thanks
>
> Kind regards,
> Marriette Katarahweire
>
> ___
> 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] [Bug 1546416] [NEW] cannot login to play.dhis2.org/demo/ with "admin/district"

2016-02-17 Thread Knut Staring
Seems to affect only the "stable demo", not the snapshot demo

On Wed, Feb 17, 2016 at 9:48 AM, Knut Staring  wrote:

> Same here
>
> On Wed, Feb 17, 2016 at 9:12 AM, Brian O'Donnell 
> wrote:
>
>> Public bug reported:
>>
>> Two computers tried and failed to login using default credentials,
>> admin=user, district=pw
>> Each one with cache cleared, no caps, and incognito mode.
>> We can access by creating a unique account,but that does not grant access
>> to all demo apps.
>> Please advise.
>>
>> Brian
>>
>> ** Affects: dhis2
>>  Importance: Undecided
>>  Status: New
>>
>>
>> ** Tags: login
>>
>> --
>> You received this bug notification because you are a member of DHIS 2
>> developers, which is subscribed to DHIS.
>> https://bugs.launchpad.net/bugs/1546416
>>
>> Title:
>>   cannot login to play.dhis2.org/demo/ with "admin/district"
>>
>> Status in DHIS:
>>   New
>>
>> Bug description:
>>   Two computers tried and failed to login using default credentials,
>> admin=user, district=pw
>>   Each one with cache cleared, no caps, and incognito mode.
>>   We can access by creating a unique account,but that does not grant
>> access to all demo apps.
>>   Please advise.
>>
>>   Brian
>>
>> To manage notifications about this bug go to:
>> https://bugs.launchpad.net/dhis2/+bug/1546416/+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
>



-- 
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] [Bug 1546416] [NEW] cannot login to play.dhis2.org/demo/ with "admin/district"

2016-02-17 Thread Knut Staring
Same here

On Wed, Feb 17, 2016 at 9:12 AM, Brian O'Donnell 
wrote:

> Public bug reported:
>
> Two computers tried and failed to login using default credentials,
> admin=user, district=pw
> Each one with cache cleared, no caps, and incognito mode.
> We can access by creating a unique account,but that does not grant access
> to all demo apps.
> Please advise.
>
> Brian
>
> ** Affects: dhis2
>  Importance: Undecided
>  Status: New
>
>
> ** Tags: login
>
> --
> You received this bug notification because you are a member of DHIS 2
> developers, which is subscribed to DHIS.
> https://bugs.launchpad.net/bugs/1546416
>
> Title:
>   cannot login to play.dhis2.org/demo/ with "admin/district"
>
> Status in DHIS:
>   New
>
> Bug description:
>   Two computers tried and failed to login using default credentials,
> admin=user, district=pw
>   Each one with cache cleared, no caps, and incognito mode.
>   We can access by creating a unique account,but that does not grant
> access to all demo apps.
>   Please advise.
>
>   Brian
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/dhis2/+bug/1546416/+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


[Dhis2-devs] Tracker Capture in Android Studio

2016-02-17 Thread Marriette Katarahweire
Hello all,
I am trying to load the Tracker Capture app in Android studio but I get the
following error:

Gradle sync failed: Configuration with name 'default' not found.
 Consult IDE log for more details (Help | Show Log)

Is there anything I am not doing right?

Thanks

Kind regards,
Marriette Katarahweire
___
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] Search and list entities by program incidence date

2016-02-17 Thread Nayeem Al Mifthah
Dear All
Is it possible to search and list entities by program incidence date. It is
a very important for our tracking..


*Nayeem Al Mifthah*
Consultant (Team Leader of HMIS)
Management Information System
Directorate General of Health Services (DGHS), Bangladesh
Supported by: UNICEF-Bangladesh
Email: n.mift...@gmail.com  | nay...@mis.dghs.gov.bd
Cell:+8801914030574
Skype: nayeem.a.m
___
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 1546416] [NEW] cannot login to play.dhis2.org/demo/ with "admin/district"

2016-02-17 Thread Brian O'Donnell
Public bug reported:

Two computers tried and failed to login using default credentials, admin=user, 
district=pw
Each one with cache cleared, no caps, and incognito mode.
We can access by creating a unique account,but that does not grant access to 
all demo apps.
Please advise.

Brian

** Affects: dhis2
 Importance: Undecided
 Status: New


** Tags: login

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

Title:
  cannot login to play.dhis2.org/demo/ with "admin/district"

Status in DHIS:
  New

Bug description:
  Two computers tried and failed to login using default credentials, 
admin=user, district=pw
  Each one with cache cleared, no caps, and incognito mode.
  We can access by creating a unique account,but that does not grant access to 
all demo apps.
  Please advise.

  Brian

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1546416/+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