Re: [Dhis2-devs] See Data elements/indicators authority dropped in 2.22

[Juan Manuel Alcantara Acosta]

Hello Team
We also noticed this in the Latam academy. The users had the suoeradmin role 
from the demo database and could not see the data elements and indicators 
module, we had to add “ALL” to the role. Is there a fix coming?
Best regards,
JM


> El 11/03/2016, a las 1:48 p.m., Prosper BT  escribió:
> 
> Dear Team,
> 
> Seems the see Data elements/indicators authority was dropped in 2.22 and now 
> only roles with "All" are the only one that can see this app.
> 
> Is this a bug or the name was changed
> 
> Regards
> 
> -- 
> Prosper Behumbiize, MPH
> Global HISP| University Of Oslo/HISP Uganda
> +256 752 751 776 | +256 776 139 139
> pros...@hispuganda.org  | pros...@dhis2.org 
>  | Skype: prospertb
> ___
> 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] Aggregation query builder details

[Dipali Sahu]

Hi Lars

If not further work on the Aggregation query builder feature, *please don't
remove it*. We actually find it very useful and is critical to our
workflow. For example, we need to get Total patients seen in a facility.
Now with queries the user can see total figures, plus when needed segregate
them by age, gender, visit type (new,follow up etc.) and many more
categories in Pivot tables which provides a easy interface to suffice all
this.

Although it is possible to get these values through Program indicators,
there is no flexibility to see data by a certain category like with the
features that pivot table allow.

I have read other emails on the group that Aggregation query builder's
behavior is a bit unpredictable, but I haven't been able to produce any
errors yet, given we have heavy database and complicated queries.

Is it not possible to keep the Aggregation query feature as it is.

Thank you
Deepali






On Mon, Mar 14, 2016 at 10:10 PM, Lars Helge Øverland 
wrote:

> Hi there,
>
> in fact, aggregation query builder is already scheduled to be removed in
> version 2.23 and will be replaced by program indicators. Admittedly there
> are a few cases where persisted aggregate event data could be useful,
> however we think that generating the aggregate values "on the fly" will
> provide more flexibility and be less of a load on the server by avoiding
> large, nightly batch jobs.
>
> The current aggregation query builder was not up to scratch and could have
> unpredictable behavior. At some point, we might use the program indicator
> engine as basis for supporting persistence of aggregated event data, but
> that is not top priority currently.
>
> We encourage you to try out the program indicators and provide feedback to
> the dev team.
>
> regards,
>
> Lars
>
>
>
>
>
>
>
>
>
> On Sun, Mar 13, 2016 at 1:28 PM, Uddin Fatema  wrote:
>
>> Dear All,
>>
>> We are facing same problem create an Aggregation query builder details as
>>  sum of data element value I put everything but it comes to Data element
>>  forsum/average/min/max ** **and try to select I can’t find anything and
>> this field is*
>>
>>
>>
>> mandatory and the data aggregation data element and tracker data element both
>> has sum aggregation
>>
>>
>> *Actually we cant to count Total Number of live birth from tracker
>> capture patient type data element.*
>>
>>
>> *How can I do it in program indicator ?*
>>
>>
>> *Thanks*
>>
>>
>> *Regards*
>>
>>
>> *Fatema*
>>
>> On Tue, Jan 5, 2016 at 5:21 PM, Ese Egerega  wrote:
>>
>>> Dear All,
>>>
>>> Am riding on Nami's question on aggregate query builder.
>>>
>>> I would like to know if there is a work around since the dropdown for
>>> "Data element for sum/average/min/max*" is not working in dhis2.21*
>>>
>>> We have a data element in tracker which records the quantity of drugs
>>> dispensed to patients during ANC visits. We would like to aggregate the
>>> total drug dispensed to a dataset so as to calculate things like maximum
>>> stock or quantity of drugs to order.
>>>
>>> Right now, am able to aggregate only the number of visits but not the
>>> actual drugs dispensed.
>>>
>>> I will appreciated any suggestions.
>>>
>>> Thanks,
>>> Ese
>>>
>>> On Fri, Nov 27, 2015 at 8:22 AM, Olav Poppe  wrote:
>>>
 Hi,
 just wanted to add my voice in support for improving (e.g. making it
 faster and more reliable, supporting cohort analysis etc), rather than
 removing the aggregation query builder. While I think the program
 indicators are great, I think there are many cases where you would rather
 want to store the aggregate data.

 One case I think is highly relevant (in the sense that countries are
 doing it now) is where you have some facilities reporting via tracker and
 other on paper/aggregate, and you would want the data to end up in the same
 data elements/data sets.

 Olav




 26. nov. 2015 kl. 23.01 skrev Knut Staring :

 Thanks for the clarifications, Elmarie and Dipali

 I think these are good inputs to our dev team, and hope some of them
 will also chip into this conversation.

 Cheers,
 Knut

 On Fri, Nov 27, 2015 at 4:11 AM, Elmarie Claasen 
 wrote:

> Hi Knut,
>
>
>
> Although I can see that program indicators can be helpful it has
> limited use in the context of interoperability between DHIS2 instances. In
> South Africa we feel that Survey type instances should be kept separate
> from Routine Health data collection and as such collect event or tracker
> data for surveys and would want to set up aggregated data elements in the
> system which populates with a stored aggregated data value which we
> export/synchronise with the routine HMIS system e.g.
>
> Patient satisfaction survey rate = No of surveys conducted/No of

Re: [Dhis2-devs] Analytics Engine in Maintenance Mode

[Pamod Amarakoon]

Thanx Lars.

Didn't notice that option and don't remember enabling it. Back online :)

But as soon as I got the output in events report, there's a new thing i
noted. The values in individual events and aggregated values of same events
do not tally. Any reason why it happens.



​
Thanx a lot !

On Tue, Mar 15, 2016 at 11:41 PM, Lars Helge Øverland 
wrote:

