[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5253: Series font size increased.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 5253 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 09:15:03 +0100
message:
Series font size increased.
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-11-30 18:09:31 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-12-01 08:14:13 +
@@ -336,8 +336,8 @@
getLegend: function(len) {
len = len ? len : DV.state.series.names.length;
return {
-position: len > 6 ? 'right' : 'top',
-labelFont: '13px arial',
+position: len > 5 ? 'right' : 'top',
+labelFont: '15px arial',
boxStroke: '#ff',
boxStrokeWidth: 0,
padding: 0
___
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 897677] Re: Some functions not working in DHIS 2 after database restore
Hello. This is what we tried and the outcome. Looking at all the suggestions made, we didn't think that we wanted to do the upgrades just yet till everyone agrees it is the recommended thing to do. We tried the delete queries as suggested by Lars, but still had the same problem; however, that gave us an idea. We created a .sql backup from pgAdmin but in the objects window, we unchecked the three tables - usersettings, systemsettings, and importobjects before running the backup. The resultant backup file was restored to a new database without any errors. The data statistics show exactly same number of data elements, data element groups, datasets, org units etc. We are not having any exceptions being thrown when trying to add users or change system settings. However, this we have noticed. The data entry module appears not to be working with the current system settings. Things like the application title, the style are different on the data entry module than all other modules (and we went through most of them). For instance, we changed the style to green but it remains blue in the data entry module. The application title does not update on the data entry module also. We had to clear the cache and cookies in Firefox 8 and Google Chrome before we got the application title and style to update. We are not sure what else might not be working. Data integrity check is taking forever to run. Let me know what you think. Thanks -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/897677 Title: Some functions not working in DHIS 2 after database restore Status in DHIS 2 - District Health Information Software: New Bug description: I run a DHIS 2.0 (version 2.5) live instance using PostgreSQL 9.1 on my Windows 7 computer. I used pg_dump to create a database backup in plain format for a restore to PostgreSQL 8.4 running on an Ubuntu 10.04 i386 server. The restore was successful but there were some errors. After logging in, we found that there were problems with the following functions: 1. Some of the settings did not import with the database restore 2. Opening system general settings throws an exception 3. Adding users also throws an exception 4. Trying to edit a dataset throws exceptions as well. I have attached some error logs and screenshots for you to see To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/897677/+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] Fwd: [OPENMRS-IMPLEMENTERS] Tomcat Out of memory Error in Deploying 2 war file
Some of this info may be useful for DHIS2 setups also, though we are promotoing DHIS Live as the primary way of running locally. Knut -- Forwarded message -- From: Ben Wolfe Date: Thu, Dec 1, 2011 at 1:00 PM Subject: Re: [OPENMRS-IMPLEMENTERS] Tomcat Out of memory Error in Deploying 2 war file To: openmrs-implemen...@listserv.iupui.edu Have you seen this wiki page? https://wiki.openmrs.org/display/docs/Performance+Tuning There are a few pointers in there about settings, etc. If your machine only has 1gb or ram then you need to be careful to only allocate 512M to tomcat, 128 to mysql, and the rest leave for the OS to use. Tomcat starts with 64M of ram. OpenMRS likes to run with 128. So if you allocate 256 or 512 to tomcat it should be ok. Make sure that tomcat is actually picking up the memory settings. localhost:8080/manager has a link somewhere that shows the amount allocated to it. Ben On Wed, Nov 30, 2011 at 2:55 PM, dodo.khan wrote: > Dear All > > > > I want to Deploy 2 OpenMRS war file on a single Tomcat Server and I have > done this successfully but after installing it creates problems in using > like 500 error and out of memory again and again I restart the server and > after few min s it creates a same error out of memory, > > > > Details of installation simple I created 2 databases and deploy 2 war file > of different version with different name and connect that with the specific > database, I have installed it on the following configuration of the system > and the software > > 1 GB RAM and 2.2 dual core processor and 160 GB HD, apache-tomcat-6.0.20, > jdk-6 and mysql-5.0.83. > > > > I tried to fix that memory issue of the tomcat like add more memory to > Tomcat from the properties / java and added 100MB in the 3 text boxes but > this again tomcat showing the same issue again and again any one of you can > help me in this problem > > > > > > Thanks and Regards > > Dodo Khan > > > > -- > > This e-mail may contain information that is privileged or confidential. If > you are not the intended recipient, please delete the e-mail and any > attachments and notify us immediately. > -- > Click here to > unsubscribefrom > OpenMRS Implementers' mailing list -- Click here to unsubscribefrom OpenMRS Implementers' mailing list -- Knut Staring Informatics, U. of Oslo http://hisp.uio.no +4791880522 ___ 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 5254: Improved validation of coordinates. Both UI and service filtering now take into account min and m...
revno: 5254
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 13:29:14 +0100
message:
Improved validation of coordinates. Both UI and service filtering now take
into account min and max values for longitude and latitude.
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2011-10-20 18:51:07 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2011-12-01 12:29:14 +
@@ -41,7 +41,11 @@
*/
public class ValidationUtils
{
-private static Pattern COORDINATE_PATTERN = Pattern.compile( "\\[([+-]?\\d+\\.?\\d*),([+-]?\\d+\\.?\\d*)\\]" );
+private static Pattern POINT_PATTERN = Pattern.compile( "\\[(.+),\\s?(.+)\\]" );
+private static int LONG_MAX = 180;
+private static int LONG_MIN = -180;
+private static int LAT_MAX = 90;
+private static int LAT_MIN = -90;
/**
* Validates whether an email string is valid.
@@ -106,7 +110,32 @@
*/
public static boolean coordinateIsValid( String coordinate )
{
-return coordinate != null ? COORDINATE_PATTERN.matcher( coordinate ).matches() : false;
+if ( coordinate == null || coordinate.trim().isEmpty() )
+{
+return false;
+}
+
+Matcher matcher = POINT_PATTERN.matcher( coordinate );
+
+if ( !matcher.find() )
+{
+return false;
+}
+
+double longitude = 0.0;
+double latitude = 0.0;
+
+try
+{
+longitude = Double.parseDouble( matcher.group( 1 ) );
+latitude = Double.parseDouble( matcher.group( 2 ) );
+}
+catch ( NumberFormatException ex )
+{
+return false;
+}
+
+return longitude >= LONG_MIN && longitude <= LONG_MAX && latitude >= LAT_MIN && latitude <= LAT_MAX;
}
/**
@@ -124,7 +153,7 @@
return null;
}
-Matcher matcher = COORDINATE_PATTERN.matcher( coordinate );
+Matcher matcher = POINT_PATTERN.matcher( coordinate );
return matcher.find() ? matcher.group( 1 ) : null;
}
@@ -144,7 +173,7 @@
return null;
}
-Matcher matcher = COORDINATE_PATTERN.matcher( coordinate );
+Matcher matcher = POINT_PATTERN.matcher( coordinate );
return matcher.find() ? matcher.group( 2 ) : null;
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java 2011-11-14 14:48:51 +
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java 2011-12-01 12:29:14 +
@@ -48,8 +48,8 @@
assertTrue( coordinateIsValid( "[+37.99034,-28.94221]" ) );
assertTrue( coordinateIsValid( "[37.99034,-28.94221]" ) );
assertTrue( coordinateIsValid( "[+37.99034,28.94221]" ) );
-assertTrue( coordinateIsValid( "[37.99034,28.94221]" ) );
-assertTrue( coordinateIsValid( "[+37,-28.94221]" ) );
+assertTrue( coordinateIsValid( "[170.99034,78.94221]" ) );
+assertTrue( coordinateIsValid( "[-167,-28.94221]" ) );
assertTrue( coordinateIsValid( "[37.99034,28]" ) );
assertFalse( coordinateIsValid( "23.34343,56.3232" ) );
@@ -60,6 +60,11 @@
assertFalse( coordinateIsValid( "[++37,-28.94221]" ) );
assertFalse( coordinateIsValid( "S-0.27726 E37.08472" ) );
assertFalse( coordinateIsValid( null ) );
+
+assertFalse( coordinateIsValid( "-185.12345,45.45423" ) );
+assertFalse( coordinateIsValid( "192.56789,-45.34332" ) );
+assertFalse( coordinateIsValid( "140.34,92.23323" ) );
+assertFalse( coordinateIsValid( "123.34,-94.23323" ) );
}
@Test
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5255: Minor to update to mapping service aop definition
revno: 5255 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2011-12-01 13:30:03 +0100 message: Minor to update to mapping service aop definition modified: dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml 2011-06-08 13:52:49 + +++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml 2011-12-01 12:30:03 + @@ -83,8 +83,7 @@ - - + ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5256: Regex adjusted + Pie chart title bug fixed + Ind/de list now always sorted + Ind/de with no value...
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 5256 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 13:44:01 +0100
message:
Regex adjusted + Pie chart title bug fixed + Ind/de list now always sorted +
Ind/de with no values excluded from series count.
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-12-01 08:14:13 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-12-01 12:26:35 +
@@ -223,6 +223,7 @@
}
items = Ext.Array.sort(items);
s.add(items);
+s.sort('shortName', 'ASC');
},
containsParent: function(s) {
for (var obj in s.storage) {
@@ -334,7 +335,7 @@
},
chart: {
getLegend: function(len) {
-len = len ? len : DV.state.series.names.length;
+len = len ? len : DV.store.chart.left.length;
return {
position: len > 5 ? 'right' : 'top',
labelFont: '15px arial',
@@ -430,7 +431,7 @@
},
{
type: 'text',
-text: DV.state.series.names[0],
+text: DV.store.chart.left[0],
font: 'bold 13px arial',
fill: '#777',
width: 300,
@@ -524,7 +525,7 @@
},
string: {
getEncodedString: function(text) {
-return text.replace(/[^a-zA-Z 0-9]+/g,'');
+return text.replace(/[^a-zA-Z 0-9(){}<>_!+;:?*&%#-]+/g,'');
}
}
};
@@ -756,7 +757,6 @@
data: [],
getData: function(exe) {
this.data = [];
-
Ext.Array.each(DV.state.category.names, function(item) {
var obj = {};
obj[DV.conf.finals.chart.x] = item;
@@ -839,7 +839,7 @@
store: DV.store.chart,
insetPadding: DV.conf.chart.inset,
items: DV.util.chart.getTitle(),
-legend: DV.util.chart.getLegend(),
+legend: DV.util.chart.getLegend(DV.store.chart.bottom.length),
axes: [
{
type: 'Category',
@@ -1320,8 +1320,7 @@
icon: 'images/arrowright.png',
width: 22,
handler: function() {
-DV.util.multiselect.select(DV.util.getCmp('multiselect[name="availableIndicators"]'),
-DV.util.getCmp('multiselect[name="selectedIndicators"]'));
+DV.util.multiselect.select(DV.cmp.dimension.indicator.available, DV.cmp.dimension.indicator.selected);
}
},
{
@@ -1329,8 +1328,7 @@
icon: 'images/arrowrightdouble.png',
width: 22,
handler: function() {
-DV.util.multiselect.selectAll(DV.util.getCmp('multiselect[name="availableIndicators"]'),
-DV.util.getCmp('multiselect[name="selectedIndicators"]'));
+DV.util.multiselect.selectAll(DV.cmp.dimension.indicator.available, DV.cmp.dimension.indicator.selected);
}
},
' '
@@ -1364,8 +1362,7 @@
icon: 'images/arrowleftdouble.png',
width: 22,
handler: function() {
-
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5257: Made quick RowMappers also implement spring jdbc RowMapper interface so they can now also be used...
revno: 5257
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 14:36:23 +0100
message:
Made quick RowMappers also implement spring jdbc RowMapper interface so they
can now also be used for spring jdbc
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataElementOperandMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueNameMinMaxRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/OrganisationUnitRelationshipRowMapper.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java 2010-05-27 15:24:59 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java 2011-12-01 13:36:23 +
@@ -38,7 +38,7 @@
* @version $Id$
*/
public class AggregatedDataMapValueRowMapper
-implements RowMapper
+implements RowMapper, org.springframework.jdbc.core.RowMapper
{
public AggregatedMapValue mapRow( ResultSet resultSet )
throws SQLException
@@ -52,4 +52,11 @@
return value;
}
+
+@Override
+public AggregatedMapValue mapRow( ResultSet resultSet, int rowNum )
+throws SQLException
+{
+return mapRow( resultSet );
+}
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataValueRowMapper.java 2010-04-12 21:23:33 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataValueRowMapper.java 2011-12-01 13:36:23 +
@@ -38,8 +38,9 @@
* @version $Id$
*/
public class AggregatedDataValueRowMapper
-implements RowMapper
+implements RowMapper, org.springframework.jdbc.core.RowMapper
{
+@Override
public AggregatedDataValue mapRow( ResultSet resultSet )
throws SQLException
{
@@ -55,4 +56,11 @@
return value;
}
+
+@Override
+public AggregatedDataValue mapRow( ResultSet resultSet, int rowNum )
+throws SQLException
+{
+return mapRow( resultSet );
+}
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java 2010-05-27 15:24:59 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java 2011-12-01 13:36:23 +
@@ -38,7 +38,7 @@
* @version $Id$
*/
public class AggregatedIndicatorMapValueRowMapper
-implements RowMapper
+implements RowMapper, org.springframework.jdbc.core.RowMapper
{
public AggregatedMapValue mapRow( ResultSet resultSet )
throws SQLException
@@ -55,4 +55,11 @@
return value;
}
+
+@Override
+public AggregatedMapValue mapRow( ResultSet resultSet, int rowNum )
+throws SQLException
+{
+return mapRow( resultSet );
+}
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java 2010-11-08 13:02:47 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndi
[Dhis2-devs] [Bug 897677] Re: Some functions not working in DHIS 2 after database restore
Just encountered this error now. ** Attachment added: "Error addOrganisationUnit.action.htm" https://bugs.launchpad.net/dhis2/+bug/897677/+attachment/2614704/+files/Error%20addOrganisationUnit.action.htm -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/897677 Title: Some functions not working in DHIS 2 after database restore Status in DHIS 2 - District Health Information Software: New Bug description: I run a DHIS 2.0 (version 2.5) live instance using PostgreSQL 9.1 on my Windows 7 computer. I used pg_dump to create a database backup in plain format for a restore to PostgreSQL 8.4 running on an Ubuntu 10.04 i386 server. The restore was successful but there were some errors. After logging in, we found that there were problems with the following functions: 1. Some of the settings did not import with the database restore 2. Opening system general settings throws an exception 3. Adding users also throws an exception 4. Trying to edit a dataset throws exceptions as well. I have attached some error logs and screenshots for you to see To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/897677/+subscriptions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 897677] Re: Some functions not working in DHIS 2 after database restore
Hi Ife, I think this is related to importing to the database directly (not through the webinterface). You can hopefullyl resolve it by increasing the value of hibernate_sequence, which you can find under Schema-public-Sequences in pgadmin Knut On Thu, Dec 1, 2011 at 3:01 PM, Ifeanyi Okoye <897...@bugs.launchpad.net>wrote: > Just encountered this error now. > > ** Attachment added: "Error addOrganisationUnit.action.htm" > > https://bugs.launchpad.net/dhis2/+bug/897677/+attachment/2614704/+files/Error%20addOrganisationUnit.action.htm > > -- > You received this bug notification because you are a member of DHIS 2 > India Developers, which is subscribed to DHIS. > https://bugs.launchpad.net/bugs/897677 > > Title: > Some functions not working in DHIS 2 after database restore > > Status in DHIS 2 - District Health Information Software: > New > > Bug description: > I run a DHIS 2.0 (version 2.5) live instance using PostgreSQL 9.1 on my > Windows 7 computer. I used pg_dump to create a database backup in plain > format for a restore to PostgreSQL 8.4 running on an Ubuntu 10.04 i386 > server. The restore was successful but there were some errors. > After logging in, we found that there were problems with the following > functions: > > 1. Some of the settings did not import with the database restore > 2. Opening system general settings throws an exception > 3. Adding users also throws an exception > 4. Trying to edit a dataset throws exceptions as well. > > I have attached some error logs and screenshots for you to see > > To manage notifications about this bug go to: > https://bugs.launchpad.net/dhis2/+bug/897677/+subscriptions > -- Knut Staring Informatics, U. of Oslo http://hisp.uio.no +4791880522 -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/897677 Title: Some functions not working in DHIS 2 after database restore Status in DHIS 2 - District Health Information Software: New Bug description: I run a DHIS 2.0 (version 2.5) live instance using PostgreSQL 9.1 on my Windows 7 computer. I used pg_dump to create a database backup in plain format for a restore to PostgreSQL 8.4 running on an Ubuntu 10.04 i386 server. The restore was successful but there were some errors. After logging in, we found that there were problems with the following functions: 1. Some of the settings did not import with the database restore 2. Opening system general settings throws an exception 3. Adding users also throws an exception 4. Trying to edit a dataset throws exceptions as well. I have attached some error logs and screenshots for you to see To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/897677/+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 5258: Work in progress on GIS service layer restructure. REmoved support for on-the-fly aggregation. Im...
revno: 5258 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2011-12-01 16:43:25 +0100 message: Work in progress on GIS service layer restructure. REmoved support for on-the-fly aggregation. Improved performance on data retrieval. modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetDataElementMapValuesAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorMapValuesAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-09-23 14:45:35 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-12-01 15:43:25 + @@ -251,7 +251,7 @@ * @param periodId the Period identifier. * @param level the OrganisationUnit level. */ -Collection getAggregatedDataMapValues( int dataElementId, int periodId, int level ); +Collection getAggregatedDataMapValues( int dataElementId, int periodId, Collection organisationUnitIds ); // -- // AggregatedIndicatorValue @@ -333,9 +333,9 @@ * * @param indicatorId the Indicator identifier. * @param periodId the Period identifier. - * @param level the OrganisationUnit level. + * @param organisationUnitIds the collection of OrganisationUnit identifiers. */ -Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level ); +Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, Collection organisationUnitIds ); /** * Retrieves the AggregatedIndicatorMapValues for the given arguments. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java 2011-09-23 14:45:35 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java 2011-12-01 15:43:25 + @@ -217,9 +217,9 @@ * * @param dataElementId the DataElement identifier. * @param periodId the Period identifier. - * @param level the OrganisationUnit level. + * @param organisationUnitIds the set of OrganisationUnit identifiers. */ -Collection getAggregatedDataMapValues( int dataElementId, int periodId, int level ); +Collection getAggregatedDataMapValues( int dataElementId, int periodId, Collection organisationUnitIds ); // -- // AggregatedIndicatorValue @@ -310,9 +310,9 @@ * * @param indicatorId the Indicator identifier. * @param periodId the Period identifier. - * @param level the OrganisationUnit level. + * @param organisationUnitIds the collection of OrganisationUnit identifiers. */ -Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level ); +Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, Collection organisationUnitIds ); /** * Retrieves the AggregatedIndicatorMapValues for the given arguments. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java 2011-11-12 12:54:31 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java 2011-12-01 15:43:25 + @@ -28,11 +28,9 @@ */ import java.util.Collection; -import java.util.Date; import java.util.Set; import org.hisp.dhis.aggregation.AggregatedMapValue; -import org.hisp.dhis.period.Period; /** * @aut
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5259: Removed unused methods
revno: 5259
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 17:05:30 +0100
message:
Removed unused methods
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-12-01 15:43:25 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-12-01 16:05:30 +
@@ -337,25 +337,6 @@
*/
Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, Collection organisationUnitIds );
-/**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- * @param OrganisationUnitId the id of the organisationUnit.
- */
-Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level, int organisationUnitId );
-
-/**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- */
-Collection getAggregatedIndicatorMapValues( int indicatorId, Collection periodIds, int level, int organisationUnitId );
-
// --
// DataValue
// --
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java 2011-12-01 15:43:25 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java 2011-12-01 16:05:30 +
@@ -314,25 +314,6 @@
*/
Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, Collection organisationUnitIds );
-/**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- * @param OrganisationUnitId the id of the organisationUnit.
- */
-Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level, int organisationUnitId );
-
-/**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- */
-Collection getAggregatedIndicatorMapValues( int indicatorId, Collection periodIds, int level, int organisationUnitId );
-
// --
// DataValue
// --
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java 2011-12-01 15:43:25 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java 2011-12-01 16:05:30 +
@@ -217,16 +217,6 @@
return aggregatedDataValueStore.getAggregatedIndicatorMapValues( indicatorId, periodId, organisationUnitIds );
}
-public Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level, int organisationUnitId )
-{
-return aggregatedDataValueStore.getAggregatedIndicatorMapValues( indicatorId, periodId, level, organisationUnitId );
-}
-
-public Collection getAggregatedIndicatorMapValues( int indicatorId, Collection periodIds, int level, int organisationUnitId )
-{
-return aggregatedDataValueStore.getAggregatedIndicatorMapValues( indicatorId, periodIds, level, organisationUnitId );
-}
-
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5261: WIP performance improvements in GIS
revno: 5261
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 18:08:55 +0100
message:
WIP performance improvements in GIS
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-12-01 16:05:30 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-12-01 17:08:55 +
@@ -253,6 +253,15 @@
*/
Collection getAggregatedDataMapValues( int dataElementId, int periodId, Collection organisationUnitIds );
+/**
+ * Retrieves the AggregatedDataMapValues for the given arguments.
+ *
+ * @param dataElementIds the set of DataElement identifiers.
+ * @param periodId the Period identifier.
+ * @param organisationUnitId the OrganisationUnit identifier.
+ */
+Collection getAggregatedDataMapValues( Collection dataElementIds, int periodId, int organisationUnitId );
+
// --
// AggregatedIndicatorValue
// --
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java 2011-12-01 16:05:30 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java 2011-12-01 17:08:55 +
@@ -221,6 +221,15 @@
*/
Collection getAggregatedDataMapValues( int dataElementId, int periodId, Collection organisationUnitIds );
+/**
+ * Retrieves the AggregatedDataMapValues for the given arguments.
+ *
+ * @param dataElementIds the set of DataElement identifiers.
+ * @param periodId the Period identifier.
+ * @param organisationUnitId the OrganisationUnit identifier.
+ */
+Collection getAggregatedDataMapValues( Collection dataElementIds, int periodId, int organisationUnitId );
+
// --
// AggregatedIndicatorValue
// --
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java 2011-12-01 16:05:30 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java 2011-12-01 17:08:55 +
@@ -157,6 +157,11 @@
return aggregatedDataValueStore.getAggregatedDataMapValues( dataElementId, periodId, organisationUnitIds );
}
+public Collection getAggregatedDataMapValues( Collection dataElementIds, int periodId, int organisationUnitId )
+{
+return aggregatedDataValueStore.getAggregatedDataMapValues( dataElementIds, periodId, organisationUnitId );
+}
+
// -
// AggregatedIndicatorValue
// -
@@ -235,5 +240,4 @@
{
return aggregatedDataValueStore.getDataValueMap( periodId, sourceId );
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java 2011-12-01 16:05:30 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java 2011-12-01 17:08:55 +
@@ -443,6 +443,30 @@
return jdbcTemplate.query( sql, new AggregatedDataMapValueRowMapper() );
}
+public Collection getAggregatedDataMapValues( Collection dataElementIds, int periodId, int organisationUnitId )
+{
+final String sq
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5262: (GIS) Performance improvements completed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 5262 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 18:41:12 +0100
message:
(GIS) Performance improvements completed.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.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-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js 2011-12-01 15:49:20 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js 2011-12-01 17:31:30 +
@@ -1099,16 +1099,21 @@
G.vars.mask.hide();
return;
}
-
-for (var i = 0; i < mapvalues.length; i++) {
-for (var j = 0; j < this.layer.features.length; j++) {
-if (mapvalues[i].oi == this.layer.features[j].attributes.id) {
+
+for (var j = 0; j < this.layer.features.length; j++) {
+for (var i = 0; i < mapvalues.length; i++) {
+if (this.layer.features[j].attributes.id == mapvalues[i].oi) {
this.layer.features[j].attributes.value = parseFloat(mapvalues[i].v);
this.layer.features[j].attributes.labelString = this.layer.features[j].attributes.name + ' (' + this.layer.features[j].attributes.value + ')';
-this.layer.features[j].attributes.name = G.util.cutString(this.layer.features[j].attributes.name, 30);
+this.layer.features[j].attributes.fixedName = G.util.cutString(this.layer.features[j].attributes.name, 30);
break;
}
}
+if (!this.layer.features[j].attributes.value) {
+this.layer.features[j].attributes.value = 0;
+this.layer.features[j].attributes.labelString = this.layer.features[j].attributes.name + ' (0)';
+this.layer.features[j].attributes.fixedName = G.util.cutString(this.layer.features[j].attributes.name, 30);
+}
}
this.updateValues = false;
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-12-01 15:49:20 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-12-01 17:31:30 +
@@ -1694,16 +1694,21 @@
G.vars.mask.hide();
return;
}
-
-for (var i = 0; i < mapvalues.length; i++) {
-for (var j = 0; j < this.layer.features.length; j++) {
-if (mapvalues[i].oi == this.layer.features[j].attributes.id) {
+
+for (var j = 0; j < this.layer.features.length; j++) {
+for (var i = 0; i < mapvalues.length; i++) {
+if (this.layer.features[j].attributes.id == mapvalues[i].oi) {
this.layer.features[j].attributes.value = parseFloat(mapvalues[i].v);
this.layer.features[j].attributes.labelString = this.layer.features[j].attributes.name + ' (' + this.layer.features[j].attributes.value + ')';
this.layer.features[j].attributes.fixedName = G.util.cutString(this.layer.features[j].attributes.name, 30);
break;
}
}
+if (!this.layer.features[j].attributes.value) {
+this.layer.features[j].attributes.value = 0;
+
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5263: Using column name instead of index for Aggregated*MapValueRowmapper
revno: 5263
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 20:39:40 +0100
message:
Using column name instead of index for Aggregated*MapValueRowmapper
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.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/aggregation/jdbc/JdbcAggregatedDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java 2011-12-01 17:08:55 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java 2011-12-01 19:39:40 +
@@ -433,7 +433,7 @@
public Collection getAggregatedDataMapValues( int dataElementId, int periodId, Collection organisationUnitIds )
{
final String sql =
-"SELECT o.organisationunitid, o.name, a.value, a.periodid " +
+"SELECT a.periodid, o.organisationunitid, o.name, a.value " +
"FROM aggregateddatavalue AS a " +
"JOIN organisationunit AS o ON (a.organisationunitid=o.organisationunitid) " +
"WHERE a.dataelementid = " + dataElementId + " " +
@@ -649,7 +649,7 @@
public Collection getAggregatedIndicatorMapValues( int indicatorId, int periodId, Collection organisationUnitIds )
{
final String sql =
-"SELECT o.organisationunitid, o.name, a.value, a.periodid, a.factor, a.numeratorvalue, a.denominatorvalue " +
+"SELECT a.periodid, o.organisationunitid, o.name, a.value, a.factor, a.numeratorvalue, a.denominatorvalue " +
"FROM aggregatedindicatorvalue AS a " +
"JOIN organisationunit AS o ON (a.organisationunitid=o.organisationunitid) " +
"WHERE a.indicatorid = " + indicatorId + " " +
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java 2011-12-01 13:36:23 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataMapValueRowMapper.java 2011-12-01 19:39:40 +
@@ -45,10 +45,10 @@
{
final AggregatedMapValue value = new AggregatedMapValue();
-value.setOrganisationUnitId( resultSet.getInt( 1 ) );
-value.setOrganisationUnitName( resultSet.getString( 2 ) );
-value.setValue( resultSet.getDouble( 3 ) );
-value.setPeriodId( resultSet.getInt( 4 ) );
+value.setPeriodId( resultSet.getInt( "periodid" ) );
+value.setOrganisationUnitId( resultSet.getInt( "organisationunitid" ) );
+value.setOrganisationUnitName( resultSet.getString( "name" ) );
+value.setValue( resultSet.getDouble( "value" ) );
return value;
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java 2011-12-01 13:36:23 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorMapValueRowMapper.java 2011-12-01 19:39:40 +
@@ -45,13 +45,13 @@
{
final AggregatedMapValue value = new AggregatedMapValue();
-value.setOrganisationUnitId( resultSet.getInt( 1 ) );
-value.setOrganisationUnitName( resultSet.getString( 2 ) );
-value.setValue( resultSet.getDouble( 3 ) );
-value.setPeriodId( resultSet.getInt( 4 ) );
-value.setFactor( resultSet.getDouble( 5 ) );
-value.setNumeratorValue( resultSet.getDouble( 6 ) );
-value.setDenominatorValue( resultSet.getDouble( 7 ) );
+value.setPeriodId( resultSet.getInt( "periodid" ) );
+value.setOrganisationUnitId( resultSet.getInt( "organisationunitid" ) );
+value.setOrganisationUnitName( resultSet.getString( "name" ) );
+value.setValue( resultSet.getDouble( "value" ) );
+value.setFactor( resultSet.getDouble( "factor" ) );
+value.setNumeratorValue( resultSet.getDouble( "numeratorvalue" ) );
+va
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5264: Fixed bug related to loading of aggregated datavalues in data visualizer
revno: 5264
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2011-12-01 21:07:31 +0100
message:
Fixed bug related to loading of aggregated datavalues in data visualizer
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesAction.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedValuesAction.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-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesAction.java 2011-10-27 12:35:27 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesAction.java 2011-12-01 20:07:31 +
@@ -97,7 +97,7 @@
if ( dataElementIds != null && periodIds != null && organisationUnitIds != null )
{
object = aggregatedDataValueService
-.getAggregatedDataValues( dataElementIds, periodIds, organisationUnitIds );
+.getAggregatedDataValueTotals( dataElementIds, periodIds, organisationUnitIds );
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java 2011-11-12 14:18:22 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java 2011-12-01 20:07:31 +
@@ -211,7 +211,7 @@
}
object = aggregatedDataValueService
-.getAggregatedDataValues( dataElementIds, periodIds, organisationUnitIds );
+.getAggregatedDataValueTotals( dataElementIds, periodIds, organisationUnitIds );
for ( AggregatedDataValue value : object )
{
@@ -219,7 +219,6 @@
value.setPeriodName( format.formatPeriod( periodService.getPeriod( value.getPeriodId() ) ) );
value.setOrganisationUnitName( organisationUnitService.getOrganisationUnit(
value.getOrganisationUnitId() ).getName() );
-
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedValuesAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedValuesAction.java 2011-11-26 13:49:52 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedValuesAction.java 2011-12-01 20:07:31 +
@@ -120,7 +120,7 @@
if ( dataElementIds != null )
{
-dataValues = aggregatedDataValueService.getAggregatedDataValues( dataElementIds, periodIds,
+dataValues = aggregatedDataValueService.getAggregatedDataValueTotals( dataElementIds, periodIds,
organisationUnitIds );
}
}
___
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] how to flush all the caches
Hi all, I tried to delete orgunit cache in Maintenance/Data admin/Clear cache and also in browser/clear cache but the orgunit tree in OrgUnit Maintence did not reflect the change. So what is the most thorough method to flush dhis2 cache? T ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] how to flush all the caches
Not sure if it is related to this bug https://bugs.launchpad.net/dhis2/+bug/891005 but it might be. The only way I have found is to get the tree to refresh properly is to logout and log back in. Regards, Jason On Fri, Dec 2, 2011 at 6:33 AM, Ngoc Thanh Nguyen wrote: > Hi all, > > I tried to delete orgunit cache in Maintenance/Data admin/Clear cache and > also in browser/clear cache but the orgunit tree in OrgUnit Maintence did > not reflect the change. > > So what is the most thorough method to flush dhis2 cache? > > T > > ___ > 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 5265: local vn - Fixed logic.
revno: 5265
committer: Hieu
branch nick: dhis2
timestamp: Fri 2011-12-02 12:48:55 +0700
message:
local vn - Fixed logic.
modified:
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/export.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 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm 2011-11-09 07:34:53 +
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm 2011-12-02 05:48:55 +
@@ -8,7 +8,7 @@
$i18n.getString('group')*
-
+
#foreach($group in $groups)
$encoder.htmlEncode( $group )
#end
@@ -24,7 +24,7 @@
$i18n.getString('period')*
-
+
@@ -50,7 +50,8 @@
#if ( $organisationUnit )
$(document).ready(function()
{
- getExportReportsByGroup( '$organisationUnit.name' );
+ currentOrgunitName = '$organisationUnit.name';
+ getExportReportsByGroup( currentOrgunitName );
});
#else
disable("group");
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/export.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/export.js 2011-11-09 07:34:53 +
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/export.js 2011-12-02 05:48:55 +
@@ -8,16 +8,20 @@
// The current selected period type name
var currentPeriodTypeName = '';
+// The current selected orgunit name
+var currentOrgunitName = '';
+
// Functions
function organisationUnitSelected( orgUnits, orgUnitNames )
{
- getExportReportsByGroup( orgUnitNames[0] );
+ currentOrgunitName = orgUnitNames[0];
+ getExportReportsByGroup( currentOrgunitName );
}
selection.setListenerFunction( organisationUnitSelected );
function getExportReportsByGroup( selectedOrgUnitName ) {
-
+
if ( selectedOrgUnitName )
{
setInnerHTML( "selectedOrganisationUnit", selectedOrgUnitName );
@@ -36,23 +40,7 @@
currentPeriodOffset = 0;
reportSelected();
displayPeriodsInternal();
-
- enable("group");
- enable("exportReport");
- enable("selectedPeriodId");
- enable("generateExportReport");
- enable("previewButton");
- enable("nextPeriod");
- enable("lastPeriod");
});
- } else {
- disable("group");
- disable("exportReport");
- disable("selectedPeriodId");
- disable("generateExportReport");
- disable("previewButton");
- disable("nextPeriod");
- disable("lastPeriod");
}
}
___
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
