[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 11370: Cleanup code
revno: 11370 committer: Tran Chau branch nick: dhis2 timestamp: Tue 2013-07-09 13:58:27 +0700 message: Cleanup code modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2013-07-09 06:32:58 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2013-07-09 06:58:27 + @@ -28,7 +28,6 @@ package org.hisp.dhis.caseentry.action.patient; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.List; @@ -54,7 +53,6 @@ import org.hisp.dhis.patient.PatientService; import org.hisp.dhis.patient.util.PatientIdentifierGenerator; import org.hisp.dhis.patientattributevalue.PatientAttributeValue; -import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.user.UserService; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java 2013-07-09 06:32:58 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java 2013-07-09 06:58:27 + @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -122,10 +121,6 @@ private Integer healthWorker; -private Character dobType; - -private String registrationDate; - // - // Output // - @@ -204,7 +199,6 @@ patient.setHealthWorker( userService.getUser( healthWorker ) ); } -Date _birthDate = new Date(); if ( birthDate != null || age != null ) { verified = (verified == null) ? false : verified; @@ -226,7 +220,6 @@ patient.setBirthDateFromAge( age.intValue(), Patient.AGE_TYPE_YEAR ); } -_birthDate = patient.getBirthDate(); patient.setDobType( dobType ); } @@ -382,11 +375,6 @@ this.patientIdentifierTypeService = patientIdentifierTypeService; } -public void setDobType( Character dobType ) -{ -this.dobType = dobType; -} - public void setFormat( I18nFormat format ) { this.format = format; @@ -487,9 +475,4 @@ this.verified = verified; } -public void setRegistrationDate( String registrationDate ) -{ -this.registrationDate = registrationDate; -} - } ___ 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 11371: Minor change registration form management.
revno: 11371 committer: Tran Chau branch nick: dhis2 timestamp: Tue 2013-07-09 14:14:55 +0700 message: Minor change registration form management. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.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-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-07-09 03:26:26 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-07-09 07:14:55 + @@ -662,4 +662,6 @@ enter_age_in_years = Enter age in years... send_to = Send to table_layout = Layout -is_hidden = Is hidden \ No newline at end of file +is_hidden = Is hidden +default_form_name = Default form name +custom_form_name = Custom form name \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-07-04 06:08:28 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-07-09 07:14:55 + @@ -13,12 +13,14 @@ - + + -$i18n.getString( "name" ) $i18n.getString( "program" ) +$i18n.getString( "default_form_name" ) +$i18n.getString( "custom_form_name" ) $i18n.getString( "operations" ) @@ -27,9 +29,6 @@ #foreach( $registrationForm in $registrationForms ) - $encoder.htmlEncode( $registrationForm.name ) - - #if($registrationForm.program) $encoder.htmlEncode( $registrationForm.program.name ) #else @@ -37,6 +36,12 @@ #set($hasCommonForm = 'true') #end + + $!encoder.htmlEncode( $registrationForm.name ) + + + $!encoder.htmlEncode( $registrationForm.dataEntryForm.name ) + @@ -52,7 +57,8 @@ #foreach($program in $programs) $encoder.htmlEncode( $program.name ) - [$i18n.getString('none')] + [$i18n.getString('none')] + [$i18n.getString('none')] ___ 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] JDK 1.6
Hi Dan, Ops okay that was added by me recently. It is not required to use that syntax, will fix it soon. Lars On Jul 8, 2013 8:34 PM, "Dan Cocos" wrote: > Hi All, > > I discovered that the latest builds of DHIS2 don't work with JDK 1.6 > because of a call to Locale.Builder that wasn't added until 1.7 > http://docs.oracle.com/javase/7/docs/api/java/util/Locale.Builder.html > > Thanks, > Dan > > > Dan Cocos > *BAO Systems* > dco...@baosystems.com > T: +1 202-352-2671 | Skype: dancocos > > > > > ___ > 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 11372: Error when to eroll a person into single event with registration.
revno: 11372 committer: Tran Chau branch nick: dhis2 timestamp: Tue 2013-07-09 15:28:54 +0700 message: Error when to eroll a person into single event with registration. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2013-07-09 06:58:27 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2013-07-09 08:28:54 + @@ -223,15 +223,6 @@ _birthDate = patient.getBirthDate(); patient.setDobType( dobType ); } -//else -//{ -//Character dobType = Patient.DOB_TYPE_DECLARED; -//Calendar today = Calendar.getInstance(); -//PeriodType.clearTimeOfDay( today ); -//Date date = today.getTime(); -//patient.setBirthDate( date ); -//patient.setDobType( dobType ); -//} // - // Registration Date === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java 2013-07-02 12:24:02 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java 2013-07-09 08:28:54 + @@ -249,7 +249,10 @@ programStage.setIrregular( irregular ); programStage.setMinDaysFromStart( minDaysFromStart ); programStage.setDisplayGenerateEventBox( displayGenerateEventBox ); -programStage.setAutoGenerateEvent( autoGenerateEvent ); +if ( !programStage.getProgram().isSingleEvent() ) +{ +programStage.setAutoGenerateEvent( autoGenerateEvent ); +} programStage.setValidCompleteOnly( validCompleteOnly ); programStage.setCaptureCoordinates( captureCoordinates ); ___ 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 11373: changed to using 1.6 compatible Locale constructor
revno: 11373 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Tue 2013-07-09 15:57:48 +0700 message: changed to using 1.6 compatible Locale constructor modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.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/i18n/locale/LocaleManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java 2013-07-02 15:58:13 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java 2013-07-09 08:57:48 + @@ -37,8 +37,8 @@ public interface LocaleManager { final String ID = LocaleManager.class.getName(); - -final Locale DHIS_STANDARD_LOCALE = new Locale.Builder().setLanguage( "en" ).build(); + +final Locale DHIS_STANDARD_LOCALE = new Locale( "en" ); Locale getCurrentLocale(); === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java 2013-07-02 18:21:13 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java 2013-07-09 08:57:48 + @@ -27,14 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Locale; -import java.util.Locale.Builder; - +import com.opensymphony.xwork2.Action; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nManager; import org.springframework.beans.factory.annotation.Autowired; -import com.opensymphony.xwork2.Action; +import java.util.Locale; /** * @author Lars Helge Overland @@ -44,9 +42,9 @@ { @Autowired private I18nManager manager; - + private String language; - + public void setLanguage( String language ) { this.language = language; @@ -73,22 +71,26 @@ public String execute() throws Exception { -Builder builder = new Locale.Builder(); - +Locale locale; + if ( language != null ) { -builder.setLanguage( language ); +if ( country != null ) +{ +locale = new Locale( language, country ); +} +else +{ +locale = new Locale( language ); +} } - -if ( country != null ) +else { -builder.setRegion( country ); +locale = null; } - -Locale locale = builder.build(); - + i18nObject = manager.getI18n( this.getClass(), locale ); - + return SUCCESS; } } ___ 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] JDK 1.6
This should be fixed in rev 11373, please test it out -- Morten On Tue, Jul 9, 2013 at 3:23 PM, Lars Helge Øverland wrote: > Hi Dan, > > Ops okay that was added by me recently. It is not required to use that > syntax, will fix it soon. > > Lars > On Jul 8, 2013 8:34 PM, "Dan Cocos" wrote: > >> Hi All, >> >> I discovered that the latest builds of DHIS2 don't work with JDK 1.6 >> because of a call to Locale.Builder that wasn't added until 1.7 >> http://docs.oracle.com/javase/7/docs/api/java/util/Locale.Builder.html >> >> Thanks, >> Dan >> >> >> Dan Cocos >> *BAO Systems* >> dco...@baosystems.com >> T: +1 202-352-2671 | Skype: dancocos >> >> >> >> >> ___ >> 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 > > ___ 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 774: documented how to send to messages to one or more userGroups/organisationUnits with the web-api
revno: 774 committer: Morten Olav Hansen branch nick: dhis2-docbook-docs timestamp: Tue 2013-07-09 17:12:19 +0700 message: documented how to send to messages to one or more userGroups/organisationUnits with the web-api modified: src/docbkx/en/dhis2_user_man_web_api.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'src/docbkx/en/dhis2_user_man_web_api.xml' --- src/docbkx/en/dhis2_user_man_web_api.xml 2013-07-05 09:55:38 + +++ src/docbkx/en/dhis2_user_man_web_api.xml 2013-07-09 10:12:19 + @@ -762,7 +762,13 @@ Writing and reading messages DHIS 2 features a mechanism for sending messages for purposes such as user feedback, notifications and general information to users. Messages are delivered to the DHIS 2 message inbox but can also be sent to the user's email addresses and mobile phones as SMS. In this example we will see how we can utilize the Web API to send and read messages. We will pretend to be the DHIS Administrator user and send a message to the Mobile user. We will then pretend to be the mobile user and read our new message. -The resource we need to interact with when sending and reading messages is the messageConversations resource. We start by visiting the Web API entry point at http://apps.dhis2.org/demo/api"/> where we find and follow the link to the messageConversations resource at http://apps.dhis2.org/demo/api/messageConversations"/>. The description tells us that we can use a POST request to create a new message using the following XML format: +The resource we need to interact with when sending and reading messages is the messageConversations resource. We start by visiting the Web API + entry point at http://apps.dhis2.org/demo/api"/> where we find and follow the link + to the messageConversations resource at http://apps.dhis2.org/demo/api/messageConversations"/>. The description tells us that + we can use a POST request to create a new message using the following XML format for sending + to multiple users:; +For sending to all users contained in one or more user groups, we can use: +This is the subject This is the text @@ -772,6 +778,26 @@; + +For sending to all users connected to one or more organisation units, we can use: +This is the subject +This is the text ++ + + + + ; + Since we want to send a message to our friend the mobile user we need to look up her identifier. We do so by going to the Web API entry point and follow the link to the users resource at http://apps.dhis2.org/demo/api/users"/>. We continue by following link to the mobile user at http://apps.dhis2.org/demo/api/users/PhzytPW3g2J"/> where we learn that her identifier is PhzytPW3g2J. We are now ready to put our XML message together to form a message where we want to ask the mobile user whether she has reported data for January 2012:This is the subject +This is the text ++ + + + + ; Mortality data reporting ___ 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] [Dhis2-users] Translations to French and Spanish
Hello Marta I think you are right and I would not say the group is death. We'll start the translation some time this week, I already started with a few tests to get acquainted with the server. I will ask Xavier -the pro translator in our group- to get in touch with you. Best regards, JM El 29/06/2013, a las 06:38, Marta Vila escribió: > Hi all, > > I hadent internet acces for a week... so thats why the big silence in this > thread from the spanish translators (well... from me) > > About the translation, it was completed for 2.11, so anything new for 2.12 is > not translated yet, would be great to have it updated. > > About the spanish language group... It is true is not very active, but every > post has got an answer (untill now) ... I thing there isnt a lot of movement > because all memebers in that list are also here, and when we need a high > level of expertise we always end up in the english (experienced) list ... > I believe It may change as spanish speaking users get more and more > expertise... what do you think??? > > Thanks for your your interest in helping out Juan M! > > > > On 28 June 2013 15:22, Juan M Alcántara Acosta > wrote: > Hello Bob > Thank you for the link. I posted to the group a couple of days ago but I see > there's not much movement there, there are 15 messages sense Dec. 2012 > (including mine) > JM > > El 26/06/2013, a las 06:00, Bob Jolliffe escribió: > >> Hi Juan >> >> I think a lot of the Spanish activities around dhis2, including considerable >> translation work, have been co-ordinated through people who are members of a >> google group https://groups.google.com/forum/?hl=en#!forum/dhis2-usuarios so >> might also make sense to get in touch with them. >> >> Bob >> >> >> On 26 June 2013 11:31, Lars Helge Øverland wrote: >> Hi Juan, >> >> yes we have an active community of translators. I am aware that labels for >> some of the new features in 2.12 is not yet translated. Hopefully we will be >> able to fix that soon. >> >> From your name it seems you know a word or two of Spanish; if you feel like >> contributing to the docs, the process is well documented here: >> >> http://www.dhis2.org/doc/snapshot/en/implementer/dhis2_documentation_guide.pdf >> >> Otherwise, Jason Pickering is overseeing the documentation effort and he >> might be able to assist you if you get stuck. >> >> best regards, >> >> Lars >> >> >> >> >> >> >> On Tue, Jun 25, 2013 at 10:12 PM, Juan M Alcántara Acosta >> wrote: >> Hello everyone >> Is someone currently working on the translation of the interface to Spanish >> and French? >> Best regards, >> JM >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> More help : https://help.launchpad.net/ListHelp >> >> >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> More help : https://help.launchpad.net/ListHelp >> >> > > > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > 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
Re: [Dhis2-devs] [Dhis2-users] Translations to French and Spanish
Great, thanks!! On 9 July 2013 13:21, Juan M Alcántara Acosta wrote: > Hello Marta > I think you are right and I would not say the group is death. > We'll start the translation some time this week, I already started with a > few tests to get acquainted with the server. I will ask Xavier -the pro > translator in our group- to get in touch with you. > Best regards, > JM > > El 29/06/2013, a las 06:38, Marta Vila escribió: > > Hi all, > > I hadent internet acces for a week... so thats why the big silence in this > thread from the spanish translators (well... from me) > > About the translation, it was completed for 2.11, so anything new for 2.12 > is not translated yet, would be great to have it updated. > > About the spanish language group... It is true is not very active, but > every post has got an answer (untill now) ... I thing there isnt a lot of > movement because all memebers in that list are also here, and when we need > a high level of expertise we always end up in the english (experienced) > list ... > I believe It may change as spanish speaking users get more and more > expertise... what do you think??? > > Thanks for your your interest in helping out Juan M! > > > > On 28 June 2013 15:22, Juan M Alcántara Acosta > wrote: > >> Hello Bob >> Thank you for the link. I posted to the group a couple of days ago but I >> see there's not much movement there, there are 15 messages sense Dec. 2012 >> (including mine) >> JM >> >> El 26/06/2013, a las 06:00, Bob Jolliffe >> escribió: >> >> Hi Juan >> >> I think a lot of the Spanish activities around dhis2, >> including considerable translation work, have been co-ordinated through >> people who are members of a google group >> https://groups.google.com/forum/?hl=en#!forum/dhis2-usuarios so might >> also make sense to get in touch with them. >> >> Bob >> >> >> On 26 June 2013 11:31, Lars Helge Øverland wrote: >> >>> Hi Juan, >>> >>> yes we have an active community of translators. I am aware that labels >>> for some of the new features in 2.12 is not yet translated. Hopefully we >>> will be able to fix that soon. >>> >>> From your name it seems you know a word or two of Spanish; if you feel >>> like contributing to the docs, the process is well documented here: >>> >>> >>> http://www.dhis2.org/doc/snapshot/en/implementer/dhis2_documentation_guide.pdf >>> >>> Otherwise, Jason Pickering is overseeing the documentation effort and he >>> might be able to assist you if you get stuck. >>> >>> best regards, >>> >>> Lars >>> >>> >>> >>> >>> >>> >>> On Tue, Jun 25, 2013 at 10:12 PM, Juan M Alcántara Acosta < >>> jmalcant...@apunto.com.mx> wrote: >>> Hello everyone Is someone currently working on the translation of the interface to Spanish and French? Best regards, JM ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users More help : https://help.launchpad.net/ListHelp >>> >>> >>> ___ >>> Mailing list: https://launchpad.net/~dhis2-users >>> Post to : dhis2-us...@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~dhis2-users >>> More help : https://help.launchpad.net/ListHelp >>> >>> >> >> >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> 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
Re: [Dhis2-devs] [Dhis2-users] Translations to French and Spanish
Hi all, just to communicate that dhis-web-pivot is already translated. Please share/correct any mistake found. Regards, Marta On 9 July 2013 13:37, Marta Vila wrote: > Great, > > thanks!! > > > On 9 July 2013 13:21, Juan M Alcántara Acosta > wrote: > >> Hello Marta >> I think you are right and I would not say the group is death. >> We'll start the translation some time this week, I already started with a >> few tests to get acquainted with the server. I will ask Xavier -the pro >> translator in our group- to get in touch with you. >> Best regards, >> JM >> >> El 29/06/2013, a las 06:38, Marta Vila escribió: >> >> Hi all, >> >> I hadent internet acces for a week... so thats why the big silence in >> this thread from the spanish translators (well... from me) >> >> About the translation, it was completed for 2.11, so anything new for >> 2.12 is not translated yet, would be great to have it updated. >> >> About the spanish language group... It is true is not very active, but >> every post has got an answer (untill now) ... I thing there isnt a lot of >> movement because all memebers in that list are also here, and when we need >> a high level of expertise we always end up in the english (experienced) >> list ... >> I believe It may change as spanish speaking users get more and more >> expertise... what do you think??? >> >> Thanks for your your interest in helping out Juan M! >> >> >> >> On 28 June 2013 15:22, Juan M Alcántara Acosta > > wrote: >> >>> Hello Bob >>> Thank you for the link. I posted to the group a couple of days ago but I >>> see there's not much movement there, there are 15 messages sense Dec. 2012 >>> (including mine) >>> JM >>> >>> El 26/06/2013, a las 06:00, Bob Jolliffe >>> escribió: >>> >>> Hi Juan >>> >>> I think a lot of the Spanish activities around dhis2, >>> including considerable translation work, have been co-ordinated through >>> people who are members of a google group >>> https://groups.google.com/forum/?hl=en#!forum/dhis2-usuarios so might >>> also make sense to get in touch with them. >>> >>> Bob >>> >>> >>> On 26 June 2013 11:31, Lars Helge Øverland wrote: >>> Hi Juan, yes we have an active community of translators. I am aware that labels for some of the new features in 2.12 is not yet translated. Hopefully we will be able to fix that soon. From your name it seems you know a word or two of Spanish; if you feel like contributing to the docs, the process is well documented here: http://www.dhis2.org/doc/snapshot/en/implementer/dhis2_documentation_guide.pdf Otherwise, Jason Pickering is overseeing the documentation effort and he might be able to assist you if you get stuck. best regards, Lars On Tue, Jun 25, 2013 at 10:12 PM, Juan M Alcántara Acosta < jmalcant...@apunto.com.mx> wrote: > Hello everyone > Is someone currently working on the translation of the interface to > Spanish and French? > Best regards, > JM > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > More help : https://help.launchpad.net/ListHelp > ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users More help : https://help.launchpad.net/ListHelp >>> >>> >>> ___ >>> Mailing list: https://launchpad.net/~dhis2-users >>> Post to : dhis2-us...@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~dhis2-users >>> 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
Re: [Dhis2-devs] JDK 1.6
Thank you rev 11373 compiles and works great. I'm also not sure where the appropriate place to share this but I with the latest builds I've run into a problem with running out of perm gen space with the maven build. I've worked around it by adding the following to my environment variables. MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m" Thanks, Dan On Jul 9, 2013, at 4:59 AM, Morten Olav Hansen wrote: > This should be fixed in rev 11373, please test it out > > -- > Morten > > > On Tue, Jul 9, 2013 at 3:23 PM, Lars Helge Øverland > wrote: > Hi Dan, > > Ops okay that was added by me recently. It is not required to use that > syntax, will fix it soon. > > Lars > > On Jul 8, 2013 8:34 PM, "Dan Cocos" wrote: > Hi All, > > I discovered that the latest builds of DHIS2 don't work with JDK 1.6 because > of a call to Locale.Builder that wasn't added until 1.7 > http://docs.oracle.com/javase/7/docs/api/java/util/Locale.Builder.html > > Thanks, > Dan > > > Dan Cocos > BAO Systems > dco...@baosystems.com > T: +1 202-352-2671 | Skype: dancocos > > > > > ___ > 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 > > ___ 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] [Dhis2-users] Translations to French and Spanish
Hi Marta Should the translations be synced from the server? I need to redo the translation server completely so want to flush out all the ones which have not already been synced with the source code. Best regards, Jason --Sent from my mobile On Jul 9, 2013 3:08 PM, "Marta Vila" wrote: > Hi all, > > just to communicate that dhis-web-pivot is already translated. > > Please share/correct any mistake found. > > Regards, > Marta > > > On 9 July 2013 13:37, Marta Vila wrote: > >> Great, >> >> thanks!! >> >> >> On 9 July 2013 13:21, Juan M Alcántara Acosta >> wrote: >> >>> Hello Marta >>> I think you are right and I would not say the group is death. >>> We'll start the translation some time this week, I already started with >>> a few tests to get acquainted with the server. I will ask Xavier -the pro >>> translator in our group- to get in touch with you. >>> Best regards, >>> JM >>> >>> El 29/06/2013, a las 06:38, Marta Vila escribió: >>> >>> Hi all, >>> >>> I hadent internet acces for a week... so thats why the big silence in >>> this thread from the spanish translators (well... from me) >>> >>> About the translation, it was completed for 2.11, so anything new for >>> 2.12 is not translated yet, would be great to have it updated. >>> >>> About the spanish language group... It is true is not very active, but >>> every post has got an answer (untill now) ... I thing there isnt a lot of >>> movement because all memebers in that list are also here, and when we need >>> a high level of expertise we always end up in the english (experienced) >>> list ... >>> I believe It may change as spanish speaking users get more and more >>> expertise... what do you think??? >>> >>> Thanks for your your interest in helping out Juan M! >>> >>> >>> >>> On 28 June 2013 15:22, Juan M Alcántara Acosta < >>> jmalcant...@apunto.com.mx> wrote: >>> Hello Bob Thank you for the link. I posted to the group a couple of days ago but I see there's not much movement there, there are 15 messages sense Dec. 2012 (including mine) JM El 26/06/2013, a las 06:00, Bob Jolliffe escribió: Hi Juan I think a lot of the Spanish activities around dhis2, including considerable translation work, have been co-ordinated through people who are members of a google group https://groups.google.com/forum/?hl=en#!forum/dhis2-usuarios so might also make sense to get in touch with them. Bob On 26 June 2013 11:31, Lars Helge Øverland wrote: > Hi Juan, > > yes we have an active community of translators. I am aware that labels > for some of the new features in 2.12 is not yet translated. Hopefully we > will be able to fix that soon. > > From your name it seems you know a word or two of Spanish; if you feel > like contributing to the docs, the process is well documented here: > > > http://www.dhis2.org/doc/snapshot/en/implementer/dhis2_documentation_guide.pdf > > Otherwise, Jason Pickering is overseeing the documentation effort and > he might be able to assist you if you get stuck. > > best regards, > > Lars > > > > > > > On Tue, Jun 25, 2013 at 10:12 PM, Juan M Alcántara Acosta < > jmalcant...@apunto.com.mx> wrote: > >> Hello everyone >> Is someone currently working on the translation of the interface to >> Spanish and French? >> Best regards, >> JM >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> More help : https://help.launchpad.net/ListHelp >> > > > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > More help : https://help.launchpad.net/ListHelp > > ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users More help : https://help.launchpad.net/ListHelp >>> >>> >> > > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > 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
Re: [Dhis2-devs] [Dhis2-users] Translations to French and Spanish
Yes, it would be good to have them synced so we don´t loose them thanks! On 9 July 2013 17:11, Jason Pickering wrote: > Hi Marta > Should the translations be synced from the server? > > I need to redo the translation server completely so want to flush out all > the ones which have not already been synced with the source code. > > Best regards, > Jason > > --Sent from my mobile > On Jul 9, 2013 3:08 PM, "Marta Vila" wrote: > >> Hi all, >> >> just to communicate that dhis-web-pivot is already translated. >> >> Please share/correct any mistake found. >> >> Regards, >> Marta >> >> >> On 9 July 2013 13:37, Marta Vila wrote: >> >>> Great, >>> >>> thanks!! >>> >>> >>> On 9 July 2013 13:21, Juan M Alcántara Acosta >> > wrote: >>> Hello Marta I think you are right and I would not say the group is death. We'll start the translation some time this week, I already started with a few tests to get acquainted with the server. I will ask Xavier -the pro translator in our group- to get in touch with you. Best regards, JM El 29/06/2013, a las 06:38, Marta Vila escribió: Hi all, I hadent internet acces for a week... so thats why the big silence in this thread from the spanish translators (well... from me) About the translation, it was completed for 2.11, so anything new for 2.12 is not translated yet, would be great to have it updated. About the spanish language group... It is true is not very active, but every post has got an answer (untill now) ... I thing there isnt a lot of movement because all memebers in that list are also here, and when we need a high level of expertise we always end up in the english (experienced) list ... I believe It may change as spanish speaking users get more and more expertise... what do you think??? Thanks for your your interest in helping out Juan M! On 28 June 2013 15:22, Juan M Alcántara Acosta < jmalcant...@apunto.com.mx> wrote: > Hello Bob > Thank you for the link. I posted to the group a couple of days ago but > I see there's not much movement there, there are 15 messages sense Dec. > 2012 (including mine) > JM > > El 26/06/2013, a las 06:00, Bob Jolliffe > escribió: > > Hi Juan > > I think a lot of the Spanish activities around dhis2, > including considerable translation work, have been co-ordinated through > people who are members of a google group > https://groups.google.com/forum/?hl=en#!forum/dhis2-usuarios so might > also make sense to get in touch with them. > > Bob > > > On 26 June 2013 11:31, Lars Helge Øverland wrote: > >> Hi Juan, >> >> yes we have an active community of translators. I am aware that >> labels for some of the new features in 2.12 is not yet translated. >> Hopefully we will be able to fix that soon. >> >> From your name it seems you know a word or two of Spanish; if you >> feel like contributing to the docs, the process is well documented here: >> >> >> http://www.dhis2.org/doc/snapshot/en/implementer/dhis2_documentation_guide.pdf >> >> Otherwise, Jason Pickering is overseeing the documentation effort and >> he might be able to assist you if you get stuck. >> >> best regards, >> >> Lars >> >> >> >> >> >> >> On Tue, Jun 25, 2013 at 10:12 PM, Juan M Alcántara Acosta < >> jmalcant...@apunto.com.mx> wrote: >> >>> Hello everyone >>> Is someone currently working on the translation of the interface to >>> Spanish and French? >>> Best regards, >>> JM >>> ___ >>> Mailing list: https://launchpad.net/~dhis2-users >>> Post to : dhis2-us...@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~dhis2-users >>> More help : https://help.launchpad.net/ListHelp >>> >> >> >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> More help : https://help.launchpad.net/ListHelp >> >> > > > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > More help : https://help.launchpad.net/ListHelp > > >>> >> >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> More help : https://help.launchpad.net/ListHelp >> >> ___ Mailing list: https://launchpad.net/~dhis2
Re: [Dhis2-devs] JDK 1.6
That sounds about right. I have found in production systems that I can get away with max permsize of 256m, but 512m should cover you. On 9 July 2013 16:30, Dan Cocos wrote: > Thank you rev 11373 compiles and works great. > > I'm also not sure where the appropriate place to share this but I with the > latest builds I've run into a problem with running out of perm gen space > with the maven build. I've worked around it by adding the following to my > environment variables. > > MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m" > > Thanks, > Dan > > On Jul 9, 2013, at 4:59 AM, Morten Olav Hansen wrote: > > This should be fixed in rev 11373, please test it out > > -- > Morten > > > On Tue, Jul 9, 2013 at 3:23 PM, Lars Helge Øverland > wrote: > >> Hi Dan, >> >> Ops okay that was added by me recently. It is not required to use that >> syntax, will fix it soon. >> >> Lars >> On Jul 8, 2013 8:34 PM, "Dan Cocos" wrote: >> >>> Hi All, >>> >>> I discovered that the latest builds of DHIS2 don't work with JDK 1.6 >>> because of a call to Locale.Builder that wasn't added until 1.7 >>> http://docs.oracle.com/javase/7/docs/api/java/util/Locale.Builder.html >>> >>> Thanks, >>> Dan >>> >>> >>> Dan Cocos >>> *BAO Systems* >>> dco...@baosystems.com >>> T: +1 202-352-2671 | Skype: dancocos >>> >>> >>> >>> >>> ___ >>> 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 >> >> > > > ___ > 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
Re: [Dhis2-devs] [Dhis2-users] Translations to French and Spanish
Hi Juan I've been seeing the flurry of activity on "usuarios". I'm delighted to see there is still strong life and potential in the community and it is intervention from new blood like you which makes that happen. Bob On 9 July 2013 13:21, Juan M Alcántara Acosta wrote: > Hello Marta > I think you are right and I would not say the group is death. > We'll start the translation some time this week, I already started with a > few tests to get acquainted with the server. I will ask Xavier -the pro > translator in our group- to get in touch with you. > Best regards, > JM > > El 29/06/2013, a las 06:38, Marta Vila escribió: > > Hi all, > > I hadent internet acces for a week... so thats why the big silence in this > thread from the spanish translators (well... from me) > > About the translation, it was completed for 2.11, so anything new for 2.12 > is not translated yet, would be great to have it updated. > > About the spanish language group... It is true is not very active, but > every post has got an answer (untill now) ... I thing there isnt a lot of > movement because all memebers in that list are also here, and when we need > a high level of expertise we always end up in the english (experienced) > list ... > I believe It may change as spanish speaking users get more and more > expertise... what do you think??? > > Thanks for your your interest in helping out Juan M! > > > > On 28 June 2013 15:22, Juan M Alcántara Acosta > wrote: > >> Hello Bob >> Thank you for the link. I posted to the group a couple of days ago but I >> see there's not much movement there, there are 15 messages sense Dec. 2012 >> (including mine) >> JM >> >> El 26/06/2013, a las 06:00, Bob Jolliffe >> escribió: >> >> Hi Juan >> >> I think a lot of the Spanish activities around dhis2, >> including considerable translation work, have been co-ordinated through >> people who are members of a google group >> https://groups.google.com/forum/?hl=en#!forum/dhis2-usuarios so might >> also make sense to get in touch with them. >> >> Bob >> >> >> On 26 June 2013 11:31, Lars Helge Øverland wrote: >> >>> Hi Juan, >>> >>> yes we have an active community of translators. I am aware that labels >>> for some of the new features in 2.12 is not yet translated. Hopefully we >>> will be able to fix that soon. >>> >>> From your name it seems you know a word or two of Spanish; if you feel >>> like contributing to the docs, the process is well documented here: >>> >>> >>> http://www.dhis2.org/doc/snapshot/en/implementer/dhis2_documentation_guide.pdf >>> >>> Otherwise, Jason Pickering is overseeing the documentation effort and he >>> might be able to assist you if you get stuck. >>> >>> best regards, >>> >>> Lars >>> >>> >>> >>> >>> >>> >>> On Tue, Jun 25, 2013 at 10:12 PM, Juan M Alcántara Acosta < >>> jmalcant...@apunto.com.mx> wrote: >>> Hello everyone Is someone currently working on the translation of the interface to Spanish and French? Best regards, JM ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users More help : https://help.launchpad.net/ListHelp >>> >>> >>> ___ >>> Mailing list: https://launchpad.net/~dhis2-users >>> Post to : dhis2-us...@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~dhis2-users >>> More help : https://help.launchpad.net/ListHelp >>> >>> >> >> >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> 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 11374: Fix bug - Don't filter data elements in Add/Update program indicator form.
revno: 11374 committer: Tran Chau branch nick: dhis2 timestamp: Wed 2013-07-10 09:51:49 +0700 message: Fix bug - Don't filter data elements in Add/Update program indicator form. modified: 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/defaultPatientRegistationForm.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.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-patient/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2013-07-03 15:40:29 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2013-07-10 02:51:49 + @@ -1150,7 +1150,7 @@ class="org.hisp.dhis.patient.action.program.GetProgramAction"> /main.vm /dhis-web-maintenance-patient/addProgramIndicator.vm - javascript/programIndicator.js + javascript/commons.js,javascript/programIndicator.js F_ADD_PROGRAM_INDICATOR @@ -1165,7 +1165,7 @@ class="org.hisp.dhis.patient.action.programtindicator.GetProgramIndicatorAction"> /main.vm /dhis-web-maintenance-patient/updateProgramIndicator.vm - javascript/programIndicator.js + javascript/commons.js,javascript/programIndicator.js F_UPDATE_PROGRAM_INDICATOR === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm 2013-07-09 06:32:58 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm 2013-07-10 02:51:49 + @@ -5,7 +5,7 @@ }); byId('name').focus(); -}); +}); $i18n.getString( "create_default_registration_form" ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.vm 2013-04-17 08:20:39 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.vm 2013-07-10 02:51:49 + @@ -17,7 +17,7 @@ - + ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 11375: Improve aggregate query builder performance (WIP).
revno: 11375 committer: Tran Chau branch nick: dhis2 timestamp: Wed 2013-07-10 12:10:43 +0700 message: Improve aggregate query builder performance (WIP). modified: dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-07-05 07:05:20 + +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-07-10 05:10:43 + @@ -789,14 +789,14 @@ { String keyExist = (isExist == true) ? "EXISTS" : "NOT EXISTS"; -String sql = " " + keyExist + " ( SELECT * " +String sql = " " + keyExist + " ( SELECT _psi.programstageinstanceid " + "FROM patientdatavalue _pdv inner join programstageinstance _psi " + "ON _pdv.programstageinstanceid=_psi.programstageinstanceid JOIN programinstance _pi " + "ON _pi.programinstanceid=_psi.programinstanceid " + "WHERE psi.programstageinstanceid=_pdv.programstageinstanceid AND _pdv.dataelementid=" + dataElementId + " AND _psi.organisationunitid in (" + TextUtils.getCommaDelimitedString( orgunitIds ) + ") " -+ "AND _pi.programid = " + programId + " AND _psi.executionDate>='" + startDate -+ "' AND _psi.executionDate <= '" + endDate + "' "; ++ "AND _pi.programid = " + programId + " AND ( _psi.executionDate BETWEEN '" + startDate + "' AND '" ++ endDate + "') "; if ( !programStageId.equals( IN_CONDITION_GET_ALL ) ) { @@ -825,8 +825,8 @@ */ private String getConditionForPatientAttribute( int attributeId, Collection orgunitIds ) { -String sql = " EXISTS ( SELECT * " + "FROM patientattributevalue _pav " -+ "WHERE _pav.patientid = pi.patientid " + "and _pav.patientattributeid=" + attributeId +String sql = " EXISTS ( SELECT _pav.patientid FROM patientattributevalue _pav " ++ "WHERE _pav.patientid = pi.patientid AND _pav.patientattributeid=" + attributeId + " AND p.organisationunitid in (" + TextUtils.getCommaDelimitedString( orgunitIds ) + ") AND _pav.value "; return sql; @@ -840,8 +840,8 @@ private String getConditionForPatient( Collection orgunitIds, String operator, String startDate, String endDate ) { -String sql = " EXISTS ( SELECT * " + "FROM patient _p " + "WHERE _p.patientid = pi.patientid " -+ "AND _p.registrationdate>='" + startDate + "' AND _p.registrationdate<='" + endDate + "' " +String sql = " EXISTS ( SELECT _p.patientid FROM patient _p " + "WHERE _p.patientid = pi.patientid " ++ "AND ( _p.registrationdate BETWEEN '" + startDate + "' AND '" + endDate + "') " + "AND p.organisationunitid in (" + TextUtils.getCommaDelimitedString( orgunitIds ) + ") "; return sql; @@ -855,7 +855,7 @@ private String getConditionForPatientProperty( String propertyName, String operator, String startDate, String endDate ) { -String sql = " EXISTS (SELECT * FROM patient _p WHERE _p.patientid = pi.patientid AND "; +String sql = " EXISTS (SELECT _p.patientid FROM patient _p WHERE _p.patientid = pi.patientid AND "; if ( propertyName.equals( PROPERTY_AGE ) ) { @@ -877,9 +877,9 @@ private String getConditionForPatientProgramStageProperty( String propertyName, String operator, String startDate, String endDate ) { -String sql = " EXISTS ( SELECT * from programstageinstance _psi " -+ "WHERE _psi.programstageinstanceid=psi.programstageinstanceid AND _psi.executionDate>='" + startDate -+ "' and _psi.executionDate<='" + endDate + "' and " + propertyName; +String sql = " EXISTS ( SELECT _psi.programstageinstanceid from programstageinstance _psi " ++ "WHERE _psi.programstageinstanceid=psi.programstageinstanceid AND ( _psi.executionDate BETWEEN '" ++ startDate + "' AND '" + endDate + "') AND " + propertyName; return sql; } @@ -892,15 +892,8 @@ */ private String getConditionForProgramProperty( String operator, String startDate, String endDate, String property ) { -String sql = " EXISTS ( SELECT * FROM programinstance as _pi WHERE psi.programinstanceid=_pi.programsinstanceid A