> Hi Pamod,
>
> can you go to system settings > general > Put analytics in maintenance
> mode and verify that the setting is not enabled?
>
> regards,
>
> Lars
>
>
> On Tue, Mar 15, 2016 at 7:01 PM, Pamod Amarakoon  wrote:
>
>> Hi,
>>
>> I'm facing this issue in 2.22 build 21900
>>
>> Event report doesn't seem to produce any report and in console it gives
>> rise to an error which goes as
>> "
>>
>> {"httpStatus":"Service 
>> Unavailable","httpStatusCode":503,"status":"ERROR","message":"Analytics 
>> engine is in maintenance mode, try again later"}"
>>
>> I tried clearing analytics table from maintenance and regenerating and
>> finally restarted the instance but it still gives this errors.
>>
>> How to get analytics engine live.
>>
>> Thanx
>>
>> --
>> Regards,
>> Pamod Amarakoon
>>
>> Confidentiality Notice: the information contained in this email and any
>> attachments may be legally privileged and confidential. If you are not an
>> intended recipient, you are hereby notified that any dissemination,
>> distribution, or copying of this e-mail is strictly prohibited. If you have
>> received this e-mail in error, please notify the sender and permanently
>> delete the e-mail and any attachments immediately. You should not retain,
>> copy or use this e-mail or any attachments for any purpose, nor disclose
>> all or any part of the contents to any other person.
>>
>>
>>
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>
>
> --
> Lars Helge Øverland
> Lead developer, DHIS 2
> University of Oslo
> Skype: larshelgeoverland
> http://www.dhis2.org 
>
>


-- 
Regards,
Pamod Amarakoon

Confidentiality Notice: the information contained in this email and any
attachments may be legally privileged and confidential. If you are not an
intended recipient, you are hereby notified that any dissemination,
distribution, or copying of this e-mail is strictly prohibited. If you have
received this e-mail in error, please notify the sender and permanently
delete the e-mail and any attachments immediately. You should not retain,
copy or use this e-mail or any attachments for any purpose, nor disclose
all or any part of the contents to any other person.
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Analytics Engine in Maintenance Mode

[Lars Helge Øverland]

Hi Pamod,

can you go to system settings > general > Put analytics in maintenance mode
and verify that the setting is not enabled?

regards,

Lars


On Tue, Mar 15, 2016 at 7:01 PM, Pamod Amarakoon  wrote:

> Hi,
>
> I'm facing this issue in 2.22 build 21900
>
> Event report doesn't seem to produce any report and in console it gives
> rise to an error which goes as
> "
>
> {"httpStatus":"Service 
> Unavailable","httpStatusCode":503,"status":"ERROR","message":"Analytics 
> engine is in maintenance mode, try again later"}"
>
> I tried clearing analytics table from maintenance and regenerating and
> finally restarted the instance but it still gives this errors.
>
> How to get analytics engine live.
>
> Thanx
>
> --
> Regards,
> Pamod Amarakoon
>
> Confidentiality Notice: the information contained in this email and any
> attachments may be legally privileged and confidential. If you are not an
> intended recipient, you are hereby notified that any dissemination,
> distribution, or copying of this e-mail is strictly prohibited. If you have
> received this e-mail in error, please notify the sender and permanently
> delete the e-mail and any attachments immediately. You should not retain,
> copy or use this e-mail or any attachments for any purpose, nor disclose
> all or any part of the contents to any other person.
>
>
>
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>


-- 
Lars Helge Øverland
Lead developer, DHIS 2
University of Oslo
Skype: larshelgeoverland
http://www.dhis2.org 
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] Analytics Engine in Maintenance Mode

[Pamod Amarakoon]

Hi,

I'm facing this issue in 2.22 build 21900

Event report doesn't seem to produce any report and in console it gives
rise to an error which goes as
"

{"httpStatus":"Service
Unavailable","httpStatusCode":503,"status":"ERROR","message":"Analytics
engine is in maintenance mode, try again later"}"

I tried clearing analytics table from maintenance and regenerating and
finally restarted the instance but it still gives this errors.

How to get analytics engine live.

Thanx

-- 
Regards,
Pamod Amarakoon

Confidentiality Notice: the information contained in this email and any
attachments may be legally privileged and confidential. If you are not an
intended recipient, you are hereby notified that any dissemination,
distribution, or copying of this e-mail is strictly prohibited. If you have
received this e-mail in error, please notify the sender and permanently
delete the e-mail and any attachments immediately. You should not retain,
copy or use this e-mail or any attachments for any purpose, nor disclose
all or any part of the contents to any other person.
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22334: tracker-capture: registration and data entry in one page - WIP

[noreply]

revno: 22334
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 17:29:06 +0100
message:
  tracker-capture: registration and data entry in one page - WIP
added:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/custom-registration-form.html
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html	2016-03-15 15:40:23 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html	2016-03-15 16:29:06 +
@@ -2,7 +2,7 @@
 
 
 
-{{currentEvent.excecutionDateLabel}}
+{{currentEvent.excecutionDateLabel ? currentEvent.excecutionDateLabel : 'report_date' | translate}}
 
 
 
-
+
 {{'due_date'| translate}}
 
-
+
 {{'reschedule_duedate'| translate}}
 
 
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html	2016-03-15 12:36:34 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html	2016-03-15 16:29:06 +
@@ -1,4 +1,6 @@
-{{'profile'| translate}}
+
+{{'profile'| translate}}
+
 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22335: Report table, XLS representation, using pretty name as column header, respect display propery for...

[noreply]

revno: 22335
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 17:42:15 +0100
message:
  Report table, XLS representation, using pretty name as column header, respect 
display propery for names.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.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/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2016-02-28 12:29:01 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2016-03-15 16:42:15 +
@@ -404,16 +404,16 @@
 }
 
 /**
- * Generates a pretty column name based on short-names of the argument
- * objects. Null arguments are ignored in the name.
+ * Generates a pretty column name based on the given display property of the 
+ * argument objects. Null arguments are ignored in the name.
  */
-public static String getPrettyColumnName( List objects )
+public static String getPrettyColumnName( List objects, DisplayProperty displayProperty )
 {
 StringBuilder builder = new StringBuilder();
 
 for ( DimensionalItemObject object : objects )
 {
-builder.append( object != null ? (object.getDisplayShortName() + SPACE) : EMPTY );
+builder.append( object != null ? ( object.getDisplayProperty( displayProperty ) + SPACE ) : EMPTY );
 }
 
 return builder.length() > 0 ? builder.substring( 0, builder.lastIndexOf( SPACE ) ) : TOTAL_COLUMN_PRETTY_NAME;
@@ -439,7 +439,7 @@
 }
 else
 {
-buffer.append( object != null ? (object.getShortName() + SEPARATOR) : EMPTY );
+buffer.append( object != null ? ( object.getShortName() + SEPARATOR ) : EMPTY );
 }
 }
 
