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

2015-10-01 Thread noreply
revno: 20422 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 09:51:29 +0200 message: Minor modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResource.java dhis-2/dhis-api/src/main/ja

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20423: All CRUD operations for app data-store. Missing authorities for checking access to namespaces.

2015-10-01 Thread noreply
Merge authors: Stian Sandvold (stian-sandvold) revno: 20423 [merge] committer: Stian Sandvold branch nick: dhis2 timestamp: Thu 2015-10-01 10:24:46 +0200 message: All CRUD operations for app data-store. Missing authorities for checki

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20424: KeyJsonValue, code style

2015-10-01 Thread noreply
revno: 20424 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 11:03:27 +0200 message: KeyJsonValue, code style modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValue.java dhis-2/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20425: Renamed impl of FileResourceContentStore

2015-10-01 Thread noreply
revno: 20425 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Thu 2015-10-01 11:45:57 +0200 message: Renamed impl of FileResourceContentStore removed: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20426: InputUtils is moved from web-api to service-dxf2; Web-api now filters events based on attribute o...

2015-10-01 Thread noreply
revno: 20426 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Thu 2015-10-01 12:05:20 +0200 message: InputUtils is moved from web-api to service-dxf2; Web-api now filters events based on attribute option combo. added: d

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20427: event-capture: Events can now be filtered/taged using attribute option combo.

2015-10-01 Thread noreply
revno: 20427 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Thu 2015-10-01 12:07:00 +0200 message: event-capture: Events can now be filtered/taged using attribute option combo. removed: dhis-2/dhis-web/dhis-web-api/sr

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

2015-10-01 Thread noreply
revno: 20428 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Thu 2015-10-01 12:26:37 +0200 message: Minor refactoring modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20429: dataentry module now refers the new InputUtils from service-dxf2

2015-10-01 Thread noreply
revno: 20429 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Thu 2015-10-01 13:35:44 +0200 message: dataentry module now refers the new InputUtils from service-dxf2 modified: dhis-2/dhis-services/dhis-service-dxf2/src/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20430: Input utils. Fixed compilation error. Removed code duplication.

2015-10-01 Thread noreply
revno: 20430 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 13:42:39 +0200 message: Input utils. Fixed compilation error. Removed code duplication. modified: dhis-2/dhis-services/dhis-service-dxf2/src/ma

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20431: Code style

2015-10-01 Thread noreply
revno: 20431 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 13:44:04 +0200 message: Code style modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/InputUtils.java d

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20432: Deprecation fix

2015-10-01 Thread noreply
revno: 20432 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 13:50:55 +0200 message: Deprecation fix modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/Defa

Re: [Dhis2-devs] [Dhis2-users] Program rule does not seem to be working

2015-10-01 Thread David Muturi
Hi Markus and team, I am writing a program rule that evaluates a yes only value and hides another field I am wondering which response to use i.e. ==true or =='yes'. Is there anywhere these rules are documented for each of the data values? rgds David 2015-09-23 9:46 GMT+03:00 Markus Bekken : > H

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20433: Use ui confirmation dialog instead of window.confirm

2015-10-01 Thread noreply
revno: 20433 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Thu 2015-10-01 14:35:14 +0200 message: Use ui confirmation dialog instead of window.confirm modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhi

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20434: Indentation consistency

2015-10-01 Thread noreply
revno: 20434 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Thu 2015-10-01 14:37:19 +0200 message: Indentation consistency modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm -

Re: [Dhis2-devs] [Dhis2-users] Program rule does not seem to be working

2015-10-01 Thread Markus Bekken
Hi David! As you probably know, the program rules has their own chapter in the user documentation. https://www.dhis2.org/doc/snapshot/en/user/html/dhis2_user_manual_en_full.html#d5e7293 But you have probably also noticed that the doc is pretty thin still. There will be more doc added in next rele

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20435: when no attribute option and category combo are specified, use default combo

2015-10-01 Thread noreply
revno: 20435 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Thu 2015-10-01 15:06:22 +0200 message: when no attribute option and category combo are specified, use default combo modified: dhis-2/dhis-services/dhis-servi

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20436: Support commons, javadoc

2015-10-01 Thread noreply
revno: 20436 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 15:14:27 +0200 message: Support commons, javadoc modified: dhis-2/dhis-support/dhis-support-commons/pom.xml dhis-2/dhis-support/dhis-support-

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20437: Moved most file entry logic from form.js to separate file entry.fileresource.js

2015-10-01 Thread noreply
revno: 20437 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Thu 2015-10-01 15:22:12 +0200 message: Moved most file entry logic from form.js to separate file entry.fileresource.js added: dhis-2/dhis-web/dhis-web-data

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20438: Removed custom Function classes, better handles by java 8 functional interfaces.

