date:20100311

[Dhis2-devs] [Bug 537672] Re: Filtering elements in list doesn't work in other browsers, only FF

2010-03-11 Thread Saptarshi

We have to recreate the elements in the list to fix this... This should
be point of discussion because it could mean performance issue if the
list if larger than 500-odd elements and the computer running it has
less RAM.

Will be recreating list elements as part of the fix and then we can test
the performance effects of this solution

** Changed in: dhis2
 Assignee: (unassigned) => Saptarshi (sunbiz)

** Changed in: dhis2
   Importance: Undecided => Medium

** Changed in: dhis2
Milestone: None => 2.0.4

** Changed in: dhis2
   Status: New => In Progress

-- 
Filtering elements in list doesn't work in other browsers, only FF
https://bugs.launchpad.net/bugs/537672
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: In Progress

Bug description:
The filtering of elements in lists is not working in any other browser than 
Firefox. This is basically because all browsers ignore CSS styles inside of 
lists or list elements.



___
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 537672] [NEW] Filtering elements in list doesn't work in other browsers, only FF

2010-03-11 Thread Saptarshi

Public bug reported:

The filtering of elements in lists is not working in any other browser
than Firefox. This is basically because all browsers ignore CSS styles
inside of lists or list elements.

** Affects: dhis2
 Importance: Medium
 Assignee: Saptarshi (sunbiz)
 Status: In Progress

-- 
Filtering elements in list doesn't work in other browsers, only FF
https://bugs.launchpad.net/bugs/537672
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: In Progress

Bug description:
The filtering of elements in lists is not working in any other browser than 
Firefox. This is basically because all browsers ignore CSS styles inside of 
lists or list elements.



___
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 418065] Re: IE7 selection lists not working

2010-03-11 Thread Saptarshi

2 people reported this and IE is the largest market share... Fixing

** Changed in: dhis2
 Assignee: (unassigned) => Saptarshi (sunbiz)

** Changed in: dhis2
   Importance: Undecided => Low

** Changed in: dhis2
   Status: New => In Progress

** Changed in: dhis2
Milestone: None => 2.0.4

-- 
IE7 selection lists not working
https://bugs.launchpad.net/bugs/418065
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: In Progress

Bug description:
When using IE7, the two lists of "available" elements and "assigned elements" 
when you for example add data elements into groups, do not work. They are just 
empty. This applies to: assigning elements to groups, assignings category 
options to categories, assigning categories to category combos. Probable all 
those lists, but I did not check for all of them.

4 March 10 -- same problem with user roles -- r.friedman



___
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] DHIS 2.0.4 release candidate 1 is out - Testers wanted

2010-03-11 Thread Saptarshi Purkayastha

Because of Rev 
1331,
we get the following exception on AJAX.

*The data locking module is throwing exception: Unable to render Velocity
Template, '/dhis-web-commons/ajax/responsePeriod.vm' (CommonsLogger.java
[7634...@qtp-21280292-5])*
*org.apache.velocity.exception.ResourceNotFoundException: Unable to find
resource '/dhis-web-commons/ajax/responsePeriod.vm'*

When we select period. Is this still a work in progress??

---
Regards,
Saptarshi PURKAYASTHA
Director R & D, HISP India
Health Information Systems Programme

My Tech Blog:  http://sunnytalkstech.blogspot.com
You Live by CHOICE, Not by CHANCE


2010/3/11 Saptarshi Purkayastha 

> Was able to replicate bug #525787 
> Committed a fix... Should be part of the RC2
> 
> ---
> Regards,
> Saptarshi PURKAYASTHA
> Director R & D, HISP India
> Health Information Systems Programme
>
> My Tech Blog:  http://sunnytalkstech.blogspot.com
> You Live by CHOICE, Not by CHANCE
>
>
> 2010/3/8 Lars Helge Øverland 
>
>>
>> Hi,
>>
>> DHIS 2.0.4 rc 1 is out and can be downloaded here:
>>
>> http://dhis2.org/download/dhis2-2.0.4-rc1.war
>>
>> Testers wanted and feedback appreciated. As more and more people are
>> testing and using DHIS 2 its crucial that we can provide stable releases.
>>
>> Apologies for the delayed release date. It was mainly caused by urgent
>> needs from India which required attention. This release is synced with the
>> Indian patient system/NBITS release.
>>
>> There are still bugs registered in LP for this release. The devs will
>> focus on solving these in the coming week.
>>
>> regards, Lars
>>
>>
>>
>> ___
>> 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 525787] Re: Division by zero error when loading data entry form

2010-03-11 Thread Launchpad Bug Tracker

** Branch linked: lp:dhis2

-- 
Division by zero error when loading data entry form
https://bugs.launchpad.net/bugs/525787
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
After upgrading to 2.0.3, one of the data entry forms refuses to show. It's 
just this one form (in DHIS for Gambia: Health Facility Quarterly Returns). The 
rest of the forms work as normal.



___
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 525787] Re: Division by zero error when loading data entry form

2010-03-11 Thread Saptarshi

Instead of the default categoryoption, if a dataelement has a blank
category option (very odd)... this can happen. Just a check to see if
the categoryoptions are empty can avoid the exception

** Changed in: dhis2
 Assignee: (unassigned) => Saptarshi (sunbiz)

** Changed in: dhis2
   Status: New => Fix Committed

-- 
Division by zero error when loading data entry form
https://bugs.launchpad.net/bugs/525787
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
After upgrading to 2.0.3, one of the data entry forms refuses to show. It's 
just this one form (in DHIS for Gambia: Health Facility Quarterly Returns). The 
rest of the forms work as normal.



___
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] DHIS 2.0.4 release candidate 1 is out - Testers wanted

2010-03-11 Thread Saptarshi Purkayastha

Was able to replicate bug #525787 
Committed a fix... Should be part of the RC2

---
Regards,
Saptarshi PURKAYASTHA
Director R & D, HISP India
Health Information Systems Programme

My Tech Blog:  http://sunnytalkstech.blogspot.com
You Live by CHOICE, Not by CHANCE


2010/3/8 Lars Helge Øverland 

>
> Hi,
>
> DHIS 2.0.4 rc 1 is out and can be downloaded here:
>
> http://dhis2.org/download/dhis2-2.0.4-rc1.war
>
> Testers wanted and feedback appreciated. As more and more people are
> testing and using DHIS 2 its crucial that we can provide stable releases.
>
> Apologies for the delayed release date. It was mainly caused by urgent
> needs from India which required attention. This release is synced with the
> Indian patient system/NBITS release.
>
> There are still bugs registered in LP for this release. The devs will focus
> on solving these in the coming week.
>
> regards, Lars
>
>
>
> ___
> 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 1634: Added check for categoryoption size to avoid divide by zero

2010-03-11 Thread noreply


revno: 1634
fixes bug(s): https://launchpad.net/bugs/525787
committer: Saptarshi 
branch nick: trunk
timestamp: Thu 2010-03-11 20:55:23 +0100
message:
  Added check for categoryoption size to avoid divide by zero
modified:
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.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-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java	2010-02-22 09:19:15 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java	2010-03-11 19:55:23 +
@@ -78,6 +78,7 @@
 // -
 // Dependencies
 // -
+
 private CustomValueService customValueService;
 
 public CustomValueService getCustomValueService()
@@ -152,7 +153,7 @@
 {
 this.categoryService = categoryService;
 }
-
+
 private I18n i18n;
 
 public void setI18n( I18n i18n )
@@ -170,7 +171,6 @@
 // -
 // Comparator
 // -
-
 private Comparator dataElementComparator;
 
 public void setDataElementComparator( Comparator dataElementComparator )
@@ -181,7 +181,6 @@
 // -
 // DisplayPropertyHandler
 // -
-
 private DisplayPropertyHandler displayPropertyHandler;
 
 public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
@@ -192,7 +191,6 @@
 // -
 // Output
 // -
-
 private List customValues = new ArrayList();
 
 public List getCustomValues()
@@ -336,7 +334,6 @@
 // -
 // Input/output
 // -
-
 private Integer selectedDataSetId;
 
 public void setSelectedDataSetId( Integer selectedDataSetId )
@@ -366,7 +363,6 @@
 // -
 // Action implementation
 // -
-
 public String execute()
 throws Exception
 {
@@ -387,23 +383,23 @@
 if ( dataSetLock != null && dataSetLock.getSources().contains( organisationUnit ) )
 {
 disabled = "disabled";
-}   
-
+}
+
 List dataElements = new ArrayList( dataSet.getDataElements() );
 
-if ( dataElements.size() == 0 )
+if ( dataElements.isEmpty() )
 {
 return SUCCESS;
-}  
-
-Collections.sort( dataElements, dataElementComparator );   
-
+}
+
+Collections.sort( dataElements, dataElementComparator );
+
 orderedDataElements = dataElementService.getGroupedDataElementsByCategoryCombo( dataElements );
-
-orderedCategoryCombos = dataElementService.getDataElementCategoryCombos( dataElements );
+
+orderedCategoryCombos = dataElementService.getDataElementCategoryCombos( dataElements );
 
 for ( DataElementCategoryCombo categoryCombo : orderedCategoryCombos )
-{
+{
 Collection optionCombos = categoryService.sortOptionCombos( categoryCombo );
 
 allOptionCombos.addAll( optionCombos );
@@ -443,24 +439,27 @@
 
 for ( DataElementCategory cat : categoryCombo.getCategories() )
 {
-catColSpan = catColSpan / cat.getCategoryOptions().size();
-int total = optionCombos.size() / (catColSpan * cat.getCategoryOptions().size());
-Collection cols = new ArrayList( total );
-
-for ( int i = 0; i < total; i++ )
+if ( !cat.getCategoryOptions().isEmpty() )
 {
-cols.add( i );
+catColSpan = catColSpan / cat.getCategoryOptions().size();
+int total = optionCombos.size() / ( catColSpan * cat.getCategoryOptions().size() );
+Collection

Re: [Dhis2-devs] GIS problem

2010-03-11 Thread Jan Henrik Øverland

A layer that has hover functionality activated will always be displayed on
top of a layer that doesn't. As I don't have implemented any hover
functionality for overlays yet, I deactivate the thematic map hover
functionality when an overlay is applied simply to be able to put the
overlay on top.

Agree that overlay hover functionality and improved drag-and-drop layer
ordering are important requirements.


On Thu, Mar 11, 2010 at 8:37 PM, Knut Staring  wrote:

> On Thu, Mar 11, 2010 at 8:35 PM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> Blueprint :)
>
>
> True - and I will include the ability to have labels on overlays. Also, the
> hover functionality does not work when there are overlays.
>
> k
>
>
>> On Thu, Mar 11, 2010 at 8:20 PM, Knut Staring  wrote:
>>
>>> On Thu, Mar 11, 2010 at 7:52 PM, Jan Henrik Øverland <
>>> janhenrik.overl...@gmail.com> wrote:
>>>
 On Thu, Mar 11, 2010 at 7:49 PM, Knut Staring  wrote:

> On Thu, Mar 11, 2010 at 7:19 PM, Knut Staring wrote:
>
>> On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
>> janhenrik.overl...@gmail.com> wrote:
>>
>>> On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring wrote:
>>>
 Is there an easy way to get at the generated image for inclusion in
 other documents?

>>>
>>> Not yet. The not so elegant print screen button is still the way to
>>> capture screen shots.
>>>
>>
>> Right...I see that I can get the background layer easily from the PDF,
>> but not the vector layer (which is what is of interest).
>>
>
> This does imply that the problem is solvable when using Geoserver (as
> everything will be "background"). Same with overlays.
>
> However, it is nice that they appear as separate layers in the PDF,
> which the viewer can switch on and off - but cannot copy into PowerPoint 
> or
> Word.
>
> The labels on the other hand are not included in the PDF (again,
> Geoserver could solve that).
>

 I think one guy in c2c commited a patch in order to include labels in
 the PDF. Will have a look at it.

>>>
>>> Great. It would also be nice to be able to choose between displaying the
>>> name and the value in the label (or both).
>>>
>>> k
>>>


>
> k
>


>>>
>>>
>>> --
>>> Cheers,
>>> Knut Staring
>>>
>>
>>
>
>
> --
> Cheers,
> Knut Staring
>
___
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] GIS problem

2010-03-11 Thread Knut Staring

On Thu, Mar 11, 2010 at 8:35 PM, Jan Henrik Øverland <
janhenrik.overl...@gmail.com> wrote:

> Blueprint :)

True - and I will include the ability to have labels on overlays. Also, the
hover functionality does not work when there are overlays.

k

> On Thu, Mar 11, 2010 at 8:20 PM, Knut Staring  wrote:
>
>> On Thu, Mar 11, 2010 at 7:52 PM, Jan Henrik Øverland <
>> janhenrik.overl...@gmail.com> wrote:
>>
>>> On Thu, Mar 11, 2010 at 7:49 PM, Knut Staring  wrote:
>>>
 On Thu, Mar 11, 2010 at 7:19 PM, Knut Staring  wrote:

> On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring wrote:
>>
>>> Is there an easy way to get at the generated image for inclusion in
>>> other documents?
>>>
>>
>> Not yet. The not so elegant print screen button is still the way to
>> capture screen shots.
>>
>
> Right...I see that I can get the background layer easily from the PDF,
> but not the vector layer (which is what is of interest).
>

 This does imply that the problem is solvable when using Geoserver (as
 everything will be "background"). Same with overlays.

 However, it is nice that they appear as separate layers in the PDF,
 which the viewer can switch on and off - but cannot copy into PowerPoint or
 Word.

 The labels on the other hand are not included in the PDF (again,
 Geoserver could solve that).

>>>
>>> I think one guy in c2c commited a patch in order to include labels in the
>>> PDF. Will have a look at it.
>>>
>>
>> Great. It would also be nice to be able to choose between displaying the
>> name and the value in the label (or both).
>>
>> k
>>
>>>
>>>

 k

>>>
>>>
>>
>>
>> --
>> Cheers,
>> Knut Staring
>>
>
>

-- 
Cheers,
Knut Staring
___
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] GIS problem

2010-03-11 Thread Jan Henrik Øverland

Blueprint :)


On Thu, Mar 11, 2010 at 8:20 PM, Knut Staring  wrote:

> On Thu, Mar 11, 2010 at 7:52 PM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> On Thu, Mar 11, 2010 at 7:49 PM, Knut Staring  wrote:
>>
>>> On Thu, Mar 11, 2010 at 7:19 PM, Knut Staring  wrote:
>>>
 On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
 janhenrik.overl...@gmail.com> wrote:

> On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring wrote:
>
>> Is there an easy way to get at the generated image for inclusion in
>> other documents?
>>
>
> Not yet. The not so elegant print screen button is still the way to
> capture screen shots.
>

 Right...I see that I can get the background layer easily from the PDF,
 but not the vector layer (which is what is of interest).

>>>
>>> This does imply that the problem is solvable when using Geoserver (as
>>> everything will be "background"). Same with overlays.
>>>
>>> However, it is nice that they appear as separate layers in the PDF, which
>>> the viewer can switch on and off - but cannot copy into PowerPoint or Word.
>>>
>>> The labels on the other hand are not included in the PDF (again,
>>> Geoserver could solve that).
>>>
>>
>> I think one guy in c2c commited a patch in order to include labels in the
>> PDF. Will have a look at it.
>>
>
> Great. It would also be nice to be able to choose between displaying the
> name and the value in the label (or both).
>
> k
>
>>
>>
>>>
>>> k
>>>
>>
>>
>
>
> --
> Cheers,
> Knut Staring
>
___
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 537522] Re: Build fails if bzr is not found on PATH or not installed

2010-03-11 Thread Saptarshi

** Changed in: dhis2
   Status: New => Fix Committed

-- 
Build fails if bzr is not found on PATH or not installed
https://bugs.launchpad.net/bugs/537522
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
Passed the source to a friend who could not build the war. The dhis-web-commons 
uses bzr to get the revision number and if that is not found on PATH or not 
installed the build fails with the error: 

