date:20140827

[Dhis2-devs] how can use single event with registration for many time.

2014-08-27 Thread rin.channara

Hi all,

DO you know how to create program with “single event with registration” that 
allow register many time with one patient?


thank you

CHANNARA___
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] how can use single event with registration for many time.

2014-08-27 Thread Morten Olav Hansen

Hi

Do you mean multiple ACTIVE enrollments?

--
Morten


On Wed, Aug 27, 2014 at 3:10 PM,  wrote:

>  Hi all,
> DO you know how to create program with “single event with registration”
> that allow register many time with one patient?
>
> thank you
> CHANNARA
>
> ___
> 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] how can use single event with registration for many time.

2014-08-27 Thread Abyot Gizaw

Hi,

The program types are self explanatory to some extent.

1. "Single event with registration" is just single event - there is no such
thing as "many times" in here.
2. "Single event without registration" is the same as 1 except that there
is no registration of patients or tracked entity instance
3. "Multiple events with registration" is the same as 1 but here you have
many events.

So if you want a single event but that allows you to record data many times
- then go for 3, create a single program stage and make this program stage
repeatable.

Thank you,
Abyot.


On Wed, Aug 27, 2014 at 10:15 AM, Morten Olav Hansen 
wrote:

> Hi
>
> Do you mean multiple ACTIVE enrollments?
>
> --
> Morten
>
>
> On Wed, Aug 27, 2014 at 3:10 PM,  wrote:
>
>>  Hi all,
>> DO you know how to create program with “single event with registration”
>> that allow register many time with one patient?
>>
>> thank you
>> CHANNARA
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>
> ___
> Mailing list: https://launchpad.net/~dhis2-users
> Post to : dhis2-us...@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-users
> More help   : https://help.launchpad.net/ListHelp
>
>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] [Dhis2-users] how can use single event with registration for many time.

2014-08-27 Thread rin.channara

Oh, I see..

thank you abyot






Sent from Windows Mail





From: Abyot Gizaw
Sent: ‎Wednesday‎, ‎August‎ ‎27‎, ‎2014 ‎3‎:‎42‎ ‎Evening
To: Morten Olav Hansen
Cc: channara rin, DHIS 2 Users list, DHIS 2 Developers list





Hi,



The program types are self explanatory to some extent. 




1. "Single event with registration" is just single event - there is no such 
thing as "many times" in here. 

2. "Single event without registration" is the same as 1 except that there is no 
registration of patients or tracked entity instance

3. "Multiple events with registration" is the same as 1 but here you have many 
events.




So if you want a single event but that allows you to record data many times - 
then go for 3, create a single program stage and make this program stage 
repeatable.




Thank you,

Abyot.




On Wed, Aug 27, 2014 at 10:15 AM, Morten Olav Hansen  wrote:


Hi



Do you mean multiple ACTIVE enrollments?




--
Morten





On Wed, Aug 27, 2014 at 3:10 PM,  wrote:







Hi all,

DO you know how to create program with “single event with registration” that 
allow register many time with one patient?




thank you

CHANNARA


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



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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16531: Help page link, minor fix

2014-08-27 Thread noreply


revno: 16531
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 11:20:22 +0200
message:
  Help page link, minor fix
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java	2014-08-26 10:51:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java	2014-08-27 09:20:22 +
@@ -28,6 +28,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.lang.Validate;
+import org.hisp.dhis.common.BaseIdentifiableObject;
+import org.hisp.dhis.common.DxfNamespaces;
+import org.hisp.dhis.common.annotation.Scanned;
+import org.hisp.dhis.common.view.DetailedView;
+import org.hisp.dhis.common.view.ExportView;
+import org.hisp.dhis.dataelement.DataElement;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
@@ -36,19 +48,6 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
-import org.apache.commons.lang.Validate;
-import org.hisp.dhis.common.BaseIdentifiableObject;
-import org.hisp.dhis.common.DxfNamespaces;
-import org.hisp.dhis.common.annotation.Scanned;
-import org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * An Expression is the expression of e.g. a validation rule. It consist of a
  * String representation of the rule as well as references to the data elements

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java	2014-08-26 07:44:39 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java	2014-08-27 09:20:22 +
@@ -29,6 +29,8 @@
  */
 
 import com.opensymphony.xwork2.Action;
+
+import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.configuration.Configuration;
 import org.hisp.dhis.configuration.ConfigurationService;
 import org.hisp.dhis.dataelement.DataElementService;
@@ -241,7 +243,7 @@
 systemSettingManager.saveSystemSetting( KEY_CALENDAR, calendar );
 systemSettingManager.saveSystemSetting( KEY_DATE_FORMAT, dateFormat );
 systemSettingManager.saveSystemSetting( KEY_ANALYTICS_MAINTENANCE_MODE, analyticsMaintenanceMode );
-systemSettingManager.saveSystemSetting( KEY_HELP_PAGE_LINK, helpPageLink );
+systemSettingManager.saveSystemSetting( KEY_HELP_PAGE_LINK, StringUtils.trimToNull( helpPageLink ) );
 
 Configuration configuration = configurationService.getConfiguration();
 

___
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 16532: Email test, fixed nullpointer vulnerability

2014-08-27 Thread noreply


revno: 16532
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 11:30:03 +0200
message:
  Email test, fixed nullpointer vulnerability
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.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/email/DefaultEmailService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java	2014-08-15 07:40:20 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java	2014-08-27 09:30:03 +
@@ -31,6 +31,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.hisp.dhis.message.MessageSender;
 import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.user.CurrentUserService;
@@ -100,7 +101,8 @@
 @Override
 public void sendTestEmail( )
 {
-String instanceName = systemSettingManager.getSystemSetting( SystemSettingManager.KEY_APPLICATION_TITLE ).toString();
+String instanceName = StringUtils.trimToEmpty( (String) systemSettingManager.getSystemSetting( SystemSettingManager.KEY_APPLICATION_TITLE ) );
+
 sendEmail( TEST_EMAIL_SUBJECT, TEST_EMAIL_TEXT + instanceName, null, currentUserService.getCurrentUser(), true );
 }
 }

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16533: Test email, minor

2014-08-27 Thread noreply


revno: 16533
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 11:49:23 +0200
message:
  Test email, minor
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.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/email/DefaultEmailService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java	2014-08-27 09:30:03 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java	2014-08-27 09:49:23 +
@@ -47,6 +47,7 @@
 {
 private static final String TEST_EMAIL_SUBJECT = "Test email from DHIS 2";
 private static final String TEST_EMAIL_TEXT = "This is an automatically generated email from ";
+private static final String TEST_DEFAULT_SENDER = "DHIS 2";
 
 // -
 // Dependencies
@@ -101,7 +102,8 @@
 @Override
 public void sendTestEmail( )
 {
-String instanceName = StringUtils.trimToEmpty( (String) systemSettingManager.getSystemSetting( SystemSettingManager.KEY_APPLICATION_TITLE ) );
+String instanceName = StringUtils.defaultIfBlank( (String) systemSettingManager.getSystemSetting( 
+SystemSettingManager.KEY_APPLICATION_TITLE ), TEST_DEFAULT_SENDER );
 
 sendEmail( TEST_EMAIL_SUBJECT, TEST_EMAIL_TEXT + instanceName, null, currentUserService.getCurrentUser(), true );
 }

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16534: DebugUtils, fixed nullpointer vulnerability

2014-08-27 Thread noreply


revno: 16534
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 12:35:22 +0200
message:
  DebugUtils, fixed nullpointer vulnerability
modified:
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.java	2014-08-15 07:40:20 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.java	2014-08-27 10:35:22 +
@@ -137,10 +137,14 @@
 public static String getStackTrace( Throwable t )
 {
 StringWriter sw = new StringWriter();
-PrintWriter pw = new PrintWriter( sw, true );
-t.printStackTrace( pw );
-pw.flush();
-sw.flush();
+
+if ( t != null )
+{
+PrintWriter pw = new PrintWriter( sw, true );
+t.printStackTrace( pw );
+pw.flush();
+sw.flush();
+}
 
 return sw.toString();
 }

___
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 16535: tracker capture - reports menu reorganization

2014-08-27 Thread noreply


revno: 16535
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2014-08-27 12:38:27 +0200
message:
  tracker capture - reports menu reorganization
added:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html	2014-08-26 16:39:26 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html	2014-08-27 10:38:27 +
@@ -1,19 +1,13 @@
 
 
 
-
-   
-
-
-{{'menu' | translate}}
-
-
-
-{{'registration_and_data_entry' | translate}}
-{{'program_summary_report' | translate}}
-{{'visit_schedule' | translate}}
-{{'lost_to_followup' | translate}}
-
+   
+
+
+{{'registration_and_data_entry' | translate}}
+{{'reports' | translate}}
+
+  
 
 
 
@@ -25,15 +19,16 @@
 
 
 
+{{'program_summary_report' | translate}}

 
-
+
 
 
-
+
 {{'program' | translate}}
 
-
+
 
 
 
-{{'org_unit'| translate}}
- 
+{{'org_unit'| translate}}
+ 
  {{'SELECTED'| translate}}
  {{'CHILDREN'| translate}}
  {{'DESCENDANTS'| translate}}
@@ -55,8 +50,8 @@
 
 
 
-
-
+
+
 
 
  
@@ -75,12 +70,12 @@
 
 
 
-
+
 {{'no_program_exists_report'| translate}} 
 
 
 
-
+
 {{'please_select_program_report'| translate}} 
 
 

=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html	1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html	2014-08-27 10:38:27 +
@@ -0,0 +1,25 @@
+   
+
+
+{{'registration_and_data_entry' | translate}}
+{{'reports' | translate}}
+
+
+
+
+{{'tracker_reports' | translate}}
+
+
+ {{'program_summary' | translate}}
+{{'program_summary_description' | translate}}
+
+
+ {{'upcoming_events' | translate}}
+{{'upcoming_events_description' | translate}}
+
+
+ {{'overdue_events' | translate}}
+{{'overdue_events_description' | translate}}
+
+
+
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-08-26 16:39:26 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-08-27 10:38:27 +
@@ -113,10 +113,18 @@
 "custom_form": "Custom form",
 "default_form": "Default form",
 "menu": "Menu",
-"report": "Report",
-"_report": "report", 
+"tracker_reports": "Tracker Reports",
+"reports": "Reports",
 "registration_and_data_entry": "Registration and Data Entry",
 "program_summary_report": "Program Summary Report",
+"program_summary": "Program Summary",
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16536: Analytics table, nullpointer vulnerability

2014-08-27 Thread noreply


revno: 16536
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 13:16:41 +0200
message:
  Analytics table, nullpointer vulnerability
modified:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.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-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java	2014-08-15 07:40:20 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java	2014-08-27 11:16:41 +
@@ -129,8 +129,8 @@
 
 Date latest = getLatestData();
 
-earliest = earliest.before( MIN_EARLIEST_DATE ) ? MIN_EARLIEST_DATE : earliest;
-latest = latest.after( MAX_LATEST_DATE ) ? MAX_LATEST_DATE : latest;
+earliest = earliest != null && earliest.before( MIN_EARLIEST_DATE ) ? MIN_EARLIEST_DATE : earliest;
+latest = latest != null && latest.after( MAX_LATEST_DATE ) ? MAX_LATEST_DATE : latest;
 
 return getTables( earliest, latest );
 }

___
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 16537: tracker capture - more reorganization/modularization of controllers

2014-08-27 Thread noreply


revno: 16537
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2014-08-27 13:18:35 +0200
message:
  tracker capture - more reorganization/modularization of controllers
removed:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html
added:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/summary-report-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/summary-report.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/column-display-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/header-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/leftbar-menu-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/report-types-controller.js
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.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
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js	2014-08-26 16:39:26 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js	1970-01-01 00:00:00 +
@@ -1,389 +0,0 @@
-trackerCapture.controller('ReportController',
-function($scope,
-$modal,
-DateUtils,
-EventUtils,
-TEIService,
-TEIGridService,
-TranslationService,
-AttributesFactory,
-ProgramFactory,
-DHIS2EventFactory,
-storage) {
-
-TranslationService.translate();
-
-$scope.today = DateUtils.format(moment());
-
-$scope.ouModes = [{name: 'SELECTED'}, {name: 'CHILDREN'}, {name: 'DESCENDANTS'}, {name: 'ACCESSIBLE'}]; 
-$scope.selectedOuMode = $scope.ouModes[0];
-$scope.report = {};
-
-//watch for selection of org unit from tree
-$scope.$watch('selectedOrgUnit', function() {
-if( angular.isObject($scope.selectedOrgUnit)){
-storage.set('SELECTED_OU', $scope.selectedOrgUnit);
-$scope.loadPrograms($scope.selectedOrgUnit);
-}
-});
-
-//load programs associated with the selected org unit.
-$scope.loadPrograms = function(orgUnit) {
-
-$scope.selectedOrgUnit = orgUnit;
-
-if (angular.isObject($scope.selectedOrgUnit)) {   
-
-ProgramFactory.getAll().then(function(programs){
-$scope.programs = [];
-angular.forEach(programs, function(program){
-if(program.organisationUnits.hasOwnProperty($scope.selectedOrgUnit.id)){
-$scope.programs.push(program);
-}
-});
-
-if($scope.programs.length === 0){
-$scope.selectedProgram = null;
-}
-else{
-if($scope.selectedProgram){
-angular.forEach($scope.programs, function(program){
-if(program.id === $scope.selectedProgram.id){
-$scope.selectedProgram = program;
-}
-});
-}
-else{
-if($scope.programs.length === 1){
-$scope.selectedProgram = $scope.programs[0];
-}
-}
-} 
-});
-}
-};
-
-//watch for selection of org unit from tree
-$scope.$watch('selectedProgram', function() {
-if( angular.isObject($scope.selectedProgram)){
-$scope.dataReady = fals

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16538: PT DV GIS ER EV i18n, using the properties files from r16440.

2014-08-27 Thread noreply

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 16538 [merge]
committer: Jan Henrik Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 13:29:11 +0200
message:
  PT DV GIS ER EV i18n, using the properties files from r16440.
removed:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n/en.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/i18n/en.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/en.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/es.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/fr.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_ar.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_es.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_fr.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_id.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_my.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_pt.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_pt_BR.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_ru.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_tg.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_vi.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_zh.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/pt.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/en.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/es.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/fr.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_ru.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/pt.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/en.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/es.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/fr.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_ar.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_es.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_fr.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_id.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_my.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_pt.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_pt_BR.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_ru.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_tg.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_vi.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_zh.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/pt.json
added:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n/en.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/i18n/en.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/ar.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/en.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/es.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/fr.p

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16539: Refactored test which failed at random due to relying on collection ordering.

2014-08-27 Thread noreply


revno: 16539
committer: Halvdan Hoem Grelland 
branch nick: dhis2
timestamp: Wed 2014-08-27 13:57:02 +0200
message:
  Refactored test which failed at random due to relying on collection ordering.
modified:
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.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/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java	2014-08-15 07:40:20 +
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java	2014-08-27 11:57:02 +
@@ -589,30 +589,37 @@
 throws Exception
 {
 OrganisationUnitGroup group1 = new OrganisationUnitGroup( "organisationUnitGroupName1" );
-int gid1 = organisationUnitGroupService.addOrganisationUnitGroup( group1 );
-
 OrganisationUnitGroup group2 = new OrganisationUnitGroup( "organisationUnitGroupName2" );
-int gid2 = organisationUnitGroupService.addOrganisationUnitGroup( group2 );
-
 OrganisationUnitGroup group3 = new OrganisationUnitGroup( "organisationUnitGroupName3" );
-int gid3 = organisationUnitGroupService.addOrganisationUnitGroup( group3 );
-
 OrganisationUnitGroup group4 = new OrganisationUnitGroup( "organisationUnitGroupName4" );
-int gid4 = organisationUnitGroupService.addOrganisationUnitGroup( group4 );
-
-Iterator iterator = organisationUnitGroupService.getAllOrganisationUnitGroups().iterator();
-
-OrganisationUnitGroup organisationUnitGroup1 = iterator.next();
-assertTrue( organisationUnitGroup1.getId() == gid1 );
-
-OrganisationUnitGroup organisationUnitGroup2 = iterator.next();
-assertTrue( organisationUnitGroup2.getId() == gid2 );
-
-OrganisationUnitGroup organisationUnitGroup3 = iterator.next();
-assertTrue( organisationUnitGroup3.getId() == gid3 );
-
-OrganisationUnitGroup organisationUnitGroup4 = iterator.next();
-assertTrue( organisationUnitGroup4.getId() == gid4 );
+
+Collection groups = new ArrayList<>();
+groups.add( group1 );
+groups.add( group2 );
+groups.add( group3 );
+groups.add( group4 );
+
+ArrayList groupIds = new ArrayList<>();
+
+for ( OrganisationUnitGroup group : groups )
+{
+groupIds.add( organisationUnitGroupService.addOrganisationUnitGroup( group ) );
+}
+
+Collection fetchedGroups = organisationUnitGroupService.getAllOrganisationUnitGroups();
+
+ArrayList fetchedGroupIds = new ArrayList<>();
+
+for ( OrganisationUnitGroup group : fetchedGroups )
+{
+fetchedGroupIds.add( group.getId() );
+}
+
+assertTrue( fetchedGroups.size() == 4 );
+assertTrue( fetchedGroups.containsAll( groups ));
+
+assertTrue( fetchedGroupIds.size() == 4 );
+assertTrue( fetchedGroupIds.containsAll( groupIds ) );
 }
 
 @Test

___
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] Java properties files in Javascript clients

2014-08-27 Thread Jan Henrik Øverland

Hi, the following function can be used to parse Java properties files (e.g.
for i18n) on the key=value format in a Javascript client. So far it handles

- unicoded characters on the format \u
- untrimmed keys and values
- values with quotation marks
- any number of line breaks
- lines that are not key=value such as date/timestamps

Please feel free to improve it.

parseProperties = function(responseText) {
var i18n = {}, rows;

if (typeof responseText !== 'string') {
return i18n;
}

rows = responseText.split(/\n/);

for (var i = 0, a; i < rows.length; i++) {
if (!!(typeof rows[i] === 'string' && rows[i].length &&
rows[i].indexOf('=') !== -1)) {
a = rows[i].split('=');
i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'')
+ '"');
}
}

return i18n;
};
___
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] Java properties files in Javascript clients

2014-08-27 Thread Jan Henrik Øverland

I have made the script available in commons. Do an ajax request to
/dhis-web-commons/javascripts/javaProperties.js to get it in your
app.


On Wed, Aug 27, 2014 at 2:14 PM, Jan Henrik Øverland <
janhenrik.overl...@gmail.com> wrote:

> Hi, the following function can be used to parse Java properties files
> (e.g. for i18n) on the key=value format in a Javascript client. So far it
> handles
>
> - unicoded characters on the format \u
> - untrimmed keys and values
> - values with quotation marks
> - any number of line breaks
> - lines that are not key=value such as date/timestamps
>
> Please feel free to improve it.
>
> parseProperties = function(responseText) {
> var i18n = {}, rows;
>
> if (typeof responseText !== 'string') {
> return i18n;
> }
>
> rows = responseText.split(/\n/);
>
> for (var i = 0, a; i < rows.length; i++) {
> if (!!(typeof rows[i] === 'string' && rows[i].length &&
> rows[i].indexOf('=') !== -1)) {
> a = rows[i].split('=');
> i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'')
> + '"');
> }
> }
>
> return i18n;
> };
>
___
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 16540: Add pagination and standard filter box for SQL Views list.

2014-08-27 Thread noreply


revno: 16540
committer: Tran Chau
branch nick: dhis2
timestamp: Wed 2014-08-27 19:50:13 +0700
message:
   Add pagination and standard filter box for SQL Views list.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java	2014-03-18 08:10:10 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java	2014-08-27 12:50:13 +
@@ -67,6 +67,8 @@
 
 String makeUpForQueryStatement( String query );
 
+int getSqlViewCountByName( String name );
+
 // -
 // SqlView Expanded
 // -

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java	2014-03-18 08:10:10 +
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java	2014-08-27 12:50:13 +
@@ -134,6 +134,12 @@
 return query.replaceAll( "\\s*;\\s+", ";" ).replaceAll( ";+", ";" ).replaceAll( "\\s+", " " ).trim();
 }
 
+@Override
+public int getSqlViewCountByName( String name )
+{
+return sqlViewStore.getCountLikeName( name );
+}
+
 // -
 // SqlView expanded
 // -

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java	2014-08-15 07:40:20 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java	2014-08-27 12:50:13 +
@@ -28,18 +28,22 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import com.opensymphony.xwork2.Action;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.paging.ActionPagingSupport;
 import org.hisp.dhis.sqlview.SqlView;
 import org.hisp.dhis.sqlview.SqlViewService;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author Dang Duy Hieu
  */
 public class GetSqlViewListAction
-implements Action
+extends ActionPagingSupport
 {
 // -
 // Dependencies
@@ -63,6 +67,18 @@
 return sqlViewObjectList;
 }
 
+private String key;
+
+public String getKey()
+{
+return key;
+}
+
+public void setKey( String key )
+{
+this.key = key;
+}
+
 // -
 // Action implementation
 // -
