[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1589: Added Sort-order for patient attribute in attribute group. Work in progress: Paging functionality...
revno: 1589 committer: Viet v...@viet-nguyen branch nick: trunk timestamp: Tue 2010-03-09 13:25:42 +0530 message: Added Sort-order for patient attribute in attribute group. Work in progress: Paging functionality in list patient. removed: dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientAttributePopulator.java added: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/paging/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/paging/PagingUtil.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/paging/RequestUtil.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/paging.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/paging.css modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeGroup.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientService.java dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierStore.java dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttributeGroup.hbm.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/AddPatientAttributeGroupAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/UpdatePatientAttributeGroupAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm The size of the diff (1027 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
Re: [Dhis2-devs] [Bug 531351] Re: chart creation without feedback
Any chance we can do a first step for 2.0.4? What is really needed here is a Please wait, chart is loading message. The fancy stuff can wait for the next release. We did a workshop in Sierra Leone and 30 people hit the create chart button at the same time and when nothing happens they hit it again and again. There is no message or reaction on the screen whatsoever right now, so a simple Please wait to keep the users away from the button would be very much welcomed. Ola Hodne Titlestad |Technical Officer| Health Metrics Network (HMN) | World Health Organization Avenue Appia 20 |1211 Geneva 27, Switzerland | Email: titlest...@who.int|Tel: +41 788216897 Website: www.healthmetricsnetwork.org Better Information. Better Decisions. Better Health. 2010/3/8 Lars Helge Øverland larshe...@gmail.com ** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) ** Changed in: dhis2 Milestone: None = 2.0.5 -- chart creation without feedback https://bugs.launchpad.net/bugs/531351 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: when clicking generate datasource and view chart, there is no feedback as to what is going on. No processing, please wait... -- 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: Confirmed 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
Re: [Dhis2-devs] [Bug 534567] [NEW] HTTP Error 500 Could not open Hibernate
Hello Ola, Thank you so much for helping to resolve this problem. I will follow up on the two links you provided and learn more about how to prevent the connection to MySQL database timing out on me. Many thanks. John. John Ojo MD, FMCPH Consultant Public Health Physician Monitoring Evaluation Specialist Abidjan-Lagos Corridor Organization 02 BP 2302 Cotonou - Benin Phone: +229 21 31 35 79/91 ~ Fax: +229 21 31 36 52 Mobile: +229 95 75 33 65 Email: j...@corridor-sida.org Site: http://www.corridor-sida.org From: Ola Hodne Titlestad olati...@gmail.com To: jn...@yahoo.com Sent: Mon, March 8, 2010 8:12:32 PM Subject: Re: [Bug 534567] [NEW] HTTP Error 500 Could not open Hibernate On 8 March 2010 19:45, john jn...@yahoo.com wrote: Public bug reported: Caused by: com.mysql.jdbc.exceptions.jdbc4.CommunicationsException: The last packet successfully received from the server was40510 seconds ago.The last packet sent successfully to the server was 40510 seconds ago, which is longer than the server configured value of 'wait_timeout'. You should consider either expiring and/or testing connection validity before use in your application, increasing the server configured values for client timeouts, or using the Connector/J connection property 'autoReconnect=true' to avoid this problem. Please what is the cause of this error and what must I do to rectify it? Thank you. John. The message above indicates that the connection to your mysql server timed out. The default value for time out is 8 hours. More here: http://dev.mysql.com/doc/refman/5.0/en/gone-away.html http://dev.mysql.com/doc/refman/5.0/en/server-system-variables.html#sysvar_wait_timeout Ola -- -- HTTP Error 500 Could not open Hibernate https://bugs.launchpad.net/bugs/534567 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: I currently have DHIS 2.0.3-SNAPSHOT installed on a system running Windows XP professional and hooked up to a MySQL database through a hibernate.properties file. The system works fine but I have observed that whenever the system has been idle for for some time (say after 4 to 6 hours) and I try to login into DHIS 2, I get the following error message: HTTP ERROR 500 Problem accessing /dhis-web-commons-security/login.action. Reason: Could not open Hibernate Session for transaction; nested exception is org.hibernate.TransactionException: JDBC begin failed: Caused by: org.springframework.transaction.CannotCreateTransactionException: Could not open Hibernate Session for transaction; nested exception is org.hibernate.TransactionException: JDBC begin failed: at org.springframework.orm.hibernate3.HibernateTransactionManager.doBegin(HibernateTransactionManager.java:599) at org.springframework.transaction.support.AbstractPlatformTransactionManager.getTransaction(AbstractPlatformTransactionManager.java:374) at org.springframework.transaction.interceptor.TransactionAspectSupport.createTransactionIfNecessary(TransactionAspectSupport.java:263) at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:101) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171) at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204) at $Proxy63.loadUserByUsername(Unknown Source) at org.acegisecurity.providers.dao.DaoAuthenticationProvider.retrieveUser(DaoAuthenticationProvider.java:86) at org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider.authenticate(AbstractUserDetailsAuthenticationProvider.java:115) at org.acegisecurity.providers.ProviderManager.doAuthentication(ProviderManager.java:188) at org.acegisecurity.AbstractAuthenticationManager.authenticate(AbstractAuthenticationManager.java:45) at org.acegisecurity.ui.webapp.AuthenticationProcessingFilter.attemptAuthentication(AuthenticationProcessingFilter.java:71) at org.acegisecurity.ui.AbstractProcessingFilter.doFilter(AbstractProcessingFilter.java:199) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.context.HttpSessionContextIntegrationFilter.doFilter(HttpSessionContextIntegrationFilter.java:193) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.util.FilterChainProxy.doFilter(FilterChainProxy.java:148) at org.acegisecurity.util.FilterToBeanProxy.doFilter(FilterToBeanProxy.java:98) at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1139) at org.springframework.orm.hibernate3.support.OpenSessionInViewFilter.doFilterInternal(OpenSessionInViewFilter.java:198) at
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1590: Fixed Bug 534825
revno: 1590
committer: hieu hieu.hispviet...@gmail.com
branch nick: trunk
timestamp: Tue 2010-03-09 15:30:08 +0700
message:
Fixed Bug 534825
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.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/i18n/i18n.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js 2009-11-08 20:18:11 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js 2010-03-09 08:30:08 +
@@ -1,3 +1,12 @@
+//--
+// Regular Expression using for checking shortname' value
+//--
+
+regexShortName = /^[\w][\w\d]+$/;
+
+//--
+
+
function updateTranslation()
{
var id = document.getElementById(id).value;
@@ -137,3 +146,36 @@
document.getElementById('message').style.display = 'block';
}
+
+function applyingPatternForShortName( shortNameValue )
+{
+ return shortNameValue.match( regexShortName );
+}
+
+function validateAddTranslation()
+{
+ var shortNameField = byId( 'shortName' );
+ var shortNameVal = shortNameField.value;
+
+ if ( shortNameVal.length 0 )
+ {
+ if ( applyingPatternForShortName( shortNameVal ) == null )
+ {
+ setMessage( shortname_invalidated );
+ shortNameField.select();
+ return false;
+ }
+ else if ( shortNameVal.length 25 )
+ {
+ setMessage( shortname_length );
+ shortNameField.select();
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ return true;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm 2010-03-08 14:50:40 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm 2010-03-09 08:30:08 +
@@ -1,6 +1,6 @@
-form id=translateForm action=translate.action method=post
+form id=translateForm action=translate.action method=post onsubmit=javascript: return validateAddTranslation();
-h3$i18n.getString( translation_translate ) #openHelp( translation )/h3
+h3$i18n.getString( translation_translate )/h3
div
input type=hidden id=id name=id value=$objectId
@@ -49,7 +49,7 @@
/tr
/table
/form
-h3$i18n.getString( translation_addlocale)/h3
+h3$i18n.getString( translation_addlocale) #openHelp( dhis-web-commons.locale )/h3
table
tr
th colspan=2Details/th
@@ -72,6 +72,7 @@
span id=message/span
script type=text/javascript
+
var propNames = new Array()
#set( $count = 0 )
#foreach ($propertyName in $propertyNames )
@@ -79,9 +80,12 @@
#set( $count = $count + 1 )
#end
-var locale_added = '$i18n.getString( translation_locale_added )'
-var language_must_be_two_chars = '$i18n.getString( translation_language_must_be_two_chars )'
-var country_must_be_two_chars = '$i18n.getString( translation_country_must_be_two_chars )'
+var locale_added = '$i18n.getString( translation_locale_added )';
+var language_must_be_two_chars = '$i18n.getString( translation_language_must_be_two_chars )';
+var country_must_be_two_chars = '$i18n.getString( translation_country_must_be_two_chars )';
var variant_must_be_specified = '$i18n.getString( translation_variant_must_be_specified )';
var locale_already_exists = '$i18n.getString( translation_locale_already_exists )';
+ var shortname_invalidated = '$encoder.jsEscape($i18n.getString( 'translation_shortname_wellformed' ) , ')';
+ var shortname_length = '$encoder.jsEscape($i18n.getString( 'translation_shortname_length' ) , ')';
+
/script
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-03-08 14:50:40 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-03-09 08:30:08 +
@@ -186,6 +186,8 @@
translation_country_must_be_two_chars = Country must be two characters
translation_variant_must_be_specified = Variant must be specified
[Dhis2-devs] [Bug 534825] Re: Translation doesn't catch the length of shortname
** Changed in: dhis2 Status: New = Fix Committed ** Changed in: dhis2 Assignee: (unassigned) = Hieu Duy Dang (hieu-hispvietnam) -- Translation doesn't catch the length of shortname https://bugs.launchpad.net/bugs/534825 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 translating items, users translate name and short names, but shortname textbox hasn't limitation. And after save the new shortname, the system generate error. ___ 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 1591: Improved docs in excel reporting module
revno: 1591 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Tue 2010-03-09 10:36:40 +0100 message: Improved docs in excel reporting module modified: dhis-2/dhis-options/src/main/resources/help_content.xml dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm The size of the diff (1230 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
Re: [Dhis2-devs] Pagination patch
Hi Viet, this looks quite elegant.. If the PagingUtil class is general, any chance we can move it to the dhis-support-system project so that it can be used by other modules if required later? Lars Yeah, I can move the PageUtil class to dhis-support-system, paging.vm and paging.css to common-resource. If I remember correctly...I think you also have a RequestUtil class somewhere Actually, to get current request path I just call the method request.getServletPath() , but I'm not sure it works for all modules... so I put it in a util class, then later I can modify that link ( maybe add or remove a / , or something like that ) -- 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] Pagination patch
2010/3/9 Viet Nguyen phamquocv...@gmail.com
Hi Viet, this looks quite elegant..
If the PagingUtil class is general, any chance we can move it to the
dhis-support-system project so that it can be used by other modules if
required later?
Lars
Yeah, I can move the PageUtil class to dhis-support-system, paging.vm and
paging.css to common-resource.
If I remember correctly...I think you also have a RequestUtil class
somewhere
Actually, to get current request path I just call the method
request.getServletPath() , but I'm not sure it works for all modules... so
I put it in a util class, then later I can modify that link ( maybe add or
remove a / , or something like that )
--
Viet Nguyen
Sorry, I forgot to mention the javascript methods.
function changePageSize( baseLink )
{
var pageSize = jQuery(#sizeOfPage).val();
window.location.href = baseLink +pageSize= + pageSize ;
}
function jumpToPage( baseLink )
{
var pageSize = jQuery(#sizeOfPage).val();
var currentPage = jQuery(#jumpToPage).val();
window.location.href = baseLink +pageSize= + pageSize +currentPage=
+currentPage;
}
So I guess, this will have to be moved to common-resources...
Should I create new file or put it in common.js ?
--
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] Pagination patch
2010/3/9 Viet Nguyen phamquocv...@gmail.com
2010/3/9 Viet Nguyen phamquocv...@gmail.com
Hi Viet, this looks quite elegant..
If the PagingUtil class is general, any chance we can move it to the
dhis-support-system project so that it can be used by other modules if
required later?
Lars
Yeah, I can move the PageUtil class to dhis-support-system, paging.vm and
paging.css to common-resource.
If I remember correctly...I think you also have a RequestUtil class
somewhere
Actually, to get current request path I just call the method
request.getServletPath() , but I'm not sure it works for all modules... so
I put it in a util class, then later I can modify that link ( maybe add or
remove a / , or something like that )
--
Viet Nguyen
Sorry, I forgot to mention the javascript methods.
function changePageSize( baseLink )
{
var pageSize = jQuery(#sizeOfPage).val();
window.location.href = baseLink +pageSize= + pageSize ;
}
function jumpToPage( baseLink )
{
var pageSize = jQuery(#sizeOfPage).val();
var currentPage = jQuery(#jumpToPage).val();
window.location.href = baseLink +pageSize= + pageSize
+currentPage= +currentPage;
}
So I guess, this will have to be moved to common-resources...
Should I create new file or put it in common.js ?
commons.js would be fine. Also moving the vm templates to commons-resources
is good.
___
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 534567] Re: HTTP Error 500 Could not open Hibernate
** Changed in: dhis2 Status: New = Invalid ** Changed in: dhis2 Status: Invalid = Won't Fix -- HTTP Error 500 Could not open Hibernate https://bugs.launchpad.net/bugs/534567 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: Won't Fix Bug description: I currently have DHIS 2.0.3-SNAPSHOT installed on a system running Windows XP professional and hooked up to a MySQL database through a hibernate.properties file. The system works fine but I have observed that whenever the system has been idle for for some time (say after 4 to 6 hours) and I try to login into DHIS 2, I get the following error message: HTTP ERROR 500 Problem accessing /dhis-web-commons-security/login.action. Reason: Could not open Hibernate Session for transaction; nested exception is org.hibernate.TransactionException: JDBC begin failed: Caused by: org.springframework.transaction.CannotCreateTransactionException: Could not open Hibernate Session for transaction; nested exception is org.hibernate.TransactionException: JDBC begin failed: at org.springframework.orm.hibernate3.HibernateTransactionManager.doBegin(HibernateTransactionManager.java:599) at org.springframework.transaction.support.AbstractPlatformTransactionManager.getTransaction(AbstractPlatformTransactionManager.java:374) at org.springframework.transaction.interceptor.TransactionAspectSupport.createTransactionIfNecessary(TransactionAspectSupport.java:263) at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:101) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171) at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204) at $Proxy63.loadUserByUsername(Unknown Source) at org.acegisecurity.providers.dao.DaoAuthenticationProvider.retrieveUser(DaoAuthenticationProvider.java:86) at org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider.authenticate(AbstractUserDetailsAuthenticationProvider.java:115) at org.acegisecurity.providers.ProviderManager.doAuthentication(ProviderManager.java:188) at org.acegisecurity.AbstractAuthenticationManager.authenticate(AbstractAuthenticationManager.java:45) at org.acegisecurity.ui.webapp.AuthenticationProcessingFilter.attemptAuthentication(AuthenticationProcessingFilter.java:71) at org.acegisecurity.ui.AbstractProcessingFilter.doFilter(AbstractProcessingFilter.java:199) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.context.HttpSessionContextIntegrationFilter.doFilter(HttpSessionContextIntegrationFilter.java:193) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.util.FilterChainProxy.doFilter(FilterChainProxy.java:148) at org.acegisecurity.util.FilterToBeanProxy.doFilter(FilterToBeanProxy.java:98) at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1139) at org.springframework.orm.hibernate3.support.OpenSessionInViewFilter.doFilterInternal(OpenSessionInViewFilter.java:198) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:76) at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1139) at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:378) at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:181) at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:417) at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) at org.mortbay.jetty.Server.handle(Server.java:324) at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:535) at org.mortbay.jetty.HttpConnection$RequestHandler.content(HttpConnection.java:880) at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:747) at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:218) at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409) at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:520) Caused by: org.hibernate.TransactionException: JDBC begin failed: at
[Dhis2-devs] [Bug 531351] Re: chart creation without feedback
** Changed in: dhis2 Milestone: 2.0.5 = 2.0.4 -- 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: Confirmed 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] [Bug 527647] Re: Cannot put the plus character in report item and excel item name
** Changed in: dhis2 Milestone: None = 2.0.4 -- Cannot put the plus character in report item and excel item name https://bugs.launchpad.net/bugs/527647 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 put the + character into the name of report item and excel item, the + become blank. ___ 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 517047] Re: DHIS 1.4 file imports ignores the OrgUnit code field
** Changed in: dhis2 Milestone: None = 2.0.4 -- DHIS 1.4 file imports ignores the OrgUnit code field https://bugs.launchpad.net/bugs/517047 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: In some installations, the OrgUnitCode field is used to store official in-country codes assigned to health facilities, and districts. In order to import data such as census data, the code is often consistent between government agencies, but the name of the organisation unit is not. Currently DHI2 does not import the OrgUnitCode field. I would suggest that this be imported into the code field during a file import. ___ 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 514293] Re: Datamart export fails silently when too many columns for crosstab
** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) ** Changed in: dhis2 Milestone: None = 2.0.5 -- Datamart export fails silently when too many columns for crosstab https://bugs.launchpad.net/bugs/514293 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: Datamart export: When doing datamart exports with lots of data elements I have noticed that despite the message in UI that says Export process finished, in the background the process stops with the WARN message Cannot crosstabulate since the number of data elements exceeded maximum columns: XXX. So while UI says everything is fine, nothing actually gets exported to datamart. We need feedback to the user and a message that says what the limit is. I also suggest we do not allow more than the limit number of data elements or indicators to be selected in the selection box, if that is possible. Right now I noticed the problem, but I still don't know what the limit is or have any idea of how many DE I have selected (I am not counting hundreds of data elements), so its really hard to do the export. ___ 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 513789] Re: Program Stages History/Plan in Patient Module show Complited about partially entered data.
** Changed in: dhis2 Milestone: None = 2.0.4 -- Program Stages History/Plan in Patient Module show Complited about partially entered data. https://bugs.launchpad.net/bugs/513789 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: In Name-Based Data Records-- Data Entry, here we are selectiong specific organisation unit, Specific Programe and specific programe stage than it display the data entry screen for that. Now for example if a program stage has 5 attributes and only one is filled till now than programe stage history plan will show it Complited with date inspite of 4 attributes entry is still left. I think it should show complited only when all the entry get finished. ___ 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 1592: Commented out lines that caused compilation errors
revno: 1592
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2010-03-09 11:01:45 +0100
message:
Commented out lines that caused compilation errors
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeGroup.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeGroup.java 2010-03-09 07:55:42 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeGroup.java 2010-03-09 10:01:45 +
@@ -29,7 +29,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
/**
* @author Chau Thu Tran
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java 2009-11-19 19:31:31 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java 2010-03-09 10:01:45 +
@@ -130,7 +130,7 @@
this.searchingAttributeId = searchingAttributeId;
}
-CollectionPatientAttribute patientAttributes;
+private CollectionPatientAttribute patientAttributes;
public CollectionPatientAttribute getPatientAttributes()
{
@@ -166,7 +166,8 @@
selectedStateManager.clearSearchingAttributeId();
selectedStateManager.clearSearchTest();
-patients = patientService.getPatientsByOrgUnit( organisationUnit );
+//TODO fix!
+//patients = patientService.getPatientsByOrgUnit( organisationUnit );
searchText = list_all_patients;
@@ -209,7 +210,8 @@
if ( listAll )
{
-patients = patientService.getPatientsByOrgUnit( organisationUnit );
+//TODO fix!
+//patients = patientService.getPatientsByOrgUnit( organisationUnit );
searchText = list_all_patients;
___
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 Mobile - UI Feedback
Hi Saptarshi, nice work... Any chance we can push this code to trunk? We already have a mobile subdir in there... 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 1593: Minor fix
revno: 1593 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Tue 2010-03-09 11:10:22 +0100 message: Minor fix 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/src/main/resources/i18n_global.properties -- 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-05 20:54:16 + +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2010-03-09 10:10:22 + @@ -2,7 +2,8 @@ dl dt$i18n.getString( current_user ):/dtdd$!currentUsername/dd - dt$i18n.getString( version ):/dtdd$!version - rev: $!revision/dd + dt$i18n.getString( version ):/dtdd$!version/dd + dt$i18n.getString( build_revision ):/dtdd$!revision/dd dt$i18n.getString( build_date ):/dtdd$format.formatDateTime( $!buildTime )/dd dt$i18n.getString( user_agent ):/dtdd$!userAgent/dd dt$i18n.getString( external_configuration_directory ):/dtdd$!externalDirectory/dd === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-03-09 08:30:08 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-03-09 10:10:22 + @@ -192,6 +192,7 @@ #-- About --# version = Version +build_revision = Build revision build_date = Build date user_agent = User agent external_configuration_directory = External configuration directory ___ 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
In order to facilitate testing we have set up the release candidate online at: test.dhis2.org ___ 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 514300] Re: Custom form editor doesn't display catoptioncombo names
** Changed in: dhis2 Status: New = Fix Committed -- Custom form editor doesn't display catoptioncombo names https://bugs.launchpad.net/bugs/514300 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: Custom data entry form editor, new/edit form: When looking at a form in the custom form editor it is very useful to be able to quickly see which data element and catoptioncombo that have been linked to a specific field. Currently the mouse over info shows the data element name plus the ID of the catoptioncombo, which is not very helpful. In stead we should be able to display the catoptioncombo name which is available from the categoryoptioncomboname class/table and displayed many other places in the application, e.g. for every field in data entry when using the same form. ___ 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 483057] Re: bulk creation of dummy indicators
Not a bug. ** Changed in: dhis2 Status: New = Invalid -- bulk creation of dummy indicators https://bugs.launchpad.net/bugs/483057 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 a lot of cases, there is a need to replicate data elements as indicators, i.e. create an indicator where the numerator is the data element and the denominator is one. We need a user interface to quickly select a number of data elements and create such dummy indicators for them. However, this does not necessarily need to be a separate screen, it would fit well into one of the existing ones, for example the data element listing, the data element group page, the data element group editor or even the data set screen. ___ 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 436687] Re: Text dataelements do not appear in report
** Changed in: dhis2 Milestone: None = 2.0.4 ** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) -- Text dataelements do not appear in report https://bugs.launchpad.net/bugs/436687 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 creating a dataelement report table it is possible to select text dataelements, but they are not included in the output. ___ 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 496936] Re: Tally row generator - more intelligent calculation of number of tick boxes
** Changed in: dhis2 Milestone: 2.0.4 = 2.0.5 -- Tally row generator - more intelligent calculation of number of tick boxes https://bugs.launchpad.net/bugs/496936 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: Tally row generator should have more intelligent calculation of number of tick boxes. Currently the value from the previous month is used which often is 0 and renders it unusable. We should look for more values and use the average. ___ 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 370791] Re: orgunitname uniqueness should only be among siblings
Not a bug. ** Changed in: dhis2 Status: New = Invalid -- orgunitname uniqueness should only be among siblings https://bugs.launchpad.net/bugs/370791 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: Currently, the name field in organisationunit have been set to be unique. This uniqueness constraint should only apply within the scope of the parent, i.e. it is the *combination* of the name and the parentid fields that should be unique. ___ 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 1596: Fixed bug #436687
revno: 1596 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Tue 2010-03-09 14:06:15 +0100 message: Fixed bug #436687 modified: dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableOptionsAction.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-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableOptionsAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableOptionsAction.java 2009-11-16 10:32:46 + +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableOptionsAction.java 2010-03-09 13:06:15 + @@ -61,6 +61,8 @@ import org.hisp.dhis.period.comparator.PeriodComparator; import org.hisp.dhis.reporttable.ReportTable; import org.hisp.dhis.reporttable.ReportTableService; +import org.hisp.dhis.system.filter.AggregatableDataElementFilter; +import org.hisp.dhis.system.util.FilterUtils; import com.opensymphony.xwork2.Action; @@ -339,6 +341,8 @@ Collections.sort( dataElements, new DataElementNameComparator() ); +FilterUtils.filter( dataElements, new AggregatableDataElementFilter() ); + displayPropertyHandler.handle( dataElements ); } else if ( mode != null mode.equals( ReportTable.MODE_DATAELEMENTS ) dimension ) ___ 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 375989] Re: Aggregate periods not available in datamart or report tables
** Changed in: dhis2 Assignee: Bob Jolliffe (bobjolliffe) = (unassigned) ** Changed in: dhis2 Milestone: 2.0.4 = 2.0.5 -- Aggregate periods not available in datamart or report tables https://bugs.launchpad.net/bugs/375989 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: The system does not pre-generate periods, but instead creates them when they are needed to store a new value, either via data entry or data import. In a system where data is entered or imported monthly only, which is quite common, there would e.g. be no quarterly periods available in the database. When you want to use or export aggregated values by quarter there is no way to select these quarterly periods in either datamart or report table GUI since they do not appear in the available period lists in the select boxes, simply because they do not exist. We need some kind of mechanism to allow output modules like datamart and report tables to create and use periods when generating aggregated data. Right now this inconsistency is blocking the users from analysing and presenting data on aggregated periods. ___ 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 436687] Re: Text dataelements do not appear in report
** Changed in: dhis2 Status: New = Fix Committed -- Text dataelements do not appear in report https://bugs.launchpad.net/bugs/436687 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 creating a dataelement report table it is possible to select text dataelements, but they are not included in the output. ___ 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 1594: Removed samples and documentation from FCK editor in dataset and patient module
revno: 1594 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Tue 2010-03-09 11:53:36 +0100 message: Removed samples and documentation from FCK editor in dataset and patient module removed: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_documentation.html dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/fckplugin.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/find.gif dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/find.html dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/lang/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/lang/en.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/lang/fr.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/lang/it.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/replace.gif dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/findreplace/replace.html dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/samples/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/_plugins/samples/fckplugin.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/fck.afpa dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/fck.afpa.code dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/sample01.afp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/sample02.afp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/sample03.afp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/sample04.afp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/afp/sampleposteddata.afp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/asp/ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/asp/sample01.asp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/asp/sample02.asp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/asp/sample03.asp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/asp/sample04.asp dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/FCK/_samples/asp/sampleposteddata.asp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1597: Fixed bug #517047
revno: 1597 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Tue 2010-03-09 14:10:43 +0100 message: Fixed bug #517047 modified: dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.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-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml 2009-11-03 13:58:21 + +++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml 2010-03-09 13:10:43 + @@ -18,6 +18,7 @@ result property=id column=OrgUnitID/ result property=name column=OrgUnitName/ result property=shortName column=OrgUnitShort/ +result property=code column=OrgUnitCode/ result property=openingDate column=ValidFrom typeHandler=dateTypeHandler/ result property=active column=Active typeHandler=booleanTypeHandler/ result property=comment column=Comment/ ___ 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 1598: updated startup.sh. Added out-of-date warning on readme
revno: 1598
committer: Bob Jolliffe b...@bobj-laptop
branch nick: trunk
timestamp: Tue 2010-03-09 14:43:41 +
message:
updated startup.sh. Added out-of-date warning on readme
modified:
dhis-live/readme.txt
dhis-live/util/script/startup.sh
--
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-live/readme.txt'
--- dhis-live/readme.txt 2010-01-08 22:42:23 +
+++ dhis-live/readme.txt 2010-03-09 14:43:41 +
@@ -1,3 +1,5 @@
+Warning: this readme has been superceded by work on the new automated installer
+
This is a first attempt at building a lite version of dhis. It
creates an executable jar which contains jetty server classes and a
simple tray icon controller.
=== modified file 'dhis-live/util/script/startup.sh'
--- dhis-live/util/script/startup.sh 2009-09-11 19:14:49 +
+++ dhis-live/util/script/startup.sh 2010-03-09 14:43:41 +
@@ -1,4 +1,28 @@
-#!/bin/sh
-
-echo Starting DHIS 2...
-java -jar dhis2-lite.jar
+#!/bin/bash
+
+# get ready to catch errors
+trap ctrl-c INT
+trap unexpected-exit ERR
+
+function ctrl-c () {
+echo
+echo
+echo Keyboard interrupt
+echo DHIS2 live exited
+echo
+exit
+}
+
+function unexpected-exit () {
+echo
+echo DHIS2 live exited with an error
+echo Make sure you have a java runtime in your path
+echo
+read -p Press any key to exit
+}
+
+echo Starting DHIS2 live ...
+# java -jar dhis2-live.jar
+$JAVA_HOME/bin/java -jar dhis2-live.jar
+echo DHIS2 live exited normally
+
___
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 513789] Re: Program Stages History/Plan in Patient Module show Complited about partially entered data.
** Changed in: dhis2 Assignee: (unassigned) = Viet Nguyen (phamquocviet) -- Program Stages History/Plan in Patient Module show Complited about partially entered data. https://bugs.launchpad.net/bugs/513789 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: In Name-Based Data Records-- Data Entry, here we are selectiong specific organisation unit, Specific Programe and specific programe stage than it display the data entry screen for that. Now for example if a program stage has 5 attributes and only one is filled till now than programe stage history plan will show it Complited with date inspite of 4 attributes entry is still left. I think it should show complited only when all the entry get finished. ___ 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 484070] Re: Source button - Designed new form in DataEntryForm
Can't reproduce this. ** Changed in: dhis2 Status: New = Won't Fix -- Source button - Designed new form in DataEntryForm https://bugs.launchpad.net/bugs/484070 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: Won't Fix Bug description: I created a new form of a new dataset. Everything's seemly working fine but if tried clicking on the Source button where at the top-left corner of the screen form. And clicked on this button once again. I saw that a new paragraph of HTML statement would be inserted into source form as below: pinput type=hidden id=gwProxy!--Session data--/inputinput type=hidden id=jsProxy onclick=jsCall(); //p div id=refHTMLnbsp;/div Please take a look at on the enclosed figure. ___ 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 527071] Re: Updating the Organisation Unit Level table throws an exception
** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) ** Changed in: dhis2 Milestone: None = 2.0.4 -- Updating the Organisation Unit Level table throws an exception https://bugs.launchpad.net/bugs/527071 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 trying to update the organisation unit level table, the following exception is thrown. [-] Exception (org.hibernate.exception.ConstraintViolationException): could not execute update query * org.hibernate.exception.SQLStateConverter.convert(SQLStateConverter.java:71) * org.hibernate.exception.JDBCExceptionHelper.convert(JDBCExceptionHelper.java:43) * org.hibernate.hql.ast.exec.BasicExecutor.execute(BasicExecutor.java:84) * org.hibernate.hql.ast.QueryTranslatorImpl.executeUpdate(QueryTranslatorImpl.java:396) * org.hibernate.engine.query.HQLQueryPlan.performExecuteUpdate(HQLQueryPlan.java:259) * org.hibernate.impl.SessionImpl.executeUpdate(SessionImpl.java:1141) * org.hibernate.impl.QueryImpl.executeUpdate(QueryImpl.java:94) * org.hisp.dhis.organisationunit.hibernate.HibernateOrganisationUnitStore.deleteOrganisationUnitLevels(HibernateOrganisationUnitStore.java:338) * org.hisp.dhis.organisationunit.DefaultOrganisationUnitService.deleteOrganisationUnitLevels(DefaultOrganisationUnitService.java:503) * 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:597) * org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:307) * org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:182) * org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:149) * org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:106) * org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171) * org.springframework.aop.framework.adapter.MethodBeforeAdviceInterceptor.invoke(MethodBeforeAdviceInterceptor.java:50) * org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171) * org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:89) * org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171) * org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204) * $Proxy9.deleteOrganisationUnitLevels(Unknown source) * org.hisp.dhis.oum.action.organisationunitlevel.SaveOrganisationUnitLevelsAction.execute(SaveOrganisationUnitLevelsAction.java:66) * 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:597) * com.opensymphony.xwork2.DefaultActionInvocation.invokeAction(DefaultActionInvocation.java:440) * com.opensymphony.xwork2.DefaultActionInvocation.invokeActionOnly(DefaultActionInvocation.java:279) * com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:242) * org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor.intercept(WebWorkPortalUserInterceptor.java:82) * com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236) * org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor.intercept(WebWorkPortalModuleInterceptor.java:85) * com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236) * org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor.intercept(WebWorkPortalMenuInterceptor.java:91) * com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236) * org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor.intercept(WebWorkPortalParamsInterceptor.java:117) * com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236) * org.hisp.dhis.interceptor.StyleInterceptor.intercept(StyleInterceptor.java:89) * com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:236) * org.hisp.dhis.interceptor.SystemSettingInterceptor.intercept(SystemSettingInterceptor.java:94) *
[Dhis2-devs] [Bug 510082] Re: Report tables: view/export before table is generated gives error
** Changed in: dhis2 Milestone: None = 2.0.4 ** Changed in: dhis2 Status: New = Fix Committed ** Changed in: dhis2 Status: Fix Committed = Confirmed ** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) -- 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: Confirmed 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] [Bug 480604] Re: Upgrade javascript form editor
** Changed in: dhis2 Status: New = Invalid -- Upgrade javascript form editor https://bugs.launchpad.net/bugs/480604 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: We have FCK editor edition 2.4.3, while the latest is 2.6.5. Also, there is a FCKeditor.Java for Java integration and a totally new version: CKEditor 3.0.1, both of which should be explored: http://ckeditor.com/download ___ 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 484075] Re: InsertDataElement button - Designed new form in DataEntryForm
This is caused by struts which sets the logging level too high, nothing to worry about. ** Changed in: dhis2 Status: New = Won't Fix -- InsertDataElement button - Designed new form in DataEntryForm https://bugs.launchpad.net/bugs/484075 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: Won't Fix Bug description: When clicking on InsertDataElement button, a new pop-up window will be opened (Data element selector). I realize that my tomcat console printing out of the message that you guys can get more reference in the attached figures. ___ 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 510039] Re: Data Element Group Editor: list of available DE includes already selected DE
** Changed in: dhis2 Assignee: (unassigned) = Tran Thanh Tri (tranthanhtri84) -- Data Element Group Editor: list of available DE includes already selected DE https://bugs.launchpad.net/bugs/510039 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: In the Data Element Group Editor the list of the right side showing available data elements includes also the data elements that are already selected members of the group. This can be very confusing when working on large groups and doesn't seem like intended behaviour. ___ 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 1601: (GIS) Auto-assign changed to Assign all.
revno: 1601
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: trunk
timestamp: Tue 2010-03-09 18:15:32 +0100
message:
(GIS) Auto-assign changed to Assign all.
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/Mapping.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-09 04:33:34 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-03-09 17:15:32 +
@@ -3065,7 +3065,6 @@
],
border: false,
map: MAP,
- layerTree: layerTree,
configUrl: printConfigUrl,
overrides: layerOverrides
}
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js 2010-03-04 14:55:20 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js 2010-03-09 17:15:32 +
@@ -256,7 +256,7 @@
{
xtype: 'button',
id: 'autoassign_be',
-text: 'Auto-assign',
+text: 'Assign all',
cls: 'aa_dark',
isVisible: false,
handler: function()
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Bug 475462] Re: GIS JS files not minified in production
** Changed in: dhis2 Status: In Progress = Fix Committed -- GIS JS files not minified in production https://bugs.launchpad.net/bugs/475462 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: GIS JS files should be minified in production in order to reduce the amount of data to be loaded in the client. ___ 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 497028] Re: User settings behaves weird
** Changed in: dhis2 Assignee: (unassigned) = Tran Thanh Tri (tranthanhtri84) -- User settings behaves weird https://bugs.launchpad.net/bugs/497028 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: In Dataset module for one dataset I gave hindi translation, I logged as one user ( trainer is userid ) and changed the Database Language to hindi. It is showing hindi for that dataset. After that I logged as another user (admin is userid) there also still it is showing hindi name for that dataset. When i went to user settings strangely it changed database language to hindi for admin user (which i didn't set). From Bharath. ___ 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 527647] Re: Cannot put the plus character in report item and excel item name
** Changed in: dhis2 Status: New = Fix Committed -- Cannot put the plus character in report item and excel item name https://bugs.launchpad.net/bugs/527647 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 put the + character into the name of report item and excel item, the + become blank. ___ 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 513150] Re: Can not generate calculated data element in Excel report
** Changed in: dhis2 Assignee: Tran Thanh Tri (tranthanhtri84) = Thu Tran (tran-hispvietnam) -- Can not generate calculated data element in Excel report https://bugs.launchpad.net/bugs/513150 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 generate report excel include data elements and calculated data elements. The calculated data elements just show blank although the sub data elements contain data values ___ 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 497028] Re: User settings behaves weird
** Changed in: dhis2 Status: Confirmed = In Progress -- User settings behaves weird https://bugs.launchpad.net/bugs/497028 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: In Dataset module for one dataset I gave hindi translation, I logged as one user ( trainer is userid ) and changed the Database Language to hindi. It is showing hindi for that dataset. After that I logged as another user (admin is userid) there also still it is showing hindi name for that dataset. When i went to user settings strangely it changed database language to hindi for admin user (which i didn't set). From Bharath. ___ 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 1604: Fixed bug 51004
revno: 1604
committer: hieu hieu.hispviet...@gmail.com
branch nick: trunk
timestamp: Wed 2010-03-10 13:35:04 +0700
message:
Fixed bug 51004
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2010-02-09 09:10:29 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2010-03-10 06:35:04 +
@@ -30,7 +30,7 @@
/tr
tr
tdlabel for=name$i18n.getString( name ) em title=$i18n.getString( required ) class=required*/em/label/td
- tdinput type=text id=name name=name style=width:20em maxlength=100 class={validate:{required:true,minlength:2,maxlength:160}}/td
+ tdinput type=text id=name name=name style=width:20em maxlength=100 class={validate:{required:true,minlength:2,maxlength:160}}//td
/tr
tr
td colspan=2 height=15px/td
@@ -42,28 +42,31 @@
th$i18n.getString( available_data_elements )/thtd/tdth$i18n.getString( group_members )/th
/tr
tr
- tdinput type=text id=availableDataElementsFilter onkeyup=filterAvailableDataElements() style=width:25em/td
+ tdinput type=text id=availableDataElementsFilter onkeyup=filterList( this.value, 'availableDataElements' ) style=width:25em//td
td style=text-align:centerlt; $i18n.getString( filters ) gt;/td
- tdinput type=text id=groupMembersFilter onkeyup=filterGroupMembers() style=width:25em/td
+ tdinput type=text id=groupMembersFilter onkeyup=filterList( this.value, 'groupMembers' ) style=width:25em//td
/tr
tr
td
- select id=availableDataElements size=2 multiple=multiple style=min-width:25em; height:25em ondblclick=addGroupMembers()
+ select id=availableDataElements size=2 multiple=multiple style=min-width:25em; height:25em ondblclick=moveSelectedById( 'availableDataElements', 'groupMembers' )
/select
/td
td style=text-align:center
- input type=button value=gt; title=$i18n.getString('move_selected') onclick=addGroupMembers()br
- input type=button value=lt; title=$i18n.getString('remove_selected') onclick=removeGroupMembers()
+ input type=button value=gt; title=$i18n.getString('move_selected') style=width:50px onclick=moveSelectedById( 'availableDataElements', 'groupMembers' )/br/
+ input type=button value=lt; title=$i18n.getString('remove_selected') style=width:50px onclick=moveSelectedById( 'groupMembers', 'availableDataElements' )/br/
+ input type=button value=gt;gt; title=$i18n.getString('move_all') style=width:50px onclick=moveAllById( 'availableDataElements', 'groupMembers' )/br/
+ input type=button value=lt;lt; title=$i18n.getString('remove_all') style=width:50px onclick=moveAllById( 'groupMembers', 'availableDataElements' )/
+
/td
td
- select id=groupMembers name=groupMembers size=2 multiple=multiple style=min-width:25em; height:25em ondblclick=removeGroupMembers() /
+ select id=groupMembers name=groupMembers size=2 multiple=multiple style=min-width:25em; height:25em ondblclick=moveSelectedById( 'groupMembers', 'availableDataElements' ) /
/td
/tr
/table
-pinput type=submit value=$i18n.getString( add ) style=width:10eminput type=button value=$i18n.getString( cancel ) onclick=window.location.href='dataElementGroup.action' style=width:10em/p
+pinput type=submit value=$i18n.getString(
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1605: Cannot generate calculated data element in Excel report.
revno: 1605
committer: Tran Chau tran.hispviet...@gmail.com
branch nick: trunk
timestamp: Wed 2010-03-10 14:12:56 +0700
message:
Cannot generate calculated data element in Excel report.
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java 2010-01-06 08:24:42 +
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java 2010-03-10 07:12:56 +
@@ -36,7 +36,10 @@
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -53,11 +56,14 @@
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.dataelement.CalculatedDataElement;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.datamart.DataMartStore;
+import org.hisp.dhis.datavalue.DataValue;
+import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
@@ -83,8 +89,8 @@
/**
* @author Dang Duy Hieu
* @author Tran Thanh Tri
- * @version $Id$
* @since 2009-09-18
+ * @version $Id: GenerateReportSupport.java 6216 2010-03-10 13:40:42Z Chau Thu Tran$
*/
public abstract class GenerateReportSupport
implements Action
@@ -142,6 +148,8 @@
protected OrganisationUnitSelectionManager organisationUnitSelectionManager;
+protected DataValueService dataValueService;
+
// ---
// Input Output
// ---
@@ -179,6 +187,11 @@
this.indicatorService = indicatorService;
}
+public void setDataValueService( DataValueService dataValueService )
+{
+this.dataValueService = dataValueService;
+}
+
public void setCurrentUserService( CurrentUserService currentUserService )
{
this.currentUserService = currentUserService;
@@ -276,6 +289,8 @@
protected Date endSixMonthly;
+private Period period;
+
// --
// Excel format
// --
@@ -380,6 +395,9 @@
protected void installPeriod( Period period )
{
+
+this.period = period;
+
Calendar calendar = Calendar.getInstance();
// Monthly period
@@ -447,7 +465,7 @@
this.initExcelFormat();
this.installDefaultExcelFormat();
-
+
this.initFormulaEvaluating();
ExcelUtils.writeValueByPOI( reportExcel.getOrganisationRow(), reportExcel.getOrganisationColumn(),
@@ -631,23 +649,78 @@
DataElementCategoryOptionCombo optionCombo = categoryService
.getDataElementCategoryOptionCombo( optionComboId );
-double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo,
-startDate, endDate, organisationUnit );
-
-if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
-{
-replaceString = NULL_REPLACEMENT;
-}
-else
-{
-replaceString = String.valueOf( aggregatedValue );
-}
-
-matcher.appendReplacement( buffer, replaceString );
+if ( !(dataElement instanceof CalculatedDataElement) )
+{
+
+double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo,
+startDate, endDate, organisationUnit );
+
+if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
+{
+replaceString = NULL_REPLACEMENT;
+}
+else
+
[Dhis2-devs] [Bug 513150] Re: Can not generate calculated data element in Excel report
** Changed in: dhis2 Status: New = Fix Committed -- Can not generate calculated data element in Excel report https://bugs.launchpad.net/bugs/513150 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 generate report excel include data elements and calculated data elements. The calculated data elements just show blank although the sub data elements contain data values ___ 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