An Ant BuildException has occured: Execute failed: java.io.IOException: Cannot 
run program "bzr" (in directory ""): CreateProcess error=2, The 
system cannot find the file specified

The build process should function without the need for bzr to be installed and 
ignore adding the revision number.



___
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 537522] Re: Build fails if bzr is not found on PATH or not installed

2010-03-11 Thread Launchpad Bug Tracker

** Branch linked: lp:dhis2

-- 
Build fails if bzr is not found on PATH or not installed
https://bugs.launchpad.net/bugs/537522
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
Passed the source to a friend who could not build the war. The dhis-web-commons 
uses bzr to get the revision number and if that is not found on PATH or not 
installed the build fails with the error: 

An Ant BuildException has occured: Execute failed: java.io.IOException: Cannot 
run program "bzr" (in directory ""): CreateProcess error=2, The 
system cannot find the file specified

The build process should function without the need for bzr to be installed and 
ignore adding the revision number.



___
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] GIS problem

2010-03-11 Thread Knut Staring

On Thu, Mar 11, 2010 at 7:52 PM, Jan Henrik Øverland <
janhenrik.overl...@gmail.com> wrote:

> On Thu, Mar 11, 2010 at 7:49 PM, Knut Staring  wrote:
>
>> On Thu, Mar 11, 2010 at 7:19 PM, Knut Staring  wrote:
>>
>>> On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
>>> janhenrik.overl...@gmail.com> wrote:
>>>
 On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring  wrote:

> Is there an easy way to get at the generated image for inclusion in
> other documents?
>

 Not yet. The not so elegant print screen button is still the way to
 capture screen shots.

>>>
>>> Right...I see that I can get the background layer easily from the PDF,
>>> but not the vector layer (which is what is of interest).
>>>
>>
>> This does imply that the problem is solvable when using Geoserver (as
>> everything will be "background"). Same with overlays.
>>
>> However, it is nice that they appear as separate layers in the PDF, which
>> the viewer can switch on and off - but cannot copy into PowerPoint or Word.
>>
>> The labels on the other hand are not included in the PDF (again, Geoserver
>> could solve that).
>>
>
> I think one guy in c2c commited a patch in order to include labels in the
> PDF. Will have a look at it.
>

Great. It would also be nice to be able to choose between displaying the
name and the value in the label (or both).

k

>
>
>>
>> k
>>
>
>


-- 
Cheers,
Knut Staring
___
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 1633: Continue build if bzr missing and printing "NA" in about when no revision info available

2010-03-11 Thread noreply


revno: 1633
fixes bug(s): https://launchpad.net/bugs/537522
committer: Saptarshi 
branch nick: trunk
timestamp: Thu 2010-03-11 20:16:22 +0100
message:
  Continue build if bzr missing and printing "NA" in about when no revision 
info available
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm
  dhis-2/dhis-web/dhis-web-commons/pom.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2010-03-09 10:10:22 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2010-03-11 19:16:22 +
@@ -3,7 +3,7 @@
 
   $i18n.getString( "current_user" ):$!currentUsername
   $i18n.getString( "version" ):$!version
-  $i18n.getString( "build_revision" ):$!revision
+  $i18n.getString( "build_revision" ):#if( $revision == '${revision}' ) NA #else $!revision #end
   $i18n.getString( "build_date" ):$format.formatDateTime( $!buildTime )
   $i18n.getString( "user_agent" ):$!userAgent
   $i18n.getString( "external_configuration_directory" ):$!externalDirectory

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-03-05 20:54:16 +
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-03-11 19:16:22 +
@@ -26,7 +26,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 1632: (GIS) Help window resized.

2010-03-11 Thread noreply


revno: 1632
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 19:57:45 +0100
message:
  (GIS) Help window resized.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.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/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-11 17:28:21 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-11 18:57:45 +
@@ -1017,8 +1017,8 @@
 title: 'Help',
 		layout: 'fit',
 closeAction: 'hide',
-		width: 560,
-		height: 350, 
+		width: 607,
+		height: 430, 
 items:
 [
 {

___
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] GIS problem

2010-03-11 Thread Jan Henrik Øverland

On Thu, Mar 11, 2010 at 7:49 PM, Knut Staring  wrote:

> On Thu, Mar 11, 2010 at 7:19 PM, Knut Staring  wrote:
>
>> On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
>> janhenrik.overl...@gmail.com> wrote:
>>
>>> On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring  wrote:
>>>
 Is there an easy way to get at the generated image for inclusion in
 other documents?

>>>
>>> Not yet. The not so elegant print screen button is still the way to
>>> capture screen shots.
>>>
>>
>> Right...I see that I can get the background layer easily from the PDF, but
>> not the vector layer (which is what is of interest).
>>
>
> This does imply that the problem is solvable when using Geoserver (as
> everything will be "background"). Same with overlays.
>
> However, it is nice that they appear as separate layers in the PDF, which
> the viewer can switch on and off - but cannot copy into PowerPoint or Word.
>
> The labels on the other hand are not included in the PDF (again, Geoserver
> could solve that).
>

I think one guy in c2c commited a patch in order to include labels in the
PDF. Will have a look at it.


>
> k
>
___
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] GIS problem

2010-03-11 Thread Knut Staring

On Thu, Mar 11, 2010 at 7:19 PM, Knut Staring  wrote:

> On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring  wrote:
>>
>>> Is there an easy way to get at the generated image for inclusion in other
>>> documents?
>>>
>>
>> Not yet. The not so elegant print screen button is still the way to
>> capture screen shots.
>>
>
> Right...I see that I can get the background layer easily from the PDF, but
> not the vector layer (which is what is of interest).
>

This does imply that the problem is solvable when using Geoserver (as
everything will be "background"). Same with overlays.

However, it is nice that they appear as separate layers in the PDF, which
the viewer can switch on and off - but cannot copy into PowerPoint or Word.

The labels on the other hand are not included in the PDF (again, Geoserver
could solve that).

k
___
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 132: GIS doc update.

2010-03-11 Thread noreply


revno: 132
committer: Jan Henrik Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 19:46:46 +0100
message:
  GIS doc update.
modified:
  src/docbkx/en/dhis2_user_man_gis.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_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 18:18:22 +
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 18:46:46 +
@@ -58,7 +58,6 @@
 
   
 
-
 
 
 Map source
@@ -81,7 +80,6 @@
 Longitude/latitude: The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
   
 
-  
   
   
 Registering geographical information

___
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 1631: GIS help content updated.

2010-03-11 Thread noreply


revno: 1631
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 19:45:51 +0100
message:
  GIS help content updated.
modified:
  dhis-2/dhis-options/src/main/resources/help_content.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-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-11 18:21:47 +
+++ dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-11 18:45:51 +
@@ -1232,7 +1232,6 @@
 
   
 
-
 
 
 Map source
@@ -1255,7 +1254,6 @@
 Longitude/latitude: The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
   
 
-  
   
 
 Registering geographical information

___
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] GIS problem

2010-03-11 Thread Jan Henrik Øverland

On Thu, Mar 11, 2010 at 7:19 PM, Knut Staring  wrote:

> On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring  wrote:
>>
>>> Is there an easy way to get at the generated image for inclusion in other
>>> documents?
>>>
>>
>> Not yet. The not so elegant print screen button is still the way to
>> capture screen shots.
>>
>
> Right...I see that I can get the background layer easily from the PDF, but
> not the vector layer (which is what is of interest).
>
>
>> -  When selecting a map view, full zoom out is applied, so the map becomes
>>> really tiny. Should zoom to preferred extent
>>>
>>
>> This is a backwards compatibility issue. Map views now store the current
>> zoom level and center position as opposed to earlier when the zoom and
>> position registered to the map were used. Older map views obviously don't
>> have this information stored, so creating new ones will get rid of your
>> problem. However, I will commit a fix to this problem by using the zoom and
>> position registered to the map when a map view without this information is
>> loaded.
>>
>
> Ok, this is a minor problem then. Works well with new views.
>
>
>>  - There seems to be some inconsistency in whether the background gets
>>> printed or not Sometimes it also hangs after printing. I have not figured
>>> out the pattern yet.
>>>
>>
>> Hm ok. Never happened to me though.
>>
>>
>>> - The "generating choropleth" message comes on top of the print box and
>>> thus obfuscates it
>>
>>
>> Ok, please explain more thoroughly when this happens.
>>
>
> Will test the above two aspects a bit more. Konqueror also had a number of
> issues, so Opera seems to be the front runner on Linux (GIS is not so cool
> in browsers like Lynx http://en.wikipedia.org/wiki/Lynx_%28web_browser%29)
>
> I get an error in Firebug telling me it cannot find the following file:
>
>
> http://109.74.202.200:8080/ke/dhis-web-mapping/resources/mapfish/widgets/geostat/Static.js
>
> But it still seems to work, so I guess it doesn't matter?
>

That's right, just forgot to remove the reference.


>
> Knut
>
___
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 1630: (GIS) Dead reference removed.

2010-03-11 Thread noreply


revno: 1630
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 19:28:22 +0100
message:
  (GIS) Dead reference removed.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.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/MapFish.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js	2010-02-18 17:01:00 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js	2010-03-11 18:28:22 +
@@ -119,7 +119,6 @@
 "widgets/geostat/Choropleth.js",
 "widgets/geostat/Mapping.js",
 "widgets/geostat/ProportionalSymbol.js",
-"widgets/geostat/Static.js",
 "widgets/tree/LayerTree.js",
 "widgets/tree/LayerTreeExtra.js",
 "widgets/toolbar/Toolbar.js",

___
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 1629: GIS help content added.

2010-03-11 Thread noreply


revno: 1629
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 19:21:47 +0100
message:
  GIS help content added.
modified:
  dhis-2/dhis-options/src/main/resources/help_content.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-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-11 17:25:31 +
+++ dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-11 18:21:47 +
@@ -1228,111 +1228,88 @@
   
 
 
-  Administrator panel
-  
-
-  
-  
-
-  
-Map source
-
-  GeoJSON files: you will find your own
-registered maps in the Map combo box in the Thematic map panel.
-The Admin panels check box will become visible.
-  Shapefiles: same as GeoJSON files, except that the files are generated from shapefiles installed in your running version of Geoserver on the fly. 
-  DHIS database: the Map combo box will
-simply be populated by the existing organisation unit levels and
-GeoJSON files will be created by the application automatically
-Organisation units must have coordinates stored in the database in
-order to be displayed in the map. This function is mainly intended
-for the facility level as it is easy to maintain and thus will
-offer up-to-date shapefiles.
-
-  
-  
-Admin panels
-
-  Show/hide the shapefile management panels.
-
-  
-  
-Longitude/latitude
-
-  The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
-
-  
-
-  
-
+Administrator panel
+
+  
+
+
+
+
+Map source
+GeoJSON files: you will find your own
+registered maps in the Map combo box in the Thematic map panel.
+The Admin panels check box will become visible.
+Shapefiles: same as GeoJSON files, except that the files are generated from shapefiles installed in your running version of Geoserver on the fly.
+DHIS database: the Map combo box will
+simply be populated by the existing organisation unit levels and
+GeoJSON files will be created by the application automatically
+Organisation units must have coordinates stored in the database in
+order to be displayed in the map. This function is mainly intended
+for the facility level as it is easy to maintain and thus will
+offer up-to-date shapefiles.
+  
+  
+Admin panels: Show/hide the shapefile management panels.
+  
+  
+Longitude/latitude: The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
+  
+
+  
+  
 
-  Registering geographical information
-  In order to view data in the GIS module, you must import your
+Registering geographical information
+In order to view data in the GIS module, you must import your
 geographical data into your DHIS installation. Once you have produced
 GeoJSON files according to the procedure above, and imported them into the
 system, you will need to establish a correspondence between the
 information in the DHIS database, and the GeoJSON file.
-  
-Register Geodata Panel
-
-  
-
-  
-
-  
-  
-
-  Organisation unit level
-  
-The level of the organization units displayed in the GeoJSON
-  file.
-  
-
-
-  Map source file
-  
-The GeoJSON file name. These files must be placed in the
+
+  Register Geodata Panel
+  
+
+  
+
+  
+
+
+  
+Display name: Represents your map in the Map combo box in the Thematic map panel.
+  
+  
+Organisation unit level: The level of the organization units displayed in the GeoJSON file.
+  
+  
+Map source file: The GeoJSON file name. These files must be placed in the
   mapping/geojson folder. Use e.g. Geoserver 2.0 (currently RC1) to
   easily produce GeoJSON from your shapefiles.
-  
-
-
-  Display name
-  
-

[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 131: GIS doc update.

2010-03-11 Thread noreply


revno: 131
committer: Jan Henrik Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 19:18:22 +0100
message:
  GIS doc update.
modified:
  src/docbkx/en/dhis2_user_man_gis.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_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 18:14:51 +
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 18:18:22 +
@@ -81,6 +81,7 @@
 Longitude/latitude: The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
   
 
+  
   
   
 Registering geographical information

___
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] GIS problem

2010-03-11 Thread Knut Staring

On Thu, Mar 11, 2010 at 2:55 PM, Jan Henrik Øverland <
janhenrik.overl...@gmail.com> wrote:

> On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring  wrote:
>
>> Is there an easy way to get at the generated image for inclusion in other
>> documents?
>>
>
> Not yet. The not so elegant print screen button is still the way to capture
> screen shots.
>

Right...I see that I can get the background layer easily from the PDF, but
not the vector layer (which is what is of interest).


> -  When selecting a map view, full zoom out is applied, so the map becomes
>> really tiny. Should zoom to preferred extent
>>
>
> This is a backwards compatibility issue. Map views now store the current
> zoom level and center position as opposed to earlier when the zoom and
> position registered to the map were used. Older map views obviously don't
> have this information stored, so creating new ones will get rid of your
> problem. However, I will commit a fix to this problem by using the zoom and
> position registered to the map when a map view without this information is
> loaded.
>

Ok, this is a minor problem then. Works well with new views.


>  - There seems to be some inconsistency in whether the background gets
>> printed or not Sometimes it also hangs after printing. I have not figured
>> out the pattern yet.
>>
>
> Hm ok. Never happened to me though.
>
>
>> - The "generating choropleth" message comes on top of the print box and
>> thus obfuscates it
>
>
> Ok, please explain more thoroughly when this happens.
>

Will test the above two aspects a bit more. Konqueror also had a number of
issues, so Opera seems to be the front runner on Linux (GIS is not so cool
in browsers like Lynx http://en.wikipedia.org/wiki/Lynx_%28web_browser%29)

I get an error in Firebug telling me it cannot find the following file:

http://109.74.202.200:8080/ke/dhis-web-mapping/resources/mapfish/widgets/geostat/Static.js

But it still seems to work, so I guess it doesn't matter?

Knut
___
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 130: GIS doc update.

2010-03-11 Thread noreply


revno: 130
committer: Jan Henrik Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 19:14:51 +0100
message:
  GIS doc update.
modified:
  src/docbkx/en/dhis2_user_man_gis.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_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 17:23:00 +
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 18:14:51 +
@@ -58,36 +58,29 @@
 
   
 
-
-
-  Map source
-  
-GeoJSON files: you will find your own
-registered maps in the Map combo box in the Thematic map panel.
-The Admin panels check box will become visible.
-Shapefiles: same as GeoJSON files, except that the files are generated from shapefiles installed in your running version of Geoserver on the fly. 
-DHIS database: the Map combo box will
-simply be populated by the existing organisation unit levels and
-GeoJSON files will be created by the application automatically
-Organisation units must have coordinates stored in the database in
-order to be displayed in the map. This function is mainly intended
-for the facility level as it is easy to maintain and thus will
-offer up-to-date shapefiles.
-  
-
-
-  Admin panels
-  
-Show/hide the shapefile management panels.
-  
-
-
-  Longitude/latitude
-  
-The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
-  
-
-  
+
+
+
+Map source
+GeoJSON files: you will find your own
+registered maps in the Map combo box in the Thematic map panel.
+The Admin panels check box will become visible.
+Shapefiles: same as GeoJSON files, except that the files are generated from shapefiles installed in your running version of Geoserver on the fly.
+DHIS database: the Map combo box will
+simply be populated by the existing organisation unit levels and
+GeoJSON files will be created by the application automatically
+Organisation units must have coordinates stored in the database in
+order to be displayed in the map. This function is mainly intended
+for the facility level as it is easy to maintain and thus will
+offer up-to-date shapefiles.
+  
+  
+Admin panels: Show/hide the shapefile management panels.
+  
+  
+Longitude/latitude: The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
+  
+
   
   
 Registering geographical information
@@ -104,33 +97,21 @@
 
   
 
-
-  
-Organisation unit level
-
-  The level of the organization units displayed in the GeoJSON
-  file.
-
-  
-  
-Map source file
-
-  The GeoJSON file name. These files must be placed in the
+
+  
+Display name: Represents your map in the Map combo box in the Thematic map panel.
+  
+  
+Organisation unit level: The level of the organization units displayed in the GeoJSON file.
+  
+  
+Map source file: The GeoJSON file name. These files must be placed in the
   mapping/geojson folder. Use e.g. Geoserver 2.0 (currently RC1) to
   easily produce GeoJSON from your shapefiles.
-
-  
-  
-Display name
-
-  Represents your map in the Map combo box in the Thematic map
-  panel.
-
-  
-  
-Name column
-
-  The shapefile data column (case sensitive!) that will be
+  
+  
+  
+Name column: The shapefile data column (case sensitive!) that will be
   matched against DHIS organisation unit names. If you have an
   instance of Geoserver installed, you can view the layer through the
   built-in OpenLayers client. Click on a particular area, and the
@@ -151,12 +132,9 @@
   
 
   
-
-  
-  
-Longitude / latitude
-
-  The longitude and latitude refer to the approximate point
+  
+  
+Longitude / latitude: The longitud

[Dhis2-devs] [Bug 537522] [NEW] Build fails if bzr is not found on PATH or not installed

2010-03-11 Thread Saptarshi

Public bug reported:

Passed the source to a friend who could not build the war. The dhis-web-
commons uses bzr to get the revision number and if that is not found on
PATH or not installed the build fails with the error:

An Ant BuildException has occured: Execute failed: java.io.IOException:
Cannot run program "bzr" (in directory ""): CreateProcess
error=2, The system cannot find the file specified

The build process should function without the need for bzr to be
installed and ignore adding the revision number.

** Affects: dhis2
 Importance: Low
 Assignee: Saptarshi (sunbiz)
 Status: New

** Changed in: dhis2
 Assignee: (unassigned) => Saptarshi (sunbiz)

** Changed in: dhis2
   Importance: Undecided => Critical

** Changed in: dhis2
   Importance: Critical => Low

** Changed in: dhis2
Milestone: None => 2.0.4

-- 
Build fails if bzr is not found on PATH or not installed
https://bugs.launchpad.net/bugs/537522
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: New

Bug description:
Passed the source to a friend who could not build the war. The dhis-web-commons 
uses bzr to get the revision number and if that is not found on PATH or not 
installed the build fails with the error: 

An Ant BuildException has occured: Execute failed: java.io.IOException: Cannot 
run program "bzr" (in directory ""): CreateProcess error=2, The 
system cannot find the file specified

The build process should function without the need for bzr to be installed and 
ignore adding the revision number.



___
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 1628: (GIS) PDF print tab added to help window.

2010-03-11 Thread noreply


revno: 1628
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 18:28:21 +0100
message:
  (GIS) PDF print tab added to help window.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.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/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-11 15:27:28 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-11 17:28:21 +
@@ -1052,6 +1052,9 @@
 		else if (tab.id == 'help6') {
 getHelpText(legendSets, tab.id);
 }
+		else if (tab.id == 'help7') {
+getHelpText(pdfprint, tab.id);
+}
 }
 },
 items:
@@ -1083,6 +1086,10 @@
 {
 title: 'Legend sets',
 id: 'help6'
+},
+{
+title: 'PDF print',
+id: 'help7'
 }
 ]
 }

___
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 1627: Minor doc fix.

2010-03-11 Thread noreply


revno: 1627
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 18:25:31 +0100
message:
  Minor doc fix.
modified:
  dhis-2/dhis-options/src/main/resources/help_content.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-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-11 16:40:07 +
+++ dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-11 17:25:31 +
@@ -1393,7 +1393,7 @@
 link. The remove all button removes all OU links for the selected
 map.
 
-
+
   Register overlays
   Overlays are geographical layers that do not have any direct linkage
 to data in the database. Example include roads, rivers, airports, ports,

___
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 129: GIS doc update.

2010-03-11 Thread noreply


revno: 129
committer: Jan Henrik Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 18:23:00 +0100
message:
  GIS doc update.
modified:
  src/docbkx/en/dhis2_user_man_gis.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_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 16:30:33 +
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 17:23:00 +
@@ -217,7 +217,7 @@
 link. The remove all button removes all OU links for the selected
 map.
   
-  
+  
 Register overlays
 Overlays are geographical layers that do not have any direct linkage
 to data in the database. Example include roads, rivers, airports, ports,

___
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] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 125: vietnamese document - Reorgasized

2010-03-11 Thread Jason Pickering

Sounds like a blueprint. :)

2010/3/11 Lars Helge Øverland :
>
>
> On Thu, Mar 11, 2010 at 3:29 PM, Jason Pickering
>  wrote:
>>
>> A big congrats to the Vietnamese team for what looks like the first
>> translation of the DHIS user manual! The documentation has exploded
>> over the past few months, and this is a great development for the
>> project. I would have figured that Norwegian would have been the first
>> language to translate, but it looks like the Vietnamese team beat you
>> to it!
>>
>
> This will also require that we expand the embedded help functionality a bit.
> The help locale could follow the database content locale user-setting.
> Lars
>
>>
>> Great work!
>>
>> Best regards,
>> Jason
>>
>>
>> On Thu, Mar 11, 2010 at 3:23 PM,   wrote:
>> > 
>> > revno: 125
>> > committer: Dao Van Sam 
>> > branch nick: dhis2-docbook-docs
>> > timestamp: Thu 2010-03-11 17:20:47 +0700
>> > message:
>> >  vietnamese document - Reorgasized
>> > removed:
>> >  src/docbkx/vn/dhis2_documentation_guide.xml
>> >  src/docbkx/vn/dhis2_technical_architechture_guide.xml
>> >  src/docbkx/vn/dhis2_user_man_excel_reports.xml
>> >  src/docbkx/vn/resources/images/ExcelReportModule/
>> >  src/docbkx/vn/resources/images/ExcelReportModule/NewReportItem.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset1.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset_completed_reports.png
>> >  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item.png
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item_group.png
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/add_new_report_button.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/administration_page.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/advanced_generate_report.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/assign_data_element_group.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/assign_org_unit_group.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/assign_user_role.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/association_org_unit.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/choose_upload_file.png
>> >  src/docbkx/vn/resources/images/ExcelReportModule/clean temporary
>> > directory.png
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory1.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/copy_excel_item_to.png
>> >  src/docbkx/vn/resources/images/ExcelReportModule/copy_report_item.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/copy_to_excel_iems_group.png
>> >  src/docbkx/vn/resources/images/ExcelReportModule/create_expression.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/create_expression1.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/create_item.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/create_new_report.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/create_report_item.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status1.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status_list.png
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/dataelement_category_report_template.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/download_template_excel_file.png
>> >  src/docbkx/vn/resources/images/ExcelReportModule/edit_report.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/edit_user_role.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_information.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_item_infor.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/excel_item_group.png
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/excel_report_left_menu.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_management.png
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report1.jpg
>> >  src/docbkx/vn/resources/images/ExcelReportModule/generate_report.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/generate_report_introduce.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel.jpg
>> >
>> >  src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel_file.jpg
>> >  sr

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1626: (GIS) Doc id references updated.

2010-03-11 Thread noreply


revno: 1626
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 17:42:06 +0100
message:
  (GIS) Doc id references updated.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.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/mapping/script/config.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2010-03-10 14:41:28 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2010-03-11 16:42:06 +
@@ -19,13 +19,14 @@
 	
 //	Help strings
 
-	thematicMap = 'thematicMap';
-	mapRegistration = 'map';
-	organisationUnitAssignment = 'mapOrganisationUnitRelation';
-	overlayRegistration = 'overlay';
-	administration = 'administration';
-	favorites = 'favoriteMapView';
-	legendSets = 'legendSet';
+	thematicMap = 'gisThematicMap';
+	mapRegistration = 'gisMap';
+	organisationUnitAssignment = 'gisMapOrganisationUnitRelation';
+	overlayRegistration = 'gisOverlay';
+	administration = 'gisAdministration';
+	favorites = 'gisFavoriteMapView';
+	legendSets = 'gisLegendSet';
+	pdfprint = 'gisPdfPrint';
 
 //  Layout
 

=== 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	2010-03-11 15:27:28 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-03-11 16:42:06 +
@@ -24,7 +24,6 @@
 
 Ext.namespace('mapfish.widgets', 'mapfish.widgets.geostat');
 
- 
 /**
  * Class: mapfish.widgets.geostat.Choropleth
  * Use this class to create a widget allowing to display choropleths

___
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] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 125: vietnamese document - Reorgasized

2010-03-11 Thread Lars Helge Øverland

On Thu, Mar 11, 2010 at 3:29 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> A big congrats to the Vietnamese team for what looks like the first
> translation of the DHIS user manual! The documentation has exploded
> over the past few months, and this is a great development for the
> project. I would have figured that Norwegian would have been the first
> language to translate, but it looks like the Vietnamese team beat you
> to it!
>
>
This will also require that we expand the embedded help functionality a bit.
The help locale could follow the database content locale user-setting.

Lars


>
> Great work!
>
> Best regards,
> Jason
>
>
> On Thu, Mar 11, 2010 at 3:23 PM,   wrote:
> > 
> > revno: 125
> > committer: Dao Van Sam 
> > branch nick: dhis2-docbook-docs
> > timestamp: Thu 2010-03-11 17:20:47 +0700
> > message:
> >  vietnamese document - Reorgasized
> > removed:
> >  src/docbkx/vn/dhis2_documentation_guide.xml
> >  src/docbkx/vn/dhis2_technical_architechture_guide.xml
> >  src/docbkx/vn/dhis2_user_man_excel_reports.xml
> >  src/docbkx/vn/resources/images/ExcelReportModule/
> >  src/docbkx/vn/resources/images/ExcelReportModule/NewReportItem.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset1.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/add_dataset_completed_reports.png
> >  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item.png
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item_group.png
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/add_new_report_button.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/administration_page.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/advanced_generate_report.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/assign_data_element_group.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/assign_org_unit_group.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/assign_user_role.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/association_org_unit.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/choose_upload_file.png
> >  src/docbkx/vn/resources/images/ExcelReportModule/clean temporary
> directory.png
> >  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory1.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/copy_excel_item_to.png
> >  src/docbkx/vn/resources/images/ExcelReportModule/copy_report_item.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/copy_to_excel_iems_group.png
> >  src/docbkx/vn/resources/images/ExcelReportModule/create_expression.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/create_expression1.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/create_item.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/create_new_report.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/create_report_item.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status1.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status_list.png
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/dataelement_category_report_template.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/download_template_excel_file.png
> >  src/docbkx/vn/resources/images/ExcelReportModule/edit_report.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/edit_user_role.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_information.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_item_infor.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/excel_item_group.png
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/excel_report_left_menu.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/excel_template_management.png
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report1.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/generate_report.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/generate_report_introduce.jpg
> >
>  src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel_file.jpg
> >  src/docbkx/vn/resources/images/ExcelReportModule/list_of_reports.jpg
> >
>  
> src/docbkx/vn/resources/images/ExcelReportModule/list_org_unit_group_report_template.jpg
> >
>

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1625: Included new gis documentation

2010-03-11 Thread noreply


revno: 1625
committer: Lars Helge Oeverland 
branch nick: trunk
timestamp: Thu 2010-03-11 17:40:07 +0100
message:
  Included new gis documentation
modified:
  dhis-2/dhis-options/src/main/resources/help_content.xml
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.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-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-09 09:36:40 +
+++ dhis-2/dhis-options/src/main/resources/help_content.xml	2010-03-11 16:40:07 +
@@ -1227,7 +1227,7 @@
   it manually and copy your GeoJSON files there.
   
 
-
+
   Administrator panel
   
 
@@ -1237,10 +1237,11 @@
   
 Map source
 
-  GeoJSON: you will find your own
+  GeoJSON files: you will find your own
 registered maps in the Map combo box in the Thematic map panel.
 The Admin panels check box will become visible.
-  DHIS Database: the Map combo box will
+  Shapefiles: same as GeoJSON files, except that the files are generated from shapefiles installed in your running version of Geoserver on the fly. 
+  DHIS database: the Map combo box will
 simply be populated by the existing organisation unit levels and
 GeoJSON files will be created by the application automatically
 Organisation units must have coordinates stored in the database in
@@ -1250,17 +1251,21 @@
 
   
   
-
-  Admin panel
-
+Admin panels
 
   Show/hide the shapefile management panels.
 
   
+  
+Longitude/latitude
+
+  The base coordinate for the current country. This coordinate will appear as default when registering maps and overlays.
+
+  
 
   
 
-
+
   Registering geographical information
   In order to view data in the GIS module, you must import your
 geographical data into your DHIS installation. Once you have produced
@@ -1364,7 +1369,7 @@
 
   
 
-
+
   Assign organization units to map
   Select a registered map and wait for it to load. The organisation
 units (OU) in your database on this level will appear in the list and
@@ -1424,15 +1429,17 @@
 
   
 
-
+
   Thematic map
-  This panel should be rather self-explanatory . Calculation method
-alludes to the legend interval size and set to Equal intervals they will be âhighest map value â lowest map value
-/ number of classesâ. Choose Fixed bounds and
-you may set your own legend limits, e.g. â20,40,60â using a comma to
-seperate each of the class break values. 
+  This panel lets you use your registered maps for thematic mapping. All you need to do is selecting your desired indicator-period-map combination in the left side menu.
+  Calculation method
+alludes to the  size  of the legend classes. Set to Equal intervals they will be âhighest map value â lowest map value
+/ number of classesâ. Set to Equal group count the legend creator will try to distribute the organisation units evenly. Choose Fixed bounds and
+you may define your own class break values, e.g. â20,40,60â using a comma to
+seperate each of them.
+  The map view combo box lists all map views (favorites) saved by the user. The settings that are stored in the map view will be automatically applied to the thematic map panel.
 
-
+
   Register favorite map views
   This panel will save the current thematic map view in order to
 restore it whenever you want via the Map view combo box in the Thematic map panel. By
@@ -1440,7 +1447,7 @@
 inserting Map views into one of link
 areas.
 
-
+
   Register legend sets
   A legend set may be connected to many indicators, but an indicator
 may only have one legend set. Thus, you may select many indicators when
@@ -1448,6 +1455,11 @@
 selected in the Thematic map panel, the number of
 classes, low color and high color is automatically set.
 
+
+  Print map as PDF
+  Click the PDF icon on the map toolbar and the left side print panel will open. You may add several pages to your PDF document by clicking the "add page" button on the bottom toolbar. Change the size of the focus rectangle in the "scale" column. The rectangle can be rotated by inserting a number (degrees) "rotation" column or by dragging th

[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 128: GIS doc update.

2010-03-11 Thread noreply


revno: 128
committer: Jan Henrik Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 17:30:33 +0100
message:
  GIS doc update.
modified:
  src/docbkx/en/dhis2_user_man_gis.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_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 16:14:25 +
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 16:30:33 +
@@ -53,7 +53,7 @@
   it manually and copy your GeoJSON files there.
 
   
-  
+  
 Administrator panel
 
   
@@ -89,7 +89,7 @@
 
   
   
-  
+  
 Registering geographical information
 In order to view data in the GIS module, you must import your
 geographical data into your DHIS installation. Once you have produced
@@ -193,7 +193,7 @@
   
 
   
-  
+  
 Assign organization units to map
 Select a registered map and wait for it to load. The organisation
 units (OU) in your database on this level will appear in the list and
@@ -253,7 +253,7 @@
   
 
   
-  
+  
 Thematic map
 This panel lets you use your registered maps for thematic mapping. All you need to do is selecting your desired indicator-period-map combination in the left side menu.
 Calculation method
@@ -263,7 +263,7 @@
 seperate each of them.
 The map view combo box lists all map views (favorites) saved by the user. The settings that are stored in the map view will be automatically applied to the thematic map panel.
   
-  
+  
 Register favorite map views
 This panel will save the current thematic map view in order to
 restore it whenever you want via the Map view combo box in the Thematic map panel. By
@@ -271,7 +271,7 @@
 inserting Map views into one of link
 areas.
   
-  
+  
 Register legend sets
 A legend set may be connected to many indicators, but an indicator
 may only have one legend set. Thus, you may select many indicators when
@@ -279,4 +279,8 @@
 selected in the Thematic map panel, the number of
 classes, low color and high color is automatically set.
   
+  
+Print map as PDF
+Click the PDF icon on the map toolbar and the left side print panel will open. You may add several pages to your PDF document by clicking the "add page" button on the bottom toolbar. Change the size of the focus rectangle in the "scale" column. The rectangle can be rotated by inserting a number (degrees) "rotation" column or by dragging the rotation knob. Your "map title" and "comment" will appear above and below the picture in the PDF document respectively. The higher "dots per inch" value you choose, the better quality of the image and the larger file size of the document.To get out of print mode you can simply expand a different panel or hide the print panel by clicking the PDF icon on the map toolbar again.
+  
 

___
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 127: GIS doc update.

2010-03-11 Thread noreply


revno: 127
committer: Jan Henrik Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 17:14:25 +0100
message:
  GIS doc update.
modified:
  src/docbkx/en/dhis2_user_man_gis.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_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 11:45:09 +
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 16:14:25 +
@@ -1,49 +1,23 @@
-<<< TREE
-
-http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; []>
-
-  
-DHIS 2 GIS User Manual
-
-  DHIS
-  GIS
-  Mapping
-
-
-  Ãverland
-  Jan Henrik
-
-
-  Pickering
-  Jason Paul
-
-
-  
-1
-12/09/2009
-JPP
-
-  Initial conversion of document to DocBook format
-
-  
-
-  
-  
+ï»¿
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; []>
+
+  GIS
+  
 Conversion of geographical data to GeoJSON format
 The DHIS2 mapping client relies on GeoJSON files in order to display
 a map in the browser window. Often times, geographical data is received in
 many different formats, but the ESRI shape file format is one of the most
 common. Several procedures will be described below. It is important, but
 not required, that the names in your geographical data match those in the
-DHIS2 organizational hierarchy. If they do not, you will need to manually
+DHIS2 organisational hierarchy. If they do not, you will need to manually
 match them in a later step
-
+
   Production of GeoJSON files with Geoserver
   Geoserver is capable of outputting GeoJSON formats. If you have
   geoserver running someplace, you can execute the following query.
   http://localhost:8080/geoserver/ows?service=WFS&version=1.0.0&request=GetFeature&typename=topp:states&outputformat=json&srs_name=EPSG:4326";>http://localhost:8080/geoserver/ows?service=WFS&version=1.0.0&request=GetFeature&typename=topp:states&outputformat=json&srs_name=EPSG:4326
-   Take note that you need to specify the spatial coordinate system. By defualt, Geoserver will return GeoJSON files with the format "long/lat" while
-the DHIS mapping client expects the ordering of the coordinates in "lat/long" format.  The expllicit declartaion of the spatial reference system will ensure that coordinates are returned in the proper order. At the time of writing, the DHIS mapping client does not support spatial reference systems other than EPSG 4326. If you are using Geoserver, the application will handle the reprojection from the native format of the geographical data to EPSG 4326. If you are using other methods as described below to generate the GeoJSON file, you will need to ensure that the GeoJSON output is set to EPSG 4326 (Geographical Lat/long). 
+   Take note that you need to specify the spatial coordinate system. By default, Geoserver will return GeoJSON files with the format "long/lat" while
+the DHIS mapping client expects the ordering of the coordinates in "lat/long" format.  The explicit declaration of the spatial reference system will ensure that coordinates are returned in the proper order. At the time of writing, the DHIS mapping client does not support spatial reference systems other than EPSG 4326. If you are using Geoserver, the application will handle the reprojection from the native format of the geographical data to EPSG 4326. If you are using other methods as described below to generate the GeoJSON file, you will need to ensure that the GeoJSON output is set to EPSG 4326 (Geographical Lat/long). 
   You will need to adjust the host destination if the machine is not
   your local machine as well as defining the actual layer in Geoserver
   which should be output to GeoJSON (in this case
@@ -55,31 +29,31 @@
   type (e.g. âadminâ for administrative layers, âhealthâ for health
   administrative boundaries). For instance, the first administrative layer
   for Zambia would be named as "zm_admin1".
-
-
+
+
   Production of GeoJSON files with GDAL
   GDAL is a multi-platform toolkit for the manipulation of
   geographical data. It is freely available for a wide-range of platforms
   at http://gdal.org";>http://gdal.org
   Production of GeoJSON files are straightforward with GDAL. Just
   execute (on Windows)
-  ogr2ogr.exe -f "GeoJSON" dst_datasource_name src_datasource_name
-  or on Linuxogr2ogr -f "GeoJSON"dst_datasource_name src_datasource_name
+  ogr2ogr.exe -f "GeoJSON" dst_datasource_

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1624: (GIS) Old map views are now loaded with the zoom level and map position stored with the map.

2010-03-11 Thread noreply


revno: 1624
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 16:27:28 +0100
message:
  (GIS) Old map views are now loaded with the zoom level and map position 
stored with the map.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.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/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-11 14:08:07 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-11 15:27:28 +
@@ -3201,7 +3201,7 @@
 params: { mapLayerPath: URL, format: 'json' },
 success: function( responseObject ) {
 		
-MAPDATA = Ext.util.JSON.decode(responseObject.responseText).map[0];
+MAPDATA = Ext.util.JSON.decode(responseObject.responseText).map[0];	
 
 if (MAPSOURCE == map_source_type_database) {
 MAPDATA.name = Ext.getCmp('map_cb').getRawValue();
@@ -3220,14 +3220,21 @@
 }
 			
 			if (!position) {
-   
 if (MAPDATA.zoom != MAP.getZoom()) {
 	MAP.zoomTo(MAPDATA.zoom);
 }
-
 MAP.setCenter(new OpenLayers.LonLat(MAPDATA.longitude, MAPDATA.latitude));
 			}
 			
+			if (MAPVIEW.longitude && MAPVIEW.latitude && MAPVIEW.zoom) {
+MAP.setCenter(new OpenLayers.LonLat(MAPVIEW.longitude, MAPVIEW.latitude), MAPVIEW.zoom);
+			}
+			else {
+MAP.setCenter(new OpenLayers.LonLat(MAPDATA.longitude, MAPDATA.latitude), MAPDATA.zoom);
+			}
+			
+			MAPVIEW = false;
+			
 			toggleFeatureLabels(false);
 
 if (redirect == thematicMap) {

=== 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	2010-03-10 14:41:28 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-03-11 15:27:28 +
@@ -247,9 +247,8 @@
 fn: function() {
 if (MAPVIEW) {
 Ext.getCmp('period_cb').setValue(MAPVIEW.periodId);
-
 var mst = MAPVIEW.mapSourceType;
-
+
 Ext.Ajax.request({
 url: path + 'setMapSourceTypeUserSetting' + type,
 method: 'POST',
@@ -286,7 +285,6 @@
 if (MAPVIEW) {
 Ext.getCmp('map_cb').setValue(MAPVIEW.mapSource);
 choropleth.classify(false, true);
-MAPVIEW = false;
 }
 }
 }
@@ -323,10 +321,8 @@
 
 success: function( responseObject ) {
 MAPVIEW = Ext.util.JSON.decode(responseObject.responseText).mapView[0];
-MAP.setCenter(new OpenLayers.LonLat(MAPVIEW.longitude, MAPVIEW.latitude), MAPVIEW.zoom);
-
-MAPSOURCE = MAPVIEW.mapSourceType;
-
+MAPSOURCE = MAPVIEW.mapSourceType;
+
 Ext.getCmp('numClasses').setValue(MAPVIEW.classes);
 Ext.getCmp('colorA_cf').setValue(MAPVIEW.colorLow);
 Ext.getCmp('colorB_cf').setValue(MAPVIEW.colorHigh);

___
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 383148] Re: Completeness button and validations

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
Milestone: None => 2.0.4

** Changed in: dhis2
 Assignee: (unassigned) => Lars Helge Øverland (larshelge)

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

Status in DHIS 2 - District Health Information Software: New

Bug description:
The following scenario would need some better pop-up messages:

Clicking the Complete button at the end of the data entry screen will
prompt the validation checks to be run. However, if there is a violation,
only the violation will appear as a pop-up, but there should also be some
text explaining that they would have to check up and change the values
that cause the violation before the completeness button will work. As it
is now, you can ignore the validation result, but the complete button will
not work.



___
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 338673] Re: Organisation unit name is yellow when we haven't chosen it yet

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
Milestone: None => 2.0.5

-- 
Organisation unit name is yellow when we haven't chosen it yet
https://bugs.launchpad.net/bugs/338673
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: New

Bug description:
When choosing parameter for generate report, the organization unit has yellow 
color when we haven't chosen it yet at the first stage. This lead to confusing 
because we don't know the organization unit chosen or not.

ADDED: Seems like the org. unit is pre-set with colours from the last time 
used. Example: Data completeness report > select org.unit, period type, and 
period. Works fine. Open Data completeness again > same org.unit as before 
already yellow, but apparently not selected. Need to unselect it, then select 
it again (or just select another uint) for the report to appear (given that I 
done the other selections)



___
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 342694] Re: In India DashBoard the organisation unit rectangular box looks not properly rectungular shpe

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
   Status: New => Invalid

-- 
In India DashBoard the organisation unit rectangular box looks not properly 
rectungular shpe
https://bugs.launchpad.net/bugs/342694
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Invalid

Bug description:
This organization unit tree box should be exactly rectangular shape which is 
not yet



___
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 342704] Re: India dashoboad - listing of data elemenst / indicators related

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
   Status: New => Invalid

-- 
India dashoboad - listing of data elemenst / indicators related
https://bugs.launchpad.net/bugs/342704
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Invalid

Bug description:
In the Indian Dashboard, if we are planning to do an element wise analysis, the 
list of data elements is empty to start with even though it says "Select data 
element Group  / all" or " Select Indicator group / all". We have the 
individual groups listed there but there is no "All" option. So if I have to do 
an analysis on an indicator which is not a part of any group, I first have to 
select a particular group and then go back to "Select data element Group  / 
all". Then only am I able to see all the data elements, groups.



___
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 342703] Re: Indian dashboard - data status page is throwing exception while exporting to WorkBook

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
   Status: New => Invalid

-- 
Indian dashboard - data status page is throwing exception while exporting to 
WorkBook
https://bugs.launchpad.net/bugs/342703
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Invalid

Bug description:
While clicking on data status in DashBoard module after selecting appropriate 
arguments , the data status page appears fine but it throw exception while 
exporting to work Book. 
 Exception (java.lang.NullPointerException): null

* 
org.hisp.dhis.dashboard.ds.action.ExportToExcelAction.execute(ExportToExcelAction.java:63)
* 
sun.reflect.NativeMethodAccessorImpl.invoke0(NativeMethodAccessorImpl.java:-2)
* 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
* 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
* java.lang.reflect.Method.invoke(Method.java:585)
* 
com.opensymphony.xwork.DefaultActionInvocation.invokeAction(DefaultActionInvocation.java:358)
* 
com.opensymphony.xwork.DefaultActionInvocation.invokeActionOnly(DefaultActionInvocation.java:218)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:192)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
org.hisp.dhis.webwork.interceptor.WebWorkDisplayPropertyInterceptor.intercept(WebWorkDisplayPropertyInterceptor.java:90)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
org.hisp.dhis.webwork.interceptor.WebWorkSortOrderInterceptor.intercept(WebWorkSortOrderInterceptor.java:124)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor.intercept(WebWorkSecurityInterceptor.java:98)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.interceptor.AroundInterceptor.intercept(AroundInterceptor.java:31)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
org.hisp.dhis.webwork.interceptor.WebWorkExceptionInterceptor.intercept(WebWorkExceptionInterceptor.java:89)
* 
com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:190)
* 
com.opensymphony.xwork.DefaultActionProxy.execute(DefaultActionProxy.java:116)
* 
com.opensymphony.webwork.dispatcher.DispatcherUtils.serviceAction(DispatcherUtils.java:273)
* 
com.opensymphony.webwork.dispatcher.FilterDispatcher.doFilter(FilterDispatcher.java:202)
* 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
* 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
* 
org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:264)
* 
org.hisp.dhis.security.filter.RequiredLoginFilter.doFilter(RequiredLoginFilter.java:131)
* 
org.acegisecurity.u

[Dhis2-devs] [Bug 343780] Re: Indian line listing: date of birth also takes garbage value

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
   Status: New => Invalid

-- 
Indian line listing: date of birth also takes garbage value 
https://bugs.launchpad.net/bugs/343780
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Invalid

Bug description:
in line listing , if we enter some other value or character in the date of 
birth/expected birth columne then it also takes some other value other than 
some period or date . for example if we enter something like  dfjlsajflkasjlk 
then it will save this dfjlsajflkasjlk value as date of birth. and we can see 
its value in line listing reports too as this garbage value.below i am 
attaching a word file here you can see in the second row there is some saved 
garbage value in date of birth columen. and it is very important to apply some 
validation here.



___
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] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 125: vietnamese document - Reorgasized

2010-03-11 Thread Jason Pickering

A big congrats to the Vietnamese team for what looks like the first
translation of the DHIS user manual! The documentation has exploded
over the past few months, and this is a great development for the
project. I would have figured that Norwegian would have been the first
language to translate, but it looks like the Vietnamese team beat you
to it!


Great work!

Best regards,
Jason


On Thu, Mar 11, 2010 at 3:23 PM,   wrote:
> 
> revno: 125
> committer: Dao Van Sam 
> branch nick: dhis2-docbook-docs
> timestamp: Thu 2010-03-11 17:20:47 +0700
> message:
>  vietnamese document - Reorgasized
> removed:
>  src/docbkx/vn/dhis2_documentation_guide.xml
>  src/docbkx/vn/dhis2_technical_architechture_guide.xml
>  src/docbkx/vn/dhis2_user_man_excel_reports.xml
>  src/docbkx/vn/resources/images/ExcelReportModule/
>  src/docbkx/vn/resources/images/ExcelReportModule/NewReportItem.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset1.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset_completed_reports.png
>  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item.png
>  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item_group.png
>  src/docbkx/vn/resources/images/ExcelReportModule/add_new_report_button.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/administration_page.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/advanced_generate_report.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/assign_data_element_group.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/assign_org_unit_group.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/assign_user_role.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/association_org_unit.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/choose_upload_file.png
>  src/docbkx/vn/resources/images/ExcelReportModule/clean temporary 
> directory.png
>  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory1.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/copy_excel_item_to.png
>  src/docbkx/vn/resources/images/ExcelReportModule/copy_report_item.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/copy_to_excel_iems_group.png
>  src/docbkx/vn/resources/images/ExcelReportModule/create_expression.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/create_expression1.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/create_item.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/create_new_report.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/create_report_item.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status1.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status_list.png
>  src/docbkx/vn/resources/images/ExcelReportModule/dataelement_category_report_template.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/download_template_excel_file.png
>  src/docbkx/vn/resources/images/ExcelReportModule/edit_report.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/edit_user_role.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_information.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_item_infor.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/excel_item_group.png
>  src/docbkx/vn/resources/images/ExcelReportModule/excel_report_left_menu.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_management.png
>  src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report1.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/generate_report.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/generate_report_introduce.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel_file.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/list_of_reports.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/list_org_unit_group_report_template.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/list_time_period_report_template.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/main_feature_of_excel_report_module.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/navigate_to_list_of_report.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/new_report_item.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/note.jpg
>  src/docbkx/vn/resources/images/ExcelReportModule/one of data enetry form o

[Dhis2-devs] [Bug 430657] Re: Date text field needs validation rule in data entry screen

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
   Status: Fix Committed => Triaged

-- 
Date text field needs validation rule in data entry screen
https://bugs.launchpad.net/bugs/430657
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Triaged

Bug description:
DHIS2 --> Services --> Data Entry

Here after selecting appropriate organisation unit, data set and period we get 
data entry screen, here we fill data one by one, after that we press complete 
button below the data entry form page and we enter some garbage character or 
special character or numbers in the date text field and it shows it is saving 
those values. Here we think this "complete" button should have some validation 
so that it prompts while clicking it if we fill some other characters inside 
date text field.



___
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 439473] Re: Custom data entry screens are not restricted to data elements in the data set

2010-03-11 Thread Lars Helge Øverland

This will have to wait a bit until we decide what to do with the dataset
model.

** Changed in: dhis2
Milestone: 2.0.4 => 2.0.5

-- 
Custom data entry screens are not restricted to data elements in the data set
https://bugs.launchpad.net/bugs/439473
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Confirmed

Bug description:
Custom data entry screens is not restricted to data elements in the data set it 
is based on. This breaks with the whole data set concept.





___
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 512191] Re: Can't save the unicode letters for description of Numerator and Denumerator

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
Milestone: 2.0.5 => 2.0.4

-- 
Can't save the unicode letters for description of Numerator and Denumerator
https://bugs.launchpad.net/bugs/512191
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
While edit numerator and denumerator of indicator. I added the Vietnamese 
characters into the description text box. But later, when I edit again and I 
see it contains full of strange characters.



___
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 1623: (GIS) The corrent panel, zoom level and map position are now restored when the print panel is clo...

2010-03-11 Thread noreply


revno: 1623
committer: Jan Henrik Overland 
branch nick: trunk
timestamp: Thu 2010-03-11 15:08:07 +0100
message:
  (GIS) The corrent panel, zoom level and map position are now restored when 
the print panel is closed.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.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/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-10 14:41:28 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-11 14:08:07 +
@@ -2761,16 +2761,10 @@
 expand: {
 fn: function() {
 choroplethLayer.setVisibility(false);
-choropleth.classify(false);
-
+choropleth.classify(false, true);
 ACTIVEPANEL = thematicMap;
 }
-},
-			collapse: {
-fn: function() {
-	ACTIVEPANEL = false;
-}
-			}
+}
 }
 });
 
@@ -2787,16 +2781,10 @@
 expand: {
 fn: function() {
 choroplethLayer.setVisibility(false);
-mapping.classify(false);
-
+mapping.classify(false, true);
 ACTIVEPANEL = organisationUnitAssignment;
 }
-},
-			collapse: {
-fn: function() {
-	ACTIVEPANEL = false;
-}
-			}
+}
 }
 });
 	
@@ -2862,6 +2850,7 @@
 	});
 	
 	function showPdf() {
+		var active = ACTIVEPANEL;
 		var printMultiPagePanel = Ext.getCmp('printMultiPage_p');
 		if (printMultiPagePanel.hidden) {
 printMultiPagePanel.show();
@@ -2870,7 +2859,12 @@
 else {
 			printMultiPagePanel.collapse();
 			printMultiPagePanel.hide();
-			choropleth.expand();
+			if (active == thematicMap) {
+choropleth.expand();
+			}
+			else if (active == organisationUnitAssignment) {
+mapping.expand();
+			}
 }
 	}	
 	
@@ -3086,8 +3080,8 @@
 shapefilePanel.hide();
 	mapping.hide();
 mapLayerPanel.hide();
+	Ext.getCmp('printMultiPage_p').hide();
 	ACTIVEPANEL = thematicMap;
-	Ext.getCmp('printMultiPage_p').hide();
 
 	/* MAP CONTROLS */
 	var selectFeatureChoropleth = new OpenLayers.Control.newSelectFeature(

___
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] GIS problem

2010-03-11 Thread Jan Henrik Øverland

On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring  wrote:

> Ok, I have now got the GIS with printing running nicely here:
> http://109.74.202.200:8080/ke (admin/district)
>
> The printing functionality is really cool, as is the Help functionality. I
> also very much like the labeling (we may need to add labeling of overlays
> also).
>
> Is there an easy way to get at the generated image for inclusion in other
> documents?
>

Not yet. The not so elegant print screen button is still the way to capture
screen shots.


>
> A few observations:
>
> - The GIS module chrashes google-chrome on Linux Mint 8, but works fine in
> Firefox and Opera.
>
-  I don't think we need this statement "This panel should be rather
> self-explanatory ."
>

Hehe, agreed. I commited a minor GIS doc update two hours ago and this line
was removed of course.


> -  When selecting a map view, full zoom out is applied, so the map becomes
> really tiny. Should zoom to preferred extent
>

This is a backwards compatibility issue. Map views now store the current
zoom level and center position as opposed to earlier when the zoom and
position registered to the map were used. Older map views obviously don't
have this information stored, so creating new ones will get rid of your
problem. However, I will commit a fix to this problem by using the zoom and
position registered to the map when a map view without this information is
loaded.


> - There seems to be some inconsistency in whether the background gets
> printed or not Sometimes it also hangs after printing. I have not figured
> out the pattern yet.
>

Hm ok. Never happened to me though.


> - We should have a Help tab for printing also, explaining that the user
> must click the PDF button again to get out of print  mode
>

Agreed. Simply expanding one of the other panels will get you out of print
mode, but there should be doc on it anyway.


> - The "generating choropleth" message comes on top of the print box and
> thus obfuscates it
>

Ok, please explain more thoroughly when this happens.

Thanks for the feedback.


>
> Knut
>
>
> On Thu, Mar 11, 2010 at 12:07 AM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> This is not the latest code.
>>
>> On Wed, Mar 10, 2010 at 11:20 PM, Knut Staring  wrote:
>>
>>>  Hi,
>>>
>>> Trying the latest build, I get this error in Firebug when opening the GIS
>>> module:
>>>
>>> "MAP_SOURCE_TYPE_GEOJSON is not defined"
>>>
>>> referring to this line in index.js:
>>>  data: [[MAP_SOURCE_TYPE_GEOJSON, 'GeoJSON files'],
>>> [MAP_SOURCE_TYPE_SHAPEFILE, 'Shapefiles'], [MAP_SOURCE_TYPE_DATABASE, 'DHIS
>>> database']]
>>>
>>> --
>>> Cheers,
>>> Knut Staring
>>>
>>> ___
>>> 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
>>>
>>>
>>
>
>
> --
> Cheers,
> Knut Staring
>
___
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] New user feedback / message panel

2010-03-11 Thread johansa

Sounds good. So this would be a little field where all messages to the
user can appear? I think this idea could be explored a bit, to standardize
user feedback as Lars points out, but also to think about extending what
DHIS communicates to the user. For example, instead of just "process
complete", it could read "Report table updated. The report can now be
viewed for (month(s))" etc. Not sure if this is a valid example, but there
should be plenty of places where a couple of sentences would help the user
understand what's going on, or point to the next logical step, etc.

Johan

> To devs,
>
> I have added a new div for user feedback which appears fixed on top of the
> screen. These methods can be used directly from any javascript:
>
> setHeaderMessage( message ) // sets header message
> updateHeaderMessage( message ) // updates header message text
> setHeaderWaitMessage( message ) // sets header message including a gif
> working-animation
> updateHeaderWaitMessage( message ) // update header wait message text
> setHeaderDelayMessage( message ) // sets header message and hides it after
> 3
> secs
> hideHeaderMessage() // hides header message
>
>
> This can be viewed eg for the generate chart function and when exporting a
> report table to excel/html/csv when it has not yet been generated.
>
> Should be useful for situations where there are no natural place to put a
> message, like in lists. We could consider moving all messages here for
> standardisation.
>
>
> Lars
> ___
> 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 490393] Re: ReportTable: DataElement dimension tables do not work correctly

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
Milestone: 2.0.4 => 2.0.5

-- 
ReportTable: DataElement dimension tables do not work correctly
https://bugs.launchpad.net/bugs/490393
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Confirmed

Bug description:
I have tested the new type of report table called Data Element Dimension table 
in Reports->Report Tables and have discovered a few issues:

* The viewing of subtotals and totals in html, excel, and csv has not been 
implemented although the actual table generated in the database has these. Not 
sure whether this was an intentional shortcut for the 2.0.3 release or not.

* When there is only one dimension (category) the subtotals are still shown in 
the table which means that all numbers are simply repeated for every option in 
that category since these subtotals are then the same as the raw values. So 
when only one category is used there should be no subtotals, just the total.

* The naming of the columns for the optioncombos is confusing since it seems 
random which category that comes first in the name. E.g a age+gender table can 
look like this. "Male <5y", "Female <5y", ">5 Male", ">5 Female" which is 
really difficult to work with. I know data entry deals with this issue and 
seems to solve it, even with custom sorting, why don't we use the same approach 
here?

* The selected DimensionOption should be persisted on edit.

* There seems to be some problems with the calculation of subtotals:

Example 1) The following report table is based on the Sierra Leone database, 
you can see the in SQL here (http://pastebin.com/m30143e7c) that one of the two 
dimensions (fixed/outreach) do not have any values for its subtotals (total 
fixed and total outreach) as the values are simply '0' although the raw values 
in the same table clearly show that there are values reported for these 
dimensions. The other dimension (less than 12 months, 12-59 months) works as 
expected for the subtotals and the total is also fine.

Example 2) This table (http://pastebin.com/m61beb2d8) is based on a category 
combo consisting of the two categories (and their options) "preg&nonpreg 
15-49y" (preg 15-49y, nonpreg 15-49y) and "fixed/outreach" (fixed, outreach), 
so totally 4 raw values, 4 subtotals, and 1 total are displayed in the report 
table.
This one turned out to be a bit more correct than example 1) as it has got all 
its 4 subtotals populated, but only 3 of them are correct. The subtotals for 
column total_1549_yrs_nonpreg has wrong values systematically for all the data 
elements (rows). It is clear that only one of the two raw values that includes 
this dimension option are used. You can see that the subtotal equals the value 
of the _1549_yrs_nonpreg_fixed column and for some reason excludes the other 
raw value in the _1549_yrs_nonpreg_outreach column.

Example 3)
This table (http://pastebin.com/m410454f3) for morbidity age group + gender 
shows some other aggregation problems for subtotals. Haven't spent that much 
time looking at all its problems, but quickly notices that the two subtotals 
'Total Male' and 'Total 15-24y' are both '0' for all the rows while e.g the raw 
values for the combination 'Male 15-24 y' has values for most of the rows.





___
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] GIS problem

2010-03-11 Thread Knut Staring

So far, Opera seems the best browser on Linux (at least on Mint 8) - it
prints to PDF and the initial zoom is correct.

Knut

On Thu, Mar 11, 2010 at 2:21 PM, Knut Staring  wrote:

> Ok, I have now got the GIS with printing running nicely here:
> http://109.74.202.200:8080/ke (admin/district)
>
> The printing functionality is really cool, as is the Help functionality. I
> also very much like the labeling (we may need to add labeling of overlays
> also).
>
> Is there an easy way to get at the generated image for inclusion in other
> documents?
>
> A few observations:
>
> - The GIS module chrashes google-chrome on Linux Mint 8, but works fine in
> Firefox and Opera.
> -  I don't think we need this statement "This panel should be rather
> self-explanatory ."
> -  When selecting a map view, full zoom out is applied, so the map becomes
> really tiny. Should zoom to preferred extent
> - There seems to be some inconsistency in whether the background gets
> printed or not Sometimes it also hangs after printing. I have not figured
> out the pattern yet.
> - We should have a Help tab for printing also, explaining that the user
> must click the PDF button again to get out of print  mode
> - The "generating choropleth" message comes on top of the print box and
> thus obfuscates it
>
> Knut
>
>
> On Thu, Mar 11, 2010 at 12:07 AM, Jan Henrik Øverland <
> janhenrik.overl...@gmail.com> wrote:
>
>> This is not the latest code.
>>
>> On Wed, Mar 10, 2010 at 11:20 PM, Knut Staring  wrote:
>>
>>>  Hi,
>>>
>>> Trying the latest build, I get this error in Firebug when opening the GIS
>>> module:
>>>
>>> "MAP_SOURCE_TYPE_GEOJSON is not defined"
>>>
>>> referring to this line in index.js:
>>>  data: [[MAP_SOURCE_TYPE_GEOJSON, 'GeoJSON files'],
>>> [MAP_SOURCE_TYPE_SHAPEFILE, 'Shapefiles'], [MAP_SOURCE_TYPE_DATABASE, 'DHIS
>>> database']]
>>>
>>> --
>>> Cheers,
>>> Knut Staring
>>>
>>> ___
>>> 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
>>>
>>>
>>
>
>
> --
> Cheers,
> Knut Staring
>



-- 
Cheers,
Knut Staring
___
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 537360] [NEW] Dataelement/indicatorgroup editor view 2 doesn't work

2010-03-11 Thread Lars Helge Øverland

Public bug reported:

Dataelement/indicatorgroup editor view 2 doesn't work. Nothing happens
when clicking on a data element group for instance.

** Affects: dhis2
 Importance: Undecided
 Assignee: Tran Thanh Tri (tranthanhtri84)
 Status: New

** Changed in: dhis2
 Assignee: (unassigned) => Tran Thanh Tri (tranthanhtri84)

** Changed in: dhis2
Milestone: None => 2.0.4

-- 
Dataelement/indicatorgroup editor view 2 doesn't work
https://bugs.launchpad.net/bugs/537360
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: New

Bug description:
Dataelement/indicatorgroup editor view 2 doesn't work. Nothing happens when 
clicking on a data element group for instance.



___
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] New user feedback / message panel

2010-03-11 Thread Saptarshi Purkayastha

Thanks... this is gr8
I was just looking for something like this where we could show common
messages and was looking for extension points as a way to do it. Any
extension points available in DHIS ??

---
Regards,
Saptarshi PURKAYASTHA
Director R & D, HISP India
Health Information Systems Programme

My Tech Blog:  http://sunnytalkstech.blogspot.com
You Live by CHOICE, Not by CHANCE


2010/3/11 Lars Helge Øverland 

>
> To devs,
>
> I have added a new div for user feedback which appears fixed on top of the
> screen. These methods can be used directly from any javascript:
>
> setHeaderMessage( message ) // sets header message
> updateHeaderMessage( message ) // updates header message text
> setHeaderWaitMessage( message ) // sets header message including a gif
> working-animation
> updateHeaderWaitMessage( message ) // update header wait message text
> setHeaderDelayMessage( message ) // sets header message and hides it after
> 3 secs
> hideHeaderMessage() // hides header message
>
>
> This can be viewed eg for the generate chart function and when exporting a
> report table to excel/html/csv when it has not yet been generated.
>
> Should be useful for situations where there are no natural place to put a
> message, like in lists. We could consider moving all messages here for
> standardisation.
>
>
> Lars
>
>
> ___
> 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] New user feedback / message panel

2010-03-11 Thread Lars Helge Øverland

To devs,

I have added a new div for user feedback which appears fixed on top of the
screen. These methods can be used directly from any javascript:

setHeaderMessage( message ) // sets header message
updateHeaderMessage( message ) // updates header message text
setHeaderWaitMessage( message ) // sets header message including a gif
working-animation
updateHeaderWaitMessage( message ) // update header wait message text
setHeaderDelayMessage( message ) // sets header message and hides it after 3
secs
hideHeaderMessage() // hides header message


This can be viewed eg for the generate chart function and when exporting a
report table to excel/html/csv when it has not yet been generated.

Should be useful for situations where there are no natural place to put a
message, like in lists. We could consider moving all messages here for
standardisation.


Lars
___
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 1622: Used header message div for user feedback in dataelement- and indicatorgroup editor.

2010-03-11 Thread noreply


revno: 1622
committer: Lars Helge Oeverland 
branch nick: trunk
timestamp: Thu 2010-03-11 14:32:06 +0100
message:
  Used header message div for user feedback in dataelement- and indicatorgroup 
editor.
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm	2010-02-25 19:44:33 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm	2010-03-11 13:32:06 +
@@ -22,8 +22,6 @@
 	$i18n.getString( "data_element_group_management" ) #openHelp( "dataElementGroupEditor" )
 
 
-
-
 
 	
 		$i18n.getString( "data_element_group" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm	2010-02-26 06:40:34 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm	2010-03-11 13:32:06 +
@@ -1,7 +1,5 @@
 $i18n.getString( "indicator_group_editor" ) #openHelp( "indicatorGroupEditor" )
 
-
-
 	
 	
 		$i18n.getString( "indicator_group" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm	2010-02-26 06:40:34 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm	2010-03-11 13:32:06 +
@@ -1,7 +1,5 @@
 $i18n.getString( "indicator_group_editor" ) #openHelp( "indicatorGroupEditor" )
 
-
-
 	
 			
 		$i18n.getString( "available_indicators" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js	2010-02-25 08:57:19 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js	2010-03-11 13:32:06 +
@@ -213,8 +213,7 @@
 function updateDataElementGroupMembersReceived( xmlObject )
 {
 dataElementGroupsSelect = document.getElementById( 'dataElementGroups' );
-document.getElementById('message').style.display='block';
-document.getElementById('message').innerHTML = i18n_update_success + " : " + dataElementGroupsSelect.options[ dataElementGroupsSelect.selectedIndex ].text;
+setHeaderDelayMessage( i18n_update_success + " : " + dataElementGroupsSelect.options[ dataElementGroupsSelect.selectedIndex ].text );
 }
 
 function deleteDataElementGroup()

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance

[Dhis2-devs] [Bug 510082] Re: Report tables: view/export before table is generated gives error

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
   Status: Confirmed => Fix Committed

-- 
Report tables: view/export before table is generated gives error
https://bugs.launchpad.net/bugs/510082
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
Logically you cannot view or export a report table before it has been 
generated, but in stead of presenting the user with a stack trace it would be 
much better to give a gentle message that says something like "Please generate 
the report table first (green arrow) and try again".



___
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 1621: Fixed bug #510082

2010-03-11 Thread noreply


revno: 1621
committer: Lars Helge Oeverland 
branch nick: trunk
timestamp: Thu 2010-03-11 14:21:41 +0100
message:
  Fixed bug #510082
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.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-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 12:12:36 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 13:21:41 +
@@ -1,4 +1,10 @@
 
+// -
+// Global variables
+// -
+
+var headerMessageTimeout = -1;
+
 /**
  * Redirects to the translate GUI.
  * 
@@ -449,7 +455,10 @@
 function setHeaderDelayMessage( message )
 {
 	setHeaderMessage( message );
-	setTimeout( "hideHeaderMessage();", 3000 );
+	
+	window.clearTimeout( headerMessageTimeout ); // Clear waiting invocations
+	
+	headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", 3000 );
 }
 
 /**

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-03-11 11:56:49 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-03-11 13:21:41 +
@@ -278,6 +278,7 @@
 tally_sheet_report = Tally Sheet report
 data_completeness_report = Data Completeness Report
 configuration = Configuration
+generate_before_export = Please generate table before exporting
 based_on_subjective = Based on complete data set registrations
 based_on_objective = Based on compulsory data elements
 deleting_existing_aggregated_data= Deleting existing aggregated data

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2010-02-17 13:38:15 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2010-03-11 13:21:41 +
@@ -332,3 +332,40 @@
 {
 window.location.href = 'displayManageTableForm.action';
 }
+
+// -
+// Export
+// -
+
+function exportToExcel( id )
+{	
+	verifyAndExport( id, "generateTableDataWorkbook.action?id=" + id );
+}
+
+function exportToHtml( id )
+{
+	verifyAndExport( id, "getTableData.action?id=" + id );
+}
+
+function exportToCsv( id )
+{
+	verifyAndExport( id, "getTableDataExport.action?exportFormat=CSV&id=" + id );
+}
+
+function verifyAndExport( id, url )
+{   
+$.getJSON( 
+   "verifyReportTable.action",
+   { "id": id },
+   function( json )
+   {
+   if ( json.response == "error" )
+   {
+   setHeaderDelayMessage( i18n_generate_before_export );
+   }
+   else
+   {
+   window.location.href = "generateTableDataWorkbook.action?id=" + id;
+   }
+   } );
+}

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2010-02-27 21:18:45 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2010-03-11 13:21:41 +
@@ -37,9 +37,9 @@
 	
 
 
-
-
-
+
+
+
 
 
 	
@@ -70,6 +70,7 @@

Re: [Dhis2-devs] GIS problem

2010-03-11 Thread Knut Staring

Ok, I have now got the GIS with printing running nicely here:
http://109.74.202.200:8080/ke (admin/district)

The printing functionality is really cool, as is the Help functionality. I
also very much like the labeling (we may need to add labeling of overlays
also).

Is there an easy way to get at the generated image for inclusion in other
documents?

A few observations:

- The GIS module chrashes google-chrome on Linux Mint 8, but works fine in
Firefox and Opera.
-  I don't think we need this statement "This panel should be rather
self-explanatory ."
-  When selecting a map view, full zoom out is applied, so the map becomes
really tiny. Should zoom to preferred extent
- There seems to be some inconsistency in whether the background gets
printed or not Sometimes it also hangs after printing. I have not figured
out the pattern yet.
- We should have a Help tab for printing also, explaining that the user must
click the PDF button again to get out of print  mode
- The "generating choropleth" message comes on top of the print box and thus
obfuscates it

Knut

On Thu, Mar 11, 2010 at 12:07 AM, Jan Henrik Øverland <
janhenrik.overl...@gmail.com> wrote:

> This is not the latest code.
>
> On Wed, Mar 10, 2010 at 11:20 PM, Knut Staring  wrote:
>
>>  Hi,
>>
>> Trying the latest build, I get this error in Firebug when opening the GIS
>> module:
>>
>> "MAP_SOURCE_TYPE_GEOJSON is not defined"
>>
>> referring to this line in index.js:
>>  data: [[MAP_SOURCE_TYPE_GEOJSON, 'GeoJSON files'],
>> [MAP_SOURCE_TYPE_SHAPEFILE, 'Shapefiles'], [MAP_SOURCE_TYPE_DATABASE, 'DHIS
>> database']]
>>
>> --
>> Cheers,
>> Knut Staring
>>
>> ___
>> 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
>>
>>
>


-- 
Cheers,
Knut Staring
___
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] [Branch ~dhis2-devs-india/dhis2/dhis2-in] Rev 850: bug fixed while adding linelisting group

2010-03-11 Thread John lewis

Hi,
I guess we keep the previous linelisting approach which i guess bharath is
making it more generic. Linelisting is not only for the birth or death. it
serves different purpose.
In the patient module (nbits) we need to do a bit of thinking how we should
handle it as death is not linked with program or its stage.
I guess we should have option both in program and in case where the
user/data entry operator specify the date of termination for program/death
and say probable causes. The probable casuses should be like data element
where system user can define it.
Just some initial thinking need more smoke in brain.
John

On Thu, Mar 11, 2010 at 10:36 AM, Saptarshi Purkayastha wrote:

> Are we going to continue with the previous approach to linelisting??
>
> Don't we want to use the patient module for linelisting as well, with
> deaths being just attribute to a person and cause of death and associated
> program for enrollment?? Just thinking out loud??
>
> ---
> Regards,
> Saptarshi PURKAYASTHA
> Director R & D, HISP India
> Health Information Systems Programme
>
> My Tech Blog:  http://sunnytalkstech.blogspot.com
> You Live by CHOICE, Not by CHANCE
>
>
> On 11 March 2010 10:17,  wrote:
>
>> 
>> revno: 850
>> committer: HISP 
>> branch nick: dhis2-in
>> timestamp: Thu 2010-03-11 14:45:13 +0530
>> message:
>>  bug fixed while adding linelisting group
>> added:
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>> modified:
>>  dhis-2/dhis-web/dhis-web-portal/pom.xml
>>
>>  local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml
>>  local/in/dhis-web-linelisting-in/src/main/resources/struts.xml
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/css/dhis-web-dataentry-national.css
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/lineListGroup.js
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/linelistagg.js
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/select.vm
>>
>>
>> --
>> lp:~dhis2-devs-india/dhis2/dhis2-in
>> https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in
>>
>> You are subscribed to branch lp:~dhis2-devs-india/dhis2/dhis2-in.
>> To unsubscribe from this branch go to
>> https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in/+edit-subscription
>> .
>>
>> === modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
>> --- dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-02-09 11:36:50 +
>> +++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-03-11 09:15:13 +
>> @@ -167,14 +167,14 @@
>>   war
>> 
>>-->
>> -
>> +
>>  > local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>>  1970-01-01 00:00:00 +
>> +++
>> local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>>  2010-03-11 09:15:13 +
>> @@ -0,0 +1,225 @@
>> +package org.hisp.dhis.ll.action.llgroup;
>> +
>> +/*
>> + * Copyright (c) 2004-2007, University of Oslo
>> + * All rights reserved.
>> + *
>> + * Redistribution and use in source and binary forms, with or without
>> + * modification, are permitted provided that the following conditions are
>> met:
>> + * * Redistributions of source code must retain the above copyright
>> notice, this
>> + *   list of conditions and the following disclaimer.
>> + * * Redistributions in binary form must reproduce the above copyright
>> notice,
>> + *   this list of conditions and the following disclaimer in the
>> documentation
>> + *   and/or other materials provided with the distribution.
>> + * * Neither the name of the HISP project nor the names of its
>> contributors may
>> + *   be used to endorse or promote products derived from this software
>> without
>> + *   specific prior written permission.
>> + *
>> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>> "AS IS" AND
>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>> IMPLIED
>> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
>> LIABLE FOR
>> + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
>> DAMAGES
>> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
>> SERVICES;
>> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
>> CAUSED AND ON
>> + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
>> TORT
>> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>> OF THIS
>> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>> + */
>> +
>> +import org.hisp.dhis.i18n.I18n;
>> +import org.hisp.dhis.linelisting.LineListGroup;
>>

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

2010-03-11 Thread noreply


revno: 1620
committer: Lars Helge Oeverland 
branch nick: trunk
timestamp: Thu 2010-03-11 13:12:36 +0100
message:
  Minor fix
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 11:56:49 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 12:12:36 +
@@ -368,6 +368,10 @@
 return htmlEncode( document.getElementById( fieldId ).value );
 }
 
+// -
+// Message, warning, info, headerMessage
+// -
+
 /**
  * Shows the message span and sets the message as text.
  * 
@@ -440,6 +444,15 @@
 }
 
 /**
+ * Sets the header message and hides it after 3 seconds.
+ */
+function setHeaderDelayMessage( message )
+{
+	setHeaderMessage( message );
+	setTimeout( "hideHeaderMessage();", 3000 );
+}
+
+/**
  * Hides the header message div.
  */
 function hideHeaderMessage()

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js	2010-03-11 11:56:49 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js	2010-03-11 12:12:36 +
@@ -7,7 +7,7 @@
 
 function runAndViewChart( chartId )
 {
-	setHeaderWaitMessage( "Please wait" );
+	setHeaderWaitMessage( i18n_please_wait );
 	
 tempChartId = chartId;
 

___
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 531351] Re: chart creation without feedback

2010-03-11 Thread Lars Helge Øverland

** Changed in: dhis2
   Status: Confirmed => Fix Committed

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

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
when clicking "generate datasource and view chart", there is no feedback as to 
what is going on. No "processing, please wait"...



___
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 1619: Fixed bug #531351 (chart creation without feedback)

2010-03-11 Thread noreply


revno: 1619
committer: Lars Helge Oeverland 
branch nick: trunk
timestamp: Thu 2010-03-11 12:56:49 +0100
message:
  Fixed bug #531351 (chart creation without feedback)
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.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-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2010-03-11 10:41:22 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2010-03-11 11:56:49 +
@@ -285,6 +285,7 @@
 
 div#headerMessageContainer
 {
+  position: fixed;
   top: 0px;
   width: 100%;
   height: 26px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 10:41:22 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 11:56:49 +
@@ -369,7 +369,7 @@
 }
 
 /**
- * Sets a message in the "message" span and makes the span visible.
+ * Shows the message span and sets the message as text.
  * 
  * @param message the message. 
  */
@@ -379,6 +379,11 @@
 $( '#message' ).slideDown( 'fast' );
 }
 
+/**
+ * Shows the message span and sets the message as text together with a wait animation.
+ * 
+ * @param message the message.
+ */
 function setWaitMessage( message )
 {
 	setMessage( message + "   " );
@@ -392,23 +397,70 @@
 	$( '#message' ).slideUp( 'fast' );
 }
 
+/**
+ * Slides down the header message div and sets the message as text.
+ * 
+ * @param message the message.
+ */
 function setHeaderMessage( message )
 {
 $( 'div#headerMessage' ).html( message );
-$( 'div#headerMessage' ).slideDown( 'slow' );
-}
-
+$( 'div#headerMessage' ).slideDown();
+}
+
+/**
+ * Updates the text in the header message div with the message.
+ * 
+ * @param message the message.
+ */
+function updateHeaderMessage( message )
+{
+	$( 'div#headerMessage' ).html( message );
+}
+
+/**
+ * Slides down the header message div and sets the message as text together with a wait animation.
+ * 
+ * @param message the message.
+ */
+function setHeaderWaitMessage( message )
+{
+	$( 'div#headerMessage' ).html( message + "   " );
+$( 'div#headerMessage' ).slideDown();
+}
+
+/**
+ * Updates the text in the header message div with the message.
+ * 
+ * @param message the message.
+ */
+function updateHeaderWaitMessage( message )
+{
+	$( 'div#headerMessage' ).html( message + "   " );
+}
+
+/**
+ * Hides the header message div.
+ */
 function hideHeaderMessage()
 {
-$( 'div#headerMessage' ).slideUp( 'slow' );
+$( 'div#headerMessage' ).slideUp();
 }   
 
+/**
+ * Slides down the info message div and sets the message as text.
+ * 
+ * @param message the message.
+ */
 function setInfo( message )
 {
 $( '#info' ).html( message );
 $( '#info' ).slideDown( 'fast' );
 }
 