2015-10-01 Thread noreply
revno: 20438 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 15:31:25 +0200 message: Removed custom Function classes, better handles by java 8 functional interfaces. removed: dhis-2/dhis-support/dhis-sup

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20439: Added entry.fileresource.js to cacheManifest

2015-10-01 Thread noreply
revno: 20439 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Thu 2015-10-01 15:35:04 +0200 message: Added entry.fileresource.js to cacheManifest modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cach

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20440: tracker-capture: minor style fix

2015-10-01 Thread noreply
revno: 20440 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Thu 2015-10-01 15:43:16 +0200 message: tracker-capture: minor style fix modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/comp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20441: tracker-capture: show tei fetching progress indicator only when tei is being fetched

2015-10-01 Thread noreply
revno: 20441 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Thu 2015-10-01 15:52:52 +0200 message: tracker-capture: show tei fetching progress indicator only when tei is being fetched modified: dhis-2/dhis-web/dhis-w

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20442: Commons, javadoc

2015-10-01 Thread noreply
revno: 20442 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 15:57:42 +0200 message: Commons, javadoc modified: dhis-2/dhis-support/dhis-support-commons/pom.xml dhis-2/dhis-support/dhis-support-commons/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20444: Added tests for KeyJsonValueStore, as well as refactoring code to follow code style and making th...

2015-10-01 Thread noreply
Merge authors: Stian Sandvold (stian-sandvold) revno: 20444 [merge] committer: Stian Sandvold branch nick: dhis2 timestamp: Thu 2015-10-01 16:41:20 +0200 message: Added tests for KeyJsonValueStore, as well as refactoring code to foll

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20443: Moved Counter.java to import-export. Removed CompositeCounter.java. Added javadoc.

2015-10-01 Thread noreply
revno: 20443 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 16:39:13 +0200 message: Moved Counter.java to import-export. Removed CompositeCounter.java. Added javadoc. removed: dhis-2/dhis-support/dhis-s

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20445: Commons, javadoc

2015-10-01 Thread noreply
revno: 20445 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 16:47:02 +0200 message: Commons, javadoc modified: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/Appe

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20446: Commons, added package-info.

2015-10-01 Thread noreply
revno: 20446 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 17:07:20 +0200 message: Commons, added package-info. added: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collec

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20447: Removed unused class

2015-10-01 Thread noreply
revno: 20447 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 17:15:55 +0200 message: Removed unused class removed: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/Excepti

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20448: Unused import

2015-10-01 Thread noreply
revno: 20448 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 17:20:39 +0200 message: Unused import modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/hibernate/Hiber

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20449: ExpressionUtils. Adjusted numeric regex.

2015-10-01 Thread noreply
revno: 20449 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 17:36:32 +0200 message: ExpressionUtils. Adjusted numeric regex. modified: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis

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

2015-10-01 Thread noreply
revno: 20450 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 17:59:38 +0200 message: Minor modified: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/PathUtils.java -- l

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20451: OrganisationUnit.mergeWith, fix for parent

2015-10-01 Thread noreply
revno: 20451 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 18:00:29 +0200 message: OrganisationUnit.mergeWith, fix for parent modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/Organ

[Dhis2-devs] Removing Organization Units

2015-10-01 Thread gerald thomas
Dear All, I am trying to remove Organisation Units from DHIS2 versions 2.18 and 2.20 but i am getting error. But i had already removed the datasets associated with these Organisation Units but i still can't remove them. Please can someone help. -- Regards, Gerald _

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread gerald thomas
Dear All, The error message: "Object not deleted because it is associated by objects of type DataValue" On 10/1/15, gerald thomas wrote: > Dear All, > I am trying to remove Organisation Units from DHIS2 versions 2.18 and > 2.20 but i am getting error. > > But i had already removed the datasets as

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread Dapo Adejumo
Hi Gerald, What error are you getting? If you have data associated with these org units, you will not be able to remove them until you delete the data in the database (even if you have removed the datasets). ……… Regards, Dapo Adejumo +2348033683677 Skype : dapojorge - Origi

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread gerald thomas
Dear Dapo, What is the command to remove those data from the database as per organisation unit? Please help me. Regards, Gerald On Oct 1, 2015 16:16, "Dapo Adejumo" wrote: > Hi Gerald, > What error are you getting? > If you have data associated with these org units, you will not be able to > rem

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread Bob Jolliffe
Gerald you would need to do this with an sql delete command. Before you do you should be 100% sure that you do really want to delete the data - maybe make a backup first. You need to find the primary key (organisationunitid) of the orgunit you want to delete. Say it is 5677 Then: DELETE FROM da

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20452: Program indicator list, fix

