[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17012: add program cache map to AbstractEventService, speeds up event imports by about 90%
revno: 17012 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 13:32:38 +0700 message: add program cache map to AbstractEventService, speeds up event imports by about 90% modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-08 12:58:59 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 06:32:38 + @@ -201,9 +201,9 @@ @Override public ImportSummary addEvent( Event event, ImportOptions importOptions ) { -Program program = programService.getProgram( event.getProgram() ); +Program program = getProgram( event.getProgram() ); ProgramInstance programInstance; -ProgramStage programStage = programStageService.getProgramStage( event.getProgramStage() ); +ProgramStage programStage = getProgramStage( event.getProgramStage() ); ProgramStageInstance programStageInstance = null; if ( importOptions == null ) @@ -962,4 +962,32 @@ return organisationUnit; } + +private MapString, Program programMap = new HashMap(); + +private Program getProgram( String id ) +{ +Program program; + +if ( programMap.containsKey( id ) ) +{ +program = programMap.get( id ); +} +else +{ +program = programService.getProgram( id ); + +if ( program != null ) +{ +programMap.put( id, program ); +} +} + +return program; +} + +private ProgramStage getProgramStage( String id ) +{ +return programStageService.getProgramStage( id ); +} } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2014-10-08 06:12:13 + +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2014-10-09 06:32:38 + @@ -500,7 +500,7 @@ if ( !importOptions.isAsync() ) { -ImportSummaries importSummaries = eventService.addEvents( events.getEvents(), importOptions ); +ImportSummaries importSummaries = eventService.addEvents( events.getEvents(), importOptions, null ); JacksonUtils.toJson( response.getOutputStream(), importSummaries ); } else ___ 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 17013: switch to using Guava CacheBuilder for id = program cache in event import
revno: 17013 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 13:53:32 +0700 message: switch to using Guava CacheBuilder for id = program cache in event import modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 06:32:38 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 06:53:32 + @@ -30,6 +30,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; @@ -82,6 +84,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; /** * @author Morten Olav Hansen morte...@gmail.com @@ -651,8 +656,7 @@ } } -CollectionTrackedEntityDataValue dataValues = dataValueService -.getTrackedEntityDataValues( programStageInstance ); +CollectionTrackedEntityDataValue dataValues = dataValueService.getTrackedEntityDataValues( programStageInstance ); for ( TrackedEntityDataValue dataValue : dataValues ) { @@ -963,27 +967,30 @@ return organisationUnit; } -private MapString, Program programMap = new HashMap(); +private static CacheString, Program programCache = CacheBuilder.newBuilder() +.expireAfterAccess( 5, TimeUnit.MINUTES ) +.initialCapacity( 10 ) +.maximumSize( 50 ) +.build(); -private Program getProgram( String id ) +private Program getProgram( final String id ) { -Program program; - -if ( programMap.containsKey( id ) ) -{ -program = programMap.get( id ); -} -else -{ -program = programService.getProgram( id ); - -if ( program != null ) +try +{ +return programCache.get( id, new CallableProgram() { -programMap.put( id, program ); -} +@Override +public Program call() throws Exception +{ +return programService.getProgram( id ); +} +} ); +} +catch ( ExecutionException ignored ) +{ } -return program; +return null; } private ProgramStage getProgramStage( String id ) ___ 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 17014: properly report import, updated, deleted data-values in AbstractEventService
revno: 17014 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 14:03:34 +0700 message: properly report import,updated,deleted data-values in AbstractEventService modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 06:53:32 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 07:03:34 + @@ -308,8 +308,7 @@ { if ( !CodeGenerator.isValidCode( event.getEvent() ) ) { -return new ImportSummary( ImportStatus.ERROR, -Event.event did not point to a valid event ); +return new ImportSummary( ImportStatus.ERROR, Event.event did not point to a valid event ); } } } @@ -520,7 +519,7 @@ TrackedEntityDataValue existingDataValue = existingDataValues.get( value.getDataElement() ); saveDataValue( programStageInstance, event.getStoredBy(), dataElement, value.getValue(), -value.getProvidedElsewhere(), existingDataValue ); +value.getProvidedElsewhere(), existingDataValue, null ); } } @@ -744,7 +743,7 @@ } private void saveDataValue( ProgramStageInstance programStageInstance, String storedBy, DataElement dataElement, -String value, Boolean providedElsewhere, TrackedEntityDataValue dataValue ) +String value, Boolean providedElsewhere, TrackedEntityDataValue dataValue, ImportSummary importSummary ) { if ( value != null value.trim().length() == 0 ) { @@ -760,6 +759,11 @@ dataValue.setProvidedElsewhere( providedElsewhere ); dataValueService.saveTrackedEntityDataValue( dataValue ); + +if ( importSummary != null ) +{ +importSummary.getDataValueCount().incrementImported(); +} } else { @@ -769,11 +773,21 @@ dataValue.setProvidedElsewhere( providedElsewhere ); dataValueService.updateTrackedEntityDataValue( dataValue ); + +if ( importSummary != null ) +{ +importSummary.getDataValueCount().incrementUpdated(); +} } } else if ( dataValue != null ) { dataValueService.deleteTrackedEntityDataValue( dataValue ); + +if ( importSummary != null ) +{ +importSummary.getDataValueCount().incrementDeleted(); +} } } @@ -892,10 +906,8 @@ TrackedEntityDataValue existingDataValue = dataElementValueMap.get( dataValue.getDataElement() ); saveDataValue( programStageInstance, dataValueStoredBy, dataElement, dataValue.getValue(), -dataValue.getProvidedElsewhere(), existingDataValue ); +dataValue.getProvidedElsewhere(), existingDataValue, importSummary ); } - -importSummary.getDataValueCount().incrementImported(); } } else ___ 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 tutorial on spdy and dhis
Hi, was playing around with nginx and realized how simple it is to set up SPDY http://en.wikipedia.org/wiki/SPDY. SPDY is a network protocol that might speed up loading of web pages significantly. Seems to work very well with DHIS 2. Read the tutorial here: https://www.dhis2.org/enable-spdy-with-nginx regards, Lars ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Dhis2-users] dhis2 system administration list
The idea is great, this domain is growing especially with security bugs being discovered here and there and which needs attention of system admins, also the could is expanding, a group dedicated to that will be helpful in the implementation of DHIS-2 regards, JPaul On Wed, Oct 8, 2014 at 11:54 PM, gerald thomas gerald17...@gmail.com wrote: Bob, I think the vision is good especially for backend users who are not too interested on the java stuff. I welcome the idea boss. On 10/8/14, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob -- Regards, Gerald ___ 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 17015: switch to 30 sec cache in event import
revno: 17015 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 14:43:10 +0700 message: switch to 30 sec cache in event import modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 07:03:34 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 07:43:10 + @@ -980,7 +980,7 @@ } private static CacheString, Program programCache = CacheBuilder.newBuilder() -.expireAfterAccess( 5, TimeUnit.MINUTES ) +.expireAfterAccess( 30, TimeUnit.SECONDS ) .initialCapacity( 10 ) .maximumSize( 50 ) .build(); ___ 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 17016: ER sorting option implemented.
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 17016 [merge] committer: Jan Henrik Overland janhenrik.overl...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 09:59:54 +0200 message: ER sorting option implemented. modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-10-08 22:37:32 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-10-09 07:58:13 + @@ -516,7 +516,9 @@ // eventreport col/row subtotals executeSql( update eventreport set colsubtotals = subtotals where colsubtotals is null ); -executeSql( update eventreport set rowsubtotals = subtotals where rowsubtotals is null ); +executeSql( update eventreport set rowsubtotals = subtotals where rowsubtotals is null ); + +executeSql( update eventchart set sortorder = 0 where sortorder is null ); // Move chart filters to chart_filters table === modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml' --- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml 2014-07-09 15:43:12 + +++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml 2014-10-09 07:58:13 + @@ -148,6 +148,8 @@ property name=baseLineLabel / +property name=sortOrder / + !-- Access properties -- property name=externalAccess / === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-10-07 10:55:39 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-10-09 07:58:13 + @@ -1363,9 +1363,10 @@ targetLineTitle, baseLineValue, baseLineTitle, +sortOrder, +rangeAxisMinValue, rangeAxisMaxValue, -rangeAxisMinValue, rangeAxisSteps, rangeAxisDecimals, rangeAxisTitle, @@ -1380,13 +1381,28 @@ general, window, +comboBottomMargin = 1, +checkboxBottomMargin = 2, +separatorTopMargin = 6, cmpWidth = 340, labelWidth = 125, numberWidth = 80; +// data + showValues = Ext.create('Ext.form.field.Checkbox', { + boxLabel: NS.i18n.show_values, + style: 'margin-bottom:' + checkboxBottomMargin + 'px', + checked: true + }); + + hideEmptyRows = Ext.create('Ext.form.field.Checkbox', { + boxLabel: NS.i18n.hide_empty_category_items, + style: 'margin-bottom:' + checkboxBottomMargin + 'px' + }); + showTrendLine = Ext.create('Ext.form.field.Checkbox', { boxLabel: NS.i18n.trend_line, - style: 'margin-bottom:6px' + style: 'margin-bottom:' + checkboxBottomMargin + 'px' }); targetLineValue = Ext.create('Ext.form.field.Number', { @@ -1424,7 +1440,6 @@ }); baseLineTitle = Ext.create('Ext.form.field.Text', { - //cls: 'ns-textfield-alt1', style: 'margin-left:1px; margin-bottom:1px', fieldStyle: 'padding-left:3px', emptyText: NS.i18n.base, @@ -1437,9 +1452,32 @@ } }); - hideEmptyRows = Ext.create('Ext.form.field.Checkbox', { - boxLabel: NS.i18n.hide_empty_category_items, - style: 'margin-bottom:4px' + sortOrder = Ext.create('Ext.form.field.ComboBox', { + cls: 'ns-combo', + style: 'margin-bottom:' + comboBottomMargin + 'px', + width: cmpWidth, + labelWidth: 125, + fieldLabel: NS.i18n.sort_order, + labelStyle: 'color:#333', + queryMode: 'local', + valueField: 'id', + editable: false, + value: 0, + store: Ext.create('Ext.data.Store', { +fields: ['id', 'text'], +data: [ + {id: 0, text: NS.i18n.none}, + {id: -1, text: NS.i18n.low_to_high}, + {id: 1, text: NS.i18n.high_to_low} +] + }) + }); + +// axes + rangeAxisMinValue = Ext.create('Ext.form.field.Number', { + width: numberWidth, +
Re: [Dhis2-devs] new tutorial on spdy and dhis
That looks good and straightforward to setup. Have you seen any noticeable speedup? On 9 October 2014 08:27, Lars Helge Øverland larshe...@gmail.com wrote: Hi, was playing around with nginx and realized how simple it is to set up SPDY http://en.wikipedia.org/wiki/SPDY. SPDY is a network protocol that might speed up loading of web pages significantly. Seems to work very well with DHIS 2. Read the tutorial here: https://www.dhis2.org/enable-spdy-with-nginx regards, Lars ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Dhis2-users] dhis2 system administration list
It's ok. The idea is welcome. Sent from my BlackBerry 10 smartphone. From: J. Paul MutalicSent: Thursday, 9 October 2014 07:35To: gerald thomasMutalicmeCc: dhis2-users; Steven Uggowitzer; dhis2-devsSubject: Re: [Dhis2-devs] [Dhis2-users] dhis2 system administration listThe idea is great, this domain is growing especially with security bugs being discovered here and there and which needs attention of system admins, also the could is expanding, a group dedicated to that will be helpful in the implementation of DHIS-2regards,JPaulOn Wed, Oct 8, 2014 at 11:54 PM, gerald thomas gerald17...@gmail.com wrote:Bob, I think the vision is good especially for backend users who are not too interested on the java stuff. I welcome the idea boss. On 10/8/14, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob -- Regards, Gerald ___ 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 ___ 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] dhis2 system administration list
Absolutely great idea! ……… Regards, Dapo Adejumo +2348033683677 Skype : dapojorge From: Dhis2-devs [mailto:dhis2-devs-bounces+dapo_adejumo=yahoo@lists.launchpad.net] On Behalf Of J. Paul Mutali Sent: 9 October, 2014 8:35 AM To: gerald thomas Cc: dhis2-users; Steven Uggowitzer; dhis2-devs Subject: Re: [Dhis2-devs] [Dhis2-users] dhis2 system administration list The idea is great, this domain is growing especially with security bugs being discovered here and there and which needs attention of system admins, also the could is expanding, a group dedicated to that will be helpful in the implementation of DHIS-2 regards, JPaul On Wed, Oct 8, 2014 at 11:54 PM, gerald thomas gerald17...@gmail.com mailto:gerald17...@gmail.com wrote: Bob, I think the vision is good especially for backend users who are not too interested on the java stuff. I welcome the idea boss. On 10/8/14, Bob Jolliffe bobjolli...@gmail.com mailto:bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob -- Regards, Gerald ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net mailto: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] dhis2 system administration list
Bob, I think the vision is good especially for backend users who are not too interested on the java stuff. I welcome the idea boss. On 10/8/14, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob -- Regards, Gerald ___ 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] dhis2 system administration list
Brilliant idea, I support the Idea. Better Information, better Decisions, better Health MUHIRE Andrew Head of HMIS / Ministry of Health A mind/brain is a terrible thing to waste -- ** Cell:(+250)788436150** *** Twitter :muhire_andrew*** skype:muhire_andrew link to HMIS system: https://hmis.moh.gov.rw/hmis On Wednesday, October 8, 2014 11:30 PM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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] dhis2 system administration list
Excellent idea Bob. Busoye On 9 Oct 2014, at 10:21, Muhire Andrew muhireand...@yahoo.com wrote: Brilliant idea, I support the Idea. Better Information, better Decisions, better Health MUHIRE Andrew Head of HMIS / Ministry of Health A mind/brain is a terrible thing to waste -- ** Cell:(+250)788436150** *** Twitter :muhire_andrew*** skype:muhire_andrew link to HMIS system: https://hmis.moh.gov.rw/hmis On Wednesday, October 8, 2014 11:30 PM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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 ___ 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] dhis2 system administration list
Not really sure I see the need.. except for the commit messages, there is not really that many developer related questions on this list (we have a history of doing off-list discussions instead). Maybe a better solution would be to unsubscribe from the commit messages (people can subscribe to them manually), which would mean that this dev list would be quiet again. -- Morten On Thu, Oct 9, 2014 at 4:41 PM, Adebusoye Anifalaje bus...@hisp.org wrote: Excellent idea Bob. Busoye On 9 Oct 2014, at 10:21, Muhire Andrew muhireand...@yahoo.com wrote: Brilliant idea, I support the Idea. -- Better Information, better Decisions, better Health MUHIRE Andrew * Head of HMIS / Ministry of Health* *A mind/brain is a terrible thing to waste* -- ** Cell:(+250)788436150** *** Twitter :muhire_andrew*** skype:muhire_andrew link to HMIS system: https://hmis.moh.gov.rw/hmis http://hmis.moh.gov.rw/hmis On Wednesday, October 8, 2014 11:30 PM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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 ___ 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] dhis2 system administration list
Brilliant idea. Let's go for it. Alex On Thu, Oct 9, 2014 at 12:30 AM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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 -- Alex Tumwesigye Technical Advisor - DHIS2, Ministry of Health/AFENET Kampala Uganda IT Consultant - BarefootPower Uganda Ltd, SmartSolar, Kenya IT Specialist (Servers, Networks and Security, Health Information Systems - DHIS2 ) Solar Consultant +256 774149 775, + 256 759 800161 I don't want to be anything other than what I have been - one tree hill ___ 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 tutorial on spdy and dhis
On Thu, Oct 9, 2014 at 10:04 AM, Bob Jolliffe bobjolli...@gmail.com wrote: That looks good and straightforward to setup. Have you seen any noticeable speedup? Yes - well haven't measured it so could be my imagination ;) ___ 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 tutorial on spdy and dhis
On Thu, Oct 9, 2014 at 11:35 AM, Mahendra Kariya mahendra.kar...@thoughtworks.com wrote: Hi Lars, The link is giving 404! Fixed now - had a minor mysql - php issue. 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
Re: [Dhis2-devs] [Dhis2-users] dhis2 system administration list
Hi Bob, I see the need, but am a bit concerned about establishing another mailing list. You can see from the dev list, that there are A LOT of non-dev topics already. Some of these are implementation issues, some end-user support, and a small smattering of Java jabberwocky. The dev list has sort of become the default mailing list for everything, and this is where people tend to go for support. The user list receives much less traffic, in spite of the fact that most of what is on the dev list is really not development related. While I think it is a good idea, there is inertia to overcome. Another idea which we have been contemplating is the establishment of a forum. This came out of the meeting in Oslo a few weeks back. I have been working with Lars Helge on this, but there is some more work which needs to be done before it would even be ready for testing. However,maybe a forum would be a better media for such discussions? Regards, Jason On Thu, Oct 9, 2014 at 12:06 PM, Alex Tumwesigye atumwesi...@gmail.com wrote: Brilliant idea. Let's go for it. Alex On Thu, Oct 9, 2014 at 12:30 AM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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 -- Alex Tumwesigye Technical Advisor - DHIS2, Ministry of Health/AFENET Kampala Uganda IT Consultant - BarefootPower Uganda Ltd, SmartSolar, Kenya IT Specialist (Servers, Networks and Security, Health Information Systems - DHIS2 ) Solar Consultant +256 774149 775, + 256 759 800161 I don't want to be anything other than what I have been - one tree hill ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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] dhis2 system administration list
Hi, I did some analysis of the email messages on our dev and users lists (for research purposes), not looking at the content, but at the number of messages and number of people. Since 2011, the number of 'listeners' to these lists have grown tremendously, although the number of messages has remained quite constant (I only counted messages sent from people, not machines so not counting automated messages). This leads me to believe that maybe we could have a discussion on how these lists could work better. Could it be that there are many people out there who maybe would like to ask questions but are afraid to do so because several hundred people will get their email? For some type of questions, would other formats be better? Stackexchange-like messaging? Forum-based messaging? Jason has a good point with this. But different discussions have different 'optimal' media... Anyway, I'm jus throwing this into the discussion. To keep to the topic, I think a sysadm list could be useful. Best regards, Lars 2014-10-09 13:34 GMT+02:00 Jason Pickering jason.p.picker...@gmail.com: Hi Bob, I see the need, but am a bit concerned about establishing another mailing list. You can see from the dev list, that there are A LOT of non-dev topics already. Some of these are implementation issues, some end-user support, and a small smattering of Java jabberwocky. The dev list has sort of become the default mailing list for everything, and this is where people tend to go for support. The user list receives much less traffic, in spite of the fact that most of what is on the dev list is really not development related. While I think it is a good idea, there is inertia to overcome. Another idea which we have been contemplating is the establishment of a forum. This came out of the meeting in Oslo a few weeks back. I have been working with Lars Helge on this, but there is some more work which needs to be done before it would even be ready for testing. However,maybe a forum would be a better media for such discussions? Regards, Jason On Thu, Oct 9, 2014 at 12:06 PM, Alex Tumwesigye atumwesi...@gmail.com wrote: Brilliant idea. Let's go for it. Alex On Thu, Oct 9, 2014 at 12:30 AM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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 -- Alex Tumwesigye Technical Advisor - DHIS2, Ministry of Health/AFENET Kampala Uganda IT Consultant - BarefootPower Uganda Ltd, SmartSolar, Kenya IT Specialist (Servers, Networks and Security, Health Information Systems - DHIS2 ) Solar Consultant +256 774149 775, + 256 759 800161 I don't want to be anything other than what I have been - one tree hill ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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 -- Lars Kristian Roland Research Fellow, Department of Informatics, University of Oslo Email: l...@roland.bz - rol...@ifi.uio.no Phone: +47 90733036 ___ 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] dhis2 system administration list
-1 for any kind of forum. I would love some kind of stackexchange like forum (or whatever its called, QA) though, much better for upvoting answers etc, we could even piggyback on existing solutions instead of hosting our own. Who knows, they might even let us add a DHIS2 section. -- Morten On Thu, Oct 9, 2014 at 6:51 PM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi Jason I think there are different problems to address here. That developer discussion doesn't happen on the devs list is certainly a problem. It should. That is a question of transparency and process which we should improve on. I don't think we should encourage the use of the dev list for all manner of things, but rather encourage that it is used for what it was meant to be used for. Or drop it or rename it. Anyway I was not trying to solve all our community building efforts related to lists with this mail. Just airing an idea that Steven raised, which I think might be quite useful. Whether it is list, forum, usenet group or googlegroup I don't have too strong a preference. Not much time right now anyway, but will keep listening to hear what people say. Bob On 9 October 2014 12:34, Jason Pickering jason.p.picker...@gmail.com wrote: Hi Bob, I see the need, but am a bit concerned about establishing another mailing list. You can see from the dev list, that there are A LOT of non-dev topics already. Some of these are implementation issues, some end-user support, and a small smattering of Java jabberwocky. The dev list has sort of become the default mailing list for everything, and this is where people tend to go for support. The user list receives much less traffic, in spite of the fact that most of what is on the dev list is really not development related. While I think it is a good idea, there is inertia to overcome. Another idea which we have been contemplating is the establishment of a forum. This came out of the meeting in Oslo a few weeks back. I have been working with Lars Helge on this, but there is some more work which needs to be done before it would even be ready for testing. However,maybe a forum would be a better media for such discussions? Regards, Jason On Thu, Oct 9, 2014 at 12:06 PM, Alex Tumwesigye atumwesi...@gmail.com wrote: Brilliant idea. Let's go for it. Alex On Thu, Oct 9, 2014 at 12:30 AM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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 -- Alex Tumwesigye Technical Advisor - DHIS2, Ministry of Health/AFENET Kampala Uganda IT Consultant - BarefootPower Uganda Ltd, SmartSolar, Kenya IT Specialist (Servers, Networks and Security, Health Information Systems - DHIS2 ) Solar Consultant +256 774149 775, + 256 759 800161 I don't want to be anything other than what I have been - one tree hill ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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] dhis2 system administration list
i.e. something like http://serverfault.com/ -- Morten On Thu, Oct 9, 2014 at 6:55 PM, Morten Olav Hansen morte...@gmail.com wrote: -1 for any kind of forum. I would love some kind of stackexchange like forum (or whatever its called, QA) though, much better for upvoting answers etc, we could even piggyback on existing solutions instead of hosting our own. Who knows, they might even let us add a DHIS2 section. -- Morten On Thu, Oct 9, 2014 at 6:51 PM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi Jason I think there are different problems to address here. That developer discussion doesn't happen on the devs list is certainly a problem. It should. That is a question of transparency and process which we should improve on. I don't think we should encourage the use of the dev list for all manner of things, but rather encourage that it is used for what it was meant to be used for. Or drop it or rename it. Anyway I was not trying to solve all our community building efforts related to lists with this mail. Just airing an idea that Steven raised, which I think might be quite useful. Whether it is list, forum, usenet group or googlegroup I don't have too strong a preference. Not much time right now anyway, but will keep listening to hear what people say. Bob On 9 October 2014 12:34, Jason Pickering jason.p.picker...@gmail.com wrote: Hi Bob, I see the need, but am a bit concerned about establishing another mailing list. You can see from the dev list, that there are A LOT of non-dev topics already. Some of these are implementation issues, some end-user support, and a small smattering of Java jabberwocky. The dev list has sort of become the default mailing list for everything, and this is where people tend to go for support. The user list receives much less traffic, in spite of the fact that most of what is on the dev list is really not development related. While I think it is a good idea, there is inertia to overcome. Another idea which we have been contemplating is the establishment of a forum. This came out of the meeting in Oslo a few weeks back. I have been working with Lars Helge on this, but there is some more work which needs to be done before it would even be ready for testing. However,maybe a forum would be a better media for such discussions? Regards, Jason On Thu, Oct 9, 2014 at 12:06 PM, Alex Tumwesigye atumwesi...@gmail.com wrote: Brilliant idea. Let's go for it. Alex On Thu, Oct 9, 2014 at 12:30 AM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi all Steven Uggowitzer recently raised the idea with me to create a system administrators list. Aimed at backend sort of things relating to the operating system, security, database tuning, dhis2-tools, virtual machine images etc. Those geeky sort of things which are not about java development or about users as such, but all the stuff that needs to happen in between. I said I'd run it by our extended community and try and gauge interest. Please reply in this thread if you think its a good idea (or not). If there is sufficient interest we can look at setting up. Cheers Bob ___ 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 -- Alex Tumwesigye Technical Advisor - DHIS2, Ministry of Health/AFENET Kampala Uganda IT Consultant - BarefootPower Uganda Ltd, SmartSolar, Kenya IT Specialist (Servers, Networks and Security, Health Information Systems - DHIS2 ) Solar Consultant +256 774149 775, + 256 759 800161 I don't want to be anything other than what I have been - one tree hill ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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-devs-core/dhis2/trunk] Rev 17017: Data entry, minor
revno: 17017 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 14:09:31 +0200 message: Data entry, minor modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.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-dataentry/src/main/webapp/dhis-web-dataentry/select.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-09-10 02:39:02 + +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2014-10-09 12:09:31 + @@ -67,9 +67,9 @@ /div div id=actions -input type=button value=$i18n.getString( 'run_validation' ) onclick=dhis2.de.validate( false ) id=validationButton style=width:120px; disabled=disabled/br -input type=button value=$i18n.getString( 'print_form' ) onclick=window.print() id=printButton style=width:120px/br -input type=button value=$i18n.getString( 'print_blank_form' ) onclick=printBlankForm() style=width:120px/br /br +input type=button value=$i18n.getString( 'run_validation' ) onclick=dhis2.de.validate( false ) id=validationButton style=width:120px; margin-bottom: 3px; disabled=disabled/br +input type=button value=$i18n.getString( 'print_form' ) onclick=window.print() id=printButton style=width:120px; margin-bottom: 3px;/br +input type=button value=$i18n.getString( 'print_blank_form' ) onclick=printBlankForm() style=width:120px; margin-bottom: 3px;/br /br /div div id=selectionBox class=inputCriteria style=width:564px ___ 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 17018: Missing author
revno: 17018 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 14:09:47 +0200 message: Missing author modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingCsvDataValue.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingCsvDataValueSet.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.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-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java 2014-07-22 16:44:27 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java 2014-10-09 12:09:47 + @@ -37,6 +37,9 @@ import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; +/** + * @author Lars Helge Overland + */ @JacksonXmlRootElement( localName = dataValue, namespace = DxfNamespaces.DXF_2_0) public class DataValue { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingCsvDataValue.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingCsvDataValue.java 2014-08-15 07:40:20 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingCsvDataValue.java 2014-10-09 12:09:47 + @@ -37,6 +37,9 @@ import static org.hisp.dhis.system.util.TextUtils.valueOf; +/** + * @author Lars Helge Overland + */ public class StreamingCsvDataValue extends DataValue { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java 2014-07-22 16:44:27 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java 2014-10-09 12:09:47 + @@ -33,6 +33,9 @@ import static org.hisp.dhis.system.util.TextUtils.valueOf; +/** + * @author Lars Helge Overland + */ public class StreamingDataValue extends DataValue { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingCsvDataValueSet.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingCsvDataValueSet.java 2014-03-18 08:10:10 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingCsvDataValueSet.java 2014-10-09 12:09:47 + @@ -36,6 +36,9 @@ import com.csvreader.CsvReader; import com.csvreader.CsvWriter; +/** + * @author Lars Helge Overland + */ public class StreamingCsvDataValueSet extends DataValueSet { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java 2014-10-06 22:28:17 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java 2014-10-09 12:09:47 + @@ -33,6 +33,9 @@ import org.hisp.dhis.dxf2.datavalue.DataValue; import org.hisp.dhis.dxf2.datavalue.StreamingDataValue; +/** + * @author Lars Helge Overland + */ public class StreamingDataValueSet extends DataValueSet { ___ 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 17019: change default format of JdbcEventStore to use long format (iso 8601 compatible), speeds up csv e...
revno: 17019 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 19:18:20 +0700 message: change default format of JdbcEventStore to use long format (iso 8601 compatible), speeds up csv export by 96%. modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 07:43:10 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 12:18:20 + @@ -377,11 +377,16 @@ ListOrganisationUnit organisationUnits, TrackedEntityInstance trackedEntityInstance, Date startDate, Date endDate, EventStatus status ) { +TimerLong timer = new SystemNanoTimer().start(); + ListEvent eventList = eventStore.getAll( program, programStage, programStatus, followUp, organisationUnits, trackedEntityInstance, startDate, endDate, status ); Events events = new Events(); events.setEvents( eventList ); +timer.stop(); +log.info( Export done, completed in + timer.toString() ); + return events; } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2014-09-17 14:51:26 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2014-10-09 12:18:20 + @@ -39,6 +39,7 @@ import org.hisp.dhis.program.Program; import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStatus; +import org.hisp.dhis.system.util.DateUtils; import org.hisp.dhis.system.util.SqlHelper; import org.hisp.dhis.trackedentity.TrackedEntityInstanceService; import org.springframework.beans.factory.annotation.Autowired; @@ -132,10 +133,14 @@ event.setStoredBy( rowSet.getString( psi_completeduser ) ); event.setOrgUnit( rowSet.getString( ou_uid ) ); + event.setDueDate( StringUtils.defaultIfEmpty( -rowSet.getString( psi_duedate ), rowSet.getString( psi_duedate ) ) ); +DateUtils.getLongDateString( rowSet.getDate( psi_duedate ) ), DateUtils.getLongDateString( rowSet.getDate( +psi_duedate ) ) ) ); + event.setEventDate( StringUtils.defaultIfEmpty( -rowSet.getString( psi_executiondate ), rowSet.getString( psi_executiondate ) ) ); +DateUtils.getLongDateString( rowSet.getDate( psi_executiondate ) ), DateUtils.getLongDateString( rowSet.getDate( +psi_executiondate ) ) ) ); if ( rowSet.getBoolean( ps_capturecoordinates ) ) { @@ -204,9 +209,13 @@ SqlHelper hlp = new SqlHelper(); String sql = -select pa.uid as tei_uid, pi.uid as pi_uid, pi.status as pi_status, pi.followup as pi_followup, p.uid as p_uid, p.type as p_type, ps.uid as ps_uid, ps.capturecoordinates as ps_capturecoordinates, pa.uid as pa_uid, psi.uid as psi_uid, psi.status as psi_status, ou.uid as ou_uid, + -psi.executiondate as psi_executiondate, psi.duedate as psi_duedate, psi.completeduser as psi_completeduser, psi.longitude as psi_longitude, psi.latitude as psi_latitude, + -psinote.trackedentitycommentid as psinote_id, psinote.commenttext as psinote_value, psinote.createddate as psinote_soreddate, psinote.creator as psinote_storedby, + +select pa.uid as tei_uid, pi.uid as pi_uid, pi.status as pi_status, pi.followup as pi_followup, p.uid as p_uid, + +p.type as p_type, ps.uid as ps_uid, ps.capturecoordinates as ps_capturecoordinates, pa.uid as pa_uid, + +psi.uid as psi_uid, psi.status as psi_status, ou.uid as ou_uid, + +psi.executiondate as psi_executiondate, psi.duedate as psi_duedate, psi.completeduser as psi_completeduser, + +
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17020: remove debug output
revno: 17020 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 19:20:58 +0700 message: remove debug output modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 12:18:20 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 12:20:58 + @@ -377,16 +377,11 @@ ListOrganisationUnit organisationUnits, TrackedEntityInstance trackedEntityInstance, Date startDate, Date endDate, EventStatus status ) { -TimerLong timer = new SystemNanoTimer().start(); - ListEvent eventList = eventStore.getAll( program, programStage, programStatus, followUp, organisationUnits, trackedEntityInstance, startDate, endDate, status ); Events events = new Events(); events.setEvents( eventList ); -timer.stop(); -log.info( Export done, completed in + timer.toString() ); - return events; } ___ 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 1378699] Re: Sites get deactivated randomly
Hi Morten, Let me give a bit more background on this issue. We have been in touch about this privately as well of course, but wanted to describe the problem in more detail. This instance has users which are assigned to specific sites or facilities. The users are not assigned to parent organisation units, but rather individual facilities at the lowest level of the hierarchy. There are reasons for this, but not important to get into that background at the moment why this has been done the way it has. In some cases, there maybe be many orgunits/sites/facilities assigned to a single user, something in the range of several thousand. You have made a few changes to the code recently which supposedly corrects this issue, and it will work under some circumstances. However, in other circumstances, it does not seem to work. It has been difficult for me to come up with a procedure which can reproduce this, but it seems to be related to network latency as well as the number of sites which a user is currently assigned to. The other issue which Oba mentions here is that we are no longer able to assign organisation units to users based on organisation unit groups. This was a really critical feature for this implementation, and because of the removal of this functionality in the later versions of DHIS2, it has caused big problems for them. Hope we can get a permanent fix for this soon. In the meantime, we may have to hobble along with some scripts which syncronize the orgunit groups and user assignments. Best regards, Jason On Wed, Oct 8, 2014 at 3:07 PM, oadekola oadekola.m...@gmail.com wrote: Yes, organisation unit assignment to users. We are currently using the 2.16 version of trunk and the challenge still persists. Also, is it possible for the developers to create a user friendly interface that allows the assignment of all sites associated to an organisation unit group to a user. I mean an interface that won't necessitate selecting organisation units one after the other. Thank you. Best regards. On Wed, Oct 8, 2014 at 10:02 AM, Morten Olav Hansen 1378...@bugs.launchpad.net wrote: What version of dhis2? I assume you mean organisation-unit assignment to users. We have had fixes related to this in 2.16 and trunk. If you are using 2.16, could you try the latest release? https://www.dhis2.org/download/releases/2.16/dhis.war -- You received this bug notification because you are subscribed to the bug report. https://bugs.launchpad.net/bugs/1378699 Title: Sites get deactivated randomly Status in DHIS 2: New Bug description: When sites are highlighted and saved(activated), not all sites are saved(activated). Also, sites activated after sometime get deactivated. This affects data entry, cause users keep complaining that their sites are missing. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1378699/+subscriptions -- Adekola Obaloluwa Emmanuel, ICT/Office Assistant, USAID/Nigeria, Monitoring and Evaluation Management Services (MEMS) II Project, 17, Euphrates Street, Maitama, Abuja, Nigeria. Mobile1: 234 809 072 6621 Mobile2: 234 903 030 4652 -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1378699 Title: Sites get deactivated randomly Status in DHIS 2: New Bug description: When sites are highlighted and saved(activated), not all sites are saved(activated). Also, sites activated after sometime get deactivated. This affects data entry, cause users keep complaining that their sites are missing. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1378699/+subscriptions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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 17021: Added util method
revno: 17021 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 14:31:08 +0200 message: Added util method modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.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/javascripts/dhis2/dhis2.util.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2014-08-27 14:03:18 + +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2014-10-09 12:31:08 + @@ -166,6 +166,16 @@ }; /** + * Convenience method to be used from inside custom forms. When a function is + * registered inside a form it will be loaded every time the form is loaded, + * hence the need to unregister and the register the function. + */ +dhis2.util.on = function( event, fn ) +{ +$( document ).off( event ).on( event, fn ); +}; + +/** * adds ':containsNC' to filtering. * $(sel).find(':containsNC(key)').doSomething(); */ ___ 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 17022: Moved default values for calendar/dateformat to CalendarService
revno: 17022 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 14:31:54 +0200 message: Moved default values for calendar/dateformat to CalendarService modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.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/calendar/CalendarService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java 2014-10-07 17:30:40 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java 2014-10-09 12:31:54 + @@ -39,6 +39,9 @@ { final String KEY_CALENDAR = keyCalendar; final String KEY_DATE_FORMAT = keyDateFormat; + +final String DEFAULT_CALENDAR = iso8601; +final String DEFAULT_DATE_FORMAT = -MM-dd; // ISO 8601 /** * Gets all available calendars as a sorted list. === 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-10-07 17:30:40 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-10-09 12:31:54 + @@ -105,8 +105,6 @@ final String DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY = lastMonth; final String DEFAULT_FLAG = dhis2; -final String DEFAULT_CALENDAR = iso8601; -final String DEFAULT_DATE_FORMAT = -MM-dd; // ISO 8601 final int DEFAULT_MAX_NUMBER_OF_ATTEMPTS = 20; final int DEFAULT_TIMEFRAME_MINUTES = 1; final double DEFAULT_FACTOR_OF_DEVIATION = 2.0; @@ -127,8 +125,8 @@ { put( KEY_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY, DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY ); put( KEY_FLAG, DEFAULT_FLAG ); -put( CalendarService.KEY_CALENDAR, DEFAULT_CALENDAR ); -put( CalendarService.KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT ); +put( CalendarService.KEY_CALENDAR, CalendarService.DEFAULT_CALENDAR ); +put( CalendarService.KEY_DATE_FORMAT, CalendarService.DEFAULT_DATE_FORMAT ); put( KEY_FACTOR_OF_DEVIATION, DEFAULT_FACTOR_OF_DEVIATION ); put( KEY_ORGUNITGROUPSET_AGG_LEVEL, DEFAULT_ORGUNITGROUPSET_AGG_LEVEL ); put( KEY_START_MODULE, DEFAULT_START_MODULE ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java 2014-10-07 17:30:40 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java 2014-10-09 12:31:54 + @@ -146,7 +146,7 @@ public String getSystemCalendarKey() { String key = keyCache.containsKey( KEY_CALENDAR ) ? keyCache.get( KEY_CALENDAR ) : -(String) settingManager.getSystemSetting( KEY_CALENDAR, SystemSettingManager.DEFAULT_CALENDAR ); +(String) settingManager.getSystemSetting( KEY_CALENDAR, DEFAULT_CALENDAR ); keyCache.put( KEY_CALENDAR, key ); return key; } @@ -160,7 +160,7 @@ public String getSystemDateFormatKey() { String key = keyCache.containsKey( KEY_DATE_FORMAT ) ? keyCache.get( KEY_DATE_FORMAT ) : -(String) settingManager.getSystemSetting( KEY_DATE_FORMAT, SystemSettingManager.DEFAULT_DATE_FORMAT ); +(String) settingManager.getSystemSetting( KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT ); keyCache.put( KEY_DATE_FORMAT, key ); return key; } ___ 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 1378699] Re: Sites get deactivated randomly
Hi Jason I'm just guessing here.. but I think the issue is related to having large amounts of IDs selected.. so even the fix I made, it will struggle to send all that data. The fix was working fine with smaller amounts of selected OUs right? I do understand the need for group-selection etc, and we did have that at some point, I'm not sure why it was removed, but I do know.. that adding it back is not an easy task. I'm going to spare you the technical details, but when you open add/edit users.. you see two windows with orgUnits.. well, they are actually backed by two completely different techs.. and adding one more of either one is a technical challenge. Not really difficult to change, but it will take time. As I said, I've been trying to understand why we removed OUST (this is what we call the expanded orgUnit assignment tree, with groups etc) and instead used OUWT (single/multiple select, but no groups etc). I think it comes down to, adding 100-1000 (or whatnot) OUs to a user is very uncommon. I think the real solution here is to get rid of both OUST/OUWT and instead build a new tree-component. We have talked about this before, but its not an easy fix. Just to make sure, the fix did work with smaller amounts of orgUnits right? its only when the volume grows large that problems arise. -- Morten On Thu, Oct 9, 2014 at 7:25 PM, Jason Pickering jason.p.picker...@gmail.com wrote: Hi Morten, Let me give a bit more background on this issue. We have been in touch about this privately as well of course, but wanted to describe the problem in more detail. This instance has users which are assigned to specific sites or facilities. The users are not assigned to parent organisation units, but rather individual facilities at the lowest level of the hierarchy. There are reasons for this, but not important to get into that background at the moment why this has been done the way it has. In some cases, there maybe be many orgunits/sites/facilities assigned to a single user, something in the range of several thousand. You have made a few changes to the code recently which supposedly corrects this issue, and it will work under some circumstances. However, in other circumstances, it does not seem to work. It has been difficult for me to come up with a procedure which can reproduce this, but it seems to be related to network latency as well as the number of sites which a user is currently assigned to. The other issue which Oba mentions here is that we are no longer able to assign organisation units to users based on organisation unit groups. This was a really critical feature for this implementation, and because of the removal of this functionality in the later versions of DHIS2, it has caused big problems for them. Hope we can get a permanent fix for this soon. In the meantime, we may have to hobble along with some scripts which syncronize the orgunit groups and user assignments. Best regards, Jason On Wed, Oct 8, 2014 at 3:07 PM, oadekola oadekola.m...@gmail.com wrote: Yes, organisation unit assignment to users. We are currently using the 2.16 version of trunk and the challenge still persists. Also, is it possible for the developers to create a user friendly interface that allows the assignment of all sites associated to an organisation unit group to a user. I mean an interface that won't necessitate selecting organisation units one after the other. Thank you. Best regards. On Wed, Oct 8, 2014 at 10:02 AM, Morten Olav Hansen 1378...@bugs.launchpad.net wrote: What version of dhis2? I assume you mean organisation-unit assignment to users. We have had fixes related to this in 2.16 and trunk. If you are using 2.16, could you try the latest release? https://www.dhis2.org/download/releases/2.16/dhis.war -- You received this bug notification because you are subscribed to the bug report. https://bugs.launchpad.net/bugs/1378699 Title: Sites get deactivated randomly Status in DHIS 2: New Bug description: When sites are highlighted and saved(activated), not all sites are saved(activated). Also, sites activated after sometime get deactivated. This affects data entry, cause users keep complaining that their sites are missing. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1378699/+subscriptions -- Adekola Obaloluwa Emmanuel, ICT/Office Assistant, USAID/Nigeria, Monitoring and Evaluation Management Services (MEMS) II Project, 17, Euphrates Street, Maitama, Abuja, Nigeria. Mobile1: 234 809 072 6621 Mobile2: 234 903 030 4652 -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1378699 Title: Sites get deactivated randomly Status in DHIS 2: New Bug description: When sites are highlighted and saved(activated), not all sites are saved(activated). Also,
[Dhis2-devs] [Bug 1378699] Re: Assignment of organisation units to users is corrupted randomly when updating under certain circumstances
** Summary changed: - Sites get deactivated randomly + Assignment of organisation units to users is corrupted randomly when updating under certain circumstances -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1378699 Title: Assignment of organisation units to users is corrupted randomly when updating under certain circumstances Status in DHIS 2: New Bug description: When sites are highlighted and saved(activated), not all sites are saved(activated). Also, sites activated after sometime get deactivated. This affects data entry, cause users keep complaining that their sites are missing. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1378699/+subscriptions ___ 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 1378699] Re: Sites get deactivated randomly
Hi Morten, Yes, I think it only seems to occur with users which have many (i.e over a thousand) assigned orgunits, but not 100% sure about this. However, I can confirm that it does happen under certain circumstances which are not always clear exactly what they are. However. I was able to reproduce it once, and the result was that ALL orgunit assignments were lost completely. Agree this is an unusual use case but it arises because specific users need to be able to enter data into specific orgunits which are spread across many branches of the hierarchy. An easier solution would be to have an assignment between orgunit groups and users, which would sort of automatically assign orgunits to a user based on the assignment of an orgunit group to that user. Regards, Jason On Thu, Oct 9, 2014 at 2:32 PM, Morten Olav Hansen morte...@gmail.com wrote: Hi Jason I'm just guessing here.. but I think the issue is related to having large amounts of IDs selected.. so even the fix I made, it will struggle to send all that data. The fix was working fine with smaller amounts of selected OUs right? I do understand the need for group-selection etc, and we did have that at some point, I'm not sure why it was removed, but I do know.. that adding it back is not an easy task. I'm going to spare you the technical details, but when you open add/edit users.. you see two windows with orgUnits.. well, they are actually backed by two completely different techs.. and adding one more of either one is a technical challenge. Not really difficult to change, but it will take time. As I said, I've been trying to understand why we removed OUST (this is what we call the expanded orgUnit assignment tree, with groups etc) and instead used OUWT (single/multiple select, but no groups etc). I think it comes down to, adding 100-1000 (or whatnot) OUs to a user is very uncommon. I think the real solution here is to get rid of both OUST/OUWT and instead build a new tree-component. We have talked about this before, but its not an easy fix. Just to make sure, the fix did work with smaller amounts of orgUnits right? its only when the volume grows large that problems arise. -- Morten On Thu, Oct 9, 2014 at 7:25 PM, Jason Pickering jason.p.picker...@gmail.com wrote: Hi Morten, Let me give a bit more background on this issue. We have been in touch about this privately as well of course, but wanted to describe the problem in more detail. This instance has users which are assigned to specific sites or facilities. The users are not assigned to parent organisation units, but rather individual facilities at the lowest level of the hierarchy. There are reasons for this, but not important to get into that background at the moment why this has been done the way it has. In some cases, there maybe be many orgunits/sites/facilities assigned to a single user, something in the range of several thousand. You have made a few changes to the code recently which supposedly corrects this issue, and it will work under some circumstances. However, in other circumstances, it does not seem to work. It has been difficult for me to come up with a procedure which can reproduce this, but it seems to be related to network latency as well as the number of sites which a user is currently assigned to. The other issue which Oba mentions here is that we are no longer able to assign organisation units to users based on organisation unit groups. This was a really critical feature for this implementation, and because of the removal of this functionality in the later versions of DHIS2, it has caused big problems for them. Hope we can get a permanent fix for this soon. In the meantime, we may have to hobble along with some scripts which syncronize the orgunit groups and user assignments. Best regards, Jason On Wed, Oct 8, 2014 at 3:07 PM, oadekola oadekola.m...@gmail.com wrote: Yes, organisation unit assignment to users. We are currently using the 2.16 version of trunk and the challenge still persists. Also, is it possible for the developers to create a user friendly interface that allows the assignment of all sites associated to an organisation unit group to a user. I mean an interface that won't necessitate selecting organisation units one after the other. Thank you. Best regards. On Wed, Oct 8, 2014 at 10:02 AM, Morten Olav Hansen 1378...@bugs.launchpad.net wrote: What version of dhis2? I assume you mean organisation-unit assignment to users. We have had fixes related to this in 2.16 and trunk. If you are using 2.16, could you try the latest release? https://www.dhis2.org/download/releases/2.16/dhis.war -- You received this bug notification because you are subscribed to the bug report. https://bugs.launchpad.net/bugs/1378699 Title: Sites get deactivated randomly Status in DHIS 2: New Bug description: When sites are highlighted and saved(activated), not
Re: [Dhis2-devs] [Bug 1378699] Re: Sites get deactivated randomly
On Thu, Oct 9, 2014 at 7:38 PM, Jason Pickering jason.p.picker...@gmail.com wrote: Yes, I think it only seems to occur with users which have many (i.e over a thousand) assigned orgunits, but not 100% sure about this. However, I can confirm that it does happen under certain circumstances which are not always clear exactly what they are. However. I was able to reproduce it once, and the result was that ALL orgunit assignments were lost completely. Saying that its ALL or nothing makes me feel like this is related to POST body size.. we might want to split assignments up to batches with 300-400 OUs, I'm not sure I can make this for 2.17, but will try next week... (bug week, before release) -- Morten ___ 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 17023: Data entry, delay message
revno: 17023 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 15:04:02 +0200 message: Data entry, delay message modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2014-09-29 17:50:45 + +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2014-10-09 13:04:02 + @@ -368,12 +368,12 @@ if ( 409 == xhr.status || 500 == xhr.status ) // Invalid value or locked { markValue( fieldId, dhis2.de.cst.colorRed ); - setHeaderMessage( xhr.responseText ); + setHeaderDelayMessage( xhr.responseText ); } else // Offline, keep local value { markValue( fieldId, resultColor ); - setHeaderMessage( i18n_offline_notification ); + setHeaderDelayMessage( i18n_offline_notification ); } } ___ 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 17024: tracker capture - date fileds respecting calendar setting, WIP
revno: 17024 committer: Abyot Asalefew Gizaw aby...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 15:41:37 +0200 message: tracker capture - date fileds respecting calendar setting, WIP modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.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-tracker-capture/components/dataentry/dataentry.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-10-02 10:25:39 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-10-09 13:41:37 + @@ -69,12 +69,12 @@ div class=row div class=col-md-6 {{currentDummyEvent.reportDateDescription}} -input type=text placeholder=-mm-dd name=eventDate class=form-control ng-date ng-model=currentDummyEvent.eventDate ng-required=false/ +input type=text placeholder={{dhis2CalendarFormat.keyDateFormat}} name=eventDate class=form-control ng-date ng-model=currentDummyEvent.eventDate ng-required=false/ span ng-if=eventCreationForm.submitted eventCreationForm.eventDate.$invalid class=error{{'required'| translate}}/span /div div class=col-md-6 {{'due_date'| translate}} -input type=text placeholder=-mm-dd name=dueDate class=form-control ng-date ng-model=currentDummyEvent.dueDate ng-required=true/ +input type=text placeholder={{dhis2CalendarFormat.keyDateFormat}} name=dueDate class=form-control ng-date ng-model=currentDummyEvent.dueDate ng-required=true/ span ng-if=eventCreationForm.submitted eventCreationForm.dueDate.$invalid class=error{{'required'| translate}}/span /div /div @@ -93,7 +93,7 @@ {{currentEvent.reportDateDescription}} input type=text name=eventDate - placeholder=-mm-dd + placeholder={{dhis2CalendarFormat.keyDateFormat}} class=form-control ng-class={'input-success': eventDateSaved} ng-date @@ -112,7 +112,7 @@ /span input type=text name=dueDate - placeholder=-mm-dd + placeholder={{dhis2CalendarFormat.keyDateFormat}} class=form-control ng-class={'input-success': dueDateSaved} ng-date === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2014-10-02 10:25:39 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2014-10-09 13:41:37 + @@ -88,7 +88,7 @@ /div div ng-switch-when=date
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17025: tracker capture - cleanup
revno: 17025 committer: Abyot Asalefew Gizaw aby...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 17:37:26 +0200 message: tracker capture - cleanup modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.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-tracker-capture/components/dashboard/dashboard-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2014-10-08 08:48:34 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2014-10-09 15:37:26 + @@ -123,6 +123,5 @@ modalInstance.result.then(function () { }); -}; - +}; }); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2014-09-05 12:52:43 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2014-10-09 15:37:26 + @@ -10,7 +10,7 @@ TranslationService.translate(); //attributes for profile -$scope.attributes = {}; +$scope.attributes = []; $scope.editProfile = false; AttributesFactory.getAll().then(function(atts){ @@ -27,10 +27,10 @@ $scope.selectedProgram = selections.pr; $scope.selectedEnrollment = selections.enrollment; -//display only those attributes that belong the selected program +//display only those attributes that belong to the selected program //if no program, display attributesInNoProgram TEIService.processAttributes($scope.selectedTei, $scope.selectedProgram, $scope.selectedEnrollment).then(function(tei){ -$scope.selectedTei = tei; +$scope.selectedTei = tei; }); }); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-10-09 13:41:37 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-10-09 15:37:26 + @@ -55,6 +55,10 @@ input type=number name=foo class=form-control ng-model=attribute.value ng-disabled=!editProfile ng-required=attribute.mandatory/ span ng-show=outerForm.submitted innerForm.foo.$invalid class=error{{'required'| translate}} - {{attribute.type}}/span /div +div ng-switch-when=email +input type=email name=foo class=form-control ng-model=attribute.value ng-disabled=!editProfile ng-required=attribute.mandatory/ +span ng-show=outerForm.submitted innerForm.foo.$invalid class=error{{'required'| translate}}/span +/div div ng-switch-default input type=text name=foo class=form-control ng-model=attribute.value ng-disabled=!editProfile ng-required=attribute.mandatory/ span ng-show=outerForm.submitted innerForm.foo.$invalid class=error{{'required'| translate}} - {{attribute.type}}/span === modified file
[Dhis2-devs] Hazelcast Status Info Messages
Hi Everyone, Any chance the default setting for Hazelcast status updates in the log can be less frequent or disabled by default? Every 30 seconds causes a lot of log pollution. Thanks, Dan ___ 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 17026: DV EV sorting, trend lines, style fixes.
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 17026 [merge] committer: Jan Henrik Overland janhenrik.overl...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 20:15:23 +0200 message: DV EV sorting, trend lines, style fixes. modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-event-visualizer/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2014-10-09 07:58:13 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2014-10-09 18:13:21 + @@ -202,7 +202,7 @@ fontFamily: 'Arial,Sans-serif,Lucida Grande,Ubuntu' }, theme: { -dv1: ['#94ae0a', '#0b3b68', '#a61120', '#ff8809', '#7c7474', '#a61187', '#ffd13e', '#24ad9a', '#a66111', '#414141', '#4500c4', '#1d5700'] +dv1: ['#94ae0a', '#1d5991', '#a61120', '#ff8809', '#7c7474', '#a61187', '#ffd13e', '#24ad9a', '#a66111', '#414141', '#4500c4', '#1d5700'] } }; @@ -1733,7 +1733,6 @@ delete layout.parentOrganisationUnit; delete layout.regression; delete layout.cumulative; -delete layout.sortOrder; delete layout.topLimit; return layout; @@ -2062,9 +2061,12 @@ }; web.report.aggregate.createChart = function(layout, xLayout, xResponse, centerRegion) { -var columnIds = xLayout.columns[0] ? xLayout.columns[0].ids : [], +var dataTotalKey = Ext.data.IdGenerator.get('uuid').generate(), +//columnIds = xLayout.columns[0] ? xLayout.columns[0].ids : [], +columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [], replacedColumnIds = support.prototype.str.replaceAll(Ext.clone(columnIds), '.', ''), -rowIds = xLayout.rows[0] ? xLayout.rows[0].ids : [], +//rowIds = xLayout.rows[0] ? xLayout.rows[0].ids : [], +rowIds = xLayout.rowDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.rowDimensionNames[0]] : [], replacedRowIds = support.prototype.str.replaceAll(Ext.clone(rowIds), '.', ''), filterIds = function() { var ids = []; @@ -2092,28 +2094,16 @@ return map; }(), -sortStoreBySum = function(store, ids, sortOrder) { -var key = Ext.data.IdGenerator.get('uuid').generate(), -total; - -// add totals -store.each( function(record) { +addDataTotals = function(data, ids) { +for (var i = 0, obj, total; i data.length; i++) { +obj = data[i]; total = 0; -for (var i = 0; i ids.length; i++) { -total += parseFloat(record.data[ids[i]]); - -record.set(key, total); +for (var j = 0; j ids.length; j++) { +total += parseFloat(obj[ids[j]]); +obj[dataTotalKey] = total; } -}); - -// sort -store.sort(key, sortOrder === -1 ? 'ASC' : 'DESC'); - -// remove totals -store.each( function(record) { -delete record.data[key]; -}); +} }, getSyncronizedXLayout, @@ -2138,7 +2128,7 @@ generator = {}; -getDefaultStore = function() { +getDefaultStore = function(isStacked) { var pe = conf.finals.dimension.period.dimensionName, columnDimensionName = xLayout.columns[0].dimensionName, rowDimensionName = xLayout.rows[0].dimensionName, @@ -2156,15 +2146,15 @@ rowValues = []; isEmpty = false; + obj[conf.finals.data.domain] = xResponse.metaData.names[category]; -for
[Dhis2-devs] JS Call to Determine User Info
Hi All, I’m writing a DHIS 2 app (a la the App Store) and I’d like to know if there is a JS call I can make to get information about the user I’m logged in as. Something similar to dhis2.de.currentDataSetId or dhis2.de.currentOrganisationUnitId but would look like dhis2.currentUser and at least give me the UID of the user if not their username/email. Thanks, Dan Dan Cocos BAO Systems www.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
Re: [Dhis2-devs] JS Call to Determine User Info
Hey Dan, There are a few endpoints in the api you can call to get information see https://www.dhis2.org/doc/snapshot/en/developer/html/ch01s27.html A few examples: https://apps.dhis2.org/dev/api/me https://apps.dhis2.org/dev/api/me/authorization Kind regards, Mark Polak m...@thedutchies.com mar...@ifi.uio.no +47 970 36 752 On 09 Oct 2014, at 20:54, Dan d...@dancocos.com wrote: Hi All, I’m writing a DHIS 2 app (a la the App Store) and I’d like to know if there is a JS call I can make to get information about the user I’m logged in as. Something similar to dhis2.de.currentDataSetId or dhis2.de.currentOrganisationUnitId but would look like dhis2.currentUser and at least give me the UID of the user if not their username/email. Thanks, Dan Dan Cocos BAO Systems www.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
Re: [Dhis2-devs] Hazelcast Status Info Messages
+1 Removing all the analytics garbage would also be good. Regards, Jason On Thursday, October 9, 2014, Dan d...@dancocos.com wrote: Hi Everyone, Any chance the default setting for Hazelcast status updates in the log can be less frequent or disabled by default? Every 30 seconds causes a lot of log pollution. Thanks, Dan ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net javascript:; Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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 17027: Temporary fix for exception while adding data sets to user roles.
revno: 17027 committer: jimgr...@gmail.com branch nick: dhis2 timestamp: Thu 2014-10-09 16:46:49 -0400 message: Temporary fix for exception while adding data sets to user roles. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.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-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java 2014-08-15 07:40:20 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java 2014-10-09 20:46:49 + @@ -126,7 +126,13 @@ for ( String id : selectedList ) { -DataSet dataSet = dataSetService.getDataSet( Integer.parseInt( id ) ); +DataSet dataSet = dataSetService.getDataSet( id ); + +if ( dataSet == null ) +{ +//TODO fix this better. Currently some are UID, some ID. Should all be the same. +dataSet = dataSetService.getDataSet( Integer.parseInt( id ) ); +} group.getDataSets().add( dataSet ); } ___ 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] Hazelcast Status Info Messages
agreed, possibly just send most or all of it to a different log file. In the mean time I mostly pipe cat and tail to grep -Ev 'com.hazelcast.util.HealthMonitor|executor.q.async.size' Timothy Harding PeaceCorps Volunteer Republic of Vanuatu hardi...@gmail.com +678 5955137 On Fri, Oct 10, 2014 at 6:50 AM, Jason Pickering jason.p.picker...@gmail.com wrote: +1 Removing all the analytics garbage would also be good. Regards, Jason On Thursday, October 9, 2014, Dan d...@dancocos.com wrote: Hi Everyone, Any chance the default setting for Hazelcast status updates in the log can be less frequent or disabled by default? Every 30 seconds causes a lot of log pollution. Thanks, Dan ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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] Hazelcast Status Info Messages
+1 I know at least one implementation where the bulk of what they are paying for relatively expensive ssd storage is mostly for analytics log storage. Growing considerably faster than the database. I think by default much of these should be DEBUG level rather than INFO. On 9 October 2014 20:50, Jason Pickering jason.p.picker...@gmail.com wrote: +1 Removing all the analytics garbage would also be good. Regards, Jason On Thursday, October 9, 2014, Dan d...@dancocos.com wrote: Hi Everyone, Any chance the default setting for Hazelcast status updates in the log can be less frequent or disabled by default? Every 30 seconds causes a lot of log pollution. Thanks, Dan ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Jason P. Pickering email: jason.p.picker...@gmail.com tel:+46764147049 ___ 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-core] JSDoc
Hi everyone Just wanted to tell you about JSDoc [1], its a documentation format for documenting JavaScript code, I'm already using it in dhis2.period.js, and it has many benefits. The most obvious benefit is proper autocompletion and also type handling, as an example, please consider this: function hello(a,b,c) {} hello(1,2,3); The JS compiler/evaluator have no idea how to interpret the parameters to this function since JS is not type aware by default. So it will just accept anything. Then please consider this: /** * @param {String} a String parameter * @param {Number} a number * @param {Number} Another number */ function hello(a,b,c) {} hello(1,2,3); Now the IDE will say that the first argument is wrong, since it expected a string to be passed, but argument 2 and 3 is correct. I can only vouch for IntelliJ's handling of this, but I'm going to assume Eclipse have similar mechanics in place. For our D2js library, we will be using JSDoc all over the place, which will make it a lot easier to use within an IDE. [1] http://usejsdoc.org/ -- Morten -- 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
Re: [Dhis2-devs-core] JSDoc
Tutorial? ;) On Thu, Oct 9, 2014 at 3:22 PM, Morten Olav Hansen morte...@gmail.com wrote: Hi everyone Just wanted to tell you about JSDoc [1], its a documentation format for documenting JavaScript code, I'm already using it in dhis2.period.js, and it has many benefits. The most obvious benefit is proper autocompletion and also type handling, as an example, please consider this: function hello(a,b,c) {} hello(1,2,3); The JS compiler/evaluator have no idea how to interpret the parameters to this function since JS is not type aware by default. So it will just accept anything. Then please consider this: /** * @param {String} a String parameter * @param {Number} a number * @param {Number} Another number */ function hello(a,b,c) {} hello(1,2,3); Now the IDE will say that the first argument is wrong, since it expected a string to be passed, but argument 2 and 3 is correct. I can only vouch for IntelliJ's handling of this, but I'm going to assume Eclipse have similar mechanics in place. For our D2js library, we will be using JSDoc all over the place, which will make it a lot easier to use within an IDE. [1] http://usejsdoc.org/ -- Morten -- 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 -- 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
Re: [Dhis2-devs-core] JSDoc
Adding back dev-core. Yes, I agree. Honestly, for me.. I care less about about the html output.. we can use whatever. But I use IntelliJ for my web dev (actually all dev), and using jsdoc helps me *alot*, simple things like type verification / auto-completion. -- Morten On Thu, Oct 9, 2014 at 9:19 PM, Mark Polak mar...@ifi.uio.no wrote: Agreed. I believe we should create the core D2JS as a JS library that D2.angular.js is build on top of. Which would mean that what i now created as d2js would be d2.angular.js and “the real d2js” would include more “portable” things that are not framework specific but more “services” that you can use which could then be exposed to angular though d2.angular.js. Note: Still does not mean we can’t use dgeni for normal d2js as well. As it is just pretty much a parser for your JSDoc. Kind regards, Mark Polak m...@thedutchies.com mar...@ifi.uio.no +47 970 36 752 On 09 Oct 2014, at 16:13, Morten Olav Hansen morte...@gmail.com wrote: I'm not convinced we should limit ourselves to AngularJS in D2js. We should definetely have d2.anguar.js, but should we only rely on AJS, I'm not sure.. This is why i tried to push a D2js on our last call. I would hate seeing us become a AJS shop only, we definitely want to make it nice for AJS developers, but it also feels limiting. I tried to push this a bit on our Oslo meeting, maybe I didn't push enough (disclaimer, I'm a big fan of AngularJS). But as you all know, there will always be a next-big-thing in JavaScript, and I feel we might be limiting ourselves if we only care about AJS (internally it makes sense, but externally..) -- Morten On Thu, Oct 9, 2014 at 9:10 PM, Mark Polak mar...@ifi.uio.no wrote: Hey Morten and JS people, Since we will be building in AngularJS we should be using https://github.com/angular/dgeni it is pretty much an extension for JSDoc. I created a repository with the packages as well. Which is available through NPM. (Which might be out of sync with the most current version of dgeni atm) What something like that will result into looks like http://markionium.github.io/d2-docs/ (The top menu should work fine but the navigation is a bit wonky as Github pages does not support AngularJS html5mode as that needs server support (Which might also be a thing we have to look at if that would be important for our apps.) Anyways as for D2 (https://github.com/Markionium/d2). What it is right now is pretty much just a collection of services and directive that i was creating while working on apps. A lot of it will need cleaning up and refactoring. For example the thing we mentioned earlier about the bootstrapping. (I will look at that sometime next week hopefully). Kind regards, Mark Polak m...@thedutchies.com mar...@ifi.uio.no +47 970 36 752 On 09 Oct 2014, at 15:22, Morten Olav Hansen morte...@gmail.com wrote: Hi everyone Just wanted to tell you about JSDoc [1], its a documentation format for documenting JavaScript code, I'm already using it in dhis2.period.js, and it has many benefits. The most obvious benefit is proper autocompletion and also type handling, as an example, please consider this: function hello(a,b,c) {} hello(1,2,3); The JS compiler/evaluator have no idea how to interpret the parameters to this function since JS is not type aware by default. So it will just accept anything. Then please consider this: /** * @param {String} a String parameter * @param {Number} a number * @param {Number} Another number */ function hello(a,b,c) {} hello(1,2,3); Now the IDE will say that the first argument is wrong, since it expected a string to be passed, but argument 2 and 3 is correct. I can only vouch for IntelliJ's handling of this, but I'm going to assume Eclipse have similar mechanics in place. For our D2js library, we will be using JSDoc all over the place, which will make it a lot easier to use within an IDE. [1] http://usejsdoc.org/ -- Morten -- 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 -- 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