[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4391: (GIS) All visible layers merged when zooming to visible extent.

2011-08-19 Thread noreply
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 4391 [merge] committer: Jan Henrik Overland branch nick: dhis2 timestamp: Sat 2011-08-20 04:41:51 +0200 message: (GIS) All visible layers merged when zooming to visible e

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4390: Minor fix.

2011-08-19 Thread noreply
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 4390 [merge] committer: Jan Henrik Overland branch nick: dhis2 timestamp: Sat 2011-08-20 03:36:16 +0200 message: Minor fix. modified: dhis-2/dhis-web/dhis-web-mapping/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4389: (GIS) Bug fixes and GUI updates.

2011-08-19 Thread noreply
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 4389 [merge] committer: Jan Henrik Overland branch nick: dhis2 timestamp: Sat 2011-08-20 03:28:30 +0200 message: (GIS) Bug fixes and GUI updates. added: dhis-2/dhis-web

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4388: Fixed minor issue

2011-08-19 Thread noreply
revno: 4388 committer: Lars Helge Overland branch nick: dhis2 timestamp: Sat 2011-08-20 01:11:39 +0200 message: Fixed minor issue modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm dhis

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4387: (GIS) User interface overhaul. Work in progress.

2011-08-19 Thread noreply
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 4387 [merge] committer: Jan Henrik Overland branch nick: dhis2 timestamp: Fri 2011-08-19 23:41:58 +0200 message: (GIS) User interface overhaul. Work in progress. added:

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4385: Codestyle

2011-08-19 Thread noreply
revno: 4385 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 23:15:48 +0200 message: Codestyle modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js -- lp:dhi

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4383: minor logic change in hasLocalData

2011-08-19 Thread noreply
revno: 4383 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 22:32:38 +0200 message: minor logic change in hasLocalData modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javasc

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4382: minor bugfix in availability check

2011-08-19 Thread noreply
revno: 4382 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 22:30:00 +0200 message: minor bugfix in availability check modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4381: Data entry, putting grey background color on disabled input fields

2011-08-19 Thread noreply
revno: 4381 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 21:27:33 +0200 message: Data entry, putting grey background color on disabled input fields modified: dhis-2/dhis-web/dhis-web-dataentry/src/main

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4380: Fixed issue, data entry works properly if user refreshes page in offline mode

2011-08-19 Thread noreply
revno: 4380 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 20:37:09 +0200 message: Fixed issue, data entry works properly if user refreshes page in offline mode added: dhis-2/dhis-web/dhis-web-commons-re

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Bob Jolliffe
On 19 August 2011 11:40, Knut Staring wrote: > Thanks for all the input - it has been very useful. I have come to realize > that this current setup should be considered temporary (until the end of the > year) and thinking&resources should probably now rather be dedicated towards > setting up two n

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Muhire Andrew
Dear Knut, if you think linux is good to be used in our server why do we have to limit ourselves since most of us are ICT people(me and my team), i think we have to use any operating system and it becomes our assignment to adapt ourselves since we are the key players. U wl give us the basic

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Bob Jolliffe
On 19 August 2011 14:58, Jason Pickering wrote: > Trimming is certainly the least that we should do. I have recently > come up against a problem with some sort of tick marks (UNICODE 0x92) > which look like apostrophes (which are bad enough) but are not. These > seem to get inserted from copy/past

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Brajesh Murari
On Fri, Aug 19, 2011 at 7:28 PM, Jason Pickering < jason.p.picker...@gmail.com> wrote: > Trimming is certainly the least that we should do. I have recently > come up against a problem with some sort of tick marks (UNICODE 0x92) > which look like apostrophes (which are bad enough) but are not. Thes

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Jason Pickering
Trimming is certainly the least that we should do. I have recently come up against a problem with some sort of tick marks (UNICODE 0x92) which look like apostrophes (which are bad enough) but are not. These seem to get inserted from copy/paste from Excel or Word who conveniently changes normal apos

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Knut Staring
On Fri, Aug 19, 2011 at 3:16 PM, Bob Jolliffe wrote: > On 19 August 2011 14:14, Bob Jolliffe wrote: > > On 19 August 2011 13:49, Ola Hodne Titlestad wrote: > >> 2011/8/19 Bob Jolliffe > >>> > >>> Yes I've seen this on a number of databases as well - causing trouble > >>> with mydatamart. Do y

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Bob Jolliffe
On 19 August 2011 14:14, Bob Jolliffe wrote: > On 19 August 2011 13:49, Ola Hodne Titlestad wrote: >> 2011/8/19 Bob Jolliffe >>> >>> Yes I've seen this on a number of databases as well - causing trouble >>> with mydatamart.  Do you think we should "discourage" this workaround >>> by trimming on

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Bob Jolliffe
On 19 August 2011 13:49, Ola Hodne Titlestad wrote: > 2011/8/19 Bob Jolliffe >> >> Yes I've seen this on a number of databases as well - causing trouble >> with mydatamart.  Do you think we should "discourage" this workaround >> by trimming on save?  I can understand the frustration that might ha

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Ola Hodne Titlestad
2011/8/19 Bob Jolliffe > Yes I've seen this on a number of databases as well - causing trouble > with mydatamart. Do you think we should "discourage" this workaround > by trimming on save? I can understand the frustration that might have > lead people to do this, but it is better to use Male_ o

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4379: Saving meta-data in sessionStorage. Overwriting on each page load when online. Means meta-data su...

2011-08-19 Thread noreply
revno: 4379 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 14:47:28 +0200 message: Saving meta-data in sessionStorage. Overwriting on each page load when online. Means meta-data survives offline page refre

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4378: fixed minor bug in upload js

2011-08-19 Thread noreply
revno: 4378 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 14:46:19 +0200 message: fixed minor bug in upload js modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/f

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Bob Jolliffe
Yes I've seen this on a number of databases as well - causing trouble with mydatamart. Do you think we should "discourage" this workaround by trimming on save? I can understand the frustration that might have lead people to do this, but it is better to use Male_ or _Male or the like than just add

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Lars Helge Øverland
It is probably remains from the days before we changed the category model - users who have not updated their databases to reflect the change from many-to-many to one-to-many between category and category options. ___ Mailing list: https://launchpad.net/~

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

2011-08-19 Thread noreply
revno: 4377 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 14:09:20 +0200 message: Minor fix modified: dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4376: Loading data set report with ajax, which implies a progress indicator and the selected params to ...

2011-08-19 Thread noreply
revno: 4376 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 14:08:26 +0200 message: Loading data set report with ajax, which implies a progress indicator and the selected params to remain. modified: dhis

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4375: fixed problem with offline notification not show when offline

2011-08-19 Thread noreply
revno: 4375 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 14:07:57 +0200 message: fixed problem with offline notification not show when offline modified: dhis-2/dhis-web/dhis-web-commons-resources/src/ma

Re: [Dhis2-devs] DHIS 2 Live

2011-08-19 Thread Ola Hodne Titlestad
Hi Olav, A recommended setup for offline district offices (at least of some size) is to use a local network with 1 ubuntu server running DHIS 2 and multiple clients (mostly Windows), allowing users to share the same installation/database of DHIS. Often there are more than one DHIS user at the dist

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Jason Pickering
Yes, this query will give you category options, which I think should not be possible, but does seem to happen. The specific issue I was referring to can be checked with this.. SELECT trim(name), count(*) from dataelementcategoryoption GROUP BY trim(name) HAVING COUNT(*) >1 Again, I have not chec

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Lars Helge Øverland
I think in fact this is caused by Hibernate being confused - since a category option is member of more than one category Hibernate produces that category option twice for some reason when asking for all category options (since the association is one-to-many). __

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Lars Helge Øverland
I agree with Jason. Run this sql to check: select categoryoptionid, ( select count(categoryoptionid) from categories_categoryoptions where categoryoptionid=cc.categoryoptionid ) as categorycount from categories_categoryoptions as cc order by categorycount desc; Lars

Re: [Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Jason Pickering
I suspect, but at not 100% sure this may because of the dodgy workaround some people (including yours truly) have used to get around the restriction of the same category option in different categories. "Male" and "Male " which appear in two different categories will be accepted by DHIS2, but duri

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4374: re-enabled clearing of data values / dataset complete after sync with server

2011-08-19 Thread noreply
revno: 4374 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 13:45:05 +0200 message: re-enabled clearing of data values / dataset complete after sync with server modified: dhis-2/dhis-web/dhis-web-dataentry

Re: [Dhis2-devs] DHIS 2 Live

2011-08-19 Thread Olav Poppe
Yes, sounds like disabling some modules might be something to consider. We're waiting for a document detailing the connectivity at various offices at the moment, hopefully that will give a better overview of how big issue this will be. As for the HW, the only thing I know at the moment is that

[Dhis2-devs] Conflicts merging databases

2011-08-19 Thread Knut Staring
Hi guys, I have a DHIS db (in MySQL) into which a lot of data have been manually imported from a different system. Now I want to move (parts of) these data into my repository, but when importing the DXF export, I get a PSQLException like this: ERROR: duplicate key value violates unique constraint

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4373: minor javascript fixes

2011-08-19 Thread noreply
revno: 4373 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 13:23:33 +0200 message: minor javascript fixes modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/

[Dhis2-devs] [Bug 828793] Re: missing version table on startup

2011-08-19 Thread Bob Jolliffe
It is fine now. Version table is created. I guess not many people are testing mysql these days :-) ** Changed in: dhis2 Status: New => Fix Committed -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.n

Re: [Dhis2-devs] [Bug 828793] Re: missing version table on startup

2011-08-19 Thread Lars Helge Øverland
It was. Sorry about that. Committed fix in 4371, pls try now. -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/828793 Title: missing version table on startup Status in DHIS 2 - District Health Inf

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Knut Staring
Thanks for all the input - it has been very useful. I have come to realize that this current setup should be considered temporary (until the end of the year) and thinking&resources should probably now rather be dedicated towards setting up two national production machines by the end of the year (on

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4372: minor ouwt bugfix

2011-08-19 Thread noreply
revno: 4372 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 12:36:08 +0200 message: minor ouwt bugfix modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js --

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4371: Fix to column name in version hbm xml

2011-08-19 Thread noreply
revno: 4371 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 12:30:25 +0200 message: Fix to column name in version hbm xml modified: dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/

Re: [Dhis2-devs] [Bug 828793] Re: missing version table on startup

2011-08-19 Thread Lars Helge Øverland
OK sorry, I can see the warnings might be irrelevant. I guess the column name "key" is a reserved word in mysql. Will check. -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/828793 Title: missing v

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Bob Jolliffe
dhis-live is not really designed to be run as a service and I wouldn't really recommend trying. Given that it has a user interaction element in the toolbar etc. Running as a service is sort of the opposite of its defining use case which is to have a minimally configured clickable app to run on a

[Dhis2-devs] [Bug 828793] Re: missing version table on startup

2011-08-19 Thread Bob Jolliffe
OK. Taking all the warnings about badly formed hibernate.properties into account it doesn't make sense to me. If there was an issue with my hibernate properties it would not affect the creation of just one table. If someone other than me can please just verify that starting dhis2 trunk buil

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Knut Staring
On Thu, Aug 18, 2011 at 2:59 PM, Bob Jolliffe wrote: > On 18 August 2011 13:56, Knut Staring wrote: > > On 8/18/11, Knut Staring wrote: > >> As Ola pointed out, the remaining and important issue is the automated > >> startup after a power cut. > > > > In fact, this is really easy, just place sh

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Knut Staring
On Fri, Aug 19, 2011 at 11:01 AM, Ola Hodne Titlestad wrote: > > On 18 August 2011 11:18, Knut Staring wrote: > >> Hello all, >> >> It has been a while since I last ran multiple DHIS2 instances (each with >> its own database) on the same Windows server. Not sure if we have reached a >> consensus

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4370: minor javascript fixes

2011-08-19 Thread noreply
revno: 4370 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 11:04:34 +0200 message: minor javascript fixes modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Ola Hodne Titlestad
On 18 August 2011 11:18, Knut Staring wrote: > Hello all, > > It has been a while since I last ran multiple DHIS2 instances (each with > its own database) on the same Windows server. Not sure if we have reached a > consensus as to best practice on this (I actually think the best practice > would

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

2011-08-19 Thread noreply
revno: 4369 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 10:56:53 +0200 message: Minor fix modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4368: added jquery.cookie to cacheManifest

2011-08-19 Thread noreply
revno: 4368 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 10:51:51 +0200 message: added jquery.cookie to cacheManifest modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4367: updated cacheManifest to include dhis2.*.js javascripts

2011-08-19 Thread noreply
revno: 4367 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Fri 2011-08-19 10:43:30 +0200 message: updated cacheManifest to include dhis2.*.js javascripts modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/weba

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4366: Data entry, displaying progress indicator and disabling data set selection until meta-data is ready

2011-08-19 Thread noreply
revno: 4366 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2011-08-19 10:39:08 +0200 message: Data entry, displaying progress indicator and disabling data set selection until meta-data is ready modified: dhis-2/dh

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4365: Reduced code.

2011-08-19 Thread noreply
revno: 4365 committer: Hieu branch nick: dhis2 timestamp: Fri 2011-08-19 15:29:01 +0700 message: Reduced code. modified: dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPingAction.java -- lp:dhis2 ht

Re: [Dhis2-devs] Multiple DHIS2 instances on Windows

2011-08-19 Thread Knut Staring
So now I'm running three instances of DHIS2 Live on different ports and can stop and start each one individually. My new problem now is how to distinguish between them: 1) Most importantly, I would like to see a different hover text for each DHIS Live icon (I now have three identical ones) 2) Se

Re: [Dhis2-devs] [Bug 828793] Re: missing version table on startup

2011-08-19 Thread Hieu Duy Dang
Hello, I just want to remind you about the space characters in the end-of-line. They are should not allow in the hibernate.properties. And there should not have any the break line (enter) in the end-of-file. Hope this useful for some reason. On Thu, Aug 18, 2011 at 11:57 PM, Bob Jolliffe wrote:

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 4363: Fixed bugs NPE into DataElement and Indicator group editor.

2011-08-19 Thread noreply
revno: 4363 committer: Hieu branch nick: dhis2 timestamp: Fri 2011-08-19 14:40:22 +0700 message: Fixed bugs NPE into DataElement and Indicator group editor. modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-w

Re: [Dhis2-devs] DHIS 2 Live

2011-08-19 Thread wanjala pepela
Dear Lars, Thanks for the new release. Please note the following important things: The Pivot tables should have an automatic pane to export data to excel as most of our staff are very conversant on use of spreadsheets. The reports should also if Iam selecting Monthly give you options of selectin