2015-10-01 Thread noreply
revno: 20452 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 18:46:42 +0200 message: Program indicator list, fix modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread Dapo Adejumo
Hi Gerald, You can run this command in the db - DELETE FROM datavalue WHERE sourceid = 'X'; Replace X with the orgunit id. Hope that helps. ……… Regards, Dapo Adejumo +2348033683677 Skype : dapojorge - Original Message - From: "gerald thomas" To: "Dapo Adejumo"

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread gerald thomas
Dear Bob, Thanks very much for your help. Will get back to you with feedback. Regards, Gerald On Oct 1, 2015 4:49 PM, "Bob Jolliffe" wrote: > Gerald you would need to do this with an sql delete command. Before > you do you should be 100% sure that you do really want to delete the > data - maybe

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread Jason Pickering
Hi Gerald, Removal of orgunits with associated reports or charts is non trivial, due to the use of the "sort_order" in these resources. It will cause a null pointer exception if you just delete the orgunit. I have added two functions to the dhis2-utils repo, which handle the deletion and merging

Re: [Dhis2-devs] Removing Organization Units

2015-10-01 Thread gerald thomas
Dear Jason, Thanks for help Regards, Gerald On Oct 1, 2015 5:07 PM, "Jason Pickering" wrote: > Hi Gerald, > > > Removal of orgunits with associated reports or charts is non trivial, due > to the use of the "sort_order" in these resources. It will cause a null > pointer exception if you just del

[Dhis2-devs] dhis2-support-commons is out

2015-10-01 Thread Lars Helge Øverland
Hi all, we have released dhis2-support-commons which is a Java utility development library. It provides collection interface implementations, utilities for expression evaluation, streams, text evaluation and more. This might come in handy when developing DHIS 2 related Java projects, such as Andro

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20453: Analytics, fixed bug, restore of aggregate charts with program indicators fix

2015-10-01 Thread noreply
revno: 20453 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 19:52:03 +0200 message: Analytics, fixed bug, restore of aggregate charts with program indicators fix modified: dhis-2/dhis-api/src/main/java/or

Re: [Dhis2-devs] [Dhis2-users] Program rule does not seem to be working

2015-10-01 Thread David Muturi
Hi Markus, Many thanks, yes I am well aware of the documentation but some of the questions raised is due to the fact one is unable to find the answers in the documentation. rgds David 2015-10-01 15:48 GMT+03:00 Markus Bekken : > Hi David! > As you probably know, the program rules has their own ch

Re: [Dhis2-devs] [Dhis2-users] Web Portal with DHIS2

2015-10-01 Thread Lars Helge Øverland
Hi Guy, for starters I recommend that you start reading up on how to use the analytics plugins here: https://www.dhis2.org/doc/snapshot/en/developer/html/ch01s23.html Using these you can embed pivots, charts and maps in web portals with live data from DHIS 2. You can also have a look at the Web

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20454: Applied patch from Tran. Renames ProgramStage.reportDateDescription > excecutionDateLabel

2015-10-01 Thread noreply
revno: 20454 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 20:17:35 +0200 message: Applied patch from Tran. Renames ProgramStage.reportDateDescription > excecutionDateLabel modified: dhis-2/dhis-api/sr

Re: [Dhis2-devs] [Bug 1457198] [NEW] analytics fails with mysql on 2.18 - 2.19 - 2.20

2015-10-01 Thread Olav P
Hi devs, this bug seems to affect all versions up to 2.20. I have tested with two databases, but it would be intersting to hear if anyone is using MySQL with version 2.18 or later are able to make analytics work. Olav > 2. jun. 2015 kl. 10.17 skrev Olav Poppe : > > Hi, has anyone had a chance

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20456: Bits and bobs

2015-10-01 Thread noreply
revno: 20456 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Thu 2015-10-01 20:46:36 +0200 message: Bits and bobs modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.filere

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20455: Using dbms manager for clearing session

2015-10-01 Thread noreply
revno: 20455 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2015-10-01 20:41:31 +0200 message: Using dbms manager for clearing session modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/da

[Dhis2-devs] change value in Individual tracker

2015-10-01 Thread channara rin
Hi DHIS2 Friends, I have a question on individual tracker section. If i change some value of individual in attribute/dataelements in program stage and then i run manual aggregation, it is still aggregate the old value to data entry. so how can show new value in data entry section, after i changed v

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20457: minor csv mapper fix

2015-10-01 Thread noreply
revno: 20457 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2015-10-02 10:59:43 +0700 message: minor csv mapper fix modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20458: use lambda in apps authority provider

2015-10-01 Thread noreply
revno: 20458 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2015-10-02 11:31:15 +0700 message: use lambda in apps authority provider modified: dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/au