@@ -70,8 +86,23 @@
 public String execute()
 throws Exception
 {
-sqlViewObjectList = new ArrayList<>( sqlViewService.getAllSqlViews() );
+if ( isNotBlank( key ) )
+{
+this.paging = createPaging( sqlViewService.getSqlViewCountByName( key ) );
+sqlViewObjectList = new ArrayList<>(
+sqlViewService.getSqlViewsBetweenByName( key, paging.getStartPos(),
+paging.getPageSize() ) );
+}
+else
+{
+this.paging = createPaging( sqlViewService.getSqlViewCount() );
+
+sqlViewObjectList = new ArrayList<>( sqlViewService.getSqlViewsBetween(
+paging.getStartPos(), paging.getPageSize() ) );
+}
 
+Collections.sort( sqlViewObjectList, IdentifiableObjectNameCompar

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16541: tracker capture - reports WIP

2014-08-27 Thread noreply


revno: 16541
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2014-08-27 14:55:29 +0200
message:
  tracker capture - reports WIP
removed:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/summary-report-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/summary-report.html
added:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/report-types.html
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/leftbar-menu-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/report-types-controller.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js	1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js	2014-08-27 12:55:29 +
@@ -0,0 +1,6 @@
+trackerCapture.controller('OverdueEventsController',
+function(TranslationService) {
+
+TranslationService.translate();   
+
+});
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2014-08-27 12:55:29 +
@@ -0,0 +1,23 @@
+
+
+
+   
+
+
+{{'registration_and_data_entry' | translate}}
+{{'reports' | translate}}
+
+  
+
+
+
+
+
+
+
+
+
+
+
+{{'overdue_events' | translate}}
+

=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js	1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js	2014-08-27 12:55:29 +
@@ -0,0 +1,389 @@
+trackerCapture.controller('ProgramSummaryController',
+function($scope,
+$modal,
+DateUtils,
+EventUtils,
+TEIService,
+TEIGridService,
+TranslationService,
+AttributesFactory,
+ProgramFactory,
+DHIS2EventFactory,
+storage) {
+
+TranslationService.translate();
+
+$scope.today = DateUtils.format(moment());
+
+$scope.ouModes = [{name: 'SELECTED'}, {name: 'CHILDREN'}, {name: 'DESCENDANTS'}, {name: 'ACCESSIBLE'}]; 
+$scope.selectedOuMode = $scope.ouModes[0];
+$scope.report = {};
+
+//watch for selection of org unit from tree
+$scope.$watch('selectedOrgUnit', function() {
+if( angular.isObject($scope.selectedOrgUnit)){
+storage.set('SELECTED_OU', $scope.selectedOrgUnit);
+$scope.loadPrograms($scope.selectedOrgUnit);
+}
+});
+
+//load programs associated with the selected org unit.
+$scope.loadPrograms = function(orgUnit) {

[Dhis2-devs] Reporting Issue with Yearly & Average Data Elements

2014-08-27 Thread Maheed Ramadan

Dear All,

I was testing the demo database and found the following issue.

As you see in the 1st screenshot, I added the "Total Population" data element 
to the pivot table, with the last 12 months on the left side.
Here all values of the data element are the same and this is logical since the 
"Total Population" data element is configured to use "Yearly & Average" 
aggregation method

However, if we remove the "period" element to the Filter section, the pivot 
will show the "Total population" in one cell with the value = 11,089,164 which 
is the Sum of the data element value for both year 2013 and 2014. (see 2nd 
picture below).

Is this a correct calculation? I think the result should stay the same since it 
should be averaging the values in both years and the value should stay = 
5,544,582.

Awaiting your feedback if this is a bug or not.



[cid:image002.jpg@01CFC20F.D7060E30]


[cid:image007.jpg@01CFC20F.D7060E30]



Thank you.

Maheed.

___
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 16542: PT DV GIS ER EV restructured.

2014-08-27 Thread noreply

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 16542 [merge]
committer: Jan Henrik Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 15:12:22 +0200
message:
  PT DV GIS ER EV restructured.
removed:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonmin.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonminValues.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroupSets.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonGeoJsonFiles.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInitialize.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMap.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapView.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapViews.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonPeriods.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMaps.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnitGroups.vm
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/void.vm
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/
added:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js
renamed:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n/ 
=> dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/images/
 => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/images/
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/index.html
 => 
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/manifest.webapp
 => 
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/
 => 
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/styles/
 => dhis-2/dhis-w

Re: [Dhis2-devs] Reporting Issue with Yearly & Average Data Elements

2014-08-27 Thread Lars Helge Øverland

Hi Maheed,

though maybe not intuitive, this is the way it works at the moment. Let me
try to explain: The aggregation operator applies for a single aggregation
period only. So if you ask for the aggregated value for a year, and the
data is collected quarterly, it will return the average of those quarters.
Currently, if you have multiple periods as filter, it will sum across those
periods.

We could have refined it and said that if the data element has the average
operator, we also average across filter time periods. However it would be a
bit complex - if there are multiple data elements in the pivot, all with
different aggregation operators (sum, average, count), we would not know
which operator to use.

That said, I do see the need for averaging across multiple years and we
could have made it so that it uses the aggregation operator from the data
elements given that all data elements share the same operator, and if not,
default to sum.

regards,

Lars

On Wed, Aug 27, 2014 at 2:59 PM, Maheed Ramadan 
wrote:

>  Dear All,
>
>
>
> I was testing the demo database and found the following issue.
>
>
>
> As you see in the 1st screenshot, I added the “Total Population” data
> element to the pivot table, with the last 12 months on the left side.
>
> Here all values of the data element are the same and this is logical since
> the “Total Population” data element is configured to use “Yearly & Average”
> aggregation method
>
>
>
> However, if we remove the “period” element to the Filter section, the
> pivot will show the “Total population” in one cell with the value =
> 11,089,164 which is the Sum of the data element value for both year 2013
> and 2014. (see 2nd picture below).
>
>
>
> Is this a correct calculation? I think the result should stay the same
> since it should be averaging the values in both years and the value should
> stay = 5,544,582.
>
>
>
> Awaiting your feedback if this is a bug or not.
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
> Thank you.
>
>
>
> Maheed.
>
>
>
___
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] Java properties files in Javascript clients

2014-08-27 Thread Jan Henrik Øverland

The script has been moved to dhis2.util.js instead. The function is called
dhis2.util.parseJavaProperties.


On Wed, Aug 27, 2014 at 2:43 PM, Jan Henrik Øverland <
janhenrik.overl...@gmail.com> wrote:

> I have made the script available in commons. Do an ajax request to
> /dhis-web-commons/javascripts/javaProperties.js to get it in your
> app.
>
>
> On Wed, Aug 27, 2014 at 2:14 PM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> Hi, the following function can be used to parse Java properties files
>> (e.g. for i18n) on the key=value format in a Javascript client. So far it
>> handles
>>
>> - unicoded characters on the format \u
>> - untrimmed keys and values
>> - values with quotation marks
>> - any number of line breaks
>> - lines that are not key=value such as date/timestamps
>>
>> Please feel free to improve it.
>>
>> parseProperties = function(responseText) {
>> var i18n = {}, rows;
>>
>> if (typeof responseText !== 'string') {
>> return i18n;
>> }
>>
>> rows = responseText.split(/\n/);
>>
>> for (var i = 0, a; i < rows.length; i++) {
>> if (!!(typeof rows[i] === 'string' && rows[i].length &&
>> rows[i].indexOf('=') !== -1)) {
>> a = rows[i].split('=');
>> i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g,
>> '\'') + '"');
>> }
>> }
>>
>> return i18n;
>> };
>>
>
>
___
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 16543: Moved properties parser to dhis2 util.

2014-08-27 Thread noreply

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 16543 [merge]
committer: Jan Henrik Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 16:04:10 +0200
message:
  Moved properties parser to dhis2 util.
removed:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2014-08-27 13:10:38 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2014-08-27 14:03:18 +
@@ -7111,54 +7111,47 @@
 var defaultKeyUiLocale = 'en';
 init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
 
+// i18n
 Ext.Ajax.request({
-url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
+url: 'i18n/' + init.keyUiLocale + '.properties',
 success: function(r) {
-var parseProperties = Ext.decode(r.responseText).parseProperties;
-
-// i18n
-Ext.Ajax.request({
-url: 'i18n/' + init.keyUiLocale + '.properties',
-success: function(r) {
-NS.i18n = parseProperties(r.responseText);
-
-if (init.keyUiLocale !== defaultKeyUiLocale) {
-Ext.Ajax.request({
-url: 'i18n/' + defaultKeyUiLocale + '.properties',
-success: function(r) {
-Ext.applyIf(NS.i18n, parseProperties(r.responseText));
-},
-callback: fn
-})
-}
-else {
-fn();
-}
-},
-failure: function() {
-var failure = function() {
-alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
-};
-
-if (init.keyUiLocale !== defaultKeyUiLocale) {
-Ext.Ajax.request({
-url: 'i18n/' + defaultKeyUiLocale + '.json',
-success: function(r) {
-console.log('No translations found for system locale (' + init.keyUiLocale + ').');
-NS.i18n = parseProperties(r.responseText);
-},
-failure: function() {
-failure();
-},
-callback: fn
-});
-}
-else {
-

[Dhis2-devs] [Bug 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

2014-08-27 Thread Derick L

Does anyone have any insights?

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

Title:
  The items listed in a categorycombo api call are less than those
  listed on the corresponding dimension (using the API)

Status in DHIS 2:
  New

Bug description:
  Hi All,

  When I view the category options assigned to a category via
  Maintenance-> Data Elements & Indicators -> Category, the items listed
  are fewer than those I get form the api/categoryCombos/ API call.

  How can I resolve this?

  DHIS v2.14 Build 13868
  OSX 10.9.4
  Chrome  36.0.1985.143

  Kind regards,

  Derick

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1361982/+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 16544: tracker capture - reports WIP

2014-08-27 Thread noreply


revno: 16544
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Wed 2014-08-27 17:40:36 +0200
message:
  tracker capture - reports WIP
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/report-types.html


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2014-08-27 12:55:29 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2014-08-27 15:40:36 +
@@ -20,4 +20,53 @@
 
 
 {{'overdue_events' | translate}}
+   
+
+
+
+
+
+{{'program' | translate}}
+
+
+
+{{programs.length > 0 ? 'please_select_a_program' : 'no_program_exists' | translate}}
+
+
+
+
+{{'org_unit'| translate}}
+ 
+ {{'SELECTED'| translate}}
+ {{'CHILDREN'| translate}}
+ {{'DESCENDANTS'| translate}}
+ {{'ACCESSIBLE'| translate}}
+
+
+
+
+
+
+
+
+
+
+ 
+{{'required'| translate}} (-mm-dd)
+
+
+
+{{'required'| translate}} (-mm-dd)
+
+
+
+
+
+{{'go'| translate}}   
+
+
+
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html	2014-08-18 10:01:22 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html	2014-08-27 15:40:36 +
@@ -1,103 +1,42 @@
-
-{{selectedProgram.name}} {{'report'| translate}}
-
-{{'date'| translate}}: {{today}}
-
-
-
-
-
-{{selectedProgram.trackedEntity.name}} {{'_details'| translate}}
-
-
-
-{{attribute.displayName}}
-
-
-{{attribute.value}}
-
-
-
-
+
+
+{{selectedProgram.name}} {{'report'| translate}}
+
+{{'date'| translate}}: {{today}}
+
 
-
-{{'enrollment'| translate}} {{'_details'| translate}}
-
-{{selectedProgram.dateOfEnrollmentDescription}}:  {{enrollment.dateOfEnrollment}}
-
-
-{{selectedProgram.dateOfIncidentDescription}}:{{enrollment.dateOfIncident}}
-
-
-{{'status'| translate}}:  {{enrollment.status}}   
-
-
-
-{{'notes'| translate}}
-
-
-
-
-{{note.value}}
-({{note.storedBy}}, {{note.storedDate}})
-  
-

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16545: User setting issue fixed.

2014-08-27 Thread noreply

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 16545 [merge]
committer: Jan Henrik Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 17:52:42 +0200
message:
  User setting issue fixed.
modified:
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java	2014-03-18 08:10:10 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java	2014-08-27 15:51:24 +
@@ -37,6 +37,8 @@
 import java.util.Locale;
 import java.util.SortedMap;
 
+import java.io.Serializable;
+
 import org.hisp.dhis.i18n.I18nService;
 import org.hisp.dhis.i18n.locale.LocaleManager;
 import org.hisp.dhis.setting.StyleManager;
@@ -181,7 +183,7 @@
 currentStyle = styleManager.getCurrentStyle();
 
 analysisDisplayProperty = (String) userSettingService.getUserSetting( KEY_ANALYSIS_DISPLAY_PROPERTY,
-DEFAULT_ANALYSIS_DISPLAY_PROPERTY );
+(Serializable) DEFAULT_ANALYSIS_DISPLAY_PROPERTY );
 
 messageEmailNotification = (Boolean) userSettingService.getUserSetting( KEY_MESSAGE_EMAIL_NOTIFICATION, false );
 

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

Re: [Dhis2-devs] [Dhis2-users] Empty database of DHIS2.Sql PostgreSQL

2014-08-27 Thread riddy ndoma

Hi Guy,
Can you recover you even with your local authority. create a database of
empty data in postgresql then modifies Miss Hibernate file and executes end
your local instance with this data base empty. DHIS2 will automatically
generate the structure of the database.


2014-08-27 16:51 GMT+01:00 Guy Ekani :

> Hello Sir,
>
> Please can u send me an empty database of DHIS2.sql, so that i can restore
> on PostgreSQL.
>
> Thank U, Sincerely
>
> =
> Guy
>
>
>
>
> ___
> 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
>
>


-- 
Riddy NDOMA
Software Developer
*Skype:* riddyndoma, *G+:* riddyndoma, *FB:* riddy ndoma
*Twitter:* riddyndoma, *LinkedIn:* riddy ndoma
*Blog:* http://riddyndoma.blogspot.com/

Vous servir est mon désire (Serving you is my desire)
___
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] Empty database of DHIS2.Sql PostgreSQL

2014-08-27 Thread Alex Tumwesigye

Dear Guy,

Create an empty postgreSQL database and edit your hibernate.properties file
to point to your new database. Start tomcat, it will deploy DHIS2
application and this will create for you an empty database.

Alex


On Wed, Aug 27, 2014 at 6:51 PM, Guy Ekani  wrote:

> Hello Sir,
>
> Please can u send me an empty database of DHIS2.sql, so that i can restore
> on PostgreSQL.
>
> Thank U, Sincerely
>
> =
> Guy
>
>
>
>
> ___
> Mailing list: https://launchpad.net/~dhis2-users
> Post to : dhis2-us...@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-users
> More help   : https://help.launchpad.net/ListHelp
>
>


-- 
Alex Tumwesigye

Teaching Assistant,
Department of Electrical and Computer Engineering
College of Engineering, Design, Art and Technology, Makerere University

IT Consultant - BarefootPower Uganda Ltd, SmartSolar, Kenya

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

+256 774149 775, + 256 759 800161

"I don't want to be anything other than what I have been - one tree hill "
___
Mailing list: https://launchpad.net/~dhis2-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 16546: Resource tables, improved performance of geeration of table _categorystructure

2014-08-27 Thread noreply


revno: 16546
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 19:08:48 +0200
message:
  Resource tables, improved performance of geeration of table _categorystructure
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.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/resourcetable/ResourceTableService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableService.java	2014-03-18 08:10:10 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableService.java	2014-08-27 17:08:48 +
@@ -69,6 +69,8 @@
 
 /**
  * Generates a resource table for all category option combos.
+ * 
+ * Depends on the category option combo names table.
  */
 void generateCategoryTable();
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java	2014-05-04 09:55:24 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java	2014-08-27 17:08:48 +
@@ -110,6 +110,8 @@
  */
 void createCategoryStructure( List categories );
 
+void populateCategoryStructure( List categories );
+
 /**
  * Creates table.
  */

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2014-08-26 09:25:52 +
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2014-08-27 17:08:48 +
@@ -51,7 +51,6 @@
 import org.hisp.dhis.dataelement.DataElement;
 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.dataelement.DataElementCategoryService;
 import org.hisp.dhis.dataelement.DataElementGroupSet;
@@ -69,7 +68,6 @@
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.resourcetable.statement.CreateCategoryOptionGroupSetTableStatement;
-import org.hisp.dhis.resourcetable.statement.CreateCategoryTableStatement;
 import org.hisp.dhis.sqlview.SqlView;
 import org.hisp.dhis.sqlview.SqlViewService;
 import org.springframework.transaction.annotation.Transactional;
@@ -340,36 +338,9 @@
 
 Collections.sort( categories, IdentifiableObjectNameComparator.INSTANCE );
 
-List categoryOptionCombos =
-new ArrayList<>( categoryService.getAllDataElementCategoryOptionCombos() );
-
 resourceTableStore.createCategoryStructure( categories );
-
-// -
-// Populate table
-// -
-
-List batchArgs = new ArrayList<>();
-
-for ( DataElementCategoryOptionCombo categoryOptionCombo : categoryOptionCombos )
-{
-List values = new ArrayList<>();
-
-values.add( categoryOptionCombo.getId() );
-values.add( categoryOptionCombo.getName() );
-
-for ( DataElementCategory category : categories )
-{
-DataElementCategoryOption categoryOption = category.getCategoryOption( categoryOptionCombo );
-
-values.add( categoryOption != null ? categoryOption.getName() : null );
-values.add( categoryOption != null ? categoryOption.getUid() : null );
-}
-
-batchArgs.add( values.toArray() );
-}
-
-resourceTableStore.batchUpdate( (categories.size() * 2) + 2, CreateCategoryTableStatement.TABLE_NAME, batchArgs );
+
+resourceTableStore.populateCategoryStructure( categories );
 
 log.info( "Category table generated" );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java'
--- dhis-2/dhis-services/dhis-s

[Dhis2-devs] [Bug 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

2014-08-27 Thread Jim Grace

To see a category's options through the api, try api/categories/.
For example in the demo system at https://apps.dhis2.org/demo/ the first
category, has 6 options as shown through the GUI. If you go to

https://apps.dhis2.org/demo/api/categories/KfdsGBcoiCa

and look under , you should see the same 6 options.
Note that category options and category combos are different things.
Does this help?

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

Title:
  The items listed in a categorycombo api call are less than those
  listed on the corresponding dimension (using the API)

Status in DHIS 2:
  New

Bug description:
  Hi All,

  When I view the category options assigned to a category via
  Maintenance-> Data Elements & Indicators -> Category, the items listed
  are fewer than those I get form the api/categoryCombos/ API call.

  How can I resolve this?

  DHIS v2.14 Build 13868
  OSX 10.9.4
  Chrome  36.0.1985.143

  Kind regards,

  Derick

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1361982/+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] Manual aggregation -In accurate aggregation

2014-08-27 Thread sumudu weerasinghe

Thanks Tran .
Yes it was a problem in my query , it is now working after adding program
id , now it aggregate according to time period.


Sumudu


On Wed, Aug 27, 2014 at 7:21 PM, Tran Chau 
wrote:

> Hi Sumudu,
>
> In your aggregate query formula, the formula does not have the type of
> date information.  The type of period information are
> 'registered'/'enrolled'/'visited'.
> When we run the 'Manual Aggregation', it asks you the date range.
> The formula needs to use that date range to check against the patient's
> 'registered'/'enrolled'/'visited' date.
>
> Currently, you didn't specify any of those date type of patients, so it is
> getting all the patients from the clinic.
>
> If 'enrollment' date is what you want (for July and August), try below.
>
> *[CA:9] is not null and [CA:3]='FEMALE' and [CA:7] <= 12 and [PG:x]*
> - In which *x* is the health program id.  '[PG:x]' means within the
> program enrollment date range. You can see the snapshot in attachment file.
>
>
>
> Best regards,
> 
> Châu Thu Trân
> HISP Viet Nam
> Email: tran.hispviet...@gmail.com
>
>
> On Tue, Aug 26, 2014 at 9:27 AM, sumudu weerasinghe 
> wrote:
>
>> Dear All,
>> I have customized DHIS2 for mental health information system and started
>> pilot. I used both tracker module(for clinic register) and aggregate part
>> (for monthly return).  After one month i try to fill the monthly return by
>> manual aggregation using created aggregate query builders.
>>
>> Clinic X has 180 total patient July 2014 and up  to today(26/8/2014) 264
>> total new patients.
>>
>> But in manual aggregation, run on 26/8/2014 shows 264 patients for the
>> July instead of 180. Also New patient -male <12 should be 18 but it shows
>> 28 , System does not give any error massage.
>>
>> ("Total new patient" is dataelement created with age and gender category
>> combination)
>>
>>
>>
>> I will attach screen shot of my Aggregate query builder (for new male
>> patient <12).
>>
>>- Is this error is due mistake done at query builder designing ? or
>>- Error in the system ?
>>
>>  My system detail as follows
>>
>>- DHIS version 2.15 revision - 15201
>>- Database MySQL Server 5.1
>>-  Java  jdk1.7.0_04
>>- server apache-tomcat-7.0.50
>>
>> Regards
>> Sumudu
>>
>>
>> ___
>> 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 16547: Analytics, ad-hoc run, avoid generating resource tables twice

2014-08-27 Thread noreply


revno: 16547
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Wed 2014-08-27 20:04:29 +0200
message:
  Analytics, ad-hoc run, avoid generating resource tables twice
modified:
  
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java	2014-08-15 07:40:20 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java	2014-08-27 18:04:29 +
@@ -38,7 +38,6 @@
 import org.hisp.dhis.period.CalendarPeriodType;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodType;
-import org.hisp.dhis.resourcetable.scheduling.ResourceTableTask;
 import org.hisp.dhis.scheduling.DataMartTask;
 import org.hisp.dhis.scheduling.ScheduledTasks;
 import org.hisp.dhis.scheduling.TaskCategory;
@@ -75,13 +74,6 @@
 this.scheduler = scheduler;
 }
 
-private ResourceTableTask resourceTableTask;
-
-public void setResourceTableTask( ResourceTableTask resourceTableTask )
-{
-this.resourceTableTask = resourceTableTask;
-}
-
 private AnalyticsTableTask analyticsTableTask;
 
 public void setAnalyticsTableTask( AnalyticsTableTask analyticsTableTask )
@@ -160,7 +152,6 @@
 {
 analyticsTableTask.setTaskId( taskId );
 
-tasks.addTask( resourceTableTask );
 tasks.addTask( analyticsTableTask );
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-07-15 16:04:42 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-08-27 18:04:29 +
@@ -164,7 +164,6 @@
 	scope="prototype">
 	
 	
-	
 	
 	
   

___
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 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

2014-08-27 Thread Derick L

Thanks for the feedback.

Unfortunately it does not help  :)

For my case (i have a private instance), if I go to /api/categories/
and if i go to /api/dimensions/ for the same category, i get
different outputs. Those listed under /api/categories are more than
those listed under /api/dimensions.

I am surprised since I’ve explicitlyset that the category be used as
a dimension.


On Aug 27, 2014, at 8:23 PM, Jim Grace <1361...@bugs.launchpad.net> wrote:

> To see a category's options through the api, try api/categories/.
> For example in the demo system at https://apps.dhis2.org/demo/ the first
> category, has 6 options as shown through the GUI. If you go to
> 
> https://apps.dhis2.org/demo/api/categories/KfdsGBcoiCa
> 
> and look under , you should see the same 6 options.
> Note that category options and category combos are different things.
> Does this help?
> 
> -- 
> You received this bug notification because you are subscribed to the bug
> report.
> https://bugs.launchpad.net/bugs/1361982
> 
> Title:
>  The items listed in a categorycombo api call are less than those
>  listed on the corresponding dimension (using the API)
> 
> Status in DHIS 2:
>  New
> 
> Bug description:
>  Hi All,
> 
>  When I view the category options assigned to a category via
>  Maintenance-> Data Elements & Indicators -> Category, the items listed
>  are fewer than those I get form the api/categoryCombos/ API call.
> 
>  How can I resolve this?
> 
>  DHIS v2.14 Build 13868
>  OSX 10.9.4
>  Chrome  36.0.1985.143
> 
>  Kind regards,
> 
>  Derick
> 
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/dhis2/+bug/1361982/+subscriptions

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

Title:
  The items listed in a categorycombo api call are less than those
  listed on the corresponding dimension (using the API)

Status in DHIS 2:
  New

Bug description:
  Hi All,

  When I view the category options assigned to a category via
  Maintenance-> Data Elements & Indicators -> Category, the items listed
  are fewer than those I get form the api/categoryCombos/ API call.

  How can I resolve this?

  DHIS v2.14 Build 13868
  OSX 10.9.4
  Chrome  36.0.1985.143

  Kind regards,

  Derick

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

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

[Dhis2-devs] [Bug 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

2014-08-27 Thread Jim Grace

Thanks, I was comparing with api/categoryCombos/ as you had said.

On the demo system when I get a list of categories using
https://apps.dhis2.org/demo/api/categories, it shows that the
"Commodities" category has a UID of gtuVl6NbXQV. And when I get a list
of dimensions using https://apps.dhis2.org/demo/api/dimensions, it shows
that the "Commodities" dimension has the same UID of gtuVl6NbXQV. So the
two URLs to access the category and the associated dimension use the
same UID value:

https://apps.dhis2.org/demo/api/categories/gtuVl6NbXQV
https://apps.dhis2.org/demo/api/dimensions/gtuVl6NbXQV

The contents of these pages show the same three category options. Can
you verify whether you are really seeing different UIDs for the same
category and dimension?

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

Title:
  The items listed in a categorycombo api call are less than those
  listed on the corresponding dimension (using the API)

Status in DHIS 2:
  New

Bug description:
  Hi All,

  When I view the category options assigned to a category via
  Maintenance-> Data Elements & Indicators -> Category, the items listed
  are fewer than those I get form the api/categoryCombos/ API call.

  How can I resolve this?

  DHIS v2.14 Build 13868
  OSX 10.9.4
  Chrome  36.0.1985.143

  Kind regards,

  Derick

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1361982/+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] Analytics: This Week, This Month, Future Periods

2014-08-27 Thread Rodolfo Melia

Hi - we are developing dashboards that incorporates near real-time data
(e.g. daily data, with 24hrs delay for it to get to the data values table).
We need the dashboards to show some charts with the values for THIS WEEK
and THIS MONTH - these options are not available on the analytics. Would it
be possible to incorporate them?

On a separate exercise, we have performance targets that are set until the
end of 2014 or 2015. We also have projections that are based on those
numbers. At the moment, YOU CANNOT select a period beyond the CURRENT
month/ year (see below). Would it be possible to open the analytics engine
with the possibility of selecting periods beyond the current month?

[image: Inline image 1]

These applies to both, 2.15 and 2.16 (I checked on both)


Rodolfo
___
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] Fwd: [AEHIN-ORG] Patient Master Index (PMI) and Patient Medical Record

2014-08-27 Thread Knut Staring

-- Forwarded message --
From: Ryan Crichton 
Date: Wed, Aug 20, 2014 at 2:19 PM
Subject: Re: [AEHIN-ORG] Patient Master Index (PMI) and Patient Medical
Record
To: aehin-...@list.wpro.who.int


Hi Alvin,

There is an OpenHIE demo site that may be useful. I hosts a number of the
OpenHIE components and people that are interested may explore the systems
that make up OpenHIE and see how they work. Note: this is a work in
progress so you may experience problem but hopefully it will be useful. You
can find the demo site here: http://demo.ohie.org/

Regards,
Ryan


On Wed, Aug 20, 2014 at 12:42 AM, Alvin Marcelo 
wrote:

> Thanks fr sharing Ryan. Would you have a sandbox where AeHIN members can
> explore?
>  On Aug 19, 2014 3:19 PM, "Ryan Crichton"  wrote:
>
>> Hi Sambath,
>>
>> You can find more about OpenEMPI here . It
>> supports the IHE PIX
>> 
>> and PDQ 
>> profiles for interoperability.
>>
>> Hope this helps.
>> Ryan
>>
>>
>> On Mon, Aug 18, 2014 at 10:47 AM, Alvin Marcelo 
>> wrote:
>>
>>> Dear Dr Sambath,
>>>
>>> The Philippine Health Information Exchange is testing its Client
>>> Registry with OpenEMPI. With support from WHO, Dr Shaun Grannis came over
>>> last July to provide guidance.
>>>
>>> What we know now is that there's a lot to learn and starting with open
>>> source EMPIs is a cost effective capacity-building activity. But beyond the
>>> software and technology is a slew of other important concepts like
>>> governance and enterprise architecture.
>>>
>>> We've encouraged our developers to join the OpenHIE mailing lists for a
>>> quick and free introduction to its various components. The community is
>>> very helpful and accommodating.
>>>
>>> Alvin
>>> On Aug 18, 2014 4:37 PM, "Ryan Crichton"  wrote:
>>>
 Hi Sambath,

 In addition to that you may want to get involved with the OpenHIE
 client registry community (
 https://wiki.ohie.org/display/SUB/Client+Registry+Community) I'm sure
 they could provide you with some advice. Also, you may find the
 documentation that this community has produced to be useful.

 Cheers,
 Ryan


 On Mon, Aug 18, 2014 at 8:12 AM, Carl Fourie  wrote:

> Good Day Sambath,
>
> We, Jembi, have been quite active in this area with a few projects
> that we have been running (a health information exchange in Rwanda) and
> more recently a local mobile to national level system where we are using a
> PMI to register pregnant women along with some patient level data.
>
> Please feel free to reach out to myself and or the team cc'd here for
> more information.
>
> Regards
>
> Carl Fourie
> ---
> *Assistant Director of Programs, Jembi Health Systems |  SOUTH AFRICA*
> *Mobile: +27 71 540 4477 <%2B27%2071%20540%204477> | Office: +27 21
> 701 0939 <%2B27%2021%20701%200939> | Skype: carl.fourie17*
> *E-mail: *c...@jembi.org
>
>
>
> On Sat, Aug 16, 2014 at 9:38 AM, Sambath Mean 
> wrote:
>
>> Dear all friends and colleagues,
>>
>>
>>
>> I would be appreciated if anyone can share with me experiences/lesion
>> learn and/or guidance related to the implementation of Patient Master 
>> Index
>> (PMI) linked with patient level database system.
>>
>>
>>
>> Thanks and hope to hear from you all soon
>>
>>
>>
>> Best
>>
>>
>>
>> Sambath
>>
>>
>>
>>
>>
>> Mean Reatanak Sambath, MD, MPH
>>
>>
>>
>> *Founder/Executive Director, Partnership for Better Health*
>>
>> *Lead national consultant for CRVS*
>>
>> *Public health specialist*
>>
>> *Member of AeHIN Working council*
>>
>> *Expertised in Health informatics, ehealth, ICT, IT framework, M&E,
>> health research and health system strengthening.*
>>
>> [image: PBH logo final]
>>
>> *Office address, St. 214, Building #10, 3rd Floor, Sangkhat Chey
>> Chumnas, Khan Daun Penh Phnom Penh, Cambodia*
>>
>> *Tel: 855 12 727919, skype: dr.sambath*
>>
>> *Email: **msamb...@pbhcam.org* 
>>
>> *Websites: **www.pbhcam.org* *, *
>>
>> *Other related: **www.aehin.org* * , *
>> *www.hiscambodia.org* *, *
>> *www.pmrscambodia.org* *, *
>> *www.crvscambodia.org* 
>>
>>
>>
>> __
>>
>>
>>- To search the archives of this moderated mailing list, go to
>>http://list.wpro.who.int/archives/AEHIN-ORG.html
>>
>>- To send a message to all subscribers, send an email to
>>aehin-...@list.wpro.who.int.
>>
>>- To uns

Re: [Dhis2-devs] Fwd: [AEHIN-ORG] Patient Master Index (PMI) and Patient Medical Record

2014-08-27 Thread Pierre Dane

Further to what Ryan has mentioned below, we have integrated openEMPI and DHIS2 
tracker into a maternal health registry which is live in South Africa 
nationally. at present we aren't using PIX/PDQ but rather a rest interface into 
openEMPI. if anyone would like to see the REST api calls we are using drop us a 
line. 


> On 28 Aug 2014, at 05:34, Knut Staring  wrote:
> 
> -- Forwarded message --
> From: Ryan Crichton 
> Date: Wed, Aug 20, 2014 at 2:19 PM
> Subject: Re: [AEHIN-ORG] Patient Master Index (PMI) and Patient Medical Record
> To: aehin-...@list.wpro.who.int
> 
> 
> Hi Alvin,
> 
> There is an OpenHIE demo site that may be useful. I hosts a number of the 
> OpenHIE components and people that are interested may explore the systems 
> that make up OpenHIE and see how they work. Note: this is a work in progress 
> so you may experience problem but hopefully it will be useful. You can find 
> the demo site here: http://demo.ohie.org/
> 
> Regards,
> Ryan
> 
> 
>> On Wed, Aug 20, 2014 at 12:42 AM, Alvin Marcelo  
>> wrote:
>> Thanks fr sharing Ryan. Would you have a sandbox where AeHIN members can 
>> explore?
>>> On Aug 19, 2014 3:19 PM, "Ryan Crichton"  wrote:
>>> Hi Sambath,
>>> 
>>> You can find more about OpenEMPI here. It supports the IHE PIX and PDQ 
>>> profiles for interoperability.
>>> 
>>> Hope this helps.
>>> Ryan
>>> 
>>> 
 On Mon, Aug 18, 2014 at 10:47 AM, Alvin Marcelo  
 wrote:
 Dear Dr Sambath,
 
 The Philippine Health Information Exchange is testing its Client Registry 
 with OpenEMPI. With support from WHO, Dr Shaun Grannis came over last July 
 to provide guidance.
 
 What we know now is that there's a lot to learn and starting with open 
 source EMPIs is a cost effective capacity-building activity. But beyond 
 the software and technology is a slew of other important concepts like 
 governance and enterprise architecture.
 
 We've encouraged our developers to join the OpenHIE mailing lists for a 
 quick and free introduction to its various components. The community is 
 very helpful and accommodating.
 
 Alvin
 
> On Aug 18, 2014 4:37 PM, "Ryan Crichton"  wrote:
> Hi Sambath,
> 
> In addition to that you may want to get involved with the OpenHIE client 
> registry community 
> (https://wiki.ohie.org/display/SUB/Client+Registry+Community) I'm sure 
> they could provide you with some advice. Also, you may find the 
> documentation that this community has produced to be useful.
> 
> Cheers,
> Ryan
> 
> 
>> On Mon, Aug 18, 2014 at 8:12 AM, Carl Fourie  wrote:
>> Good Day Sambath,
>> 
>> We, Jembi, have been quite active in this area with a few projects that 
>> we have been running (a health information exchange in Rwanda) and more 
>> recently a local mobile to national level system where we are using a 
>> PMI to register pregnant women along with some patient level data.
>> 
>> Please feel free to reach out to myself and or the team cc'd here for 
>> more information.
>> 
>> Regards
>> 
>> Carl Fourie
>> ---
>> Assistant Director of Programs, Jembi Health Systems |  SOUTH AFRICA
>> Mobile: +27 71 540 4477 | Office: +27 21 701 0939 | Skype: carl.fourie17
>> E-mail: c...@jembi.org
>> 
>> 
>> 
>>> On Sat, Aug 16, 2014 at 9:38 AM, Sambath Mean  
>>> wrote:
>>> Dear all friends and colleagues,
>>> 
>>>  
>>> 
>>> I would be appreciated if anyone can share with me experiences/lesion 
>>> learn and/or guidance related to the implementation of Patient Master 
>>> Index (PMI) linked with patient level database system.
>>> 
>>>  
>>> 
>>> Thanks and hope to hear from you all soon
>>> 
>>>  
>>> 
>>> Best
>>> 
>>>  
>>> 
>>> Sambath
>>> 
>>>  
>>> 
>>>  
>>> 
>>> Mean Reatanak Sambath, MD, MPH
>>> 
>>>  
>>> 
>>> Founder/Executive Director, Partnership for Better Health
>>> 
>>> Lead national consultant for CRVS
>>> 
>>> Public health specialist
>>> 
>>> Member of AeHIN Working council
>>> 
>>> Expertised in Health informatics, ehealth, ICT, IT framework, M&E, 
>>> health research and health system strengthening.
>>> 
>>> 
>>> 
>>> Office address, St. 214, Building #10, 3rd Floor, Sangkhat Chey 
>>> Chumnas, Khan Daun Penh Phnom Penh, Cambodia
>>> 
>>> Tel: 855 12 727919, skype: dr.sambath
>>> 
>>> Email: msamb...@pbhcam.org
>>> 
>>> Websites: www.pbhcam.org,
>>> 
>>> Other related: www.aehin.org , www.hiscambodia.org, 
>>> www.pmrscambodia.org, www.crvscambodia.org
>>> 
>>>  
>>> 
>>> __
>>> 
>>> To search the archives of this moderated mailing list, go to 
>>> http://list.wpro.who.int/archives/AEHIN-ORG.html

[Dhis2-devs] how can use single event with registration for many time.

Re: [Dhis2-devs] how can use single event with registration for many time.

Re: [Dhis2-devs] [Dhis2-users] how can use single event with registration for many time.

Re: [Dhis2-devs] [Dhis2-users] how can use single event with registration for many time.

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16531: Help page link, minor fix

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16532: Email test, fixed nullpointer vulnerability

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16533: Test email, minor

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16534: DebugUtils, fixed nullpointer vulnerability

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16535: tracker capture - reports menu reorganization

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16536: Analytics table, nullpointer vulnerability

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16537: tracker capture - more reorganization/modularization of controllers

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16538: PT DV GIS ER EV i18n, using the properties files from r16440.

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16539: Refactored test which failed at random due to relying on collection ordering.

[Dhis2-devs] Java properties files in Javascript clients

Re: [Dhis2-devs] Java properties files in Javascript clients

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16540: Add pagination and standard filter box for SQL Views list.

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16541: tracker capture - reports WIP

[Dhis2-devs] Reporting Issue with Yearly & Average Data Elements

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16542: PT DV GIS ER EV restructured.

Re: [Dhis2-devs] Reporting Issue with Yearly & Average Data Elements

Re: [Dhis2-devs] Java properties files in Javascript clients

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16543: Moved properties parser to dhis2 util.

[Dhis2-devs] [Bug 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16544: tracker capture - reports WIP

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16545: User setting issue fixed.

Re: [Dhis2-devs] [Dhis2-users] Empty database of DHIS2.Sql PostgreSQL

Re: [Dhis2-devs] [Dhis2-users] Empty database of DHIS2.Sql PostgreSQL

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16546: Resource tables, improved performance of geeration of table _categorystructure

[Dhis2-devs] [Bug 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

Re: [Dhis2-devs] Manual aggregation -In accurate aggregation

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16547: Analytics, ad-hoc run, avoid generating resource tables twice

Re: [Dhis2-devs] [Bug 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

[Dhis2-devs] [Bug 1361982] Re: The items listed in a categorycombo api call are less than those listed on the corresponding dimension (using the API)

[Dhis2-devs] Analytics: This Week, This Month, Future Periods

[Dhis2-devs] Fwd: [AEHIN-ORG] Patient Master Index (PMI) and Patient Medical Record

Re: [Dhis2-devs] Fwd: [AEHIN-ORG] Patient Master Index (PMI) and Patient Medical Record

36 matches

Site Navigation

Mail list logo

Footer information