@@ -576,7 +576,7 @@
 
 for ( List column : gridColumns )
 {
-grid.addHeader( new GridHeader( getPrettyColumnName( column ), getColumnName( column ), Double.class
+grid.addHeader( new GridHeader( getPrettyColumnName( column, displayProperty ), getColumnName( column ), Double.class
 .getName(), false, false ) );
 }
 

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2016-03-15 16:42:15 +
@@ -303,7 +303,7 @@
 
 for ( GridHeader header : headers )
 {
-sheet.addCell( new Label( columnIndex++, rowNumber, header.getColumn(), XLS_FORMAT_LABEL ) );
+sheet.addCell( new Label( columnIndex++, rowNumber, header.getName(), XLS_FORMAT_LABEL ) );
 }
 
 rowNumber++;

___
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 22333: Impl DatabaseInfoFactoryBean

[noreply]

revno: 22333
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 17:15:22 +0100
message:
  Impl DatabaseInfoFactoryBean
added:
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfoFactoryBean.java
modified:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java
  
dhis-2/dhis-support/dhis-support-system/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-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	2016-03-15 15:09:32 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java	2016-03-15 16:15:22 +
@@ -57,6 +57,7 @@
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.resourcetable.ResourceTableService;
 import org.hisp.dhis.setting.SystemSettingManager;
+import org.hisp.dhis.system.database.DatabaseInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -97,6 +98,9 @@

 @Autowired
 protected StatementBuilder statementBuilder;
+
+@Autowired
+protected DatabaseInfo databaseInfo;
 
 protected JdbcTemplate jdbcTemplate;
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java	2016-03-15 16:15:22 +
@@ -45,7 +45,7 @@
 import org.hisp.dhis.external.location.LocationManagerException;
 import org.hisp.dhis.setting.SettingKey;
 import org.hisp.dhis.setting.SystemSettingManager;
-import org.hisp.dhis.system.database.DatabaseInfoProvider;
+import org.hisp.dhis.system.database.DatabaseInfo;
 import org.hisp.dhis.system.util.DateUtils;
 import org.hisp.dhis.system.util.SystemUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@
 private LocationManager locationManager;
 
 @Autowired
-private DatabaseInfoProvider databaseInfoProvider;
+private DatabaseInfo databaseInfo;
 
 @Autowired
 private ConfigurationService configurationService;
@@ -176,7 +176,7 @@
 // Database
 // -
 
-info.setDatabaseInfo( databaseInfoProvider.getDatabaseInfo() );
+info.setDatabaseInfo( databaseInfo );
 
 // -
 // System env variables and properties

=== added file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfoFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfoFactoryBean.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfoFactoryBean.java	2016-03-15 16:15:22 +
@@ -0,0 +1,64 @@
+package org.hisp.dhis.system.database;
+
+/*
+ * Copyright (c) 2004-2016, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22332: tracker-capture: date validation directive applied to event execution and due dates

[noreply]

revno: 22332
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 16:40:23 +0100
message:
  tracker-capture: date validation directive applied to event execution and due 
dates
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2016-03-10 16:56:46 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2016-03-15 15:40:23 +
@@ -1419,22 +1419,6 @@
 
 $scope.saveEventDateForEvent = function (eventToSave, reOrder) {
 $scope.eventDateSaved = false;
-if (angular.isUndefined(eventToSave.eventDate) || eventToSave.eventDate === '') {
-$scope.invalidDate = eventToSave.event;
-$scope.validatedDateSetForEvent = {date: '', event: eventToSave};
-$scope.currentElement = {id: "eventDate", saved: false};
-return false;
-}
-
-var rawDate = angular.copy(eventToSave.eventDate);
-var convertedDate = DateUtils.format(eventToSave.eventDate);
-
-if (rawDate !== convertedDate) {
-$scope.invalidDate = eventToSave.event;
-$scope.validatedDateSetForEvent = {date: '', event: eventToSave};
-$scope.currentElement = {id: "eventDate", saved: false};
-return false;
-}
 
 $scope.currentElement = {id: "eventDate", event: eventToSave.event, saved: false};
 
@@ -1469,22 +1453,8 @@
 };
 
 $scope.saveDueDate = function () {
-
 $scope.dueDateSaved = false;
 
-if ($scope.currentEvent.dueDate === '') {
-$scope.invalidDueDate = $scope.currentEvent.event;
-return false;
-}
-
-var rawDate = angular.copy($scope.currentEvent.dueDate);
-var convertedDate = DateUtils.format($scope.currentEvent.dueDate);
-
-if (rawDate !== convertedDate) {
-$scope.invalidDueDate = $scope.currentEvent.event;
-return false;
-}
-
 var e = {event: $scope.currentEvent.event,
 enrollment: $scope.currentEvent.enrollment,
 dueDate: DateUtils.formatFromUserToApi($scope.currentEvent.dueDate),

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html	2016-02-15 12:05:18 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html	2016-03-15 15:40:23 +
@@ -7,9 +7,11 @@
placeholder="{{dhis2CalendarFormat.keyDateFormat}}"
class="form-control hideInPrint" 
ng-class="{'input-success': eventDateSaved}"
+   d2-date-validator 
d2-date 
max-date="0"
min-date=""
+   name="eventDate"
ng-model="currentEvent.eventDate"
ng-disabled="currentEvent.status === 'SKIPPED' || selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed"
ng-required="true"
@@ -18,7 +20,8 @@
class="form-control not-for-screen" 
ng-class="{'input-success': eventDateSaved}"   
value={{currentEvent.eventDate}}>
-{{'date_required'| translate}}
+
+
 
 
 
@@ -31,15 +34,18 @@
placeholder="{{dhis2CalendarFormat.keyDateFormat}}"
class="form-control hideInPrint"
ng-class="{'input-success': dueDateSaved}"
-   d2-date
+   d2-date-validator 
+   d2-date   
+   name="dueDate"
ng-model="currentEvent.dueDate"
blur-or-change="saveDueDate()" 
ng-disabled="currentEvent.eventDate || !schedulingEnabled || currentEvent.enrollmentStatus !== 'ACTIVE' || currentEvent.editingNotAllowed"/>
 
-{{'date_required'| translate}}
+   value={{currentEvent.dueDate}}>
+
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22331: Included spatial support in db in DatabaseInfo provider.

[noreply]

revno: 22331
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 16:23:35 +0100
message:
  Included spatial support in db in DatabaseInfo provider.
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfo.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java
  
dhis-2/dhis-support/dhis-support-system/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-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java	2016-03-15 15:09:32 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java	2016-03-15 15:23:35 +
@@ -103,8 +103,6 @@
 private String memoryInfo;
 
 private Integer cpuCores;
-
-private boolean spatialSupport;
 
 private String systemId;
 
@@ -133,7 +131,6 @@
 this.databaseInfo = null;
 this.memoryInfo = null;
 this.cpuCores = null;
-this.spatialSupport = false;
 this.systemId = null;
 }
 
@@ -431,18 +428,6 @@
 
 @JsonProperty
 @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-public boolean isSpatialSupport()
-{
-return spatialSupport;
-}
-
-public void setSpatialSupport( boolean spatialSupport )
-{
-this.spatialSupport = spatialSupport;
-}
-
-@JsonProperty
-@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
 public String getSystemId()
 {
 return systemId;

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfo.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfo.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfo.java	2016-03-15 15:23:35 +
@@ -53,6 +53,8 @@
 
 private String url;
 
+private boolean spatialSupport;
+
 // -
 // Constructor
 // -
@@ -141,6 +143,18 @@
 this.url = url;
 }
 
+@JsonProperty
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+public boolean isSpatialSupport()
+{
+return spatialSupport;
+}
+
+public void setSpatialSupport( boolean spatialSupport )
+{
+this.spatialSupport = spatialSupport;
+}
+
 // -
 // toString
 // -

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java	2016-03-15 15:23:35 +
@@ -30,6 +30,7 @@
 
 import org.hibernate.cfg.Configuration;
 import org.hisp.dhis.hibernate.HibernateConfigurationProvider;
+import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
  * @author Lars Helge Overland
@@ -64,10 +65,19 @@
 this.hibernateConfigurationProvider = hibernateConfigurationProvider;
 }
 
+private JdbcTemplate jdbcTemplate;
+
+public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+{
+this.jdbcTemplate = jdbcTemplate;
+}
+
 public void init()
 {
 Configuration config = hibernateConfigurationProvider.getConfiguration();
 
+boolean spatialSupport = isSpatialSupport();
+
 String dialect = config.getProperty( KEY_DIALECT );
 String driverClass = config.getProperty( KEY_DRIVER_CLASS );
 String url = config.getProperty( KEY_URL );
@@ -95,6 +105,7 @@
 info.setDialect( dialect );
 info.setDriverClass( driverClass );
 info.setUrl( url );
+info.setSpatialSupport( spatialSupport );
 }
 
 // -
@@ -112,4 +123,21 @@
 {
 return info.getUrl() != null && info.getUrl().contains( ":mem:" );
 }
+
+// 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22330: JdbcTemplate. Replaced autowired with xml mapping. Preparing for multiple jdbc templates.

[noreply]

revno: 22330
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 16:09:32 +0100
message:
  JdbcTemplate. Replaced autowired with xml mapping. Preparing for multiple 
jdbc templates.
modified:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/partition/JdbcPartitionManager.java
  
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/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDimensionDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/code/SMSCodesDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/FavoriteDataItemUpgrader.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableCreator.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserGroupDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java	2016-03-15 15:09:32 +
@@ -101,9 +101,13 @@
 
 private static final String COL_APPROVALLEVEL = "approvallevel";
 
-@Autowired
 private JdbcTemplate jdbcTemplate;
 
+public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+{
+this.jdbcTemplate = jdbcTemplate;
+}
+
 @Autowired
 private StatementBuilder statementBuilder;
 

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2016-03-15 15:09:32 +
@@ -89,10 +89,14 @@
 private static final String QUERY_ERR_MSG = "Query failed, likely because the requested analytics table does not exist";
 private static final String ITEM_NAME_SEP = ": ";
 private static final String NA = "[N/A]";
-
-@Autowired
+
 private JdbcTemplate jdbcTemplate;
-
+
+public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+{
+this.jdbcTemplate = jdbcTemplate;
+}
+
 @Autowired
 private StatementBuilder statementBuilder;
 

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/partition/JdbcPartitionManager.java'
--- 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22329: minor

[noreply]

revno: 22329
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 15:50:51 +0100
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.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/registration/enrollment-dates-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html	2016-03-15 13:14:36 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html	2016-03-15 14:50:51 +
@@ -9,14 +9,6 @@
 
 
 
-{{'program' | translate}}
-
-
-
-
-
-
-
 {{selectedProgram.enrollmentDateLabel}}
 
 

___
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 22328: tracker/event-capture: custom form directive now uses parent scope. this makes it easy to render ...

[noreply]

revno: 22328
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 15:42:33 +0100
message:
  tracker/event-capture: custom form directive now uses parent scope. this 
makes it easy to render both registration and data entry custom forms at the 
same time.
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2016-03-08 16:27:49 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2016-03-15 14:42:33 +
@@ -208,6 +208,9 @@
 .directive('d2CustomForm', function ($compile) {
 return{
 restrict: 'E',
+scope: {
+customForm: '='
+},
 link: function (scope, elm, attrs) {
 scope.$watch('customForm', function () {
 if (angular.isObject(scope.customForm)) {

___
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] [GSOC][Idea-2-PatialRendering-for-Nashorn] Idea interest and Calarification

[Mark Polak]

Hey Dehan,

Sorry for the slow response from my side.

It is true that SPA applications have better responsiveness while using the
app. The goal of the project is then also not to totally replace the SPA
stuff with rendering on the server.

The goal of the project is more to see if/how we can utilise the
capabilities that Nashorn gives us to pre-render the initial SPA payload on
the server. Due to the nature of React its "diffing" of the DOM the SPA
could "continue" on the client side. This could potentially save some
requests which (in some of our working areas, high latency places) could be
a good thing. Also a reduced "perceived loading time" gives a more pleasant
user experience in general.

As the product (DHIS2) is primarily a web application, that is behind a
login wall, we generally don't have much to index for search engines.
Therefore this benefit is not really of importance. As an additional
benefit (not initially part of the task description, but could be added if
enough time, the Nashorn integration could enhance our architecture of
custom apps (which are currently client side Javascript only) with the
ability to run server side code and possibly even interact with the service
layer. (I'm just thinking out loud here ;))

Regarding your concern of the increased payload. I don't believe the
payload increase would decrease performance that much, but during the
development of the test cases we could see if this concern is legitimate
and see if there is perhaps a hybrid/different solution. I think the
project in general is more of a prototyping experience and a change to work
with cool fairly cutting edge stuff ;)

Regards,

Mark

On Wed, Mar 9, 2016 at 6:56 PM, Dehan De Croos 
wrote:

> Hi Mark Polak,
>
> I am Dehan currently finishing off my final year at University of
> Moratuwa, Sri Lanka. I am really interested in web technologies and
> therefore also this project.
>
> Considering the project idea, it has the idea of partial rendering
> introduced to increase performance or
> as per the article sighted in the project idea page improve web crawler
> indexing[1]
>
> It's true that a SPA takes time to load initially, but after the initial
> loading point the SPA performance is greatly increased because now only a
> simply JSON/XML data structure is called for each REST call. But there is
> the obvious drawback when indexing because when using mechanisms like
> angular routing I assume they will not be crawled again as per the article
> provided earlier.
>
> But if indeed the startup time is what you are looking at to reduce,
> wouldn't it come at a cost of each page taking more time to lead due to the
> increased markup which now should be brought in for each request?. Isn't it
> better to sacrifice more start up time to have more responsiveness when
> actually using the web app? which is the principal behind SPAs?
>
> Furthermore which version of Spring is used ? Is it Spring 4 and beyond or
> a version before that?
>
>
> If we are to work with Nashorn we will have to work with Clojure I
> guess?[2]
>
>
>
> [1] - http://augustl.com/blog/2014/jdk8_react_rendering_on_server/
> [2] -
> https://carouselapps.com/2015/09/11/isomorphic-clojurescriptjavascript-for-pre-rendering-single-page-applications-part-1/
>
> best regards,
> *Dehan de Croos*
>
> ___
> 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 22327: minor

[noreply]

revno: 22327
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 14:14:36 +0100
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.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/registration/enrollment-dates-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html	2016-02-15 09:46:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html	2016-03-15 13:14:36 +
@@ -1,4 +1,4 @@
-
+
 
 
 {{'enrolling_orgunit' | translate}}

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22326: tracker/event-capture: minor style fixes

[noreply]

revno: 22326
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 13:36:34 +0100
message:
  tracker/event-capture: minor style fixes
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-notes.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-notes.html	2016-03-08 15:39:09 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-notes.html	2016-03-15 12:36:34 +
@@ -17,20 +17,16 @@
 
 
 
-
-
-
-{{note.heading}}
-{{note.displayDate}}
-
-
-
-
{{content.value}}
-

-
{{'created_by' | translate}}: {{content.storedBy}}
-
{{'date' | translate}}: {{content.storedDate}}
   
-
- 
+
+{{note.heading}}
+{{note.displayDate}}
+
+
+
{{content.value}}
+

+
{{'created_by' | translate}}: {{content.storedBy}}
+
{{'date' | translate}}: {{content.storedDate}}
   
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2016-02-15 09:46:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2016-03-15 12:36:34 +
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 
 {{'enrolling_orgunit' | translate}}

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2016-03-08 15:39:09 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2016-03-15 12:36:34 +
@@ -46,21 +46,16 @@
 
 
 
-
-
-
-{{note.heading}}
-{{note.displayDate}}
-
-
-
-
-
{{content.value}}
-

-
{{'created_by' | translate}}: {{content.storedBy}}
-
{{'date' | translate}}: {{content.storedDate}}
   
-
- 
+
+{{note.heading}}
+{{note.displayDate}}
+
+
+
{{content.value}}
+

+
{{'created_by' | translate}}: {{content.storedBy}}
+
{{'date' | translate}}: {{content.storedDate}}
   
+
 
 
 

=== modified file 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22324: Tracked entity instance enrollment validation, using equals instead of == for reliable comparison

[noreply]

revno: 22324
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 12:40:54 +0100
message:
  Tracked entity instance enrollment validation, using equals instead of == for 
reliable comparison
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.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/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2016-03-15 11:22:02 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2016-03-15 11:40:54 +
@@ -454,11 +454,9 @@
 // Add program instance
 // -
 
-if( program.getTrackedEntity() != trackedEntityInstance.getTrackedEntity() )
+if ( program.getTrackedEntity() != null && !program.getTrackedEntity().equals( trackedEntityInstance.getTrackedEntity() ) )
 {
-log.warn( "Tracked entitiy instance needs to have the same tracked entity as the program" );
-
-throw new IllegalQueryException( "Tracked entitiy instance needs to have the same tracked entity as the program" );
+throw new IllegalQueryException( "Tracked entitiy instance must have same tracked entity as program: " + program.getUid() );
 }
 
 ProgramInstance programInstance = new ProgramInstance();

___
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 22323: Enrollment services now checks if the TEI being enrolled has the same tracked entity as the progr...

[noreply]

revno: 22323
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 12:22:02 +0100
message:
  Enrollment services now checks if the TEI being enrolled has the same tracked 
entity as the program its getting enrolled into
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.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/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2016-03-08 13:58:56 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2016-03-15 11:22:02 +
@@ -453,6 +453,13 @@
 // -
 // Add program instance
 // -
+
+if( program.getTrackedEntity() != trackedEntityInstance.getTrackedEntity() )
+{
+log.warn( "Tracked entitiy instance needs to have the same tracked entity as the program" );
+
+throw new IllegalQueryException( "Tracked entitiy instance needs to have the same tracked entity as the program" );
+}
 
 ProgramInstance programInstance = new ProgramInstance();
 programInstance.setUid( CodeGenerator.isValidCode( uid ) ? uid : CodeGenerator.generateCode() );

___
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 22322: Data source, increased max idle time

[noreply]

revno: 22322
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 12:13:21 +0100
message:
  Data source, increased max idle time
modified:
  
dhis-2/dhis-support/dhis-support-hibernate/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-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2016-03-15 08:27:06 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2016-03-15 11:13:21 +
@@ -60,7 +60,7 @@
 
 
 
-
+
   
 
   

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22321: Upgraded postgresql and mysql jdbc connectors

[noreply]

revno: 22321
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 12:02:44 +0100
message:
  Upgraded postgresql and mysql jdbc connectors
modified:
  dhis-2/pom.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2016-03-15 08:27:06 +
+++ dhis-2/pom.xml	2016-03-15 11:02:44 +
@@ -793,12 +793,12 @@
   
 mysql
 mysql-connector-java
-5.1.33
+5.1.38
   
   
 org.postgresql
 postgresql
-9.3-1102-jdbc41
+9.4.1208
   
 
   

___
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 22320: dhis conf, supporting connection pool max size setting.

[noreply]

revno: 22320
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 11:49:45 +0100
message:
  dhis conf, supporting connection pool max size setting.
modified:
  
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java
  
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.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-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java	2016-01-13 15:47:42 +
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java	2016-03-15 10:49:45 +
@@ -41,6 +41,7 @@
 CONNECTION_USERNAME( "connection.username" ),
 CONNECTION_PASSWORD( "connection.password" ),
 CONNECTION_SCHEMA( "connection.schema" ),
+CONNECTION_POOL_MAX_SIZE( "connection.pool.max_size" ),
 LDAP_URL( "ldap.url", "ldaps://0:1" ),
 LDAP_MANAGER_DN( "ldap.manager.dn" ),
 LDAP_MANAGER_PASSWORD( "ldap.manager.password" ),

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java	2016-01-14 23:23:54 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java	2016-03-15 10:49:45 +
@@ -215,6 +215,7 @@
 putIfExists( properties, ConfigurationKey.CONNECTION_USERNAME.getKey(), "hibernate.connection.username" );
 putIfExists( properties, ConfigurationKey.CONNECTION_PASSWORD.getKey(), "hibernate.connection.password" );
 putIfExists( properties, ConfigurationKey.CONNECTION_SCHEMA.getKey(), "hibernate.hbm2ddl.auto" );
+putIfExists( properties, ConfigurationKey.CONNECTION_POOL_MAX_SIZE.getKey(), "hibernate.c3p0.max_size" );
 }
 
 private void putIfExists( Properties properties, String from, String to )

___
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 22319: minor order changes in schema descriptors

[noreply]

revno: 22319
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-03-15 17:24:55 +0700
message:
  minor order changes in schema descriptors
added:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AnalyticalObjectObjectBundleHook.java
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapViewSchemaDescriptor.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ReportSchemaDescriptor.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ReportTableSchemaDescriptor.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceFavoritesTest.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/schema/descriptors/ChartSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java	2016-03-10 03:41:51 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java	2016-03-15 10:24:55 +
@@ -54,7 +54,7 @@
 Schema schema = new Schema( Chart.class, SINGULAR, PLURAL );
 schema.setRelativeApiEndpoint( API_ENDPOINT );
 schema.setShareable( true );
-schema.setOrder( 1360 );
+schema.setOrder( 2000 );
 
 schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_CHART_PUBLIC_ADD" ) ) );
 schema.getAuthorities().add( new Authority( AuthorityType.EXTERNALIZE, Lists.newArrayList( "F_CHART_EXTERNAL" ) ) );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java	2016-03-10 03:41:51 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java	2016-03-15 10:24:55 +
@@ -54,7 +54,7 @@
 Schema schema = new Schema( Document.class, SINGULAR, PLURAL );
 schema.setRelativeApiEndpoint( API_ENDPOINT );
 schema.setShareable( true );
-schema.setOrder( 1040 );
+schema.setOrder( 2000 );
 
 schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_DOCUMENT_PUBLIC_ADD" ) ) );
 schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_DOCUMENT_PRIVATE_ADD" ) ) );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java	2016-03-10 03:41:51 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java	2016-03-15 10:24:55 +
@@ -50,7 +50,7 @@
 {
 Schema schema = new Schema( MapLayer.class, SINGULAR, PLURAL );
 schema.setRelativeApiEndpoint( API_ENDPOINT );
-schema.setOrder( 1090 );
+schema.setOrder( 2000 );
 
 return schema;
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java	2016-03-10 03:41:51 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java	2016-03-15 10:24:55 +
@@ -54,7 +54,7 @@
 Schema schema = new Schema( Map.class, SINGULAR, PLURAL );
 schema.setRelativeApiEndpoint( API_ENDPOINT );
 schema.setShareable( true );
-schema.setOrder( 1420 );
+schema.setOrder( 2000 );
 
 schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, 

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

[noreply]

revno: 22318
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 11:16:20 +0100
message:
  Minor
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.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-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2016-03-15 08:33:08 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2016-03-15 10:16:20 +
@@ -277,7 +277,7 @@
 
 {{'section'| translate}} {{section.displayName}} {{'has_no_dataelements'| translate}}
   
-
+
 
 
 

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22317: Moved code for getting user settings with fallback into own method in service, from controller

[noreply]

Merge authors:
  Stian Sandvold (stian-sandvold)

revno: 22317 [merge]
committer: Stian Sandvold 
branch nick: dhis2
timestamp: Tue 2016-03-15 11:12:20 +0100
message:
  Moved code for getting user settings with fallback into own method in 
service, from controller
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.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/user/UserSettingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java	2016-03-15 10:04:09 +
@@ -30,6 +30,8 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * The main interface for working with user settings. Implementation need to get
@@ -128,6 +130,14 @@
  * @return all user settings belonging to the current user.
  */
 List getAllUserSettings();
+
+/**
+ * Returns all specified user settings. If any user settings have not been set,
+ * system settings will be used as a fallback.
+ * @param names the settings to retrieve
+ * @return a map of setting names and their values
+ */
+Map getUserSettingsWithFallbackByUserAsMap( User user, Set names );
 
 /**
  * Invalidates in-memory caches.

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java	2016-03-14 18:04:21 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java	2016-03-15 10:09:43 +
@@ -42,12 +42,10 @@
 import org.springframework.transaction.support.TransactionTemplate;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -232,6 +230,22 @@
 }
 
 @Override
+public Map getUserSettingsWithFallbackByUserAsMap( User user, Set names )
+{
+Map result = Sets.newHashSet( getUserSettings(user) ).stream()
+.collect( Collectors.toMap( UserSetting::getName, UserSetting::getValue ) );
+
+names.forEach( name -> {
+if ( !result.containsKey( name ) )
+{
+result.put( name, systemSettingManager.getSystemSetting( NAME_SETTING_KEY_MAP.get( name ) ) );
+}
+} );
+
+return result;
+}
+
+@Override
 @Transactional
 public List getUserSettings( User user )
 {
@@ -263,15 +277,15 @@
 try
 {
 String username = user.isPresent() ? user.get().getUsername() : currentUserService.getCurrentUsername();
-
+
 String cacheKey = getCacheKey( key.getName(), username );
-
+
 Optional result = SETTING_CACHE.
 get( cacheKey, () -> getUserSettingOptional( key, username ) );
 
 if ( !result.isPresent() && NAME_SETTING_KEY_MAP.containsKey( key.getName() ) )
 {
-return Optional.ofNullable( 
+return Optional.ofNullable(
 systemSettingManager.getSystemSetting( NAME_SETTING_KEY_MAP.get( key.getName() ) ) );
 }
 else

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java	2016-03-14 14:46:23 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java	2016-03-15 10:09:43 +
@@ -29,18 +29,9 @@
  */
 
 import com.google.common.collect.Sets;
+import org.hisp.dhis.dxf2.webmessage.WebMessageException;
 import org.hisp.dhis.render.RenderService;
-
-import org.hisp.dhis.dxf2.webmessage.WebMessageException;
-import org.hisp.dhis.setting.SettingKey;
-import org.hisp.dhis.setting.SystemSettingManager;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-import 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22314: minor fix

[noreply]

revno: 22314
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-03-15 16:37:19 +0700
message:
  minor fix
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java	2016-03-14 08:30:30 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java	2016-03-15 09:37:19 +
@@ -46,7 +46,6 @@
 import org.hisp.dhis.schema.SchemaService;
 import org.hisp.dhis.schema.validation.SchemaValidator;
 import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.UserCredentials;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -390,7 +389,7 @@
 persistedObject.mergeWith( object, bundle.getMergeMode() );
 persistedObject.mergeSharingWith( object );
 
-sessionFactory.getCurrentSession().update( persistedObject );
+manager.update( persistedObject, bundle.getUser() );
 
 objectBundleHooks.forEach( hook -> hook.postUpdate( persistedObject, bundle ) );
 

___
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 22313: moved hbms/stores from dhis-service-reporting to dhis-service-core

[noreply]

revno: 22313
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-03-15 16:34:18 +0700
message:
  moved hbms/stores from dhis-service-reporting to dhis-service-core
removed:
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardItemStore.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/hibernate/HibernateInterpretationStore.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/
  dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/
  dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/Dashboard.hbm.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardItem.hbm.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/hibernate/Document.hbm.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/Interpretation.hbm.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/InterpretationComment.hbm.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml
added:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dashboard/
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dashboard/hibernate/
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardItemStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/interpretation/
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/interpretation/hibernate/
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/interpretation/hibernate/HibernateInterpretationStore.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/chart/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/chart/hibernate/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dashboard/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dashboard/hibernate/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dashboard/hibernate/Dashboard.hbm.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardItem.hbm.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/document/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/document/hibernate/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/document/hibernate/Document.hbm.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/interpretation/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/interpretation/hibernate/
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/interpretation/hibernate/Interpretation.hbm.xml
  

Re: [Dhis2-devs] connecting to play.dhis2.org fails using event capture

[Erling Fjeldstad]

Hi Moses,
You can try to connect to https://play.dhis2.org/demo
username: android
password: Android123

Remember that passwords is case sensitve

Regards,
Erling - DHIS2 Android Team

On Tue, Mar 15, 2016 at 8:15 AM, moses mwale  wrote:

> which address do i use to connect to the play.dhis2.org/dev using event
> capture apk app.
> is it possible?
>
> --
> developer_lusaka_systems
>
> ___
> 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 22311: Removed dependency from analytics to dxf2

[noreply]

revno: 22311
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 09:41:27 +0100
message:
  Removed dependency from analytics to dxf2
modified:
  dhis-2/dhis-services/dhis-service-analytics/pom.xml
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.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/pom.xml'
--- dhis-2/dhis-services/dhis-service-analytics/pom.xml	2016-01-15 00:52:40 +
+++ dhis-2/dhis-services/dhis-service-analytics/pom.xml	2016-03-15 08:41:27 +
@@ -27,10 +27,6 @@
 
 
   org.hisp.dhis
-  dhis-service-dxf2
-
-
-  org.hisp.dhis
   dhis-service-administration
 
 

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2016-02-27 12:02:42 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2016-03-15 08:41:27 +
@@ -75,7 +75,6 @@
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
 import org.hisp.dhis.dataelement.DataElementGroupSet;
 import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dxf2.common.JacksonUtils;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
 import org.hisp.dhis.period.Period;
@@ -1226,7 +1225,7 @@
 map.put( "Filters", filters );
 map.put( "Aggregation type", aggregationType );
 
-return JacksonUtils.toJsonAsStringSilent( map );
+return map.toString(); //TODO
 }
 
 // -

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java	2016-03-15 08:41:27 +
@@ -52,7 +52,6 @@
 import org.hisp.dhis.common.QueryItem;
 import org.hisp.dhis.commons.collection.ListUtils;
 import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dxf2.common.JacksonUtils;
 import org.hisp.dhis.legend.Legend;
 import org.hisp.dhis.option.OptionSet;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -532,7 +531,7 @@
 map.put( "Dimensions", dimensions );
 map.put( "Filters", filters );
 
-return JacksonUtils.toJsonAsStringSilent( map );
+return map.toString(); //TODO
 }
 
 // -

___
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 22310: Removed unnecessary dep

[noreply]

revno: 22310
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 09:37:44 +0100
message:
  Removed unnecessary dep
modified:
  dhis-2/dhis-services/dhis-service-administration/pom.xml
  dhis-2/dhis-services/pom.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-administration/pom.xml'
--- dhis-2/dhis-services/dhis-service-administration/pom.xml	2016-01-15 00:52:40 +
+++ dhis-2/dhis-services/dhis-service-administration/pom.xml	2016-03-15 08:37:44 +
@@ -25,10 +25,6 @@
   org.hisp.dhis
   dhis-service-core
 
-
-  org.hisp.dhis
-  dhis-service-dxf2
-
 
 
 

=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml	2016-02-22 11:40:17 +
+++ dhis-2/dhis-services/pom.xml	2016-03-15 08:37:44 +
@@ -24,8 +24,8 @@
 
 dhis-service-dxf2
 dhis-service-mobile
+dhis-service-administration
 
-dhis-service-administration
 dhis-service-analytics
 
 dhis-service-reporting

___
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 22309: minor style fix

[noreply]

revno: 22309
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 09:33:08 +0100
message:
  minor style fix
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.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-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css	2016-03-11 10:57:01 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css	2016-03-15 08:33:08 +
@@ -365,6 +365,7 @@
 .section-label{
 font-size: 14pt;
 color: #585D61;
+padding-bottom: 5px;
 border-bottom: 1px solid #e3e3e3;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2016-03-10 09:15:35 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2016-03-15 08:33:08 +
@@ -277,7 +277,7 @@
 
 {{'section'| translate}} {{section.displayName}} {{'has_no_dataelements'| translate}}
   
-
+
 
 
 

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22308: Revert 22305..22304

[noreply]

revno: 22308
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-03-15 15:29:20 +0700
message:
  Revert 22305..22304
removed:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/DocumentStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableStore.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceFavoritesTest.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/metadata_with_charts1.json
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/HibernateChartStore.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/hibernate/HibernateDocumentStore.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/hibernate/HibernateReportStore.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/hibernate/HibernateReportTableStore.java
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/QueryService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/impl/DefaultDocumentService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartStoreTest.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentStoreTest.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportStoreTest.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java	2016-03-15 07:24:23 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java	1970-01-01 00:00:00 +
@@ -1,40 +0,0 @@
-package org.hisp.dhis.chart;
-
-/*
- * Copyright (c) 2004-2016, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.common.AnalyticalObjectStore;
-
-/**
- * @author Morten Olav Hansen 
- */
-public interface ChartStore
-extends AnalyticalObjectStore
-{
-String ID = ChartStore.class.getName();
-}

=== removed file 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22307: Setting versions in dependency managemetn to avoid duplicate deps

[noreply]

revno: 22307
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2016-03-15 09:27:06 +0100
message:
  Setting versions in dependency managemetn to avoid duplicate deps
modified:
  
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/pom.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2016-03-14 15:55:25 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2016-03-15 08:27:06 +
@@ -68,6 +68,8 @@
 	
   
 
+  
+
   
 
 

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2016-03-08 19:45:16 +
+++ dhis-2/pom.xml	2016-03-15 08:27:06 +
@@ -662,6 +662,16 @@
 3.4
   
   
+commons-lang
+commons-lang
+2.5
+  
+  
+commons-beanutils
+commons-beanutils
+1.9.0
+  
+  
 commons-digester
 commons-digester
 2.1

___
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 22306: tracker-capture: rules engine is now applied during relative regsitration

[noreply]

revno: 22306
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-03-15 09:14:44 +0100
message:
  tracker-capture: rules engine is now applied during relative regsitration
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2016-03-14 14:35:45 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2016-03-15 08:14:44 +
@@ -29,12 +29,10 @@
 $scope.trackedEntityForm = null;
 $scope.customForm = null;
 $scope.selectedTei = {};
-$scope.tei = {};
+$scope.tei = {};
+$scope.hiddenFields = {};
+$scope.helpTexts = {};
 $scope.registrationMode = 'REGISTRATION';
-$scope.hiddenFields = {};
-
-$scope.helpTexts = {};
-
 
 $scope.attributesById = CurrentSelection.getAttributesById();
 if(!$scope.attributesById){
@@ -252,7 +250,7 @@
 if(!$scope.selectedTei.trackedEntityInstance){
 $scope.selectedTei.trackedEntity = $scope.tei.trackedEntity = $scope.selectedProgram && $scope.selectedProgram.trackedEntity && $scope.selectedProgram.trackedEntity.id ? $scope.selectedProgram.trackedEntity.id : $scope.trackedEntities.selected.id;
 $scope.selectedTei.orgUnit = $scope.tei.orgUnit = $scope.selectedOrgUnit.id;
-$scope.selectedTei.attributes = $scope.selectedTei.attributes = [];
+$scope.selectedTei.attributes = $scope.tei.attributes = [];
 }
 
 //get tei attributes and their values

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html	2016-02-15 10:16:24 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html	2016-03-15 08:14:44 +
@@ -48,7 +48,7 @@
 {{'form_is_empty_fill_at_least_one'| translate}} 
 
 
-{{'save'| translate}}
+{{'save'| translate}}
 {{'cancel'| translate}}
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js	2016-03-14 10:36:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js	2016-03-15 08:14:44 +
@@ -512,12 +512,23 @@
 DialogService,
 CurrentSelection,
 DateUtils,
+EventUtils,
+DHIS2EventFactory,
 RegistrationService,
-SessionStorageService) {
+SessionStorageService,
+TrackerRulesExecutionService,
+TEIGridService) {
 $scope.selectedOrgUnit = SessionStorageService.get('SELECTED_OU');
 $scope.enrollment = {enrollmentDate: '', incidentDate: ''};
 $scope.attributesById = CurrentSelection.getAttributesById();
 $scope.maxOptionSize = 30;
+$scope.today = DateUtils.getToday();
+$scope.trackedEntityForm = null;
+$scope.customForm = null;
+$scope.selectedTei = {};
+$scope.tei = {};
+$scope.hiddenFields = {};
+$scope.editingDisabled = false;
 
 var selections = CurrentSelection.get();
 $scope.programs = selections.prs;
@@ -547,8 +558,8 @@
 }
 
 var assignInheritance = function(){
+$scope.selectedTei = {};
 if($scope.addingRelationship){
-$scope.selectedTei = {};
 var t = angular.copy( CurrentSelection.getRelationshipOwner() );
 angular.forEach(t.attributes, function(att){
 t[att.attribute] = att.value;
@@ -561,9 +572,6 @@
 });
 t = {};
 }
-else{
-$scope.selectedTei = {};
-}
 };
 
 var getRules = function(){
@@ -579,7 +587,7 @@
 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22305: add stores for Chart, Report, ReportTable, Document

[noreply]

revno: 22305
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-03-15 14:24:23 +0700
message:
  add stores for Chart, Report, ReportTable, Document
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/DocumentStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableStore.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceFavoritesTest.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/metadata_with_charts1.json
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/HibernateChartStore.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/hibernate/HibernateDocumentStore.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/hibernate/HibernateReportStore.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/hibernate/
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/hibernate/HibernateReportTableStore.java
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/QueryService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/impl/DefaultDocumentService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartStoreTest.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentStoreTest.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportStoreTest.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java	2016-03-15 07:24:23 +
@@ -0,0 +1,40 @@
+package org.hisp.dhis.chart;
+
+/*
+ * Copyright (c) 2004-2016, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.common.AnalyticalObjectStore;
+
+/**
+ * @author Morten Olav Hansen 
+ */
+public interface ChartStore
+extends AnalyticalObjectStore
+{
+String ID = ChartStore.class.getName();
+}

=== added file 

[Dhis2-devs] connecting to play.dhis2.org fails using event capture

[moses mwale]

which address do i use to connect to the play.dhis2.org/dev using event
capture apk app.
is it possible?

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