+/**
+ * Hides the info div.
+ */
 function hideInfo()
 {
 $( '#info' ).slideUp( 'fast' );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-03-08 16:53:05 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-03-11 11:56:49 +
@@ -280,6 +280,12 @@
 configuration = Configuration
 based_on_subjective = Based on complete data set registrations
 based_on_objective = Based on compulsory data elements
+deleting_existing_aggregated_data= Deleting existing aggregated data
+crosstabulating_data= Crosstabulating data
+exporting_data_for_data_elements= Exporting data for data elements
+exporting_data_for_calculated_data_elements = Exporting data for calculated data elements
+exporting_data_for_indicators= Exporting data for indicators
+export_process_done= Export process done
 report_table_process_started = Report table process started
 report_table_process_done = Report table process done
 report_table_process_failed = Report table process failed - See log for details

=== modified file

[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 126: GIS doc update.

2010-03-11 Thread noreply


revno: 126
committer: Jan Henrik Overland 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 12:45:09 +0100
message:
  GIS doc update.
modified:
  src/docbkx/en/dhis2_user_man_gis.xml
  src/docbkx/en/resources/images/GIS/admin_panel.png
  src/docbkx/en/resources/images/GIS/assign_org_units.png
  src/docbkx/en/resources/images/GIS/register_geodata.png


--
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_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-03-01 14:31:31 +
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-03-11 11:45:09 +
@@ -1,3 +1,261 @@
+<<< TREE
+
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; []>
+
+  
+DHIS 2 GIS User Manual
+
+  DHIS
+  GIS
+  Mapping
+
+
+  Ãverland
+  Jan Henrik
+
+
+  Pickering
+  Jason Paul
+
+
+  
+1
+12/09/2009
+JPP
+
+  Initial conversion of document to DocBook format
+
+  
+
+  
+  
+Conversion of geographical data to GeoJSON format
+The DHIS2 mapping client relies on GeoJSON files in order to display
+a map in the browser window. Often times, geographical data is received in
+many different formats, but the ESRI shape file format is one of the most
+common. Several procedures will be described below. It is important, but
+not required, that the names in your geographical data match those in the
+DHIS2 organizational hierarchy. If they do not, you will need to manually
+match them in a later step
+
+  Production of GeoJSON files with Geoserver
+  Geoserver is capable of outputting GeoJSON formats. If you have
+  geoserver running someplace, you can execute the following query.
+  http://localhost:8080/geoserver/ows?service=WFS&version=1.0.0&request=GetFeature&typename=topp:states&outputformat=json&srs_name=EPSG:4326";>http://localhost:8080/geoserver/ows?service=WFS&version=1.0.0&request=GetFeature&typename=topp:states&outputformat=json&srs_name=EPSG:4326
+   Take note that you need to specify the spatial coordinate system. By defualt, Geoserver will return GeoJSON files with the format "long/lat" while
+the DHIS mapping client expects the ordering of the coordinates in "lat/long" format.  The expllicit declartaion of the spatial reference system will ensure that coordinates are returned in the proper order. At the time of writing, the DHIS mapping client does not support spatial reference systems other than EPSG 4326. If you are using Geoserver, the application will handle the reprojection from the native format of the geographical data to EPSG 4326. If you are using other methods as described below to generate the GeoJSON file, you will need to ensure that the GeoJSON output is set to EPSG 4326 (Geographical Lat/long). 
+  You will need to adjust the host destination if the machine is not
+  your local machine as well as defining the actual layer in Geoserver
+  which should be output to GeoJSON (in this case
+  topp:states).
+  Upon execution of the URL, Geoserver will produce a GeoJSON file,
+  and you will be asked to save it. Once it has finished downloading,
+  rename the file following the suggested naming convention:
+  ISO2CountryCode followed by an underscore, followed by the layer
+  type (e.g. âadminâ for administrative layers, âhealthâ for health
+  administrative boundaries). For instance, the first administrative layer
+  for Zambia would be named as "zm_admin1".
+
+
+  Production of GeoJSON files with GDAL
+  GDAL is a multi-platform toolkit for the manipulation of
+  geographical data. It is freely available for a wide-range of platforms
+  at http://gdal.org";>http://gdal.org
+  Production of GeoJSON files are straightforward with GDAL. Just
+  execute (on Windows)
+  ogr2ogr.exe -f "GeoJSON" dst_datasource_name src_datasource_name
+  or on Linuxogr2ogr -f "GeoJSON"dst_datasource_name src_datasource_name
+  Replace dst_datasource_name with the path
+  to the destination geographical data file (following the naming
+  convention described above) and
+  src_datasource_name with the source geographical
+  data file. Take note that you may need to specify input and output coordinate systems as described above.
+
+
+  Copying files to the DHIS application
+  Currently, your GeoJSON files should be placed in the
+  DHIS_HOME/geoson of your DHIS application to be accessible to the GIS
+  module. If the GeoJSON

[Dhis2-devs] Current and future features

2010-03-11 Thread Knut Staring

Hello everyone,

http://www.sdmx-hd.org/wiki/monitoring/Monitoring_Systems

I would like to point to a new wiki page on the SDMX-HD site comparing
various applications - it needs input from us, starting from current
features:
http://dhis2.org/features
http://dhis2.org/functionality
https://blueprints.launchpad.net/dhis2/+milestone/2.0.4

There will be a workshop in Oslo from the 22nd to 26th of this month, with
participants from at least Tanzania, India, Djibouti, Ireland, Switzerland
and Norway (probably more).

As DHIS 2.0.4 is now right around the corner, this will be a good occasion
to step back a little bit and discuss some directions for the coming year.
Ola and I are working on a document incorporating current blueprints and
other feature requests that have been raised in various contexts, which we
will send to the list as background (there will certainly  be things we have
overlooked). Crucial discussions then need to be had around priorities and
sequencing.

As further background, I include below a list of general requirements for
monitoring and evaluation systems.

 Things we have:

1. Ability to accept manually entered data

2. Ability to define custom forms for manual data entry

6. Indicator frequency: day, week, month, quarter, semester, annual (and
aggregates thereof)

8. Ability to disaggregate indicators by geography (nested), age group
(nested), sex, direct/indirect

9. Ability to define additional aggregation/disaggregation categories

10. Multi-lingual

11. Role-based security with dimensions of job function, geography and
organizational affiliation

13. Tools for defining/generating reports, graphs (including longitudinal),
maps, pivot tables and combinations thereof, and permitting their being
saved as files

18. Flexibility to respond to changing reporting requirements of donors,
countries and others

19. Extensibility to other diseases and conditions

20. Extensibility to changing scenarios

21. Hierarchical control or import of code sets and data tables

22. Hierarchical control or import of forms and reports

23. Ability to maintain facility-level data for multiple facilities on a
single machine

24. Simple maintenance and management at the facility level

29. Database neutrality


More work needed:

3. Ability to accept data exported from an electronic data system or perform
an extraction therefrom

4. Support for the following types of indicators: count, ratio, %,
population rate, $, national currency, yes/no/unknown

5. Hierarchical indicator definition via inheritance or import at
(minimally) international, national and local level

7. Ability to aggregate indicators by donor, government agency, partner,
sub-partner, funding source, activity type, program area

12. Versioning of data (knowledge of latest date an element of an aggregate
was updated), release status (preliminary, validated, released, corrected)

14. Suppression of small counts in output, "smudging" of geography to
prevent identification of individuals

15. Data interchange (especially via IXF3)

16. Target, revised target and actual data (provides budget capability)

17. Audit trail

25. Highly responsive data entry, moderately reponsive report generation

26. System monitoring reports (timeliness, completeness)

27. Ability to store and forward text or attachments as identified items
(narrative reporting)

28. Ability to add adjustments to indicator values and their justifications
at each hierarchical level and to specify their allocation among
disaggregation categories

30. Reliable, ongoing customer support, including training, software and
documentation updates, etc.
___
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 1618: Reverted r1615

2010-03-11 Thread noreply


revno: 1618
committer: Lars Helge Oeverland 
branch nick: trunk
timestamp: Thu 2010-03-11 11:42:29 +0100
message:
  Reverted r1615
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/date.js
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  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/completeRegistration.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-commons-resources/src/main/webapp/dhis-web-commons/util/date.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/date.js	2010-03-11 10:23:21 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/date.js	2010-03-11 10:42:29 +
@@ -193,6 +193,7 @@
 	var year=now.getYear();
 	var month=now.getMonth()+1;
 	var date=1;
+	
 	while (i_format < format.length) {
 		// Get next token from format string
 		c=format.charAt(i_format);
@@ -227,7 +228,6 @@
 	}
 }
 			if ((month < 1)||(month>12)){return 0;}
-
 			}
 		else if (token=="EE"||token=="E"){
 			for (var i=0; i12)){return 0;}
 			i_val+=month.length;}
@@ -266,7 +266,6 @@
 		}
 	// Correct hours value
 	var newdate=new Date(year,month-1,date);
-	
 	return newdate.getTime();
 	}
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-03-11 10:23:21 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-03-11 10:42:29 +
@@ -115,5 +115,4 @@
 interpolation		= Interpolation
 validation_rule		= Validation rule
 the_following_values_are_outliers   = The following values are considered as outliers (min-max or std dev).
-no_outlier_values_found= No outlier values found.
-invalid_date		= Input invalid date
\ No newline at end of file
+no_outlier_values_found= No outlier values found.
\ No newline at end of file

=== 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	2010-03-11 10:23:21 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2010-03-11 10:42:29 +
@@ -4,230 +4,208 @@
 "http://struts.apache.org/dtds/struts-2.0.dtd";>
 
 
-	
-
-	
-
-		
-			select.action
-			
-		
-
-		
-			
-			defaultform
-			
-			sectionform
-			
-			multidimensionalform
-			
-			/main.vm
-			/dhis-web-dataentry/select.vm
-			/dhis-web-dataentry/menu.vm
-			420
-			../dhis-web-commons/ouwt/ouwt.js,javascript/general.js,javascript/form.js,
-../dhis-web-commons/util/date.js
-			style/dhis-web-dataentry.css,style/custom_data_entry_form_styles.css
-		
-
-		
-			select.action
-			
-		
-
-		
-			select.action
-			
-		
-
-		
-			
-			/main.vm
-			/dhis-web-dataentry/form.vm
-			/dhis-web-dataentry/menu.vm
-			420
-			
-../dhis-web-commons/ouwt/ouwt.js,
-javascript/general.js,javascript/form.js,
-../dhis-web-commons/calendar/calendar.js,
-../dhis-web-commons/calendar/calendar-lang.js,
-../dhis-web-commons/calendar/calendar-setup.js,
-../dhis-web-commons/util/date.js
-  
-			style/dhis-web-dataentry.css,style/custom_data_entry_form_styles.css
-		
-
-		
-			
-			/main.vm
-			/dhis-web-dataentry/section/form.vm
-			/dhis-web-dataentry/menu.vm
-			420
-			
-../dhis-web-commons/ouwt/ouwt.js,
-javascript/general.js,javascript/form.js,
-../dhis-web-commons/calendar/calendar.js,
-../dhis-web-commons/calendar/calendar-lang.js,
-../dhis-web-commons/calendar/calendar-setup.js
-  
-			style/dhis-web-dataentry.css
-		
-
-		
-			
-			/main.vm
-			/dhis-web-dataentry/multidimensional/form.vm
-			/dhis-web-dataentry/menu.vm
-			420
-			
-../dhis-web-commons/ouwt/ouwt.js,
-javascript/general.js,javascript/form.js,javascript/multidimensional.js,
-../dhis-web-commons/calendar/calendar.js,
-../dhis-web-commons/calendar/calendar-lang.js,
-../dhis-web-commons/calendar/calendar-setup.js
-  
-			style/dhis-web-dataentry.css,style/custom_data_entry_form_styles.css
-		
-
-		
-			status.vm
-			plainTextError
-			F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE
-		
-
-		
-			status.vm
-			plainTextError
-			F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE
-		
-
-		
-			status.vm
-			plainTextError
-			F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE
-		
-
-		
-			
-204
-			
-			plainTextError
-			F_DATAELEMENT_MINMAX_ADD,F_DATAELEMENT_MINMAX_UPDATE
-		
-
-

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1617: Work in progress on chart feedback bug

2010-03-11 Thread noreply


revno: 1617
committer: Lars Helge Oeverland 
branch nick: trunk
timestamp: Thu 2010-03-11 11:41:22 +0100
message:
  Work in progress on chart feedback bug
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.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-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2010-02-27 19:45:18 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2010-03-11 10:41:22 +
@@ -283,6 +283,32 @@
   padding: 0.5em;
 }
 
+div#headerMessageContainer
+{
+  top: 0px;
+  width: 100%;
+  height: 26px;
+  z-index: 20;
+}
+
+div#headerMessage
+{
+  display: none;
+  height: 26px;
+  width: 560px;
+  margin-left: auto;
+  margin-right: auto;
+  background-color: #bf;
+  border-right: 1px solid #00;
+  border-bottom: 1px solid #00;
+  border-left: 1px solid #00;
+  z-index: 21;
+  font-size: 9pt;
+  text-align: center;
+  vertical-align: center;
+  line-height: 25px;
+}
+
 /**/
 /* The main calendar widget. Div containing a table.  */
 /**/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-02-27 20:22:30 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 10:41:22 +
@@ -392,6 +392,17 @@
 	$( '#message' ).slideUp( 'fast' );
 }
 
+function setHeaderMessage( message )
+{
+$( 'div#headerMessage' ).html( message );
+$( 'div#headerMessage' ).slideDown( 'slow' );
+}
+
+function hideHeaderMessage()
+{
+$( 'div#headerMessage' ).slideUp( 'slow' );
+}   
+
 function setInfo( message )
 {
 $( '#info' ).html( message );

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2010-03-08 09:25:52 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2010-03-11 10:41:22 +
@@ -109,6 +109,10 @@
 
 
 
+
+  
+
+
 
   #if( !$page )
 $i18n.getString( "no_page_specified" )

___
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 1616: Mirror fix.

2010-03-11 Thread noreply


revno: 1616
committer: Tran Chau 
branch nick: trunk
timestamp: Thu 2010-03-11 17:37:57 +0700
message:
  Mirror fix.
modified:
  dhis-2/dhis-web/dhis-web-dataentry/pom.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/pom.xml	2010-03-11 10:23:21 +
+++ dhis-2/dhis-web/dhis-web-dataentry/pom.xml	2010-03-11 10:37:57 +
@@ -10,7 +10,7 @@
   
   
   dhis-web-dataentry
-  jar
+  war
   DHIS Data Entry
   
   

___
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 430657] Re: Date text field needs validation rule in data entry screen

2010-03-11 Thread Thu Tran

** Changed in: dhis2
   Status: Confirmed => Fix Committed

-- 
Date text field needs validation rule in data entry screen
https://bugs.launchpad.net/bugs/430657
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: Fix Committed

Bug description:
DHIS2 --> Services --> Data Entry

Here after selecting appropriate organisation unit, data set and period we get 
data entry screen, here we fill data one by one, after that we press complete 
button below the data entry form page and we enter some garbage character or 
special character or numbers in the date text field and it shows it is saving 
those values. Here we think this "complete" button should have some validation 
so that it prompts while clicking it if we fill some other characters inside 
date text field.



___
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 1615: Date text field needs validation rule in data entry screen.

2010-03-11 Thread noreply


revno: 1615
committer: Tran Chau 
branch nick: trunk
timestamp: Thu 2010-03-11 17:23:21 +0700
message:
  Date text field needs validation rule in data entry screen.
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/date.js
  dhis-2/dhis-web/dhis-web-dataentry/pom.xml
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  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/completeRegistration.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-commons-resources/src/main/webapp/dhis-web-commons/util/date.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/date.js	2010-02-28 10:44:15 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/date.js	2010-03-11 10:23:21 +
@@ -193,7 +193,6 @@
 	var year=now.getYear();
 	var month=now.getMonth()+1;
 	var date=1;
-	
 	while (i_format < format.length) {
 		// Get next token from format string
 		c=format.charAt(i_format);
@@ -228,6 +227,7 @@
 	}
 }
 			if ((month < 1)||(month>12)){return 0;}
+
 			}
 		else if (token=="EE"||token=="E"){
 			for (var i=0; i12)){return 0;}
 			i_val+=month.length;}
@@ -266,6 +266,7 @@
 		}
 	// Correct hours value
 	var newdate=new Date(year,month-1,date);
+	
 	return newdate.getTime();
 	}
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/pom.xml	2010-02-22 14:04:08 +
+++ dhis-2/dhis-web/dhis-web-dataentry/pom.xml	2010-03-11 10:23:21 +
@@ -10,7 +10,7 @@
   
   
   dhis-web-dataentry
-  war
+  jar
   DHIS Data Entry
   
   

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-01-29 17:10:33 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-03-11 10:23:21 +
@@ -115,4 +115,5 @@
 interpolation		= Interpolation
 validation_rule		= Validation rule
 the_following_values_are_outliers   = The following values are considered as outliers (min-max or std dev).
-no_outlier_values_found= No outlier values found.
\ No newline at end of file
+no_outlier_values_found= No outlier values found.
+invalid_date		= Input invalid date
\ No newline at end of file

=== 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	2010-01-28 23:08:44 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2010-03-11 10:23:21 +
@@ -4,208 +4,230 @@
 "http://struts.apache.org/dtds/struts-2.0.dtd";>
 
 
-  
-  
-  
-
-
-  select.action
-
-
-
-  
-  defaultform
-  sectionform
-  multidimensionalform
-  /main.vm
-  /dhis-web-dataentry/select.vm
-  /dhis-web-dataentry/menu.vm
-  420
-  ../dhis-web-commons/ouwt/ouwt.js,javascript/general.js,javascript/form.js
-  style/dhis-web-dataentry.css,style/custom_data_entry_form_styles.css
-
-	  	  
-	
-  select.action
-
-
-
-  select.action
-
-
-
-  
-  /main.vm
-  /dhis-web-dataentry/form.vm
-  /dhis-web-dataentry/menu.vm
-  420
-  
-../dhis-web-commons/ouwt/ouwt.js,
-javascript/general.js,javascript/form.js,
-javascript/form.js,../dhis-web-commons/calendar/calendar.js,
-../dhis-web-commons/calendar/calendar-lang.js,
-../dhis-web-commons/calendar/calendar-setup.js
-  
-  style/dhis-web-dataentry.css,style/custom_data_entry_form_styles.css
-
-
-
-  
-  /main.vm
-  /dhis-web-dataentry/section/form.vm
-  /dhis-web-dataentry/menu.vm
-  420
-  
-../dhis-web-commons/ouwt/ouwt.js,
-javascript/general.js,javascript/form.js,
-../dhis-web-commons/calendar/calendar.js,
-../dhis-web-commons/calendar/calendar-lang.js,
-../dhis-web-commons/calendar/calendar-setup.js
-  
-  style/dhis-web-dataentry.css
-
-
-
-  
-  /main.vm
-  /dhis-web-dataentry/multidimensional/form.vm
-  /dhis-web-dataentry/menu.vm
-  420
-  
-../dhis-web-commons/ouwt/ouwt.js,
-javascript/general.js,javascript/form.js,javascript/multidimensional.js,
-../dhis-web-commons/calendar/calendar.js,
-../dhis-web-commons/calendar/calendar-lang.js,
-../dhis-web-commons/calendar/calendar-set

[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 125: vietnamese document - Reorgasized

2010-03-11 Thread noreply


revno: 125
committer: Dao Van Sam 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 17:20:47 +0700
message:
  vietnamese document - Reorgasized
removed:
  src/docbkx/vn/dhis2_documentation_guide.xml
  src/docbkx/vn/dhis2_technical_architechture_guide.xml
  src/docbkx/vn/dhis2_user_man_excel_reports.xml
  src/docbkx/vn/resources/images/ExcelReportModule/
  src/docbkx/vn/resources/images/ExcelReportModule/NewReportItem.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/add_dataset1.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/add_dataset_completed_reports.png
  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item.png
  src/docbkx/vn/resources/images/ExcelReportModule/add_excel_item_group.png
  src/docbkx/vn/resources/images/ExcelReportModule/add_new_report_button.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/administration_page.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/advanced_generate_report.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/assign_data_element_group.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/assign_org_unit_group.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/assign_user_role.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/association_org_unit.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/choose_upload_file.png
  src/docbkx/vn/resources/images/ExcelReportModule/clean temporary directory.png
  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/configure_directory1.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/copy_excel_item_to.png
  src/docbkx/vn/resources/images/ExcelReportModule/copy_report_item.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/copy_to_excel_iems_group.png
  src/docbkx/vn/resources/images/ExcelReportModule/create_expression.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/create_expression1.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/create_item.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/create_new_report.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/create_report_item.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status1.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/data_entry_status_list.png
  
src/docbkx/vn/resources/images/ExcelReportModule/dataelement_category_report_template.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/download_template_excel_file.png
  src/docbkx/vn/resources/images/ExcelReportModule/edit_report.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/edit_user_role.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_information.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/enter_report_item_infor.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/excel_item_group.png
  src/docbkx/vn/resources/images/ExcelReportModule/excel_report_left_menu.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/excel_template_management.png
  
src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/generate_individual_report1.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/generate_report.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/generate_report_introduce.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/import_data_from_excel_file.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/list_of_reports.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/list_org_unit_group_report_template.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/list_time_period_report_template.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/main_feature_of_excel_report_module.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/navigate_to_list_of_report.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/new_report_item.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/note.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/one of data enetry form of 
reports.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/open_excel_report_module.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/operating_buttons.jpg
  
src/docbkx/vn/resources/images/ExcelReportModule/operations_excel_item_group.png
  src/docbkx/vn/resources/images/ExcelReportModule/remove_report.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/report_association.jpg
  src/docbkx/vn/resources/images/ExcelReportModule/report_item.jpg
  src/docbkx/vn/resources/image

Re: [Dhis2-devs] [Branch ~dhis2-devs-india/dhis2/dhis2-in] Rev 850: bug fixed while adding linelisting group

2010-03-11 Thread bharath kumar

It is requirement from bangladesh, they dont want to trac, they just want to
collect the name based info.

On Thu, Mar 11, 2010 at 3:06 PM, Saptarshi Purkayastha wrote:

> Are we going to continue with the previous approach to linelisting??
>
> Don't we want to use the patient module for linelisting as well, with
> deaths being just attribute to a person and cause of death and associated
> program for enrollment?? Just thinking out loud??
>
> ---
> Regards,
> Saptarshi PURKAYASTHA
> Director R & D, HISP India
> Health Information Systems Programme
>
> My Tech Blog:  http://sunnytalkstech.blogspot.com
> You Live by CHOICE, Not by CHANCE
>
>
> On 11 March 2010 10:17,  wrote:
>
>> 
>> revno: 850
>> committer: HISP 
>> branch nick: dhis2-in
>> timestamp: Thu 2010-03-11 14:45:13 +0530
>> message:
>>  bug fixed while adding linelisting group
>> added:
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>> modified:
>>  dhis-2/dhis-web/dhis-web-portal/pom.xml
>>
>>  local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml
>>  local/in/dhis-web-linelisting-in/src/main/resources/struts.xml
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/css/dhis-web-dataentry-national.css
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/lineListGroup.js
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/linelistagg.js
>>
>>  
>> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/select.vm
>>
>>
>> --
>> lp:~dhis2-devs-india/dhis2/dhis2-in
>> https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in
>>
>> You are subscribed to branch lp:~dhis2-devs-india/dhis2/dhis2-in.
>> To unsubscribe from this branch go to
>> https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in/+edit-subscription
>> .
>>
>> === modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
>> --- dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-02-09 11:36:50 +
>> +++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-03-11 09:15:13 +
>> @@ -167,14 +167,14 @@
>>   war
>> 
>>-->
>> -
>> +
>>  > local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>>  1970-01-01 00:00:00 +
>> +++
>> local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>>  2010-03-11 09:15:13 +
>> @@ -0,0 +1,225 @@
>> +package org.hisp.dhis.ll.action.llgroup;
>> +
>> +/*
>> + * Copyright (c) 2004-2007, University of Oslo
>> + * All rights reserved.
>> + *
>> + * Redistribution and use in source and binary forms, with or without
>> + * modification, are permitted provided that the following conditions are
>> met:
>> + * * Redistributions of source code must retain the above copyright
>> notice, this
>> + *   list of conditions and the following disclaimer.
>> + * * Redistributions in binary form must reproduce the above copyright
>> notice,
>> + *   this list of conditions and the following disclaimer in the
>> documentation
>> + *   and/or other materials provided with the distribution.
>> + * * Neither the name of the HISP project nor the names of its
>> contributors may
>> + *   be used to endorse or promote products derived from this software
>> without
>> + *   specific prior written permission.
>> + *
>> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>> "AS IS" AND
>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>> IMPLIED
>> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
>> LIABLE FOR
>> + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
>> DAMAGES
>> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
>> SERVICES;
>> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
>> CAUSED AND ON
>> + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
>> TORT
>> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>> OF THIS
>> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>> + */
>> +
>> +import org.hisp.dhis.i18n.I18n;
>> +import org.hisp.dhis.linelisting.LineListGroup;
>> +import org.hisp.dhis.linelisting.LineListService;
>> +
>> +import com.opensymphony.xwork2.Action;
>> +import java.util.ArrayList;
>> +import java.util.Collection;
>> +import java.util.List;
>> +import org.hisp.dhis.dbmanager.DataBaseManagerInterface;
>> +import org.hisp.dhis.linelisting.LineListElement;
>> +
>> +public class ValidateLineListGroupAddAction
>> +impleme

Re: [Dhis2-devs] [Branch ~dhis2-devs-india/dhis2/dhis2-in] Rev 850: bug fixed while adding linelisting group

2010-03-11 Thread Saptarshi Purkayastha

Are we going to continue with the previous approach to linelisting??

Don't we want to use the patient module for linelisting as well, with deaths
being just attribute to a person and cause of death and associated program
for enrollment?? Just thinking out loud??

---
Regards,
Saptarshi PURKAYASTHA
Director R & D, HISP India
Health Information Systems Programme

My Tech Blog:  http://sunnytalkstech.blogspot.com
You Live by CHOICE, Not by CHANCE


On 11 March 2010 10:17,  wrote:

> 
> revno: 850
> committer: HISP 
> branch nick: dhis2-in
> timestamp: Thu 2010-03-11 14:45:13 +0530
> message:
>  bug fixed while adding linelisting group
> added:
>
>  
> local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
> modified:
>  dhis-2/dhis-web/dhis-web-portal/pom.xml
>
>  local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml
>  local/in/dhis-web-linelisting-in/src/main/resources/struts.xml
>
>  
> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/css/dhis-web-dataentry-national.css
>
>  
> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/lineListGroup.js
>
>  
> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/linelistagg.js
>
>  
> local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/select.vm
>
>
> --
> lp:~dhis2-devs-india/dhis2/dhis2-in
> https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in
>
> You are subscribed to branch lp:~dhis2-devs-india/dhis2/dhis2-in.
> To unsubscribe from this branch go to
> https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in/+edit-subscription
> .
>
> === modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
> --- dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-02-09 11:36:50 +
> +++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-03-11 09:15:13 +
> @@ -167,14 +167,14 @@
>   war
> 
>-->
> -
> +
>   local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>  1970-01-01 00:00:00 +
> +++
> local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
>  2010-03-11 09:15:13 +
> @@ -0,0 +1,225 @@
> +package org.hisp.dhis.ll.action.llgroup;
> +
> +/*
> + * Copyright (c) 2004-2007, University of Oslo
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are
> met:
> + * * Redistributions of source code must retain the above copyright
> notice, this
> + *   list of conditions and the following disclaimer.
> + * * Redistributions in binary form must reproduce the above copyright
> notice,
> + *   this list of conditions and the following disclaimer in the
> documentation
> + *   and/or other materials provided with the distribution.
> + * * Neither the name of the HISP project nor the names of its
> contributors may
> + *   be used to endorse or promote products derived from this software
> without
> + *   specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
> IS" AND
> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> IMPLIED
> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> LIABLE FOR
> + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> DAMAGES
> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> SERVICES;
> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
> AND ON
> + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> OF THIS
> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +import org.hisp.dhis.i18n.I18n;
> +import org.hisp.dhis.linelisting.LineListGroup;
> +import org.hisp.dhis.linelisting.LineListService;
> +
> +import com.opensymphony.xwork2.Action;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +import java.util.List;
> +import org.hisp.dhis.dbmanager.DataBaseManagerInterface;
> +import org.hisp.dhis.linelisting.LineListElement;
> +
> +public class ValidateLineListGroupAddAction
> +implements Action
> +{
> +//
> -
> +// Dependencies
> +//
> -
> +
> +private LineListService lineListService;
> +
> +public void setLineListService( LineListService lineListService )
> +{
> +this.lineListService = lineListService;
> +}
> +
> +private I18n i18n;
> +
> +public v

[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 124: Vietnamese document

2010-03-11 Thread noreply


revno: 124
committer: Tran Chau 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 15:30:20 +0700
message:
  Vietnamese document
removed:
  src/docbkx/vn/resources/images/data_dimensions/
  src/docbkx/vn/resources/images/data_dimensions/Ex_table1.jpg
  src/docbkx/vn/resources/images/data_dimensions/Ex_table2.jpg
  src/docbkx/vn/resources/images/data_dimensions/dhis_input_output.JPG
  src/docbkx/vn/resources/images/data_dimensions/pivot1.jpg
  src/docbkx/vn/resources/images/data_dimensions/pivot2.jpg
  src/docbkx/vn/resources/images/data_dimensions/pivot3.jpg
  src/docbkx/vn/resources/images/data_dimensions/pivot4.jpg
  src/docbkx/vn/resources/images/data_dimensions/pivot5.jpg


--
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.
=== removed directory 'src/docbkx/vn/resources/images/data_dimensions'
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/Ex_table1.jpg'
Binary files src/docbkx/vn/resources/images/data_dimensions/Ex_table1.jpg	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/Ex_table1.jpg	1970-01-01 00:00:00 + differ
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/Ex_table2.jpg'
Binary files src/docbkx/vn/resources/images/data_dimensions/Ex_table2.jpg	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/Ex_table2.jpg	1970-01-01 00:00:00 + differ
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/dhis_input_output.JPG'
Binary files src/docbkx/vn/resources/images/data_dimensions/dhis_input_output.JPG	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/dhis_input_output.JPG	1970-01-01 00:00:00 + differ
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/pivot1.jpg'
Binary files src/docbkx/vn/resources/images/data_dimensions/pivot1.jpg	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/pivot1.jpg	1970-01-01 00:00:00 + differ
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/pivot2.jpg'
Binary files src/docbkx/vn/resources/images/data_dimensions/pivot2.jpg	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/pivot2.jpg	1970-01-01 00:00:00 + differ
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/pivot3.jpg'
Binary files src/docbkx/vn/resources/images/data_dimensions/pivot3.jpg	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/pivot3.jpg	1970-01-01 00:00:00 + differ
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/pivot4.jpg'
Binary files src/docbkx/vn/resources/images/data_dimensions/pivot4.jpg	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/pivot4.jpg	1970-01-01 00:00:00 + differ
=== removed file 'src/docbkx/vn/resources/images/data_dimensions/pivot5.jpg'
Binary files src/docbkx/vn/resources/images/data_dimensions/pivot5.jpg	2010-03-11 07:03:05 + and src/docbkx/vn/resources/images/data_dimensions/pivot5.jpg	1970-01-01 00:00:00 + differ
___
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 123: commit vietnamese document

2010-03-11 Thread noreply


revno: 123
committer: Dao Van Sam 
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-03-11 15:18:29 +0700
message:
  commit vietnamese document
added:
  src/docbkx/vn/resources/images/images_cantho/
  src/docbkx/vn/resources/images/images_hcm/
  src/docbkx/vn/tailieuhuongdan_cantho_vn.xml
  src/docbkx/vn/taillieuhuongdan_hcm_vn.xml
The size of the diff (1421 lines) is larger than your specified limit of 1000 
lines

--
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.

___
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 1614: Mirror fix.

2010-03-11 Thread noreply


revno: 1614
committer: Tran Chau 
branch nick: trunk
timestamp: Thu 2010-03-11 15:10:12 +0700
message:
  Mirror fix.
modified:
  
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java
  
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml
  
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml
  
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml
  
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.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-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java	2010-03-11 06:27:12 +
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java	2010-03-11 08:10:12 +
@@ -130,8 +130,6 @@
 
 Criteria criteria = session.createCriteria( ReportExcel.class );
 
-criteria.setCacheable( true );
-
 return criteria.list();
 
 }

=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml	2010-03-11 06:27:12 +
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml	2010-03-11 08:10:12 +
@@ -8,8 +8,6 @@
 	
 
-		
-
 		
 			
 		

=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml	2010-03-11 06:27:12 +
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml	2010-03-11 08:10:12 +
@@ -6,8 +6,6 @@
 	
 
-		
-
 		
 			
 		

=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml	2010-03-11 06:27:12 +
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml	2010-03-11 08:10:12 +
@@ -5,8 +5,6 @@
 
 	
 	
-		
-
 		
 			
 		

=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.xml	2010-03-11 06:27:12 +
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.xml	2010-03-11 08:10:12 +
@@ -5,8 +5,6 @@
 
 	
 	
-		
-
 		
 			
 		

___
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

76 matches

Mail list logo