[Dhis2-devs] Error: Editing Aggregate Query
Hi devs, After creating a number of aggregate queries, I get an error in my log when I try to edit. Error details below: * ERROR 2014-11-25 09:29:23,015 #parse(): syntax error in #parse()-ed template '/dhis-web-maintenance-program/updateCaseAggregation.vm', called at /ma in.vm[line 153, column 9] (Log4JLogChute.java [http-apr-8080-exec-2]) * ERROR 2014-11-25 09:29:23,015 Unable to render Velocity Template, '/main.vm' (CommonsLogger.java [http-apr-8080-exec-2]) org.apache.velocity.exception.ParseErrorException: Encountered )\/td\r\n /tr\r\n\r\ntr\r\n\t\ttdlabel for=\dataSets\ at /dh is-web-maintenance-program/updateCaseAggregation.vm[line 27, column 101] Was expecting one of: [ ... , ... ) ... WHITESPACE ... Any ideas what might be causing this? Thanks. Busoye Version: 2.17 Build revision: 17561 ___ 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] Option to Delete Program Instance from Tracker Capture App
Hi devs, I can’t see any option to delete a program instance from the Tracker Capture app. In Individual records, you had this option after listing the program instance. However, with the Tracker Capture app I can’t see the equivalent. As a temporary measure, I have been finding the instance in Individual records to delete. Any pointers? Thanks. Busoye ___ 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] Option to Delete Program Instance from Tracker Capture App
Hi Busoye, Yes, that feature is missing. Currently it is only the event (program stage instance) part that allows for full operation - create, edit, delete, skip, complete. Both program instance and tracked entity instance are missing the delete part. It is something to do with the web-api, we will get it fixed sometime soon. --- Thank you, Abyot. On Tue, Nov 25, 2014 at 9:47 AM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, I can’t see any option to delete a program instance from the Tracker Capture app. In Individual records, you had this option after listing the program instance. However, with the Tracker Capture app I can’t see the equivalent. As a temporary measure, I have been finding the instance in Individual records to delete. Any pointers? Thanks. Busoye ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] New event form edit
Dear Admin, I am a new devoloper in DHIS. I need to make changes on an existing new event form I need to allow future dates and years also to be able to edit some fields names . Please help me out and guide me through. Thanks ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] New event form edit
Hi, To enable capturing of future dates, go to your Program -- View program stages -- Edit then check Date in future for those data elements you wanted to capture future date. I am not sure what you mean by to be able to edit some fields names ? If you are in default form, field name is data element Form name (if you have set this one) or Name and it is always possible to edit this. If you are in custom form, you can put whatever name you want in your form - both data element Form name and Name have no effect. --- Thank you, Abyot. On Tue, Nov 25, 2014 at 10:43 AM, Anne Grace missannegr...@gmail.com wrote: Dear Admin, I am a new devoloper in DHIS. I need to make changes on an existing new event form I need to allow future dates and years also to be able to edit some fields names . Please help me out and guide me through. Thanks ___ 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 17580: Code style
revno: 17580
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-11-25 12:51:12 +0100
message:
Code style
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.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-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2014-11-13 20:35:17 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2014-11-25 11:51:12 +
@@ -294,7 +294,9 @@
int orgUnitLevelAbove = 0;
-for ( DataApprovalLevel dal : dataApprovalLevelService.getAllDataApprovalLevels() )
+ListDataApprovalLevel approvalLevels = dataApprovalLevelService.getAllDataApprovalLevels();
+
+for ( DataApprovalLevel dal : approvalLevels )
{
if ( dal.getOrgUnitLevel() orgUnitLevel )
{
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-11-05 23:33:26 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-11-25 11:51:12 +
@@ -282,14 +282,14 @@
User currentUser = currentUserService.getCurrentUser();
User user = userUid != null ? userService.getUser( userUid ) : currentUser;
-if( user == null )
+if ( user == null )
{
response.setStatus( HttpServletResponse.SC_NOT_FOUND );
responseNode.addChild( new SimpleNode( message, No user with uid: + userUid ) );
return responseNode;
}
-if( !canModifyUserConversation( currentUser, user ) )
+if ( !canModifyUserConversation( currentUser, user ) )
{
throw new UpdateAccessDeniedException( Not authorized to modify this object. );
}
@@ -306,9 +306,9 @@
CollectionNode marked = responseNode.addChild( new CollectionNode( markedRead ) );
marked.setWrapping( false );
-for( org.hisp.dhis.message.MessageConversation conversation : messageConversations )
+for ( org.hisp.dhis.message.MessageConversation conversation : messageConversations )
{
-if( conversation.markRead( user ) )
+if ( conversation.markRead( user ) )
{
messageService.updateMessageConversation( conversation );
marked.addChild( new SimpleNode( uid, conversation.getUid() ) );
@@ -333,14 +333,14 @@
User currentUser = currentUserService.getCurrentUser();
User user = userUid != null ? userService.getUser( userUid ) : currentUser;
-if( user == null )
+if ( user == null )
{
response.setStatus( HttpServletResponse.SC_NOT_FOUND );
responseNode.addChild( new SimpleNode( message, No user with uid: + userUid ) );
return responseNode;
}
-if( !canModifyUserConversation( currentUser, user ) )
+if ( !canModifyUserConversation( currentUser, user ) )
{
throw new UpdateAccessDeniedException( Not authorized to modify this object. );
}
@@ -357,9 +357,9 @@
CollectionNode marked = responseNode.addChild( new CollectionNode( markedUnread ) );
marked.setWrapping( false );
-for( org.hisp.dhis.message.MessageConversation conversation : messageConversations )
+for ( org.hisp.dhis.message.MessageConversation conversation : messageConversations )
{
-if( conversation.markUnread( user ) )
+if ( conversation.markUnread( user ) )
{
messageService.updateMessageConversation( conversation );
marked.addChild( new SimpleNode( uid, conversation.getUid() ) );
@@ -403,7 +403,7 @@
User user = userService.getUser( userUid );
-if( user == null )
+if ( user == null )
{
responseNode.addChild( new SimpleNode( message, No user with uid: + userUid ) );
response.setStatus( HttpServletResponse.SC_NOT_FOUND );
@@ -418,7 +418,7 @@
org.hisp.dhis.message.MessageConversation
[Dhis2-devs] DHIS2 Developer Email List
Hi, Please add me to this mailing list. Thank you. Kind Regards, Arthur Gwatidzo Description: cid:image001.png@01CCADE7.1D5397D0 Software Developer Health Information Systems Program --- Email:mailto:arthu...@hisp.org arthu...@hisp.org Cell: +27(0)768983930 or +27(0)0730966325 Skype: Arthur.Gwatidzo Web: http://www.hisp.org/ http://www.hisp.org 66 Rigel Avenue North, Waterkloof Ridge Pretoria, 0181 South Africa E -25.7847787 S 28.2347984 This message may contain privileged and confidential information intended only for the person or entity to which it is addressed. Any review, retransmission, dissemination, copy or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient, is prohibited. If you received this message in error, please notify the sender immediately by e-mail, facsimile or telephone and thereafter delete the material from any computer. Any views expressed in this message are those of the individual sender, except where the sender specifically states them to be the view of the entity transmitting the message. ___ 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 Developer Email List
Hi Arthur, you need to do it yourself, instructions here: https://www.dhis2.org/contact best regards, Lars On Tue, Nov 25, 2014 at 12:03 PM, Arthur Gwatidzo arthu...@hisp.org wrote: Hi, Please add me to this mailing list. Thank you. Kind Regards, Arthur Gwatidzo [image: Description: cid:image001.png@01CCADE7.1D5397D0] Software Developer *Health Information Systems Program* --- Email: arthu...@hisp.org Cell: +27(0)768983930 or +27(0)0730966325 Skype: Arthur.Gwatidzo Web*: * http://www.hisp.org 66 Rigel Avenue North, Waterkloof Ridge Pretoria, 0181 South Africa E -25.7847787 S 28.2347984 This message may contain privileged and confidential information intended only for the person or entity to which it is addressed. Any review, retransmission, dissemination, copy or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient, is prohibited. If you received this message in error, please notify the sender immediately by e-mail, facsimile or telephone and thereafter delete the material from any computer. Any views expressed in this message are those of the individual sender, except where the sender specifically states them to be the view of the entity transmitting the message. ___ 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 17581: New general setting: default relative period for analysis + PT DV updated.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 17581 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-11-25 13:42:44 +0100
message:
New general setting: default relative period for analysis + PT DV updated.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.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-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-11-24 18:14:38 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-11-25 12:35:16 +
@@ -103,7 +103,8 @@
final String KEY_HELP_PAGE_LINK = helpPageLink;
final String KEY_ACCEPTANCE_REQUIRED_FOR_APPROVAL = keyAcceptanceRequiredForApproval;
final String KEY_SYSTEM_NOTIFICATIONS_EMAIL = keySystemNotificationsEmail;
-
+final String KEY_ANALYSIS_RELATIVE_PERIOD = keyAnalysisRelativePeriod;
+
final String DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY = lastMonth;
final String DEFAULT_FLAG = dhis2;
final int DEFAULT_MAX_NUMBER_OF_ATTEMPTS = 20;
@@ -120,6 +121,7 @@
final int DEFAULT_ANALYTICS_MAX_LIMIT = 5;
final int DEFAULT_DATABASE_SERVER_CPUS = 0; // Detect automatically
final String DEFAULT_HELP_PAGE_LINK = ../dhis-web-commons-about/help.action;
+final String DEFAULT_ANALYSIS_RELATIVE_PERIOD = LAST_12_MONTHS;
final MapString, Serializable DEFAULT_SETTINGS_VALUES = new HashMapString, Serializable()
{
@@ -136,6 +138,7 @@
put( KEY_TIME_FOR_SENDING_MESSAGE, DEFAULT_TIME_FOR_SENDING_MESSAGE );
put( KEY_CACHE_STRATEGY, DEFAULT_CACHE_STRATEGY );
put( KEY_ANALYTICS_MAX_LIMIT, DEFAULT_ANALYTICS_MAX_LIMIT );
+put( KEY_ANALYSIS_RELATIVE_PERIOD, DEFAULT_ANALYSIS_RELATIVE_PERIOD );
}
};
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-17 15:08:22 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-25 12:35:16 +
@@ -208,6 +208,33 @@
user_has_critical_authorities=User has critical authorities
default=Default
+#-- Relative periods ---#
+
+LAST_MONTH=Last month
+LAST_BIMONTH=Last bi-month
+LAST_QUARTER=Last quarter
+LAST_SIX_MONTH=Last six-month
+MONTHS_THIS_YEAR=Months this year
+QUARTERS_THIS_YEAR=Quarters this year
+THIS_YEAR=This year
+MONTHS_LAST_YEAR=Months last year
+QUARTERS_LAST_YEAR=Quarters last year
+LAST_YEAR=Last year
+LAST_5_YEARS=Last 5 years
+LAST_12_MONTHS=Last 12 months
+LAST_6_MONTHS=Last 6 months
+LAST_3_MONTHS=Last 3 months
+LAST_6_BIMONTHS=Last 6 bi-months
+LAST_4_QUARTERS=Last 4 quarters
+LAST_2_SIXMONTHS=Last 2 six-months
+THIS_FINANCIAL_YEAR=This financial year
+LAST_FINANCIAL_YEAR=Last financial year
+LAST_5_FINANCIAL_YEARS=Last 5 financial years
+LAST_WEEK=Last week
+LAST_4_WEEKS=Last 4 weeks
+LAST_12_WEEKS=Last 12 weeks
+LAST_52_WEEKS=Last 52 weeks
+
#-- PeriodTypes #
Daily=Daily
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-11-20 16:15:18 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-11-25 12:35:16 +
@@ -3947,6 +3947,10 @@
if (chb.xtype === 'checkbox') {
period.checkboxes.push(chb);
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17582: GIS legendset cache buster removed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 17582 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-11-25 15:10:20 +0100
message:
GIS legendset cache buster removed.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.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-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2014-11-19 12:34:26 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2014-11-25 14:09:19 +
@@ -2220,6 +2220,7 @@
Ext.Ajax.request({
url: gis.init.contextPath + '/api/mapLegendSets/' + view.legendSet.id + '.json?fields=' + gis.conf.url.mapLegendSetFields.join(','),
scope: this,
+disableCaching: false,
success: function(r) {
legends = Ext.decode(r.responseText).mapLegends;
___
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] Error: Editing Aggregate Query
I’ve found the bug the that is causing this, here is a diff against the current trunk, but the bug exists in 2.17 as well. 09:35:23|dhis-2:dan$bzr diff === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-11-03 13:35:42 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-11-25 14:18:04 + @@ -24,7 +24,7 @@ tr tdlabel for=name$i18n.getString( name ) em title=$i18n.getString( required ) class=required*/em/label/td -tdinput type=text id=name name=name value=$encoder.htmlEncode(caseAggregation.name)/td +tdinput type=text id=name name=name value=$encoder.htmlEncode($caseAggregation.name)/td /tr tr Dan Cocos BAO Systems www.baosystems.com http://www.baosystems.com/ T: +1 202-352-2671 | skype: dancocos On Nov 25, 2014, at 3:35 AM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, After creating a number of aggregate queries, I get an error in my log when I try to edit. Error details below: * ERROR 2014-11-25 09:29:23,015 #parse(): syntax error in #parse()-ed template '/dhis-web-maintenance-program/updateCaseAggregation.vm', called at /ma in.vm[line 153, column 9] (Log4JLogChute.java [http-apr-8080-exec-2]) * ERROR 2014-11-25 09:29:23,015 Unable to render Velocity Template, '/main.vm' (CommonsLogger.java [http-apr-8080-exec-2]) org.apache.velocity.exception.ParseErrorException: Encountered )\/td\r\n /tr\r\n\r\ntr\r\n\t\ttdlabel for=\dataSets\ at /dh is-web-maintenance-program/updateCaseAggregation.vm[line 27, column 101] Was expecting one of: [ ... , ... ) ... WHITESPACE ... Any ideas what might be causing this? Thanks. Busoye Version: 2.17 Build revision: 17561 ___ 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] Error: Editing Aggregate Query
There is a bug in the template Here is the diff against 2.18-SNAPSHOT, but it also exists in the 2.17 builds. 09:35:23|dhis-2:dan$bzr diff === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-11-03 13:35:42 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-11-25 14:18:04 + @@ -24,7 +24,7 @@ tr tdlabel for=name$i18n.getString( name ) em title=$i18n.getString( required ) class=required*/em/label/td -tdinput type=text id=name name=name value=$encoder.htmlEncode(caseAggregation.name)/td +tdinput type=text id=name name=name value=$encoder.htmlEncode($caseAggregation.name)/td /tr tr Dan Cocos BAO Systems www.baosystems.com http://www.baosystems.com/ T: +1 202-352-2671 | skype: dancocos On Nov 25, 2014, at 3:35 AM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, After creating a number of aggregate queries, I get an error in my log when I try to edit. Error details below: * ERROR 2014-11-25 09:29:23,015 #parse(): syntax error in #parse()-ed template '/dhis-web-maintenance-program/updateCaseAggregation.vm', called at /ma in.vm[line 153, column 9] (Log4JLogChute.java [http-apr-8080-exec-2]) * ERROR 2014-11-25 09:29:23,015 Unable to render Velocity Template, '/main.vm' (CommonsLogger.java [http-apr-8080-exec-2]) org.apache.velocity.exception.ParseErrorException: Encountered )\/td\r\n /tr\r\n\r\ntr\r\n\t\ttdlabel for=\dataSets\ at /dh is-web-maintenance-program/updateCaseAggregation.vm[line 27, column 101] Was expecting one of: [ ... , ... ) ... WHITESPACE ... Any ideas what might be causing this? Thanks. Busoye Version: 2.17 Build revision: 17561 ___ 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 17583: Data import, displaying translated error messages in import summary
revno: 17583
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-11-25 17:39:09 +0100
message:
Data import, displaying translated error messages in import summary
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nManager.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/DefaultI18nManager.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.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-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nManager.java 2014-07-24 16:46:51 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nManager.java 2014-11-25 16:39:09 +
@@ -42,6 +42,8 @@
{
String ID = I18nManager.class.getName();
+I18n getI18n();
+
I18n getI18n( Locale locale );
I18n getI18n( Class? clazz );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/DefaultI18nManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/DefaultI18nManager.java 2014-07-24 16:46:51 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/DefaultI18nManager.java 2014-11-25 16:39:09 +
@@ -68,6 +68,14 @@
// -
@Override
+public I18n getI18n()
+{
+Locale locale = getCurrentLocale();
+
+return new I18n( getGlobalResourceBundle( locale ), null );
+}
+
+@Override
public I18n getI18n( Locale locale )
{
return new I18n( getGlobalResourceBundle( locale ), null );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-25 12:35:16 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-25 16:39:09 +
@@ -193,6 +193,7 @@
unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported.
data_element_or_type_null_or_empty=Data element or type not defined
value_length_greater_than_max_length=Value is greater than max length
+comment_length_greater_than_max_length=Comment is greater than max length
value_not_numeric=Value is not numeric
value_not_unit_interval=Value is not a unit interval
value_not_percentage=Value is not a percentage
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-11-10 14:05:42 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-11-25 16:39:09 +
@@ -74,6 +74,8 @@
import org.hisp.dhis.dxf2.metadata.ImportOptions;
import org.hisp.dhis.dxf2.pdfform.PdfDataEntryFormUtil;
import org.hisp.dhis.dxf2.utils.JacksonUtils;
+import org.hisp.dhis.i18n.I18n;
+import org.hisp.dhis.i18n.I18nManager;
import org.hisp.dhis.importexport.ImportStrategy;
import org.hisp.dhis.jdbc.batchhandler.DataValueBatchHandler;
import org.hisp.dhis.node.types.CollectionNode;
@@ -103,14 +105,13 @@
{
private static final Log log = LogFactory.getLog( DefaultDataValueSetService.class );
+private static final String ERROR_SEP = : ;
private static final String ERROR_INVALID_DATA_SET = Invalid data set: ;
-
private static final String ERROR_INVALID_PERIOD = Invalid period: ;
-
private static final String ERROR_INVALID_ORG_UNIT = Invalid org unit: ;
-
private static final String ERROR_OBJECT_NEEDED_TO_COMPLETE = Must be provided to complete data set;
-
+private static final String ERROR_INSIGNIFICANT_ZERO = Value is zero and not significant;
+
@Autowired
private IdentifiableObjectManager identifiableObjectManager;
@@ -137,6 +138,9 @@
@Autowired
private DataValueSetStore dataValueSetStore;
+
+@Autowired
+private I18nManager i18nManager;
@Autowired
private Notifier notifier;
@@ -558,6 +562,8 @@
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17584: Improve approval query time.
revno: 17584
committer: jimgr...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-11-25 14:23:03 -0500
message:
Improve approval query time.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.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-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2014-11-25 11:51:12 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2014-11-25 19:23:03 +
@@ -286,7 +286,7 @@
for ( int i = 1; i orgUnitLevel; i++ )
{
-joinAncestors += left join _orgunitstructure o + i + on o + i + .idlevel + orgUnitLevel + = o.organisationunitid and o + i + .idlevel + i + = coo.organisationunitid ;
+joinAncestors += left join _orgunitstructure o + i + on o + i + .organisationunitid = o.organisationunitid and o + i + .idlevel + i + = coo.organisationunitid ;
testAncestors += or o + i + .organisationunitid is not null ;
}
___
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 17585: Temp fix bug where transient fields read and followUp of MessageConversation where not set on fet...
revno: 17585
committer: Halvdan Hoem Grelland halvda...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-11-25 21:22:50 +0100
message:
Temp fix bug where transient fields read and followUp of MessageConversation
where not set on fetch from DB.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.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/message/MessageConversation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2014-08-19 11:16:02 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2014-11-25 20:22:50 +
@@ -163,6 +163,19 @@
return false;
}
+public boolean isRead( User user )
+{
+for( UserMessage userMessage : userMessages )
+{
+if( userMessage.getUser() != null userMessage.getUser().equals( user ) )
+{
+return userMessage.isRead();
+}
+}
+
+return false;
+}
+
public boolean markRead( User user )
{
for ( UserMessage userMessage : userMessages )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java 2014-11-18 12:55:20 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java 2014-11-25 20:22:50 +
@@ -307,6 +307,23 @@
@Override
public MessageConversation getMessageConversation( String uid )
{
+/*
+ * TODO:
+ * This is a temporary workaround to ensure transient fields followUp and read
+ * are set correctly (and not just to false). Issue should be tackled in
+ * HibernateIdentifiableObjectStore and/or HibernateMessageConversationStore.
+ */
+
+MessageConversation mc = messageConversationStore.getByUid( uid );
+
+if( mc == null )
+{
+return null;
+}
+
+mc.setFollowUp( mc.isFollowUp( currentUserService.getCurrentUser() ) );
+mc.setRead( mc.isRead( currentUserService.getCurrentUser() ) );
+
return messageConversationStore.getByUid( uid );
}
___
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 17586: fix no Action mapped for namespace [/dhis-web-maintenance-mobile] and action name [sms_command_form]
revno: 17586 committer: Long Ngo Thanh thanhlongngo1...@yahoo.com.vn branch nick: dhis2 timestamp: Wed 2014-11-26 10:31:53 +0700 message: fix no Action mapped for namespace [/dhis-web-maintenance-mobile] and action name [sms_command_form] modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.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-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm 2014-10-23 13:32:39 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm 2014-11-26 03:31:53 + @@ -4,6 +4,6 @@ #introListImgItem( showSMSConfigureForm.action sms_service_configuration configuration ) #introListImgItem( showSentPage.action view_sent_sms mobile ) #introListImgItem( show_receive_sms_form.action show_receive_sms_form mobile ) -#introListImgItem( sms_command_form.action sms_command_form mobile ) +#introListImgItem( SMSCommands.action sms_command_form mobile ) #introListImgItem( j2me_client_update.action j2me_client_update configuration ) /ul ___ 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-core] Bug in Aggregate Query Editor
Hi I found a bug when editing aggregation queries. Here is the diff against 2.18-SNAPSHOT, but it also exists in the 2.17 builds. 09:35:23|dhis-2:dan$bzr diff === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-11-03 13:35:42 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-11-25 14:18:04 + @@ -24,7 +24,7 @@ tr tdlabel for=name$i18n.getString( name ) em title=$i18n.getString( required ) class=required*/em/label/td -tdinput type=text id=name name=name value=$encoder.htmlEncode(caseAggregation.name)/td +tdinput type=text id=name name=name value=$encoder.htmlEncode($caseAggregation.name)/td /tr tr Dan Cocos BAO Systems www.baosystems.com http://www.baosystems.com/ T: +1 202-352-2671 | skype: dancocos -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp
