[Dhis2-devs] [Bug 546684] [NEW] DHIS 1.4 File imports result in weird shortnames
Public bug reported: During a DHIS 1.4 file import,some weird numbers are appended to the shortname column in the organisationunit table. See below for an example. Chitimukulu OPD580 Zambia MoH933 Mumba OPD380 Chililabombwe District618 Chingola District420 Kalulushi District427 Kitwe District42 Luanshya District283 Lufwanyama District588 ** Affects: dhis2 Importance: Undecided Status: New -- DHIS 1.4 File imports result in weird shortnames https://bugs.launchpad.net/bugs/546684 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: During a DHIS 1.4 file import,some weird numbers are appended to the shortname column in the organisationunit table. See below for an example. Chitimukulu OPD580 Zambia MoH933 Mumba OPD380 Chililabombwe District618 Chingola District420 Kalulushi District427 Kitwe District42 Luanshya District283 Lufwanyama District588 ___ 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 546686] [NEW] Pie chart type is needed
Public bug reported: The current chart (under REPORTs) just includes: Line and Bar chart. There is a need of pie chart for analysing the propotional indicators, for example: malnutrition level 1,2,3; male/female, etc. ** Affects: dhis2 Importance: Undecided Status: New -- Pie chart type is needed https://bugs.launchpad.net/bugs/546686 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 current chart (under REPORTs) just includes: Line and Bar chart. There is a need of pie chart for analysing the propotional indicators, for example: malnutrition level 1,2,3; male/female, 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
Re: [Dhis2-devs] Hudson doc build
Its been there for some time now. 2010/3/24, Knut Staring knu...@gmail.com: As the documentation is continually improved, I think we really do need a link to the latest build on http://dhis2.org, i.e. a link to Hudson. The PDF that is there now is very outdated. Knut On Wed, Mar 24, 2010 at 9:04 AM, Jason Pickering jason.p.picker...@gmail.com wrote: I strongly suspect this is an encoding issue as mentioned yesterday. Also, I do not really understand where the list of complete artifacts are. Basically, Doxbkx will only build what needs to be built. I think since the Vietnamese documents have been altered, then they will be rebuilt. Otherwise, there may be a way to force the Docbook maven plugin to rebuild everything, even if it does not need to be. This seems a bit pointless. Ideally, if we could have a web link to the /target directory of the builds that result from Hudson, then everything should be there. Regards, Jason On Wed, Mar 24, 2010 at 10:00 AM, Kim-Anh Vo cata...@gmail.com wrote: but the .pdf file with Vietnamese font issues! http://dhis.uio.no/ci/job/Dhis2%20documentation/lastSuccessfulBuild/artifact/target/docbkx/pdf/dhis2_user_manual_vn.pdf Any suggestions? On Wed, Mar 24, 2010 at 2:43 PM, Knut Staring knu...@gmail.com wrote: It seems Hudson now only builds the VN version of the docs? http://dhis.uio.no/ci/job/Dhis2%20documentation/ -- 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 -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com ___ 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 -- -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+260968395190 -- Cheers, Knut Staring -- Sendt fra min mobile enhet ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 546684] [NEW] DHIS 1.4 File imports result in weird shortnames
Possibly, but I would still regard this as a bug. These shortname are unique anyway, and it affects all of them. If this is the behaviour of the import, then it should only append numbers to shortnames that are not unique, rather than all of them. On Thu, Mar 25, 2010 at 9:13 AM, Knut Staring knu...@gmail.com wrote: Could it be that it is appending the numbers in order to achieve uniqueness? On Thu, Mar 25, 2010 at 7:57 AM, jason.p.pickering jason.p.picker...@gmail.com wrote: Public bug reported: During a DHIS 1.4 file import,some weird numbers are appended to the shortname column in the organisationunit table. See below for an example. Chitimukulu OPD580 Zambia MoH933 Mumba OPD380 Chililabombwe District618 Chingola District420 Kalulushi District427 Kitwe District42 Luanshya District283 Lufwanyama District588 ** Affects: dhis2 Importance: Undecided Status: New -- DHIS 1.4 File imports result in weird shortnames https://bugs.launchpad.net/bugs/546684 You received this bug notification because you are a member of DHIS 2 coordinators, which is the registrant for DHIS. Status in DHIS 2 - District Health Information Software: New Bug description: During a DHIS 1.4 file import,some weird numbers are appended to the shortname column in the organisationunit table. See below for an example. Chitimukulu OPD580 Zambia MoH933 Mumba OPD380 Chililabombwe District618 Chingola District420 Kalulushi District427 Kitwe District42 Luanshya District283 Lufwanyama District588 -- Cheers, Knut Staring -- -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+260968395190 -- DHIS 1.4 File imports result in weird shortnames https://bugs.launchpad.net/bugs/546684 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: During a DHIS 1.4 file import,some weird numbers are appended to the shortname column in the organisationunit table. See below for an example. Chitimukulu OPD580 Zambia MoH933 Mumba OPD380 Chililabombwe District618 Chingola District420 Kalulushi District427 Kitwe District42 Luanshya District283 Lufwanyama District588 ___ 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 484055] Re: very slow speed and lack of status updates of Assign dataset to organisation units for registering function
** Changed in: dhis2 Milestone: None = 2.0.5 -- very slow speed and lack of status updates of Assign dataset to organisation units for registering function https://bugs.launchpad.net/bugs/484055 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: If we assign by Selecting all at level, or unselect all at level, it's no problem. But the problem appear when unselect some of organisation unit when already selected large number of org units. Each time click to Orgunit to unassign or assign, the system loading once. This slow down the process of select Orgunit. Beside that, the Save button also invisible, and I have to wait for a long time until the system finish loading. But when I check again, and see that there are just few selected org units assigned, and a many selected orgunits hasn't been assigned. chosing OUs for assigning/removing assignments can make confusions to users when the status just Loading, please wait... but actually just a few (surely with the first one) work out! So, why not adding the OU name to the status, for example: assigning OU1,please wait...!!! This refers to the reliability of the sys. ___ 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 161: Testing Google Translate for documentation
revno: 161 committer: Knut Staring knu...@knutst-laptop branch nick: dhis2-docbook-docs timestamp: Thu 2010-03-25 09:10:38 +0100 message: Testing Google Translate for documentation added: src/docbkx/fr/ src/docbkx/fr/dhis2_documentation_guide.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. === added directory 'src/docbkx/fr' === added file 'src/docbkx/fr/dhis2_documentation_guide.xml' --- src/docbkx/fr/dhis2_documentation_guide.xml 1970-01-01 00:00:00 + +++ src/docbkx/fr/dhis2_documentation_guide.xml 2010-03-25 08:10:38 + @@ -0,0 +1,407 @@ +?xml version='1.0' encoding='UTF-8'? +!-- This document was created with Syntext Serna Free. -- +!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.4//EN http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [ +!ENTITY br ''] + +chapter + chapterinfo +title + DHIS 2 guide de documentation +/title +author + firstname +Jason + /firstname + surname +Pickering + /surname + affiliation +orgname +/orgname + /affiliation +/author +pubdate + 14/09/09 +/pubdate +keywordset + keyword +DHIS2 + /keyword + keyword +Documentation + /keyword + keyword +DocBook + /keyword +/keywordset +revhistory + revision +revnumber + 2 +/revnumber +date + 28/10/09 +/date +revdescription + para +Ajout de quelques informations supplémentaires sur des documents multilingues et des éditeurs. + /para +/revdescription + /revision + revision +revnumber + 1 +/revnumber +date + 29/09/09 +/date +revdescription + para +Ajout d#39;informations plus vous lancer dans le bzr et DocBook + /para +/revdescription + /revision +/revhistory + /chapterinfo + title +DHIS2 guide de documentation + /title + section id=docs_1 +title + DHIS 2 Documentation Aperçu du système +/title +para remap= + DHIS 2 est un système Web d#39;information de gestion globale en cours de développement très actif. Bien qu#39;il soit principalement destiné à la gestion de granulats, les données géoréférencées de santé, il devrait être possible d#39;utiliser le système à d#39;autres fins aussi. Actuellement, il existe un grand nombre de poches isolées de systèmes de documentation dans divers formats (MediaWiki, documents Word, Confluence). Il ya une nécessité de consolider le processus de documentation et de la mettre davantage en ligne avec la nature distribuée du développement de l#39;application elle-même. On a donc suggéré de déplacer la documentation actuelle sur la plateforme DocBook. Cet article ne va pas discuter des mérites relatifs de la plate-forme DocBook, mais servira plutôt comme un guide succinct à son utilisation par DHIS 2 exécutants, des utilisateurs et développeurs. Les lecteurs sont encouragés à prendre leur propre décision quant à savoir si d#39;utiliser DocBook ou non à des fins de documentation. +/para + /section + section id=docs_2 +title + Introduction +/title +para + Un des principaux avantages de DocBook est qu#39;il existe une séparation complète entre le contenu et la présentation. DocBook est un format pur XML, et est bien documenté. On croit que seul un très petit sous-ensemble de ses fonctionnalités seront nécessaires afin d#39;atteindre beaucoup plus de documentation de qualité pour DHIS. Il ya quelque 400 marque distincte en place les éléments qui répondent à presque n#39;importe quel niveau de besoins en documentation technique, mais en réalité, seulement quelques douzaines de ces éléments devront probablement être employées pour assurer une documentation de haute qualité pour DHIS 2, tant pour les imprimés ainsi que sur des formats en ligne, telles que HTML ou de systèmes d#39;aide intégré dans l#39;application elle-même. Par conséquent, il existe un large éventail de possibilités en termes de quel éditeur peut être utilisé pour la création de fichiers DocBook. Une liste assez complète des possibilités se situe + ulink url=http://wiki.docbook.org/topic/DocBookAuthoringTools; +ici + /ulink + . Il est actuellement recommandé d#39;utiliser + ulink url=http://www.syntext.com/products/serna-free/ +Syntext Serna gratuit + /ulink + pour les fichiers source DocBook montage comme WYSIWYG. Il
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1692: Description for formulaText - Excel Reporting.
revno: 1692 committer: Tran Chau tran.hispviet...@gmail.com branch nick: trunk timestamp: Thu 2010-03-25 15:15:35 +0700 message: Description for formulaText - Excel Reporting. added: dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression/ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression/action/ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression/action/GetFormulaTextAction.java modified: dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/GetReportExcelItemAction.java dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/reportItem.js dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseReportItem.vm dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/style.css -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription. === added directory 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression' === added directory 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression/action' === added file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression/action/GetFormulaTextAction.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression/action/GetFormulaTextAction.java 1970-01-01 00:00:00 + +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/expression/action/GetFormulaTextAction.java 2010-03-25 08:15:35 + @@ -0,0 +1,101 @@ +package org.hisp.dhis.reportexcel.expression.action; + +/* + * 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.expression.ExpressionService; +import org.hisp.dhis.i18n.I18n; + +import com.opensymphony.xwork2.ActionSupport; + +/** + * @author Lars Helge Overland + * @version $Id: GetFormulaTextAction.java 5334 2008-06-04 13:45:41Z larshelg $ + */ +public class GetFormulaTextAction +extends ActionSupport +{ +// - +// Dependencies +// - + +private ExpressionService expressionService; + +public void setExpressionService( ExpressionService expressionService ) +{ +this.expressionService = expressionService; +} + +private I18n i18n; + +public void setI18n( I18n i18n ) +{ +this.i18n = i18n; +} + +//
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1693: Added exclusions of xalan and xercesImpl for jasperreports and mapfish printlib. Will fallback an...
revno: 1693 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Thu 2010-03-25 09:25:46 +0100 message: Added exclusions of xalan and xercesImpl for jasperreports and mapfish printlib. Will fallback and use the ones provided by JRE. Caused conflicts when rendering jasper designs. modified: dhis-2/dhis-web/dhis-web-mapping/pom.xml dhis-2/pom.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription. === modified file 'dhis-2/dhis-web/dhis-web-mapping/pom.xml' --- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-24 10:56:30 + +++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 08:25:46 + @@ -65,6 +65,16 @@ groupIdorg.mapfish.print/groupId artifactIdprint-lib/artifactId version1.2-SNAPSHOT/version + exclusions +exclusion + groupIdxalan/groupId + artifactIdxalan/artifactId +/exclusion +exclusion + groupIdxerces/groupId + artifactIdxercesImpl/artifactId +/exclusion + /exclusions /dependency === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2010-03-22 09:59:24 + +++ dhis-2/pom.xml 2010-03-25 08:25:46 + @@ -505,17 +505,17 @@ groupIdjasperreports/groupId artifactIdjasperreports/artifactId version3.7.0/version - /dependency - dependency -groupIdxerces/groupId - artifactIdxercesImpl/artifactId - version2.7.1/version + exclusions + exclusion +groupIdxalan/groupId +artifactIdxalan/artifactId + /exclusion + exclusion +groupIdxerces/groupId +artifactIdxercesImpl/artifactId + /exclusion +/exclusions /dependency - dependency -groupIdxalan/groupId - artifactIdxalan/artifactId - version2.6.0/version - /dependency dependency groupIdjfree/groupId artifactIdjfreechart/artifactId ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 546710] [NEW] add translate and add to dashboard function for Chart object
This is not a bug. There are dedicated chart areas in dashboard. On Thu, Mar 25, 2010 at 9:14 AM, Kim Anh Vo cata...@gmail.com wrote: Public bug reported: currently, there none of the above functions for a chart object. It's good to have the charts on the dashboard. ** Affects: dhis2 Importance: Undecided Status: New -- add translate and add to dashboard function for Chart object https://bugs.launchpad.net/bugs/546710 You received this bug notification because you are a member of DHIS 2 coordinators, which is the registrant for DHIS. Status in DHIS 2 - District Health Information Software: New Bug description: currently, there none of the above functions for a chart object. It's good to have the charts on the dashboard. -- add translate and add to dashboard function for Chart object https://bugs.launchpad.net/bugs/546710 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: currently, there none of the above functions for a chart object. It's good to have the charts on the dashboard. ___ 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 163: Google translations for Hindi, Portuguese, Swahili and Simplified Chinese
revno: 163 committer: Knut Staring knu...@knutst-laptop branch nick: dhis2-docbook-docs timestamp: Thu 2010-03-25 09:32:51 +0100 message: Google translations for Hindi, Portuguese, Swahili and Simplified Chinese added: src/docbkx/hi/ src/docbkx/hi/dhis2_documentation_guide.xml src/docbkx/pt/ src/docbkx/pt/dhis2_documentation_guide.xml src/docbkx/sw/ src/docbkx/sw/dhis2_documentation_guide.xml src/docbkx/zh/ src/docbkx/zh/dhis2_documentation_guide.xml The size of the diff (1665 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] Multilingual documentation
Just sitting here talking to Knut, and it would seem that Google translation may be good enough for a first pass of the translation. Now, a few issues arise from this. Management of the pom to generate the documentation, may become a major problem. Currently, we need quite a bit of XML for each language. The more languages we add, the bigger problem this is going to be. Knut and I would like to suggest to the community to fork off each language into a seperate branch. This will allow better ownership by each individual language community and will simplify the process of actually getting the documentation. It really may not be necessary for everyone to have every language, but rather the languages that they are actually interested in. Comments? Regards, Jason -- -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+260968395190 ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 546710] [NEW] add translate and add to dashboard function for Chart object
got it, thanks! 2010/3/25 Lars Helge Øverland larshe...@gmail.com This is not a bug. There are dedicated chart areas in dashboard. On Thu, Mar 25, 2010 at 9:14 AM, Kim Anh Vo cata...@gmail.com wrote: Public bug reported: currently, there none of the above functions for a chart object. It's good to have the charts on the dashboard. ** Affects: dhis2 Importance: Undecided Status: New -- add translate and add to dashboard function for Chart object https://bugs.launchpad.net/bugs/546710 You received this bug notification because you are a member of DHIS 2 coordinators, which is the registrant for DHIS. Status in DHIS 2 - District Health Information Software: New Bug description: currently, there none of the above functions for a chart object. It's good to have the charts on the dashboard. -- add translate and add to dashboard function for Chart object https://bugs.launchpad.net/bugs/546710 You received this bug notification because you are a direct subscriber of the bug. Status in DHIS 2 - District Health Information Software: New Bug description: currently, there none of the above functions for a chart object. It's good to have the charts on the dashboard. To unsubscribe from this bug, go to: https://bugs.launchpad.net/dhis2/+bug/546710/+subscribe -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com -- add translate and add to dashboard function for Chart object https://bugs.launchpad.net/bugs/546710 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: currently, there none of the above functions for a chart object. It's good to have the charts on the dashboard. ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] How to customize the links of RSS Health in the Dashboard section?
Dear all, In the dashboard, the first board with the links of RSS Healh... where are the links from? which pages for example? If wanting to customize this to the local news for example, how to make it? -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com ___ 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 165: Final google translation in this batch: Arabic. Please check the quality
revno: 165 committer: Knut Staring knu...@knutst-laptop branch nick: dhis2-docbook-docs timestamp: Thu 2010-03-25 09:56:45 +0100 message: Final google translation in this batch: Arabic. Please check the quality added: src/docbkx/ar/ src/docbkx/ar/dhis2_documentation_guide.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. === added directory 'src/docbkx/ar' === added file 'src/docbkx/ar/dhis2_documentation_guide.xml' --- src/docbkx/ar/dhis2_documentation_guide.xml 1970-01-01 00:00:00 + +++ src/docbkx/ar/dhis2_documentation_guide.xml 2010-03-25 08:56:45 + @@ -0,0 +1,408 @@ +?xml version='1.0' encoding='UTF-8'? +!-- This document was created with Syntext Serna Free. -- +!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.4//EN http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [ +!ENTITY br ''] + + +chapter + chapterinfo +title + DHIS 2 اÙتÙØ«Ù٠اÙدÙÙÙ +/title +author + firstname +جاÙسÙÙ + /firstname + surname +بÙÙرÙÙغ + /surname + affiliation +orgname +/orgname + /affiliation +/author +pubdate + 14/09/09 +/pubdate +keywordset + keyword +DHIS2 + /keyword + keyword +Ùثائ٠+ /keyword + keyword +DocBook + /keyword +/keywordset +revhistory + revision +revnumber + 2 +/revnumber +date + 28/10/09 +/date +revdescription + para +Ùأضا٠بعض ٠زÙد ٠٠اÙ٠عÙÙ٠ات ØÙ٠اÙ٠ستÙدات ٠تعددة اÙÙغات ÙاÙÙ ØررÙÙ. + /para +/revdescription + /revision + revision +revnumber + 1 +/revnumber +date + 29/09/09 +/date +revdescription + para +Ùأضا٠٠زÙد ٠٠اÙ٠عÙÙ٠ات ØÙ٠بدء اÙع٠٠٠ع bzr ÙDocBook + /para +/revdescription + /revision +/revhistory + /chapterinfo + title +DHIS2 اÙتÙØ«Ù٠اÙدÙÙÙ + /title + section id=docs_1 +title + DHIS 2 Ùظا٠اÙتÙØ«ÙÙ Ùظرة عا٠ة +/title +para remap= + DHIS 2 ÙÙ Ùائ٠عÙ٠شبÙØ© اÙØ¥ÙترÙت اÙÙÙÙ Ùظا٠إدارة اÙ٠عÙÙ٠ات Ù٠إطار تÙÙ ÙØ© Ùشطة ÙÙغاÙØ©. ÙÙ ØÙ٠تÙد٠أساسا Ùإدارة اÙÙÙÙØ© Ø ÙاÙبÙاÙات اÙجغراÙÙØ© اÙ٠رجع اÙصØÙØ© Ø ÙÙÙبغ٠أ٠ÙÙÙ٠٠٠اÙÙ Ù Ù٠استخدا٠Ùذا اÙÙظا٠Ùأغراض أخر٠ÙØ°ÙÙ. ØاÙÙا Ø ÙÙا٠عدد ÙبÙر ٠٠جÙÙب Ù ÙÙصÙØ© ٠٠اÙÙثائ٠Ù٠أشÙا٠٠ختÙÙØ© (Ù Ø«Ù Ù ÙدÙاÙÙÙÙ Ø ÙÙÙ Ø© ÙØ«Ø§Ø¦Ù Ø Ø§ÙÙ ÙتÙÙ). ÙÙا٠Øاجة ÙتعزÙز ع٠ÙÙØ© اÙتÙØ«ÙÙ ÙجعÙÙا Ø£Ùثر Ø ØªÙ Ø´Ùا ٠ع طبÙعة Ùزعت ÙتطÙÙر اÙتطبÙÙ ÙÙسÙ. ÙÙد اÙØªØ±Ø ÙØ°ÙÙ ÙÙÙ٠اÙÙثائ٠اÙØاÙÙØ© Ø¥ÙÙ Ù Ùصة DocBook. Ùذ٠اÙÙ ÙاÙØ© ÙÙ Ù ÙاÙشة اÙ٠زاÙا اÙÙسبÙØ© ÙÙ Ùصة DocBook Ø ÙØ¥Ù٠ا سÙÙÙ٠ب٠ثابة دÙÙÙ Ù Ùجز Ùاستخدا٠٠٠٠Ùب٠DHIS 2 Ù ÙÙØ°ÙÙ ÙاÙ٠ستخد٠ÙÙ ÙاÙÙ Ø·ÙرÙÙ. اÙÙراء ٠دعÙÙ٠إÙÙ ÙتخذÙا ÙرارÙÙ ØÙ٠٠ا اذا Ùا٠استخدا٠DocBook Ø£Ù ÙÙس Ùأغراض اÙتÙØ«ÙÙ. +/para + /section + section id=docs_2 +title + Ù Ùد٠ة +/title +para + ÙاØدة ٠٠أÙ٠٠زاÙا DocBook Ù٠ا٠ÙÙÙÙ ÙÙا٠Ùص٠Ùا٠٠بÙ٠اÙ٠ض٠ÙÙ ÙاÙعرض. DocBook ÙÙ Ù Øض Ø´Ù٠أÙس Ø£Ù Ø£Ù Ø ÙÙ ÙØ«ÙØ© جÙدا. Ø£ÙÙ ÙعتÙد أ٠صغÙرة جدا ÙÙØ· ÙرعÙØ© Ù Ù Ù Ùزات٠ستÙÙÙ Ù Ø·ÙÙبة ٠٠أج٠تØÙÙ٠أعÙ٠بÙØ«Ùر ٠٠جÙدة Ùثائ٠ÙDHIS. ÙÙÙا٠ÙØÙ 400 عÙا٠ة Ù ÙÙصÙØ© ٠تابعة اÙعÙاصر اÙت٠تÙب٠اØتÙاجات ٠ا ÙÙرب ٠٠أ٠٠ستÙ٠٠٠اØتÙاجات اÙÙثائ٠اÙتÙÙÙØ© Ø ÙÙÙÙ ÙÙ ÙاÙع اÙأ٠ر Ø Ø³Ù٠بضع عشرات Ù Ù Ùذ٠اÙعÙاصر Ùرب٠ا ÙتعÙ٠استخدا٠Ùا ÙتØÙÙÙ ÙÙعÙØ© عاÙÙØ© ÙÙÙثائ٠DHIS 2 Ø Ø³Ùاء باÙÙسبة ÙÙطباعة ÙضÙا ع٠اÙأشÙا٠خط ٠ث٠أتش ت٠أ٠أ٠أ٠٠ساعدة Ø£Ùظ٠ة ٠تÙا٠ÙØ© ض٠٠اÙتطبÙÙ ÙÙسÙ. ÙÙØ°ÙÙ Ø ÙØ¥Ù ÙÙا٠طائÙØ© Ùاسعة ٠٠اÙاØت٠اÙات Ù Ù ØÙØ« اÙتØرÙر ÙاÙت٠ÙÙ ÙÙ
[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 164: Google translation for Spanish. Please check the quality
revno: 164 committer: Knut Staring knu...@knutst-laptop branch nick: dhis2-docbook-docs timestamp: Thu 2010-03-25 09:53:11 +0100 message: Google translation for Spanish. Please check the quality added: src/docbkx/es/ src/docbkx/es/dhis2_documentation_guide.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. === added directory 'src/docbkx/es' === added file 'src/docbkx/es/dhis2_documentation_guide.xml' --- src/docbkx/es/dhis2_documentation_guide.xml 1970-01-01 00:00:00 + +++ src/docbkx/es/dhis2_documentation_guide.xml 2010-03-25 08:53:11 + @@ -0,0 +1,409 @@ +?xml version='1.0' encoding='UTF-8'? +!-- This document was created with Syntext Serna Free. -- +!DOCTYPE chapter PUBLIC -//OASIS//DTD DocBook XML V4.4//EN http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [ +!ENTITY br ''] + + + +chapter + chapterinfo +title + DHIS 2 Documentación GuÃa +/title +author + firstname +Jason + /firstname + surname +Pickering + /surname + affiliation +orgname +/orgname + /affiliation +/author +pubdate + 14/09/09 +/pubdate +keywordset + keyword +DHIS2 + /keyword + keyword +documentación + /keyword + keyword +DocBook + /keyword +/keywordset +revhistory + revision +revnumber + 2 +/revnumber +date + 28/10/09 +/date +revdescription + para +Añadido un poco más de información sobre los documentos en varios idiomas y editores. + /para +/revdescription + /revision + revision +revnumber + 1 +/revnumber +date + 29/09/09 +/date +revdescription + para +Información más Añadido el empezar con bzr y DocBook + /para +/revdescription + /revision +/revhistory + /chapterinfo + title +DHIS2 Documentación GuÃa + /title + section id=docs_1 +title + DHIS 2 Documentación Descripción general del sistema +/title +para remap= + DHIS 2 es una red basada en el sistema global de información de gestión en fase de desarrollo muy activo. Aunque principalmente destinados a la gestión de los agregados, los datos georreferenciados de la salud, debe ser posible utilizar el sistema para otros fines. Actualmente, hay un gran número de bolsillos desconectada de la documentación en varios formatos (por ejemplo, MediaWiki, documentos de Word, Confluencia). Hay una necesidad de consolidar el proceso de documentación y que esté más en consonancia con la naturaleza distribuida de la evolución de la propia aplicación. Se ha sugerido, por tanto, mover la documentación actual para la plataforma de DocBook. Este artÃculo no vamos a discutir los méritos relativos de la plataforma de DocBook, sino más bien servirá como una guÃa breve para su utilización por DHIS 2 ejecutores, usuarios y desarrolladores. Los lectores son alentados a tomar su propia decisión sobre si utilizar DocBook o no con fines de documentación. +/para + /section + section id=docs_2 +title + Introducción +/title +para + Una de las principales ventajas de DocBook es que hay una separación completa entre el contenido y presentación. DocBook es un formato XML puro, y está bien documentado. Se cree que sólo un pequeño subconjunto de sus caracterÃsticas será necesario para lograr la documentación de calidad mucho más alta para DHIS. Hay alrededor de 400 marcas-up elementos que se adaptan a casi cualquier nivel de las necesidades de documentación técnica, pero en realidad, sólo una docena de estos elementos probablemente tendrá que ser empleados para conseguir documentación de alta calidad para DHIS 2, tanto para los impresos , asà como en los formatos en lÃnea, tales como HTML o sistemas de ayuda integrados en la propia aplicación. Rango Por lo tanto, hay variedad de posibilidades en términos de que el editor puede ser usado para la creación de ficheros DocBook. Una lista bastante completa de las posibilidades se encuentra + ulink url=http://wiki.docbook.org/topic/DocBookAuthoringTools; +aquà + /ulink + . En la actualidad se recomienda el uso de + ulink url=http://www.syntext.com/products/serna-free/ +Syntext Serna Libre + /ulink + para los archivos de código fuente DocBook como la edición WYSIWYG. No se recomienda utilizar el editor XML Editor XMLmind Personal Edition (también conocido como XXE
Re: [Dhis2-devs] Multilingual documentation
Just to add a bit: Because of the identified need to have separate image files for each language in the manuals, we have to make sure the checkout and build processes don't become unnecessarily burdensome. Most people would only be interested in one or two languages. However, we have to consider the integrated help function - I suppose we want to build DHIS2 with all help languages, which will be much smaller, since the images are not included. So what would be a good way to achieve both the goals above at the same time - ideally also without too complex pom.xml (Maven 1.x allowed for scripting such as foreach loops through Jelly, something similar may be possible with Antrun or Beanshell in Maven 2??). Knut On Thu, Mar 25, 2010 at 9:55 AM, Jason Pickering jason.p.picker...@gmail.com wrote: Just sitting here talking to Knut, and it would seem that Google translation may be good enough for a first pass of the translation. Now, a few issues arise from this. Management of the pom to generate the documentation, may become a major problem. Currently, we need quite a bit of XML for each language. The more languages we add, the bigger problem this is going to be. Knut and I would like to suggest to the community to fork off each language into a seperate branch. This will allow better ownership by each individual language community and will simplify the process of actually getting the documentation. It really may not be necessary for everyone to have every language, but rather the languages that they are actually interested in. Comments? Regards, Jason -- -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+260968395190 ___ 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] How to customize the links of RSS Health in the Dashboard section?
It needs to be included in the source code, can you send me the URL to the RSS provider you need? Lars On Thu, Mar 25, 2010 at 9:57 AM, Kim-Anh Vo cata...@gmail.com wrote: Dear all, In the dashboard, the first board with the links of RSS Healh... where are the links from? which pages for example? If wanting to customize this to the local news for example, how to make it? -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com ___ 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 1694: GIS - export map to excel function
revno: 1694 committer: Tran Thanh Tri Tran Thanh t...@compaq branch nick: trunk timestamp: Thu 2010-03-25 12:32:49 +0100 message: GIS - export map to excel function added: dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java modified: dhis-2/dhis-web/dhis-web-mapping/pom.xml dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGDocument.java dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml 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/pom.xml' --- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 08:25:46 + +++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 11:32:49 + @@ -77,6 +77,15 @@ /exclusions /dependency + !-- JSON -- + + dependency + groupIdnet.sf.json-lib/groupId + artifactIdjson-lib/artifactId + version2.2.3/version + classifierjdk15/classifier + /dependency + !-- Batik -- === added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 1970-01-01 00:00:00 + +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2010-03-25 11:32:49 + @@ -0,0 +1,359 @@ +package org.hisp.dhis.mapping.action; + +/* + * 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 java.io.File; + +import jxl.Workbook; +import jxl.format.Alignment; +import jxl.format.Border; +import jxl.format.BorderLineStyle; +import jxl.format.Colour; +import jxl.write.Label; +import jxl.write.Number; +import jxl.write.WritableCellFormat; +import jxl.write.WritableImage; +import jxl.write.WritableSheet; +import jxl.write.WritableWorkbook; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import net.sf.json.JSONSerializer; + +import org.hisp.dhis.external.location.LocationManager; +import org.hisp.dhis.i18n.I18n; +import org.hisp.dhis.i18n.I18nFormat; +import org.hisp.dhis.indicator.Indicator; +import org.hisp.dhis.indicator.IndicatorService; +import org.hisp.dhis.mapping.MappingService; +import org.hisp.dhis.mapping.export.SVGDocument; +import org.hisp.dhis.mapping.export.SVGUtils; +import org.hisp.dhis.organisationunit.OrganisationUnit; +import org.hisp.dhis.organisationunit.OrganisationUnitService; +import org.hisp.dhis.period.Period; +import org.hisp.dhis.period.PeriodService; +import org.hisp.dhis.system.util.StreamUtils; + +import com.opensymphony.xwork2.Action; + +/** + * @author Tran Thanh Tri + * @version $Id$ + */ + +public class ExportExcelAction +implements Action +{ +// - +// Map position in excel +// - + +int
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1696: (GIS) export map to excel with table of organisation and datavalue
revno: 1696 committer: Tran Thanh Tri Tran Thanh t...@compaq branch nick: trunk timestamp: Thu 2010-03-25 17:43:52 +0100 message: (GIS) export map to excel with table of organisation and datavalue added: dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLegendComparator.java modified: dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DownloadFileAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendsByMapLegendSetAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js The size of the diff (1688 lines) is larger than your specified limit of 1000 lines -- 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. ___ 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 1697: Improved deletionhandler for maplegendset
revno: 1697 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Thu 2010-03-25 18:25:47 +0100 message: Improved deletionhandler for maplegendset modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLegendComparator.java dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapLegendSetDeletionHandler.java dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java dhis-2/dhis-web/dhis-web-mapping/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-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLegendComparator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLegendComparator.java 2010-03-25 16:43:52 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLegendComparator.java 2010-03-25 17:25:47 + @@ -31,20 +31,16 @@ import org.hisp.dhis.mapping.MapLegend; - /** * @author Tran Thanh Tri * @version $Id$ */ - -public class MapLegendComparator - implements ComparatorMapLegend +public class MapLegendComparator +implements ComparatorMapLegend { - - @Override - public int compare( MapLegend o1, MapLegend o2 ) - { - return o1.getStartValue().compareTo( o2.getStartValue() ); - } - +@Override +public int compare( MapLegend o1, MapLegend o2 ) +{ +return o1.getStartValue().compareTo( o2.getStartValue() ); +} } === modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapLegendSetDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapLegendSetDeletionHandler.java 2009-04-23 17:16:55 + +++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapLegendSetDeletionHandler.java 2010-03-25 17:25:47 + @@ -59,6 +59,18 @@ } @Override +public void deleteMapLegend( MapLegend mapLegend ) +{ +for ( MapLegendSet legendSet : mappingService.getAllMapLegendSets() ) +{ +if ( legendSet.getMapLegends().remove( mapLegend ) ) +{ +mappingService.updateMapLegendSet( legendSet ); +} +} +} + +@Override public void deleteIndicator( Indicator indicator ) { for ( MapLegendSet legendSet : mappingService.getAllMapLegendSets() ) === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2010-02-22 09:19:15 + +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2010-03-25 17:25:47 + @@ -51,6 +51,7 @@ import org.hisp.dhis.indicator.IndicatorGroupSet; import org.hisp.dhis.indicator.IndicatorType; import org.hisp.dhis.mapping.Map; +import org.hisp.dhis.mapping.MapLegend; import org.hisp.dhis.mapping.MapLegendSet; import org.hisp.dhis.mapping.MapOrganisationUnitRelation; import org.hisp.dhis.mapping.MapView; @@ -445,6 +446,15 @@ return true; } +public void deleteMapLegend( MapLegend mapLegend ) +{ +} + +public boolean allowDeleteMapLegend( MapLegend mapLegend ) +{ +return true; +} + public void deleteMapLegendSet( MapLegendSet mapLegendSet ) { } === modified file 'dhis-2/dhis-web/dhis-web-mapping/pom.xml' --- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 11:32:49 + +++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 17:25:47 + @@ -75,6 +75,9 @@ artifactIdxercesImpl/artifactId /exclusion /exclusions + TREE +/dependency +=== /dependency !-- JSON -- @@ -86,6 +89,7 @@ classifierjdk15/classifier /dependency + MERGE-SOURCE !-- Batik -- @@ -169,8 +173,7 @@ artifactIdbatik-xml/artifactId version1.7/version /dependency - - + /dependencies repositories ___ 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 547086] [NEW] dhis14-import-datasets-20 characters
Public bug reported: DHIS 1.4 file imports will allow Dataset names with more than 20 characters while DHIS2 does not. The import works, but then when you edit a dataset, a validation message says that the dataset name can be no longer than 20 characters. You must then change the name of the dataset in order to save any changes ** Affects: dhis2 Importance: Undecided Status: New -- dhis14-import-datasets-20 characters https://bugs.launchpad.net/bugs/547086 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: DHIS 1.4 file imports will allow Dataset names with more than 20 characters while DHIS2 does not. The import works, but then when you edit a dataset, a validation message says that the dataset name can be no longer than 20 characters. You must then change the name of the dataset in order to save any changes ___ 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 484055] Re: very slow speed and lack of status updates of Assign dataset to organisation units for registering function
Bumping this bug. The entire browser freezes for a few seconds during any data element or organization unit listing. -- very slow speed and lack of status updates of Assign dataset to organisation units for registering function https://bugs.launchpad.net/bugs/484055 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: If we assign by Selecting all at level, or unselect all at level, it's no problem. But the problem appear when unselect some of organisation unit when already selected large number of org units. Each time click to Orgunit to unassign or assign, the system loading once. This slow down the process of select Orgunit. Beside that, the Save button also invisible, and I have to wait for a long time until the system finish loading. But when I check again, and see that there are just few selected org units assigned, and a many selected orgunits hasn't been assigned. chosing OUs for assigning/removing assignments can make confusions to users when the status just Loading, please wait... but actually just a few (surely with the first one) work out! So, why not adding the OU name to the status, for example: assigning OU1,please wait...!!! This refers to the reliability of the sys. ___ 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 1698: Minor fix
revno: 1698 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Thu 2010-03-25 18:42:43 +0100 message: Minor fix modified: dhis-2/dhis-web/dhis-web-mapping/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-mapping/pom.xml' --- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 17:25:47 + +++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 17:42:43 + @@ -75,9 +75,6 @@ artifactIdxercesImpl/artifactId /exclusion /exclusions - TREE -/dependency -=== /dependency !-- JSON -- @@ -89,8 +86,6 @@ classifierjdk15/classifier /dependency - MERGE-SOURCE - !-- Batik -- dependency ___ 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 1699: (GIS) Work in progress on adapting MapView to the new legend system.
revno: 1699 committer: Jan Henrik Overland janhenrik.overl...@gmail.com branch nick: trunk timestamp: Thu 2010-03-25 19:55:29 +0100 message: (GIS) Work in progress on adapting MapView to the new legend system. modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLegendComparator.java dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingStoreTest.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 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-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java 2010-03-25 15:27:40 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSet.java 2010-03-25 18:55:29 + @@ -37,6 +37,10 @@ */ public class MapLegendSet { +public static final String MAPLEGENDSET_TYPE_AUTOMATIC = automatic; + +public static final String MAPLEGENDSET_TYPE_PREDEFINED = predefined; + private int id; private String name; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java 2010-02-24 17:50:17 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java 2010-03-25 18:55:29 + @@ -60,6 +60,8 @@ private String mapSource; +private String mapLegendType; + private int method; private int classes; @@ -68,6 +70,8 @@ private String colorHigh; +private int mapLegendSetId; + private String longitude; private String latitude; @@ -79,8 +83,8 @@ } public MapView( String name, IndicatorGroup indicatorGroup, Indicator indicator, PeriodType periodType, -Period period, String mapSourceType, String mapSource, int method, int classes, String colorLow, -String colorHigh, String longitude, String latitude, int zoom ) +Period period, String mapSourceType, String mapSource, String mapLegendType, int method, int classes, +String colorLow, String colorHigh, int mapLegendSetId, String longitude, String latitude, int zoom ) { this.name = name; this.indicatorGroup = indicatorGroup; @@ -89,10 +93,12 @@ this.period = period; this.mapSourceType = mapSourceType; this.mapSource = mapSource; +this.mapLegendType = mapLegendType; this.method = method; this.classes = classes; this.colorLow = colorLow; this.colorHigh = colorHigh; +this.mapLegendSetId = mapLegendSetId; this.longitude = longitude; this.latitude = latitude; this.zoom = zoom; @@ -216,6 +222,16 @@ this.mapSource = mapSource; } +public String getMapLegendType() +{ +return mapLegendType; +} + +public void setMapLegendType( String mapLegendType ) +{ +this.mapLegendType = mapLegendType; +} + public int getMethod() { return method; @@ -256,6 +272,16 @@ this.colorHigh = colorHigh; } +public int getMapLegendSetId() +{ +return mapLegendSetId; +} + +public void setMapLegendSetId( int mapLegendSetId ) +{ +this.mapLegendSetId = mapLegendSetId; +} + public String getLongitude() { return longitude; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java 2010-03-25 15:27:40 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java 2010-03-25 18:55:29 + @@ -341,8 +341,8 @@ void updateMapLegendSet( MapLegendSet legendSet
Re: [Dhis2-devs] [Bug 547086] [NEW] dhis14-import-datasets-20 characters
On Thu, Mar 25, 2010 at 11:01 PM, jason.p.pickering jason.p.picker...@gmail.com wrote: Public bug reported: DHIS 1.4 file imports will allow Dataset names with more than 20 characters while DHIS2 does not. The import works, but then when you edit a dataset, a validation message says that the dataset name can be no longer than 20 characters. You must then change the name of the dataset in order to save any changes ** Affects: dhis2 Importance: Undecided Status: New -- dhis14-import-datasets-20 characters https://bugs.launchpad.net/bugs/547086 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: DHIS 1.4 file imports will allow Dataset names with more than 20 characters while DHIS2 does not. The import works, but then when you edit a dataset, a validation message says that the dataset name can be no longer than 20 characters. You must then change the name of the dataset in order to save any changes ___ Mailing list: https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs More help : https://help.launchpad.net/ListHelp I have just had a look. It seems you are talking about short name. Also looked at other objects . There are changes of the length of some fields in hibernate file. I will have to update those changes for client validation. Will update you when I'm done. Regards. -- Viet Nguyen ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 547086] [NEW] dhis14-import-datasets-20 characters
Yes, indeed, it was both the shortname and the code field. Thanks for looking at this, but hopefully, I will never have to do this painful process again! Regards, Jason On Thu, Mar 25, 2010 at 7:05 PM, Viet Nguyen phamquocv...@gmail.com wrote: On Thu, Mar 25, 2010 at 11:01 PM, jason.p.pickering jason.p.picker...@gmail.com wrote: Public bug reported: DHIS 1.4 file imports will allow Dataset names with more than 20 characters while DHIS2 does not. The import works, but then when you edit a dataset, a validation message says that the dataset name can be no longer than 20 characters. You must then change the name of the dataset in order to save any changes ** Affects: dhis2 Importance: Undecided Status: New -- dhis14-import-datasets-20 characters https://bugs.launchpad.net/bugs/547086 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: DHIS 1.4 file imports will allow Dataset names with more than 20 characters while DHIS2 does not. The import works, but then when you edit a dataset, a validation message says that the dataset name can be no longer than 20 characters. You must then change the name of the dataset in order to save any changes ___ Mailing list: https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs More help : https://help.launchpad.net/ListHelp I have just had a look. It seems you are talking about short name. Also looked at other objects . There are changes of the length of some fields in hibernate file. I will have to update those changes for client validation. Will update you when I'm done. Regards. -- Viet Nguyen ___ Mailing list: https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs More help : https://help.launchpad.net/ListHelp -- -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+260968395190 ___ 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 1700: (GIS) Work in progress on adapting MapView to the new legend system.
revno: 1700 committer: Jan Henrik Overland janhenrik.overl...@gmail.com branch nick: trunk timestamp: Thu 2010-03-25 20:27:31 +0100 message: (GIS) Work in progress on adapting MapView to the new legend system. modified: dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm 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/java/org/hisp/dhis/mapping/action/ExportExcelAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2010-03-25 16:43:52 + +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2010-03-25 19:27:31 + @@ -40,7 +40,6 @@ import jxl.write.WritableImage; import jxl.write.WritableSheet; import jxl.write.WritableWorkbook; - import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JSONSerializer; === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java 2010-03-25 15:27:40 + +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendsAction.java 2010-03-25 19:27:31 + @@ -32,9 +32,12 @@ import org.hisp.dhis.mapping.MapLegend; import org.hisp.dhis.mapping.MappingService; +import org.hisp.dhis.mapping.comparator.MapLegendComparator; import com.opensymphony.xwork2.Action; +import edu.emory.mathcs.backport.java.util.Collections; + /** * @author Jan Henrik Overland * @version $Id$ @@ -71,6 +74,8 @@ public String execute() { this.object = new ArrayListMapLegend( this.mappingService.getAllMapLegends() ); + +Collections.sort( this.object, new MapLegendComparator() ); return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm 2010-03-25 15:27:40 + +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm 2010-03-25 19:27:31 + @@ -6,7 +6,8 @@ name: $!encoder.jsEncode( ${mapLegend.name} ), startValue: $!{mapLegend.startValue}, endValue: $!{mapLegend.endValue}, -color: $!encoder.jsEncode( ${mapLegend.color} ) +color: $!encoder.jsEncode( ${mapLegend.color} ), +displayString: $!encoder.jsEncode( ${mapLegend.name} ), $!{mapLegend.startValue} - $!{mapLegend.endValue}, $!encoder.jsEncode( ${mapLegend.color} ) }#if( $velocityCount $size ),#end #end ] } \ No newline at end of file === 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-25 18:55:29 + +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-03-25 19:27:31 + @@ -1229,8 +1229,7 @@ url: path + 'getAllMapLegends' + type, root: 'mapLegends', id: 'id', -fields: ['id', 'name'], -sortInfo: { field: 'name', direction: 'ASC' }, +fields: ['id', 'name', 'startValue', 'endValue', 'color', 'displayString'], autoLoad: true }); @@ -1310,9 +1309,9 @@ id: 'predefinednewmaplegend_ms', isFormField: true, hideLabel: true, -dataFields: ['id', 'name', 'startValue', 'endValue', 'color'], +dataFields: ['id', 'name', 'startValue', 'endValue', 'color', 'displayString'], valueField: 'id', -displayField: 'name', +displayField: 'displayString', width: multiselect_width, height: getMultiSelectHeight(), store: predefinedMapLegendStore @@ -1466,7 +1465,7 @@ handler: function() { var mlsv = Ext.getCmp('predefinedmaplegendsetname_tf').getValue(); var mlms = Ext.getCmp('predefinednewmaplegend_ms').getValue(); - + if (!mlsv) { Ext.messageRed.msg('New legend set', 'Please select a legend set.'); return; ___ Mailing list: https://launchpad.net/~dhis2-devs Post
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1701: (GIS) - finished export map to image/excel
revno: 1701 committer: Tran Thanh Tri Tran Thanh t...@compaq branch nick: trunk timestamp: Thu 2010-03-25 23:59:41 +0100 message: (GIS) - finished export map to image/excel modified: dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGDocument.java 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/java/org/hisp/dhis/mapping/action/ExportExcelAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2010-03-25 19:27:31 + +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2010-03-25 22:59:41 + @@ -201,11 +201,11 @@ this.includeValues = includeValues; } -private boolean includeLegend; +private boolean includeLegends; -public void setIncludeLegend( boolean includeLegend ) +public void setIncludeLegends( boolean includeLegends ) { -this.includeLegend = includeLegend; +this.includeLegends = includeLegends; } // --- @@ -241,6 +241,11 @@ svgDocument.setPeriod( p ); svgDocument.setIndicator( i ); + +svgDocument.setLegends( this.legends ); + +svgDocument.setIncludeLegends( this.includeLegends ); + int random = (int) (Math.random() * 1000); @@ -295,26 +300,11 @@ sheet.addCell( new Label( titlePositionCol + 2, titlePositionRow + 1, i.getName(), header ) ); sheet.addCell( new Label( titlePositionCol, titlePositionRow + 2, i18n.getString( period ), header ) ); sheet.addCell( new Label( titlePositionCol + 2, titlePositionRow + 2, p.getName(), header ) ); - -if ( includeLegend ) -{ - -WritableCellFormat legendHeader = new WritableCellFormat(); -legendHeader.setBorder( Border.ALL, BorderLineStyle.THIN ); -legendHeader.setAlignment( Alignment.CENTRE ); -legendHeader.setBackground( Colour.ICE_BLUE ); - -sheet.mergeCells( legendPositionCol, legendPositionRow, legendPositionCol + 2, legendPositionRow ); -sheet.addCell( new Label( legendPositionCol, legendPositionRow, i18n.getString( legend ), legendHeader ) ); -sheet -.addCell( new Label( legendPositionCol, legendPositionRow + 1, i18n.getString( color ), legendHeader ) ); -sheet.addCell( new Label( legendPositionCol + 1, legendPositionRow + 1, i18n.getString( min ), -legendHeader ) ); -sheet.addCell( new Label( legendPositionCol + 2, legendPositionRow + 1, i18n.getString( max ), -legendHeader ) ); - -} - + + + +/* TODO write data values*/ + if ( includeValues ) { WritableCellFormat datavalueHeader = new WritableCellFormat(); === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2010-03-25 11:32:49 + +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2010-03-25 22:59:41 + @@ -1,4 +1,5 @@ package org.hisp.dhis.mapping.action; + /* * Copyright (c) 2004-2007, University of Oslo * All rights reserved. @@ -112,11 +113,18 @@ this.period = period; } -private String outputFile; - -public String getOutputFile() -{ -return outputFile; +private String legends; + +public void setLegends( String legends ) +{ +this.legends = legends; +} + +private boolean includeLegends; + +public void setIncludeLegends( boolean includeLegends ) +{ +this.includeLegends = includeLegends; } private Integer width; @@ -133,32 +141,43 @@ this.height = height; } +private String outputFile; + +public String getOutputFile() +{ +return outputFile; +} + @Override public String execute() throws Exception { Period p = periodService.getPeriod( period ); - + p.setName( format.formatPeriod( p ) ); - + Indicator i = indicatorService.getIndicator( indicator ); - + int random =
[Dhis2-devs] [Bug 548556] [NEW] Data entry status functionality of Excel Report Module
Public bug reported: Data entry status functionality of Excel Report Module does not count for calculated data elements and shows data for that period as incomplete. ** Affects: dhis2 Importance: Undecided Status: New -- Data entry status functionality of Excel Report Module https://bugs.launchpad.net/bugs/548556 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: Data entry status functionality of Excel Report Module does not count for calculated data elements and shows data for that period as incomplete. ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] How to customize the links of RSS Health in the Dashboard section?
*Here are the feeds of Health-Society news from some top websites:* YKHOANET: http://ykhoanet.vn/home/feed VNEXPRESS: http://vnexpress.net/rss/gl/xa-hoi.rss VIETNAMNET: http://vietnamnet.vn/xahoi/index.rss TUOITRE: http://tuoitre.vn/RssFeeds.aspx?ChannelID=12 DANTRI: http://dantri.com.vn/suckhoe.rss BAODATVIET: http://www.baodatviet.vn/Home/doisong.rss ... If possible, it's better to open this for user-customization not fixed in the source-code, like GoogleReader (user can add feeds) for example. Thanks! 2010/3/25 Lars Helge Øverland larshe...@gmail.com It needs to be included in the source code, can you send me the URL to the RSS provider you need? Lars On Thu, Mar 25, 2010 at 9:57 AM, Kim-Anh Vo cata...@gmail.com wrote: Dear all, In the dashboard, the first board with the links of RSS Healh... where are the links from? which pages for example? If wanting to customize this to the local news for example, how to make it? -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com ___ Mailing list: https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs More help : https://help.launchpad.net/ListHelp -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 546686] [NEW] Pie chart type is needed
I'll create a blueprint for this. Thanks! On Thu, Mar 25, 2010 at 2:23 PM, Jason Pickering jason.p.picker...@gmail.com wrote: Sounds more like a blueprint than a bug? On Thu, Mar 25, 2010 at 9:06 AM, Kim Anh Vo cata...@gmail.com wrote: Public bug reported: The current chart (under REPORTs) just includes: Line and Bar chart. There is a need of pie chart for analysing the propotional indicators, for example: malnutrition level 1,2,3; male/female, etc. ** Affects: dhis2 Importance: Undecided Status: New -- Pie chart type is needed https://bugs.launchpad.net/bugs/546686 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 current chart (under REPORTs) just includes: Line and Bar chart. There is a need of pie chart for analysing the propotional indicators, for example: malnutrition level 1,2,3; male/female, etc. ___ Mailing list: https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs More help : https://help.launchpad.net/ListHelp -- -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+260968395190 ___ Mailing list: https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devshttps://launchpad.net/%7Edhis2-devs More help : https://help.launchpad.net/ListHelp -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com ___ 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] Tally sheet generator: Factor and Calculate tally rows?
Dear all, Can anyone PLZ explain to me the usage of these two: Factor and Calculate tally rows? Because of the issues: 1. Factor=1.0 is a default... and tried to change with a different number (2.0 for example) but nothing happens/changes in the tally sheets 2. When clicking this button Calculate tally rows... all selected daels still checked status but the tally_rows (equivalent to the checked daels) zero. What is this button for? Guessing that maybe I'm a newbie with tallysheet or the like so... needing more info about this referring to DHIS2 Reports. Thanks! -- -- Best regards, Kim-Anh Vo +84.906612246 k...@ifi.uio.no Coordinator of HISP(hisp.info) in Vietnam Master of Information Systems at the University of Oslo join facebook at www.facebook.com join LinkedIn at www.linkedin.com ___ 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