[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16608: minor fix/opt, include user arg in sharing criteria (default to currentUser)
revno: 16608
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 13:24:44 +0700
message:
minor fix/opt, include user arg in sharing criteria (default to currentUser)
modified:
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.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-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2014-09-02 05:23:24 +
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2014-09-02 06:24:44 +
@@ -54,10 +54,12 @@
import org.hisp.dhis.hibernate.exception.UpdateAccessDeniedException;
import org.hisp.dhis.interpretation.Interpretation;
import org.hisp.dhis.user.CurrentUserService;
+import org.hisp.dhis.user.User;
import org.hisp.dhis.user.UserGroupAccess;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import java.util.HashSet;
@@ -170,6 +172,8 @@
/**
* Creates a Criteria for the implementation Class type.
*
+ * Please note that sharing is not considered.
+ *
* @return a Criteria instance.
*/
protected final Criteria getCriteria()
@@ -179,18 +183,25 @@
protected final Disjunction getSharingDisjunction()
{
+return getSharingDisjunction( currentUserService.getCurrentUser() );
+}
+
+protected final Disjunction getSharingDisjunction( User user )
+{
+Assert.notNull( user, User argument can't be null. );
+
Disjunction disjunction = Restrictions.disjunction();
disjunction.add( Restrictions.like( publicAccess, r% ) );
disjunction.add( Restrictions.isNull( user ) );
-disjunction.add( Restrictions.eq( user, currentUserService.getCurrentUser() ) );
+disjunction.add( Restrictions.eq( user, user ) );
DetachedCriteria detachedCriteria = DetachedCriteria.forClass( UserGroupAccess.class, uga );
detachedCriteria.createAlias( uga.userGroup, ug );
detachedCriteria.createAlias( ug.members, ugm );
detachedCriteria.add( Restrictions.like( uga.access, r% ) );
-detachedCriteria.add( Restrictions.eq( ugm.id, currentUserService.getCurrentUser().getId() ) );
+detachedCriteria.add( Restrictions.eq( ugm.id, user.getId() ) );
detachedCriteria.setProjection( Projections.id() );
@@ -199,13 +210,13 @@
return disjunction;
}
-/**
- * Creates a Criteria for the implementation Class type.
- *
- * @return a Criteria instance.
- */
protected final Criteria getSharingCriteria()
{
+return getSharingCriteria( currentUserService.getCurrentUser() );
+}
+
+protected final Criteria getSharingCriteria( User user )
+{
Criteria criteria = getCriteria();
if ( !sharingEnabled() )
@@ -213,7 +224,9 @@
return criteria;
}
-criteria.add( getSharingDisjunction() );
+Assert.notNull( user, User argument can't be null. );
+
+criteria.add( getSharingDisjunction( user ) );
return criteria;
}
___
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 16609: Minor.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16609 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 08:31:03 +0200
message:
Minor.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.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-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-01 22:20:49 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-02 06:29:33 +
@@ -8754,7 +8754,6 @@
menu: {},
handler: function(b) {
b.menu = Ext.create('Ext.menu.Menu', {
-title: 'sddd',
closeAction: 'destroy',
shadow: false,
showSeparator: false,
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Auto-calculated data in entry forms
great. surprised that a medical doctor can write that code. if you turn it
to jquery it is much easier. anyway, its fine for now
On Sep 2, 2014 11:54 AM, Pamod Amarakoon pam...@gmail.com wrote:
Hi,
Thanks a lot. In fact I'm a medical doctor and have limited knowledhe in
Javascript. I managed to get it done with following javascript I created.
height enterd in cm and weight in kg.
script type=text/javascript
function updateBMI() {
var ht = document.getElementById(HeightID-val).value;
var wt = document.getElementById(WeightID-val).value;
if(ht!= wt!=){
var bmi = wt/(ht*ht/1);
bmi = +bmi.toFixed(2);
}else{
var bmi =Enter Height and Weight;
}
var inputbmi= document.getElementById(BMI-ID-val);
inputbmi.value = bmi;
}
updateBMI();
/script
It serves the purpose it seems. Pls suggest any modifications
On Mon, Sep 1, 2014 at 11:52 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
yes you can use custom data entry form and add some js script like
onchange event on weight and height.
the event handler should then calculate the bmi and update the text field
bmi.
do you have any technical person to do this? if not give me your account
i can help
On Sep 2, 2014 12:26 AM, Pamod Amarakoon pam...@gmail.com wrote:
I'd like to add something to this.
For example, if we have a data entry form (BMI) for a program stage if
we have height and weight input boxes/data elements is there a way to
calculate BMI?
is it only possible by using javascript/webapp
On Mon, Sep 1, 2014 at 10:21 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
Hi
I believe the calculated data value (now as indicator) can only be seen
after an aggregation is run.
In addition, in some forms in some countries like VN, auto-calculated
data elements some time can be input by users.
In VN, we use Javascript to achieve this. However, it is quite
complicated. Imagine that you have to rebuild a spreadsheet engine.
Important lesson learnt was if a dataelement is auto-calculated, make
sure no one can change it manually. Otherwise, you end up with very low
data quality.
Thanh
On Mon, Sep 1, 2014 at 11:15 PM, Jason Pickering
jason.p.picker...@gmail.com wrote:
Hi Robin,
You can simply use an indicator to do this.
In case you have not seen it, we have extensive documentation on the
use of indicators here
https://www.dhis2.org/doc/snapshot/en/user/html/ch13.html#indicator_maintenance
It should also be possible to calculate the value from other data, not
contained in the data entry form, IF it exists for the same orgunit and
period.
Best regards,
Jason
On Mon, Sep 1, 2014 at 5:48 PM, Robin Martens mart...@sher.be wrote:
Dear all,
Does anyone know if there's a way to have auto-calculated fields in
data entry forms? This auto-calculated field would then be available for
further reporting and indicator calculation (i.e. it is a data element
calculated based on other data elements in the same entry form).
Actually, if it would be possible to calculate data elements based on
other data elements outside of a data form, that would be great too (but
if
I remember well this is currently not possible).
Thanks for any ideas,
Robin
___
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
___
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
--
Pamod
--
Pamod
___
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] Auto-calculated data in entry forms
Hi,
Thanx. Is jquery available inside data entry form on the fly or has to link
it separately to outside library.
On Tue, Sep 2, 2014 at 12:31 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
great. surprised that a medical doctor can write that code. if you turn it
to jquery it is much easier. anyway, its fine for now
On Sep 2, 2014 11:54 AM, Pamod Amarakoon pam...@gmail.com wrote:
Hi,
Thanks a lot. In fact I'm a medical doctor and have limited knowledhe in
Javascript. I managed to get it done with following javascript I created.
height enterd in cm and weight in kg.
script type=text/javascript
function updateBMI() {
var ht = document.getElementById(HeightID-val).value;
var wt = document.getElementById(WeightID-val).value;
if(ht!= wt!=){
var bmi = wt/(ht*ht/1);
bmi = +bmi.toFixed(2);
}else{
var bmi =Enter Height and Weight;
}
var inputbmi= document.getElementById(BMI-ID-val);
inputbmi.value = bmi;
}
updateBMI();
/script
It serves the purpose it seems. Pls suggest any modifications
On Mon, Sep 1, 2014 at 11:52 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
yes you can use custom data entry form and add some js script like
onchange event on weight and height.
the event handler should then calculate the bmi and update the text
field bmi.
do you have any technical person to do this? if not give me your account
i can help
On Sep 2, 2014 12:26 AM, Pamod Amarakoon pam...@gmail.com wrote:
I'd like to add something to this.
For example, if we have a data entry form (BMI) for a program stage if
we have height and weight input boxes/data elements is there a way to
calculate BMI?
is it only possible by using javascript/webapp
On Mon, Sep 1, 2014 at 10:21 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
Hi
I believe the calculated data value (now as indicator) can only be
seen after an aggregation is run.
In addition, in some forms in some countries like VN, auto-calculated
data elements some time can be input by users.
In VN, we use Javascript to achieve this. However, it is quite
complicated. Imagine that you have to rebuild a spreadsheet engine.
Important lesson learnt was if a dataelement is auto-calculated, make
sure no one can change it manually. Otherwise, you end up with very low
data quality.
Thanh
On Mon, Sep 1, 2014 at 11:15 PM, Jason Pickering
jason.p.picker...@gmail.com wrote:
Hi Robin,
You can simply use an indicator to do this.
In case you have not seen it, we have extensive documentation on the
use of indicators here
https://www.dhis2.org/doc/snapshot/en/user/html/ch13.html#indicator_maintenance
It should also be possible to calculate the value from other data,
not contained in the data entry form, IF it exists for the same orgunit
and
period.
Best regards,
Jason
On Mon, Sep 1, 2014 at 5:48 PM, Robin Martens mart...@sher.be
wrote:
Dear all,
Does anyone know if there's a way to have auto-calculated fields in
data entry forms? This auto-calculated field would then be available for
further reporting and indicator calculation (i.e. it is a data element
calculated based on other data elements in the same entry form).
Actually, if it would be possible to calculate data elements based
on other data elements outside of a data form, that would be great too
(but
if I remember well this is currently not possible).
Thanks for any ideas,
Robin
___
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
___
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
--
Pamod
--
Pamod
--
Pamod
___
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] Requirement related to indicators - Target vs achieved
Dear All, I have a requirement were for each data element I need to define a Target Value that is to be achieved in a future period (i.e. Target Date ). We need this to be able to track the achievement % for each data element against its goal/target. I know we can define indicators and calculate them by dividing the numerator (i.e. data element) by another target indicator. But this doesn't fulfill our needs for the following reasons: 1- the data elements we need to measure are project based, and they follow the start-end period of the project. A project can start in the middle of a year and end somewhere next year. So we need to show the progress of the data elements from the start date of the project till the end of the project. 2- We need to show inside our reports both the actual (cumulative) value of the data elements and the % achieved till date. In addition to the remaining value to reach the target. Since there is no direct relationship between the actual data element and the target one, the only way we can show them together is by creating customizing standard reports. since we need to show all data elements grouped by project, and for each data element we need to show the Achievements vs Target, this makes report design very complicated and time consuming. We are looking for a way to minimize the number of reports we create and make them more dynamic. I don't know if anybody have similar issues or requirements like this one. I think 2 thinks are missing here: 1- Cannot define the target value for a data element within the data element itself. It should be defined using another data element 2- The target value are not time-bound. This means we cannot set that the target value should be reached starting date X and ending date Y. Is there a possibility this kind of requirement be solved/achieved using DHIS? If anyone have similar requirements, what is the correct/clean approach to implement it in DHIS? Hope I delivered my point well... Thank you. Maheed ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Auto-calculated data in entry forms
Hi
it is already inside dhis2 (for every dhis2 page). no need for external
import
Thanh
On Tue, Sep 2, 2014 at 2:17 PM, Pamod Amarakoon pam...@gmail.com wrote:
Hi,
Thanx. Is jquery available inside data entry form on the fly or has to
link it separately to outside library.
On Tue, Sep 2, 2014 at 12:31 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
great. surprised that a medical doctor can write that code. if you turn
it to jquery it is much easier. anyway, its fine for now
On Sep 2, 2014 11:54 AM, Pamod Amarakoon pam...@gmail.com wrote:
Hi,
Thanks a lot. In fact I'm a medical doctor and have limited knowledhe in
Javascript. I managed to get it done with following javascript I created.
height enterd in cm and weight in kg.
script type=text/javascript
function updateBMI() {
var ht = document.getElementById(HeightID-val).value;
var wt = document.getElementById(WeightID-val).value;
if(ht!= wt!=){
var bmi = wt/(ht*ht/1);
bmi = +bmi.toFixed(2);
}else{
var bmi =Enter Height and Weight;
}
var inputbmi= document.getElementById(BMI-ID-val);
inputbmi.value = bmi;
}
updateBMI();
/script
It serves the purpose it seems. Pls suggest any modifications
On Mon, Sep 1, 2014 at 11:52 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
yes you can use custom data entry form and add some js script like
onchange event on weight and height.
the event handler should then calculate the bmi and update the text
field bmi.
do you have any technical person to do this? if not give me your
account i can help
On Sep 2, 2014 12:26 AM, Pamod Amarakoon pam...@gmail.com wrote:
I'd like to add something to this.
For example, if we have a data entry form (BMI) for a program stage if
we have height and weight input boxes/data elements is there a way to
calculate BMI?
is it only possible by using javascript/webapp
On Mon, Sep 1, 2014 at 10:21 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
Hi
I believe the calculated data value (now as indicator) can only be
seen after an aggregation is run.
In addition, in some forms in some countries like VN, auto-calculated
data elements some time can be input by users.
In VN, we use Javascript to achieve this. However, it is quite
complicated. Imagine that you have to rebuild a spreadsheet engine.
Important lesson learnt was if a dataelement is auto-calculated, make
sure no one can change it manually. Otherwise, you end up with very low
data quality.
Thanh
On Mon, Sep 1, 2014 at 11:15 PM, Jason Pickering
jason.p.picker...@gmail.com wrote:
Hi Robin,
You can simply use an indicator to do this.
In case you have not seen it, we have extensive documentation on the
use of indicators here
https://www.dhis2.org/doc/snapshot/en/user/html/ch13.html#indicator_maintenance
It should also be possible to calculate the value from other data,
not contained in the data entry form, IF it exists for the same orgunit
and
period.
Best regards,
Jason
On Mon, Sep 1, 2014 at 5:48 PM, Robin Martens mart...@sher.be
wrote:
Dear all,
Does anyone know if there's a way to have auto-calculated fields in
data entry forms? This auto-calculated field would then be available
for
further reporting and indicator calculation (i.e. it is a data element
calculated based on other data elements in the same entry form).
Actually, if it would be possible to calculate data elements based
on other data elements outside of a data form, that would be great too
(but
if I remember well this is currently not possible).
Thanks for any ideas,
Robin
___
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
___
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
--
Pamod
--
Pamod
--
Pamod
___
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] IMPORTANT: Vulnerability discovered in DHIS2 version 2.16 and some versions of trunk.
My testing environment was vulnerable to this and I confirm UFW temporally
solved the issue. I m running 2.16
regards
JPaul Mutali
On Mon, Sep 1, 2014 at 5:46 PM, Jason Pickering jason.p.picker...@gmail.com
wrote:
A potentially serious vulnerability of DHIS2 has been discovered by
members of the core development team this afternoon (2014-09-01).
The development team is working on a permanent solution for this, but in
the meantime, all users of DHIS2 are advised to review their system for
potential vulnerabilities.
*Potentially affected versions: *
All version of DHIS2 2.16 and any version of trunk, from revision 15124
and up.
*Vulnerability Details: *
Hazelcast is a component of DHIS2 used to provide caching. By default,
Hazelcast will open a port (5701) on the machine which is running DHIS2.
The Hazelcast cluster may be vulnerable to attack. The Hazelcast cluster
API may expose critical information about the system, including network
information and other runtime data. It is not currently known to what
extent the information contained inside of DHIS2 might be exposed through
this vulnerability.
*Risk: *
When running DHIS2 on a network that's directly attached to the Internet
or other unsecured network, an attacker may access and inject critical
information into the Hazelcast component. The exposed API could be used to
influence systems availability by injecting arbitrary into the DHIS2
caching system.
*Steps to confirm if your server is vulnerable:*
Replace server with your IP address or the name of your server and
attempt to access the resulting address through your web browser
http://server:5701/hazelcast/rest/cluster/
Affected versions of DHIS2 will show something like the response below.
Members [1] {
Member [XXX.XXX.XXX.XX]:5701 this
}
ConnectionCount: 4
AllConnectionCount: 5
If you see any response, even different from this one, your DHIS2 server
is vulnerable, and should be upgraded immediately.
*Mitigation: *
If you are running DHIS 2.15 or lower, do not upgrade at this point, until
advised otherwise. Further testing of the solution will need to be
confirmed.
If you are running DHIS2 version 2.16 or higher, or any version of trunk
past revision 15124, or any branch of trunk including revision 15124 and
up, you should immediately use a software based firewall to block all
non-localhost traffic on port 5701. The package UFW is a simple firewall,
which can be easily installed and enable as below
sudo apt-get install ufw (only if you have not installed this package
previously)
sudo ufw allow 22 (change this if need be to whatever port your ssh is
listening on)
sudo ufw allow 80
sudo ufw allow 443
sudo ufw enable
Additionally, you should immediately upgrade your DHIS2 server software
version to at least the following revisions.
*Trunk: Revision 166032.16: 16386*
The core development team will communicate further on this issues, once we
have had time to determine the extent of the problem, as well as to confirm
a final fix. If you have any questions about this mail, please do not
hesitate to ask!
Best regards,
Jason Pickering
___
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] Auto-calculated data in entry forms
Ook. Thanx :)
On Tue, Sep 2, 2014 at 2:02 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
Hi
it is already inside dhis2 (for every dhis2 page). no need for external
import
Thanh
On Tue, Sep 2, 2014 at 2:17 PM, Pamod Amarakoon pam...@gmail.com wrote:
Hi,
Thanx. Is jquery available inside data entry form on the fly or has to
link it separately to outside library.
On Tue, Sep 2, 2014 at 12:31 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
great. surprised that a medical doctor can write that code. if you turn
it to jquery it is much easier. anyway, its fine for now
On Sep 2, 2014 11:54 AM, Pamod Amarakoon pam...@gmail.com wrote:
Hi,
Thanks a lot. In fact I'm a medical doctor and have limited knowledhe
in Javascript. I managed to get it done with following javascript I
created.
height enterd in cm and weight in kg.
script type=text/javascript
function updateBMI() {
var ht = document.getElementById(HeightID-val).value;
var wt = document.getElementById(WeightID-val).value;
if(ht!= wt!=){
var bmi = wt/(ht*ht/1);
bmi = +bmi.toFixed(2);
}else{
var bmi =Enter Height and Weight;
}
var inputbmi= document.getElementById(BMI-ID-val);
inputbmi.value = bmi;
}
updateBMI();
/script
It serves the purpose it seems. Pls suggest any modifications
On Mon, Sep 1, 2014 at 11:52 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
yes you can use custom data entry form and add some js script like
onchange event on weight and height.
the event handler should then calculate the bmi and update the text
field bmi.
do you have any technical person to do this? if not give me your
account i can help
On Sep 2, 2014 12:26 AM, Pamod Amarakoon pam...@gmail.com wrote:
I'd like to add something to this.
For example, if we have a data entry form (BMI) for a program stage
if we have height and weight input boxes/data elements is there a way to
calculate BMI?
is it only possible by using javascript/webapp
On Mon, Sep 1, 2014 at 10:21 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.com wrote:
Hi
I believe the calculated data value (now as indicator) can only be
seen after an aggregation is run.
In addition, in some forms in some countries like VN,
auto-calculated data elements some time can be input by users.
In VN, we use Javascript to achieve this. However, it is quite
complicated. Imagine that you have to rebuild a spreadsheet engine.
Important lesson learnt was if a dataelement is auto-calculated,
make sure no one can change it manually. Otherwise, you end up with very
low data quality.
Thanh
On Mon, Sep 1, 2014 at 11:15 PM, Jason Pickering
jason.p.picker...@gmail.com wrote:
Hi Robin,
You can simply use an indicator to do this.
In case you have not seen it, we have extensive documentation on
the use of indicators here
https://www.dhis2.org/doc/snapshot/en/user/html/ch13.html#indicator_maintenance
It should also be possible to calculate the value from other data,
not contained in the data entry form, IF it exists for the same
orgunit and
period.
Best regards,
Jason
On Mon, Sep 1, 2014 at 5:48 PM, Robin Martens mart...@sher.be
wrote:
Dear all,
Does anyone know if there's a way to have auto-calculated fields
in data entry forms? This auto-calculated field would then be
available for
further reporting and indicator calculation (i.e. it is a data element
calculated based on other data elements in the same entry form).
Actually, if it would be possible to calculate data elements based
on other data elements outside of a data form, that would be great
too (but
if I remember well this is currently not possible).
Thanks for any ideas,
Robin
___
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
___
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
--
Pamod
--
Pamod
--
Pamod
--
Pamod
___
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] Requirement related to indicators - Target vs achieved
Hi Maheed I am sure you will get much more informed feedback on this question because I think its something many folk grapple with. Just a quick observation regarding implementation. I don't know if anybody have similar issues or requirements like this one. I think 2 thinks are missing here: 1- Cannot define the target value for a data element within the data element itself. It should be defined using another data element 2- The target value are not time-bound. This means we cannot set that the target value should be reached starting date X and ending date Y. These two seem to be contradictory. Associating a target value with a data element sounds sensible enough except that it would then lose the sense of target time. So you need to use another dataelement. ( I am not sure whether that is in fact what you are saying with 1 or you are pointing out what is missing). Note the same time boundedness can also be true of space. It is possible that different countries, provinces, districts set different target values. Do you think it makes more sense to focus on target values for indicators than dataelements? (Oddly enough I imagine the measured value should be an indicator and the target value should be a dataelement because you'd want to enter these targets directly). So maybe what is missing is the ability to assign a target dataelement to an indicator definition. So an indicator can have (an optional) dataelement associated with it for its target values. Of course you can do this manually but, as you say, the reports become laborious. Having an explicit association might make it easier to design smart reports. Look forward to hear what other people's experience is. ___ 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] IMPORTANT: Vulnerability discovered in DHIS2 version 2.16 and some versions of trunk.
Thanks JP for the feedback. If you are using dhis2-tools you can upgrade
to the latest stable when you get the chance with:
dhis2-deploy-war your instance name
But its always good to have ufw enabled anyway to provide some strength in
depth and protect against mistakes, misconfigurations etc
On 2 September 2014 09:48, J. Paul Mutali mut...@gmail.com wrote:
My testing environment was vulnerable to this and I confirm UFW temporally
solved the issue. I m running 2.16
regards
JPaul Mutali
On Mon, Sep 1, 2014 at 5:46 PM, Jason Pickering
jason.p.picker...@gmail.com wrote:
A potentially serious vulnerability of DHIS2 has been discovered by
members of the core development team this afternoon (2014-09-01).
The development team is working on a permanent solution for this, but in
the meantime, all users of DHIS2 are advised to review their system for
potential vulnerabilities.
*Potentially affected versions: *
All version of DHIS2 2.16 and any version of trunk, from revision 15124
and up.
*Vulnerability Details: *
Hazelcast is a component of DHIS2 used to provide caching. By default,
Hazelcast will open a port (5701) on the machine which is running DHIS2.
The Hazelcast cluster may be vulnerable to attack. The Hazelcast cluster
API may expose critical information about the system, including network
information and other runtime data. It is not currently known to what
extent the information contained inside of DHIS2 might be exposed through
this vulnerability.
*Risk: *
When running DHIS2 on a network that's directly attached to the Internet
or other unsecured network, an attacker may access and inject critical
information into the Hazelcast component. The exposed API could be used to
influence systems availability by injecting arbitrary into the DHIS2
caching system.
*Steps to confirm if your server is vulnerable:*
Replace server with your IP address or the name of your server and
attempt to access the resulting address through your web browser
http://server:5701/hazelcast/rest/cluster/
Affected versions of DHIS2 will show something like the response below.
Members [1] {
Member [XXX.XXX.XXX.XX]:5701 this
}
ConnectionCount: 4
AllConnectionCount: 5
If you see any response, even different from this one, your DHIS2 server
is vulnerable, and should be upgraded immediately.
*Mitigation: *
If you are running DHIS 2.15 or lower, do not upgrade at this point,
until advised otherwise. Further testing of the solution will need to be
confirmed.
If you are running DHIS2 version 2.16 or higher, or any version of trunk
past revision 15124, or any branch of trunk including revision 15124 and
up, you should immediately use a software based firewall to block all
non-localhost traffic on port 5701. The package UFW is a simple firewall,
which can be easily installed and enable as below
sudo apt-get install ufw (only if you have not installed this package
previously)
sudo ufw allow 22 (change this if need be to whatever port your ssh is
listening on)
sudo ufw allow 80
sudo ufw allow 443
sudo ufw enable
Additionally, you should immediately upgrade your DHIS2 server software
version to at least the following revisions.
*Trunk: Revision 166032.16: 16386*
The core development team will communicate further on this issues, once
we have had time to determine the extent of the problem, as well as to
confirm a final fix. If you have any questions about this mail, please do
not hesitate to ask!
Best regards,
Jason Pickering
___
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
___
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] Auto-calculated data in entry forms
Thanks for the input. I'll have a look at jQuery then!
Regards,
Robin
From: Pamod Amarakoon [mailto:pam...@gmail.com]
Sent: 02 September 2014 10:54
To: Ngoc Thanh Nguyen
Cc: dhis2-devs; Robin Martens; Jason Pickering; DHIS 2 Users list
Subject: Re: [Dhis2-devs] Auto-calculated data in entry forms
Ook. Thanx :)
On Tue, Sep 2, 2014 at 2:02 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.commailto:thanh.hispviet...@gmail.com wrote:
Hi
it is already inside dhis2 (for every dhis2 page). no need for external import
Thanh
On Tue, Sep 2, 2014 at 2:17 PM, Pamod Amarakoon
pam...@gmail.commailto:pam...@gmail.com wrote:
Hi,
Thanx. Is jquery available inside data entry form on the fly or has to link it
separately to outside library.
On Tue, Sep 2, 2014 at 12:31 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.commailto:thanh.hispviet...@gmail.com wrote:
great. surprised that a medical doctor can write that code. if you turn it to
jquery it is much easier. anyway, its fine for now
On Sep 2, 2014 11:54 AM, Pamod Amarakoon
pam...@gmail.commailto:pam...@gmail.com wrote:
Hi,
Thanks a lot. In fact I'm a medical doctor and have limited knowledhe in
Javascript. I managed to get it done with following javascript I created.
height enterd in cm and weight in kg.
script type=text/javascript
function updateBMI() {
var ht = document.getElementById(HeightID-val).value;
var wt = document.getElementById(WeightID-val).value;
if(ht!= wt!=){
var bmi = wt/(ht*ht/1);
bmi = +bmi.toFixed(2);
}else{
var bmi =Enter Height and Weight;
}
var inputbmi= document.getElementById(BMI-ID-val);
inputbmi.value = bmi;
}
updateBMI();
/script
It serves the purpose it seems. Pls suggest any modifications
On Mon, Sep 1, 2014 at 11:52 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.commailto:thanh.hispviet...@gmail.com wrote:
yes you can use custom data entry form and add some js script like onchange
event on weight and height.
the event handler should then calculate the bmi and update the text field bmi.
do you have any technical person to do this? if not give me your account i can
help
On Sep 2, 2014 12:26 AM, Pamod Amarakoon
pam...@gmail.commailto:pam...@gmail.com wrote:
I'd like to add something to this.
For example, if we have a data entry form (BMI) for a program stage if we have
height and weight input boxes/data elements is there a way to calculate BMI?
is it only possible by using javascript/webapp
On Mon, Sep 1, 2014 at 10:21 PM, Ngoc Thanh Nguyen
thanh.hispviet...@gmail.commailto:thanh.hispviet...@gmail.com wrote:
Hi
I believe the calculated data value (now as indicator) can only be seen after
an aggregation is run.
In addition, in some forms in some countries like VN, auto-calculated data
elements some time can be input by users.
In VN, we use Javascript to achieve this. However, it is quite complicated.
Imagine that you have to rebuild a spreadsheet engine.
Important lesson learnt was if a dataelement is auto-calculated, make sure no
one can change it manually. Otherwise, you end up with very low data quality.
Thanh
On Mon, Sep 1, 2014 at 11:15 PM, Jason Pickering
jason.p.picker...@gmail.commailto:jason.p.picker...@gmail.com wrote:
Hi Robin,
You can simply use an indicator to do this.
In case you have not seen it, we have extensive documentation on the use of
indicators here
https://www.dhis2.org/doc/snapshot/en/user/html/ch13.html#indicator_maintenance
It should also be possible to calculate the value from other data, not
contained in the data entry form, IF it exists for the same orgunit and period.
Best regards,
Jason
On Mon, Sep 1, 2014 at 5:48 PM, Robin Martens
mart...@sher.bemailto:mart...@sher.be wrote:
Dear all,
Does anyone know if there's a way to have auto-calculated fields in data entry
forms? This auto-calculated field would then be available for further reporting
and indicator calculation (i.e. it is a data element calculated based on other
data elements in the same entry form).
Actually, if it would be possible to calculate data elements based on other
data elements outside of a data form, that would be great too (but if I
remember well this is currently not possible).
Thanks for any ideas,
Robin
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to :
dhis2-devs@lists.launchpad.netmailto: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.netmailto: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.netmailto:dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More
Re: [Dhis2-devs] Requirement related to indicators - Target vs achieved
Hi Bob, Regarding point 1, you're right. What I meant is that currently the actual and target data elements are not related in a way or another. So what is missing is some way to link them. I am also with you that the target value could be either date bound and space bound. But I was just looking at it from a simple case/perspective. Maybe your point to define target values for indicators is logical. But if this is done so that we can select a target data element for an indicator, I don't know how simple it is to implement technically as both indicators and target data elements are subject to time and space. At the end, I think what is mostly needed is to show/compare the actual target values next to each other easily in pivot tables and/or reports. Thanks for your feedback. Looking forward to other people's comments. Maheed From: Bob Jolliffe [mailto:bobjolli...@gmail.com] Sent: Tuesday, September 02, 2014 11:59 AM To: Maheed Ramadan Cc: DHIS 2 Developers list; dhis2-users Subject: Re: [Dhis2-devs] Requirement related to indicators - Target vs achieved Hi Maheed I am sure you will get much more informed feedback on this question because I think its something many folk grapple with. Just a quick observation regarding implementation. I don't know if anybody have similar issues or requirements like this one. I think 2 thinks are missing here: 1- Cannot define the target value for a data element within the data element itself. It should be defined using another data element 2- The target value are not time-bound. This means we cannot set that the target value should be reached starting date X and ending date Y. These two seem to be contradictory. Associating a target value with a data element sounds sensible enough except that it would then lose the sense of target time. So you need to use another dataelement. ( I am not sure whether that is in fact what you are saying with 1 or you are pointing out what is missing). Note the same time boundedness can also be true of space. It is possible that different countries, provinces, districts set different target values. Do you think it makes more sense to focus on target values for indicators than dataelements? (Oddly enough I imagine the measured value should be an indicator and the target value should be a dataelement because you'd want to enter these targets directly). So maybe what is missing is the ability to assign a target dataelement to an indicator definition. So an indicator can have (an optional) dataelement associated with it for its target values. Of course you can do this manually but, as you say, the reports become laborious. Having an explicit association might make it easier to design smart reports. Look forward to hear what other people's experience is. ___ 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 16610: DV GIS ER EV future periods.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16610 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 13:10:54 +0200
message:
DV GIS ER EV future periods.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-01 22:20:49 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-02 10:52:02 +
@@ -4319,10 +4319,11 @@
}
});
-onPeriodTypeSelect = function(value) {
-var periodType = value,
+onPeriodTypeSelect = function() {
+var type = periodType.getValue(),
+periodOffset = periodType.periodOffset,
generator = ns.core.init.periodGenerator,
-periods = generator.filterFuturePeriodsExceptCurrent(generator.generateReversedPeriods(periodType, this.periodOffset));
+periods = generator.generateReversedPeriods(type, type === 'Yearly' ? periodOffset - 5 : periodOffset);
for (var i = 0; i periods.length; i++) {
periods[i].id = periods[i].iso;
@@ -4346,7 +4347,8 @@
periodOffset: 0,
listeners: {
select: function(cmp) {
-onPeriodTypeSelect(cmp.getValue());
+periodType.periodOffset = 0;
+onPeriodTypeSelect();
}
}
});
@@ -4358,7 +4360,7 @@
handler: function() {
if (periodType.getValue()) {
periodType.periodOffset--;
-onPeriodTypeSelect(periodType.getValue());
+onPeriodTypeSelect();
}
}
});
@@ -4370,7 +4372,7 @@
handler: function() {
if (periodType.getValue()) {
periodType.periodOffset++;
-onPeriodTypeSelect(periodType.getValue());
+onPeriodTypeSelect();
}
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-01 22:20:49 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-02 11:00:54 +
@@ -3954,14 +3954,15 @@
}
});
-onPeriodTypeSelect = function(value) {
-var ptype = new PeriodType(),
+onPeriodTypeSelect = function() {
+var type = periodType.getValue(),
+periodOffset = periodType.periodOffset,
+generator = ns.core.init.periodGenerator,
+periods = generator.generateReversedPeriods(type, type === 'Yearly' ? periodOffset - 5 : periodOffset);
-periods = ptype.get(value).generatePeriods({
-offset: periodType.periodOffset,
-filterFuturePeriods: true,
-reversePeriods: true
-});
+for (var i = 0; i periods.length; i++) {
+periods[i].id = periods[i].iso;
+}
fixedPeriodAvailableStore.setIndex(periods);
fixedPeriodAvailableStore.loadData(periods);
@@ -3981,7 +3982,8 @@
periodOffset: 0,
listeners: {
select: function(cmp) {
-onPeriodTypeSelect(cmp.getValue());
+periodType.periodOffset = 0;
+onPeriodTypeSelect();
}
}
});
@@ -3993,7 +3995,7 @@
handler: function() {
if (periodType.getValue()) {
periodType.periodOffset--;
-onPeriodTypeSelect(periodType.getValue());
+onPeriodTypeSelect();
}
}
});
@@ -4005,7 +4007,7 @@
handler: function() {
if (periodType.getValue()) {
periodType.periodOffset++;
-
[Dhis2-devs] Issue with GroupSets
Hi Lars, We tried creating a Favorite in Data Visualizer selecting the organization unit, period and groupSet. When we saw network call, it doesn't take organization unit as one of the filters Can you please have a look at it ? -- Thanks, Mansi Singhal ___ 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] Issue with GroupSets
Hi Mansi, which version are you using? Jan On Tue, Sep 2, 2014 at 2:06 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Lars, We tried creating a Favorite in Data Visualizer selecting the organization unit, period and groupSet. When we saw network call, it doesn't take organization unit as one of the filters Can you please have a look at it ? -- Thanks, Mansi Singhal ___ 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] Issue with GroupSets
Hi Jan, We are working with trunk and we are not on the latest version of trunk. We cannot merge with trunk right now since we have a release in another 15 days. Can you please give us the commit numbers in which this has been fixed so that we can take only that commit and merge it with our branch. Thanks, Mansi On Tue, Sep 2, 2014 at 5:43 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Hi Mansi, which version are you using? Jan On Tue, Sep 2, 2014 at 2:06 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Lars, We tried creating a Favorite in Data Visualizer selecting the organization unit, period and groupSet. When we saw network call, it doesn't take organization unit as one of the filters Can you please have a look at it ? -- Thanks, Mansi Singhal ___ 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] Issue with GroupSets
If this was a bug at some point I was not aware of it. Which rev number are you using? On Tue, Sep 2, 2014 at 2:29 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Jan, We are working with trunk and we are not on the latest version of trunk. We cannot merge with trunk right now since we have a release in another 15 days. Can you please give us the commit numbers in which this has been fixed so that we can take only that commit and merge it with our branch. Thanks, Mansi On Tue, Sep 2, 2014 at 5:43 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Hi Mansi, which version are you using? Jan On Tue, Sep 2, 2014 at 2:06 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Lars, We tried creating a Favorite in Data Visualizer selecting the organization unit, period and groupSet. When we saw network call, it doesn't take organization unit as one of the filters Can you please have a look at it ? -- Thanks, Mansi Singhal ___ 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] Issue with GroupSets
Hey Jan, It's difficult to know the exact rev number. it's a snapshot of 2.17 as it was about 15 days ago. If you could point us to why this might be happening, where to look and possible commits on trunk that could fix this issue, we can cherry-pick those changes and test it on our end. this would be super useful. Thank you Kiran. On Tue, Sep 2, 2014 at 6:02 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: If this was a bug at some point I was not aware of it. Which rev number are you using? On Tue, Sep 2, 2014 at 2:29 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Jan, We are working with trunk and we are not on the latest version of trunk. We cannot merge with trunk right now since we have a release in another 15 days. Can you please give us the commit numbers in which this has been fixed so that we can take only that commit and merge it with our branch. Thanks, Mansi On Tue, Sep 2, 2014 at 5:43 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Hi Mansi, which version are you using? Jan On Tue, Sep 2, 2014 at 2:06 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Lars, We tried creating a Favorite in Data Visualizer selecting the organization unit, period and groupSet. When we saw network call, it doesn't take organization unit as one of the filters Can you please have a look at it ? -- Thanks, Mansi Singhal ___ 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] [Bug 1364360] [NEW] Daily and Weekly Periods not rendered in Dataset Reports
Public bug reported: The Daily and weekly periods are not rendered properly in the Dataset Reports ** Affects: dhis2 Importance: Undecided Status: New -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1364360 Title: Daily and Weekly Periods not rendered in Dataset Reports Status in DHIS 2: New Bug description: The Daily and weekly periods are not rendered properly in the Dataset Reports To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1364360/+subscriptions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16611: PT DV GIS ER EV analysis display property.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16611 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 14:54:29 +0200
message:
PT DV GIS ER EV analysis display property.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-02 10:52:02 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-02 12:52:53 +
@@ -3388,7 +3388,7 @@
}
else {
Ext.Ajax.request({
-url: ns.core.init.contextPath + '/api/programs.json?filter=id:eq:' + programId + 'fields=programStages[id,name],programTrackedEntityAttributes[trackedEntityAttribute[id,name,valueType,optionSet[id,name]]]paging=false',
+url: ns.core.init.contextPath + '/api/programs.json?filter=id:eq:' + programId + 'fields=programStages[id,name],programTrackedEntityAttributes[trackedEntityAttribute[id,' + ns.core.init.namePropertyUrl + ',valueType,optionSet[id,name]]]paging=false',
success: function(r) {
var program = Ext.decode(r.responseText).programs[0],
stages,
@@ -3491,7 +3491,7 @@
}
else {
Ext.Ajax.request({
-url: ns.core.init.contextPath + '/api/programStages.json?filter=id:eq:' + stageId + 'fields=programStageDataElements[dataElement[id,name,type,optionSet[id,name]]]',
+url: ns.core.init.contextPath + '/api/programStages.json?filter=id:eq:' + stageId + 'fields=programStageDataElements[dataElement[id,' + ns.core.init.namePropertyUrl + ',type,optionSet[id,name]]]',
success: function(r) {
var objects = Ext.decode(r.responseText).programStages,
dataElements;
@@ -4634,7 +4634,7 @@
format: 'json',
noCache: false,
extraParams: {
- fields: 'children[id,name,children::isNotEmpty|rename(hasChildren)paging=false'
+ fields: 'children[id,' + ns.core.init.namePropertyUrl + ',children::isNotEmpty|rename(hasChildren)paging=false'
},
url: ns.core.init.contextPath + '/api/organisationUnits',
reader: {
@@ -5057,7 +5057,7 @@
return;
}
- path = '/organisationUnitGroups.json?fields=id,namefilter=organisationUnitGroupSet.id:eq:' + dimension.id + (filter ? 'filter=name:like:' + filter : '');
+ path = '/organisationUnitGroups.json?fields=id,' + ns.core.init.namePropertyUrl + 'filter=organisationUnitGroupSet.id:eq:' + dimension.id + (filter ? 'filter=name:like:' + filter : '');
store.isPending = true;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-02 11:00:54 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-02 12:52:53 +
@@ -3024,7 +3024,7 @@
}
else {
Ext.Ajax.request({
-url: ns.core.init.contextPath + '/api/programs.json?filter=id:eq:' + programId + 'fields=programStages[id,name],programTrackedEntityAttributes[trackedEntityAttribute[id,name,valueType,optionSet[id,name]]]paging=false',
+url: ns.core.init.contextPath + '/api/programs.json?filter=id:eq:' + programId + 'fields=programStages[id,name],programTrackedEntityAttributes[trackedEntityAttribute[id,' + ns.core.init.namePropertyUrl + ',valueType,optionSet[id,name]]]paging=false',
success: function(r) {
var program = Ext.decode(r.responseText).programs[0],
stages,
@@ -3127,7 +3127,7 @@
}
else {
Ext.Ajax.request({
-url: ns.core.init.contextPath + '/api/programStages.json?filter=id:eq:' + stageId + 'fields=programStageDataElements[dataElement[id,name,type,optionSet[id,name]]]',
+url:
Re: [Dhis2-devs] Issue with GroupSets
Hi, please check server/api/system/info.json and then revision. I will check out that revision and if I am able to reproduce the issue you are describing I can provide a patch. On Tue, Sep 2, 2014 at 2:43 PM, Kiran Prakash kprak...@thoughtworks.com wrote: Hey Jan, It's difficult to know the exact rev number. it's a snapshot of 2.17 as it was about 15 days ago. If you could point us to why this might be happening, where to look and possible commits on trunk that could fix this issue, we can cherry-pick those changes and test it on our end. this would be super useful. Thank you Kiran. On Tue, Sep 2, 2014 at 6:02 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: If this was a bug at some point I was not aware of it. Which rev number are you using? On Tue, Sep 2, 2014 at 2:29 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Jan, We are working with trunk and we are not on the latest version of trunk. We cannot merge with trunk right now since we have a release in another 15 days. Can you please give us the commit numbers in which this has been fixed so that we can take only that commit and merge it with our branch. Thanks, Mansi On Tue, Sep 2, 2014 at 5:43 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Hi Mansi, which version are you using? Jan On Tue, Sep 2, 2014 at 2:06 PM, Mansi Singhal msing...@thoughtworks.com wrote: Hi Lars, We tried creating a Favorite in Data Visualizer selecting the organization unit, period and groupSet. When we saw network call, it doesn't take organization unit as one of the filters Can you please have a look at it ? -- Thanks, Mansi Singhal ___ 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 ___ 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 16612: Minor.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16612 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 16:13:05 +0200
message:
Minor.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-02 12:52:53 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-02 14:11:29 +
@@ -,7 +,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + 'nbsp;nbsp;',
+ text: 'Embed in web page' + 'nbsp;nbsp;',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-02 12:52:53 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-02 14:11:29 +
@@ -6347,7 +6347,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + 'nbsp;nbsp;',
+ text: 'Embed in web page' + 'nbsp;nbsp;',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-02 12:40:23 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-02 14:11:29 +
@@ -8426,7 +8426,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + 'nbsp;nbsp;',
+ text: 'Embed in web page' + 'nbsp;nbsp;',
iconCls: 'gis-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-02 11:45:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-02 14:11:29 +
@@ -5419,7 +5419,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed in any webpage' + 'nbsp;nbsp;',
+ text: 'Embed in web page' + 'nbsp;nbsp;',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-02 11:48:50 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-02 14:11:29 +
@@ -5319,7 +5319,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + 'nbsp;nbsp;',
+ text: 'Embed in web page' + 'nbsp;nbsp;',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
___
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] DHIS2 - Clone event
Hi devs, Would it be possible to include a Clone event button in the Event Capture module? As some events might be very similar in overhead data, it might be useful to avoid duplication of work by cloning a previous entry and simply modifying the fields that vary. In my case, this duplication always happens on the same day (i.e. multiple events with the same report date, so no need to modify the report date). If this would be possible shortly, that would be great! Kind regards, Robin ___ 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 16613: Data element, trimming of form names
revno: 16613
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 11:24:29 -0400
message:
Data element, trimming of form names
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2014-08-15 07:40:20 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2014-09-02 15:24:29 +
@@ -33,6 +33,7 @@
import java.util.HashSet;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.hisp.dhis.attribute.AttributeService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -248,21 +249,11 @@
// Prepare values
// -
-if ( alternativeName != null alternativeName.trim().length() == 0 )
-{
-alternativeName = null;
-}
-
-if ( code != null code.trim().length() == 0 )
-{
-code = null;
-}
-
-if ( description != null description.trim().length() == 0 )
-{
-description = null;
-}
-
+alternativeName = StringUtils.trimToNull( alternativeName );
+code = StringUtils.trimToNull( code );
+description = StringUtils.trimToNull( description );
+formName = StringUtils.trimToNull( formName );
+
// -
// Create data element
// -
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2014-08-15 07:40:20 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2014-09-02 15:24:29 +
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.hisp.dhis.attribute.AttributeService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -272,26 +273,11 @@
// Prepare values
// -
-if ( alternativeName != null alternativeName.trim().length() == 0 )
-{
-alternativeName = null;
-}
-
-if ( code != null code.trim().length() == 0 )
-{
-code = null;
-}
-
-if ( description != null description.trim().length() == 0 )
-{
-description = null;
-}
-
-if ( formName != null formName.trim().length() == 0 )
-{
-formName = null;
-}
-
+alternativeName = StringUtils.trimToNull( alternativeName );
+code = StringUtils.trimToNull( code );
+description = StringUtils.trimToNull( description );
+formName = StringUtils.trimToNull( formName );
+
// -
// Update data element
// -
___
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: This Week, This Month, Future Periods
Future periods are now in trunk and backported to 2.16. Relative periods will take some more time. On Mon, Sep 1, 2014 at 10:28 PM, Rodolfo Melia rme...@knowming.com wrote: Thanks Jan - we will try to plan for an update. *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Mon, Sep 1, 2014 at 7:00 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: I am sure we can add those as well. Bram, you are right, that should be fixed too. Will try to find some time for it this week. On Mon, Sep 1, 2014 at 6:23 PM, Rodolfo Melia rme...@knowming.com wrote: Hi Jan - we should be updating our servers soon, so I will look for the fix on the next couple of days. About This Week/ This Month/ This Bi Month/ This Quarter - you didn't reply to that piece. Is that being added? Again, we have some programs/ datasets with near-real time data, so we need dashboard favourites for this week/ this month. R *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Mon, Sep 1, 2014 at 11:48 AM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Hi Rodolfo, On Wed, Aug 27, 2014 at 11:33 PM, Rodolfo Melia rme...@knowming.com wrote: Hi - we are developing dashboards that incorporates near real-time data (e.g. daily data, with 24hrs delay for it to get to the data values table). We need the dashboards to show some charts with the values for THIS WEEK and THIS MONTH - these options are not available on the analytics. Would it be possible to incorporate them? On a separate exercise, we have performance targets that are set until the end of 2014 or 2015. We also have projections that are based on those numbers. At the moment, YOU CANNOT select a period beyond the CURRENT month/ year (see below). Would it be possible to open the analytics engine with the possibility of selecting periods beyond the current month? Agree that future periods should be available. I suggest the following changes: - Show all periods in the current year by default when a period type is selected - Allow the next year button to get periods from future years [image: Inline image 1] These applies to both, 2.15 and 2.16 (I checked on both) Rodolfo ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ 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: This Week, This Month, Future Periods
Thanks Jan - PSI servers should be in 2.16 later this month. *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Tue, Sep 2, 2014 at 4:37 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Future periods are now in trunk and backported to 2.16. Relative periods will take some more time. On Mon, Sep 1, 2014 at 10:28 PM, Rodolfo Melia rme...@knowming.com wrote: Thanks Jan - we will try to plan for an update. *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Mon, Sep 1, 2014 at 7:00 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: I am sure we can add those as well. Bram, you are right, that should be fixed too. Will try to find some time for it this week. On Mon, Sep 1, 2014 at 6:23 PM, Rodolfo Melia rme...@knowming.com wrote: Hi Jan - we should be updating our servers soon, so I will look for the fix on the next couple of days. About This Week/ This Month/ This Bi Month/ This Quarter - you didn't reply to that piece. Is that being added? Again, we have some programs/ datasets with near-real time data, so we need dashboard favourites for this week/ this month. R *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Mon, Sep 1, 2014 at 11:48 AM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Hi Rodolfo, On Wed, Aug 27, 2014 at 11:33 PM, Rodolfo Melia rme...@knowming.com wrote: Hi - we are developing dashboards that incorporates near real-time data (e.g. daily data, with 24hrs delay for it to get to the data values table). We need the dashboards to show some charts with the values for THIS WEEK and THIS MONTH - these options are not available on the analytics. Would it be possible to incorporate them? On a separate exercise, we have performance targets that are set until the end of 2014 or 2015. We also have projections that are based on those numbers. At the moment, YOU CANNOT select a period beyond the CURRENT month/ year (see below). Would it be possible to open the analytics engine with the possibility of selecting periods beyond the current month? Agree that future periods should be available. I suggest the following changes: - Show all periods in the current year by default when a period type is selected - Allow the next year button to get periods from future years [image: Inline image 1] These applies to both, 2.15 and 2.16 (I checked on both) Rodolfo ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ 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] Convert SHP to GML in Windows 7
Hi to all, Please How can I Convert SHP File to GML in Windows 7? Sincerely, = Guy ___ 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] Convert SHP to GML in Windows 7
There are multiple ways to do this, the easiest of which is to install QGIS (www.qgis.org), open the shapefile and then save as gml. QGIS also allows you to easily transform projections, in case your shapefile is projected. More info on handling boundary files in the documentation, though I'm not sure it's all up to date. bram On 2 September 2014 17:26, Guy Ekani constyek...@yahoo.fr wrote: Hi to all, Please How can I Convert SHP File to GML in Windows 7? Sincerely, = Guy ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users More help : https://help.launchpad.net/ListHelp ___ 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 16614: Area and pie PNG charts, respecting hide legend option
revno: 16614
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 13:50:55 -0400
message:
Area and pie PNG charts, respecting hide legend option
modified:
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.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-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-08-31 20:38:25 +
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-09-02 17:50:55 +
@@ -128,7 +128,7 @@
private static final String TREND_PREFIX = Trend - ;
-private static final Color[] colors = { Color.decode( #88be3b ), Color.decode( #3b6286 ),
+private static final Color[] COLORS = { Color.decode( #88be3b ), Color.decode( #3b6286 ),
Color.decode( #b7404c ), Color.decode( #ff9f3a ), Color.decode( #968f8f ), Color.decode( #b7409f ),
Color.decode( #ffda64 ), Color.decode( #4fbdae ), Color.decode( #b78040 ), Color.decode( #676767 ),
Color.decode( #6a33cf ), Color.decode( #4a7833 ) };
@@ -450,9 +450,9 @@
renderer.setMaximumBarWidth( 0.07 );
-for ( int i = 0; i colors.length; i++ )
+for ( int i = 0; i COLORS.length; i++ )
{
-renderer.setSeriesPaint( i, colors[i] );
+renderer.setSeriesPaint( i, COLORS[i] );
renderer.setShadowVisible( false );
}
@@ -466,9 +466,9 @@
{
LineAndShapeRenderer renderer = new LineAndShapeRenderer();
-for ( int i = 0; i colors.length; i++ )
+for ( int i = 0; i COLORS.length; i++ )
{
-renderer.setSeriesPaint( i, colors[i] );
+renderer.setSeriesPaint( i, COLORS[i] );
}
return renderer;
@@ -481,9 +481,9 @@
{
StackedBarRenderer renderer = new StackedBarRenderer();
-for ( int i = 0; i colors.length; i++ )
+for ( int i = 0; i COLORS.length; i++ )
{
-renderer.setSeriesPaint( i, colors[i] );
+renderer.setSeriesPaint( i, COLORS[i] );
renderer.setShadowVisible( false );
}
@@ -499,9 +499,9 @@
{
AreaRenderer renderer = new AreaRenderer();
-for ( int i = 0; i colors.length; i++ )
+for ( int i = 0; i COLORS.length; i++ )
{
-renderer.setSeriesPaint( i, colors[i] );
+renderer.setSeriesPaint( i, COLORS[i] );
}
return renderer;
@@ -622,7 +622,7 @@
private JFreeChart getAreaChart( BaseChart chart, CategoryDataset dataSet )
{
JFreeChart areaChart = ChartFactory.createAreaChart( chart.getName(), chart.getDomainAxisLabel(),
-chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, true, false, false );
+chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, !chart.isHideLegend(), false, false );
setBasicConfig( areaChart, chart );
@@ -652,7 +652,7 @@
private JFreeChart getStackedBarChart( BaseChart chart, CategoryDataset dataSet, boolean horizontal )
{
JFreeChart stackedBarChart = ChartFactory.createStackedBarChart( chart.getName(), chart.getDomainAxisLabel(),
-chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, true, false, false );
+chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, !chart.isHideLegend(), false, false );
setBasicConfig( stackedBarChart, chart );
@@ -696,7 +696,7 @@
for ( int i = 0; i dataSets[0].getColumnCount(); i++ )
{
-piePlot.setSectionPaint( dataSets[0].getColumnKey( i ), colors[(i % colors.length)] );
+piePlot.setSectionPaint( dataSets[0].getColumnKey( i ), COLORS[(i % COLORS.length)] );
}
return multiplePieChart;
___
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 16615: PNG charts, fixed inconsistency, DV was using stacked area charts while PNG charts was using area...
revno: 16615
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 14:14:13 -0400
message:
PNG charts, fixed inconsistency, DV was using stacked area charts while PNG
charts was using area charts
modified:
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.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-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-09-02 17:50:55 +
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-09-02 18:14:13 +
@@ -107,6 +107,7 @@
import org.jfree.chart.renderer.category.BarRenderer;
import org.jfree.chart.renderer.category.CategoryItemRenderer;
import org.jfree.chart.renderer.category.LineAndShapeRenderer;
+import org.jfree.chart.renderer.category.StackedAreaRenderer;
import org.jfree.chart.renderer.category.StackedBarRenderer;
import org.jfree.chart.title.TextTitle;
import org.jfree.data.category.CategoryDataset;
@@ -491,13 +492,13 @@
}
/**
- * Returns an area renderer.
+ * Returns a stacked area renderer.
* p/
* TODO centralize these renderer methods.
*/
-private AreaRenderer getAreaRenderer()
+private AreaRenderer getStackedAreaRenderer()
{
-AreaRenderer renderer = new AreaRenderer();
+StackedAreaRenderer renderer = new StackedAreaRenderer();
for ( int i = 0; i COLORS.length; i++ )
{
@@ -555,7 +556,7 @@
}
else if ( chart.isType( TYPE_AREA ) )
{
-return getAreaChart( chart, dataSets[0] );
+return getStackedAreaChart( chart, dataSets[0] );
}
else if ( chart.isType( TYPE_PIE ) )
{
@@ -619,22 +620,22 @@
return jFreeChart;
}
-private JFreeChart getAreaChart( BaseChart chart, CategoryDataset dataSet )
+private JFreeChart getStackedAreaChart( BaseChart chart, CategoryDataset dataSet )
{
-JFreeChart areaChart = ChartFactory.createAreaChart( chart.getName(), chart.getDomainAxisLabel(),
+JFreeChart stackedAreaChart = ChartFactory.createStackedAreaChart( chart.getName(), chart.getDomainAxisLabel(),
chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, !chart.isHideLegend(), false, false );
-setBasicConfig( areaChart, chart );
+setBasicConfig( stackedAreaChart, chart );
-CategoryPlot plot = (CategoryPlot) areaChart.getPlot();
+CategoryPlot plot = (CategoryPlot) stackedAreaChart.getPlot();
plot.setOrientation( PlotOrientation.VERTICAL );
-plot.setRenderer( getAreaRenderer() );
+plot.setRenderer( getStackedAreaRenderer() );
CategoryAxis xAxis = plot.getDomainAxis();
xAxis.setCategoryLabelPositions( CategoryLabelPositions.UP_45 );
xAxis.setLabelFont( LABEL_FONT );
-return areaChart;
+return stackedAreaChart;
}
private JFreeChart getRadarChart( BaseChart chart, CategoryDataset dataSet )
___
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] Start up issues
Hello Everyone, I am trying to restore a database backup on dhis 2.4. The application runs fine on an empty database but I get the error in the attached log soon as i try to start up after restoring my backup. Please help if you have come across this before. Below are the version details: Version: 2.4 Build revision: 4507 Build date: 2011-09-22 08:42 Thank you! tomcatlog.log Description: Binary data ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Start up issues
Hi Amina, This seems to be an issue with serialization of system settings. Try running these SQL statements and restart. Then you need to set the scheduled tasks from data administration again. delete from systemsetting where name = 'keySchedTasks'; delete from systemsetting where name = 'keyScheduledTasks'; best regards, Lars On Tue, Sep 2, 2014 at 2:52 PM, Amina Abba Gana abbaga...@gmail.com wrote: Hello Everyone, I am trying to restore a database backup on dhis 2.4. The application runs fine on an empty database but I get the error in the attached log soon as i try to start up after restoring my backup. Please help if you have come across this before. Below are the version details: Version: 2.4 Build revision: 4507 Build date: 2011-09-22 08:42 Thank you! ___ 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 16616: Data entry, removed function for updating the current selection for attribute option combo, slow.
revno: 16616
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 15:24:02 -0400
message:
Data entry, removed function for updating the current selection for attribute
option combo, slow.
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-08-29 15:50:39 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 19:24:02 +
@@ -979,8 +979,6 @@
clearEntryForm();
dhis2.de.clearAttributes();
}
-
-dhis2.de.updateOptionsStatus();
}
// -
@@ -1164,35 +1162,6 @@
};
/**
- * Updates the options status showing options selected if any.
- */
-dhis2.de.updateOptionsStatus = function()
-{
-var html = '';
-
-if ( dhis2.de.currentCategories dhis2.de.currentCategories.length != 0 )
-{
-var prefix = '(';
-$.safeEach( dhis2.de.currentCategories, function ( idx, category ) {
-var option = $('#category-' + category.id).val();
-
-if ( option option != -1) {
-var options = dhis2.de.categories[ category.id ].options;
-var matching = $.grep(options, function (e) {
-return e.id == option;
-});
-
-html += prefix + matching[0].name;
-prefix = ', ';
-}
-});
-html += html.length == 0 ? '' : ')';
-}
-
-$( '#currentOptionsSelection' ).html( html );
-};
-
-/**
* Returns a query param value for the currently selected category options where
* each option is separated by the ; character.
*/
@@ -1287,8 +1256,6 @@
{
clearEntryForm();
}
-
-dhis2.de.updateOptionsStatus();
};
// -
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-07-21 09:45:25 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-09-02 19:24:02 +
@@ -63,7 +63,6 @@
div id=currentSelection
span id=closeCurrentSelectionimg src=../images/hide.png title=$i18n.getString( 'close' ) onclick=closeCurrentSelection()/span
span id=currentOrganisationUnit$i18n.getString( no_organisationunit_selected )/span - span id=currentPeriod$i18n.getString( no_period_selected )/span/
-span id=currentOptionsSelection/spanbr
span id=currentDataElement$i18n.getString( no_dataelement_selected )/span
/div
___
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 16617: Data entry, removed Ext dependency
revno: 16617
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 15:37:55 -0400
message:
Data entry, removed Ext dependency
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
--
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-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2014-06-02 15:29:13 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2014-09-02 19:37:55 +
@@ -13,7 +13,7 @@
result name=success type=velocity/main.vm/result
param name=page/dhis-web-dataentry/select.vm/param
param name=menu/dhis-web-dataentry/menu.vm/param
- param name=javascripts../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/ext/ext-all.js,javascript/form.js,javascript/entry.js,javascript/history.js/param
+ param name=javascripts../dhis-web-commons/ouwt/ouwt.js,javascript/form.js,javascript/entry.js,javascript/history.js/param
param name=stylesheetsstyle/dhis-web-dataentry.css/param
param name=manifest../dhis-web-commons/cacheManifest.action/param
/action
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 19:24:02 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 19:37:55 +
@@ -1217,7 +1217,7 @@
$.safeEach( category.options, function( idx, option ) {
if ( dhis2.de.optionValidWithinPeriod( option, period ) ) {
-var selected = Ext.Array.contains( options, option.id ) ? selected : ;
+var selected = ( $.inArray( option.id, options ) != -1 ) ? selected : ;
html += 'option value=' + option.id + '' + selected + '' + option.name + '/option';
}
} );
___
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 16618: Data entry, fixed wrong period variable test
revno: 16618
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 15:50:45 -0400
message:
Data entry, fixed wrong period variable test
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 19:37:55 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 19:50:45 +
@@ -1205,7 +1205,7 @@
var options = dhis2.de.getCurrentCategoryOptions();
- if ( !dhis2.de.currentCategories || dhis2.de.currentCategories.length == 0 || period.iso == ) {
+ if ( !dhis2.de.currentCategories || dhis2.de.currentCategories.length == 0 || !period ) {
return html;
}
___
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 16619: Data entry, removed unused variable
revno: 16619
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 16:08:51 -0400
message:
Data entry, removed unused variable
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 19:50:45 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 20:08:51 +
@@ -931,13 +931,11 @@
* Callback for changes in data set list.
*/
function dataSetSelected()
-{
-var x = dhis2.de.currentDataSetId;
-
+{
var dataSetId = $( '#selectedDataSetId' ).val();
var previousDataSetValid = ( dhis2.de.currentDataSetId dhis2.de.currentDataSetId != -1 );
-var previousPeriodType = previousDataSetValid ? dhis2.de.dataSets[dhis2.de.currentDataSetId].periodType : null;
+var previousPeriodType = !!previousDataSetValid ? dhis2.de.dataSets[dhis2.de.currentDataSetId].periodType : null;
dhis2.de.currentDataSetId = dataSetId;
___
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 16620: Data entry, fixed issue, period selection was not populated when switching between org units whic...
revno: 16620
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 16:33:43 -0400
message:
Data entry, fixed issue, period selection was not populated when switching
between org units which have org units and org units which do not have org units
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 20:08:51 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 20:33:43 +
@@ -112,7 +112,7 @@
*/
dhis2.de.on = function( event, fn )
{
- $( document ).off( event ).on( event, fn );
+$( document ).off( event ).on( event, fn );
}
var EVENT_FORM_LOADED = dhis-web-dataentry-form-loaded; // Deprecated
@@ -828,14 +828,14 @@
multiDataSetValid = true;
}
-$( 'option /' ).attr( 'data-multiorg', true ).attr( 'value', item.id).html(item.name).appendTo( '#selectedDataSetId' );
+$( 'option /' ).attr( 'data-multiorg', true ).attr( 'value', item.id).html( item.name ).appendTo( '#selectedDataSetId' );
} );
$( '#selectDataSetId' ).append( '/optgroup' );
}
}
-if ( !dhis2.de.multiOrganisationUnit dataSetValid dataSetId != null ) {
+if ( !dhis2.de.multiOrganisationUnit dataSetValid dataSetId ) {
$( '#selectedDataSetId' ).val( dataSetId ); // Restore selected data set
if ( dhis2.de.inputSelected() dhis2.de.dataEntryFormIsLoaded ) {
@@ -844,12 +844,13 @@
loadDataValues();
}
}
-else if ( dhis2.de.multiOrganisationUnit multiDataSetValid dataSetId != null ) {
+else if ( dhis2.de.multiOrganisationUnit multiDataSetValid dataSetId ) {
$( '#selectedDataSetId' ).val( dataSetId ); // Restore selected data set
dataSetSelected();
}
else {
dhis2.de.multiOrganisationUnit = false;
+dhis2.de.currentDataSetId = null;
clearSectionFilters();
clearPeriod();
___
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] Web API: Email Invitation to create account
Hi, I’m trying out the web api for sending emails to users to create their accounts. Not quite sure what the Json format is. Can anyone help? There’s nothing in the manual at the moment. I will not be including the username so that users can choose this themselves. Thanks. Regards, Busoye ___ 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 16621: Login page footer css fix
revno: 16621
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 20:54:27 -0400
message:
Login page footer css fix
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.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-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css 2014-08-29 11:08:42 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css 2014-09-03 00:54:27 +
@@ -129,13 +129,18 @@
position: absolute;
bottom: 0;
left: 0;
- padding: 10px 0 9px 50px;
+ padding: 10px 0 9px 0;
font-size: 13px;
border-top: 1px solid #416f9d;
color: #6b90b8;
width: 100%;
}
+#poweredByLabel
+{
+ margin-left: 50px;
+}
+
#localeSelect
{
width: 160px;
___
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-documenters/dhis2/dhis2-docbook-docs] Rev 1179: Minor
revno: 1179
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2-docbook-docs
timestamp: Tue 2014-09-02 21:06:55 -0400
message:
Minor
modified:
src/docbkx/en/dhis2_implementation_guide_installation.xml
--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs
Your team DHIS 2 developers is subscribed to branch
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription
=== modified file 'src/docbkx/en/dhis2_implementation_guide_installation.xml'
--- src/docbkx/en/dhis2_implementation_guide_installation.xml 2014-08-05 13:58:25 +
+++ src/docbkx/en/dhis2_implementation_guide_installation.xml 2014-09-03 01:06:55 +
@@ -259,8 +259,11 @@
parascreensudo /etc/init.d/nginx start
sudo /etc/init.d/nginx reload
sudo /etc/init.d/nginx stop/screen/para
- paraNow that we have installed nginx we will now continue to configure regular proxying of requests to our Tomcat instance, which we assume runs at emphasis role=italichttp://localhost:8080/emphasis. To configure nginx you can open the configuration file by invoking/para
- paracodesudo nano /etc/nginx/nginx.conf/code/para
+ paraNow that we have installed nginx we will now continue to configure regular proxying of
+requests to our Tomcat instance, which we assume runs at emphasis role=italic
+ http://localhost:8080/emphasis. To configure nginx you can open the configuration file
+by invoking:/para
+ screensudo nano /etc/nginx/nginx.conf/screen
paranginx configuration is built around a hierarchy of blocks representing http, server and location, where each block inherit settings from parent blocks. The following snippet will configure nginx to proxy pass (redirect) requests from port 80 (which is the port nginx will listen on by default) to our Tomcat instance. It will also make nginx serve requests for static content such as Javascript, stylesheets and images and instruct clients to cache it for 4 days which will reduce the load on Tomcat and improve overall performance. Include the following configuration in nginx.conf:/para
parascreenhttp {
gzip on; # Enables compression
___
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] Requirement related to indicators - Target vs achieved
Hi Maheed, Have you considered using attribute category options for your projects? If this works for you, you could consider the following with current DHIS 2 features: - enter any data that applies to a project by selecting the project. - enter goals/target as separate data elements, selecting the same project. - use data element groups and/or indicator groups for different types of reporting needs, e.g. an indicator group for % complete for indicators that divide data by target. In analysis, such as pivot table or visualization, select the project(s) and indicator(s), and report over a sufficient number of years to capture all the data for any of your projects. This assumes that you can enter data on a per-project basis. Or does the data need to be entered regardless of project, and then you impose the concept of project by goals that apply during a time period? Cheers, Jim On Tue, Sep 2, 2014 at 6:00 AM, Maheed Ramadan maheed.rama...@nrc.no wrote: Hi Bob, Regarding point 1, you’re right. What I meant is that currently the actual and target data elements are not related in a way or another. So what is missing is some way to link them. I am also with you that the target value could be either date bound and space bound. But I was just looking at it from a simple case/perspective. Maybe your point to define target values for indicators is logical. But if this is done so that we can select a target data element for an indicator, I don’t know how simple it is to implement technically as both indicators and target data elements are subject to time and space. At the end, I think what is mostly needed is to show/compare the actual target values next to each other easily in pivot tables and/or reports. Thanks for your feedback. Looking forward to other people’s comments. Maheed *From:* Bob Jolliffe [mailto:bobjolli...@gmail.com] *Sent:* Tuesday, September 02, 2014 11:59 AM *To:* Maheed Ramadan *Cc:* DHIS 2 Developers list; dhis2-users *Subject:* Re: [Dhis2-devs] Requirement related to indicators - Target vs achieved Hi Maheed I am sure you will get much more informed feedback on this question because I think its something many folk grapple with. Just a quick observation regarding implementation. I don’t know if anybody have similar issues or requirements like this one. I think 2 thinks are missing here: 1- Cannot define the target value for a data element within the data element itself. It should be defined using another data element 2- The target value are not time-bound. This means we cannot set that the target value should be reached starting date X and ending date Y. These two seem to be contradictory. Associating a target value with a data element sounds sensible enough except that it would then lose the sense of target time. So you need to use another dataelement. ( I am not sure whether that is in fact what you are saying with 1 or you are pointing out what is missing). Note the same time boundedness can also be true of space. It is possible that different countries, provinces, districts set different target values. Do you think it makes more sense to focus on target values for indicators than dataelements? (Oddly enough I imagine the measured value should be an indicator and the target value should be a dataelement because you'd want to enter these targets directly). So maybe what is missing is the ability to assign a target dataelement to an indicator definition. So an indicator can have (an optional) dataelement associated with it for its target values. Of course you can do this manually but, as you say, the reports become laborious. Having an explicit association might make it easier to design smart reports. Look forward to hear what other people's experience is. ___ 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 16622: Data entry, reduced z-index of current selection so that it appears below top dropdown menu
revno: 16622 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Tue 2014-09-02 21:48:33 -0400 message: Data entry, reduced z-index of current selection so that it appears below top dropdown menu modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.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-dataentry/src/main/webapp/dhis-web-dataentry/select.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-09-02 19:24:02 + +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-09-03 01:48:33 + @@ -62,7 +62,7 @@ div id=currentSelection span id=closeCurrentSelectionimg src=../images/hide.png title=$i18n.getString( 'close' ) onclick=closeCurrentSelection()/span - span id=currentOrganisationUnit$i18n.getString( no_organisationunit_selected )/span - span id=currentPeriod$i18n.getString( no_period_selected )/span/ + span id=currentOrganisationUnit$i18n.getString( no_organisationunit_selected )/span - span id=currentPeriod$i18n.getString( no_period_selected )/span/ - span id=currentDataElement$i18n.getString( no_dataelement_selected )/span /div === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2014-08-29 17:05:11 + +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2014-09-03 01:48:33 + @@ -11,7 +11,7 @@ filter: alpha(opacity=85); opacity: 0.85; border-radius: 3px; - z-index: 10; + z-index: 5; } #actions ___ 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 16623: TableAlteror, removed logging
revno: 16623
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-02 23:26:27 -0400
message:
TableAlteror, removed logging
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.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/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-08-28 12:01:44 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-09-03 03:26:27 +
@@ -1179,9 +1179,5 @@
{
executeSql( drop table optionsetmembers );
}
-else
-{
-log.info( Updated optionvalue table, SQL: + sql );
-}
}
}
___
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-core] testing
Hi, just a note, we are using trunk for the pepfar project for some time and are having a series of presentations in the coming weeks. So please test well before committing to trunk, and if you develop large features please do so in a branch. cheers Lars -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs-core] testing
I guess jason should be on this list? On 2 September 2014 11:33, Lars Helge Øverland larshe...@gmail.com wrote: Hi, just a note, we are using trunk for the pepfar project for some time and are having a series of presentations in the coming weeks. So please test well before committing to trunk, and if you develop large features please do so in a branch. cheers Lars -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp
