Re: [Dhis2-devs] DHIS2 reports/charts/graphs Sharing
I may have missed or configured some thing that causes this issue. The same settings settings were working for other user groups and roles. I have now created an alternate user role with same access level. Created a new user, assigned the new role. Created a new user group for the new user. And now it worked :). A few more queries that incurs to me during this configuration steps. What is the difference between "User by Organization Unit" and "User"?, as I see the same options available when opt to eidt a user. What is the option "Join Group" does? What Managed user groups does? Is it used to group the groups into a big group? Like group, Health Service and Sales into a new year end group to share reports at once? How can we see disables users by just looking at list? Or a filter can be added to fetch the disables users or only active users. On Mon, Jun 15, 2015 at 5:44 PM, Ola Hodne Titlestad wrote: > To see your shared dashboard the user only needs the authority to see the > dashboard module, nothing else. So the user role for that is very basic. > > What's important is the user group. You share dashboard with a user group, > not a user role. > Note that each tab on your Dashboards page is referred to as one Dashboard > and has its own sharing settings. For each dashboard you want to > restrict/mange access to, click on Share, then remove the public access and > add one or more user group that you want to grant read or write access to. > > Ola > > On Mon, 15 Jun 2015 14:07 Knut Staring wrote: > >> What if you try a different browser and chrome incognito mode? >> >> And what if you make a third group which also have the same access rights? >> >> On Mon, Jun 15, 2015 at 2:04 PM, Muhammad Tahir >> wrote: >> >>> Yes, I have cleared the cache at admin and other user's end, but the >>> results are still different. >>> >>> On Mon, Jun 15, 2015 at 5:03 PM, Knut Staring wrote: >>> So both user roles have exactly the same rights, but show different results? That is weird... On Mon, Jun 15, 2015 at 1:55 PM, Muhammad Tahir wrote: > Hi Matthieu, > > I have created two roles "Sales" and "Health Services" with following > rights, > > >- M_dhis-web-maintenance-appmanager >- M_dhis-web-maintenance-user >- M_dhis-web-event-visualizer >- M_dhis-web-reporting >- M_dhis-web-maintenance-dataset >- M_dhis-web-pivot >- M_dhis-web-dashboard-integration >- M_dhis-web-dataentry >- M_dhis-web-cache-cleaner >- M_dhis-web-mobile >- M_dhis-web-event-capture >- M_dhis-web-sms >- M_dhis-web-light >- M_dhis-web-maintenance-datadictionary >- M_dhis-web-maintenance-settings >- M_dhis-web-maintenance-program >- M_dhis-web-validationrule >- M_dhis-web-mapping >- See Tabular Tracker Capture >- M_dhis-web-maintenance-organisationunit >- M_dhis-web-importexport >- M_dhis-web-api-fred >- M_dhis-web-caseentry >- M_dhis-web-visualizer >- M_dhis-web-event-reports >- M_dhis-web-maintenance-dataadmin >- M_dhis-web-maintenance-mobile >- M_dhis-web-tracker-capture >- F_EXPORT_EVENTS >- F_EXPORT_DATA >- F_VIEW_DATABROWSER >- F_MYDATAMART_VIEW > > > Later user created with each role is added to their respective groups > Sales Group and HS Group. > > > But the dashboard does not appear for Sales user, rather it appears > for HS User. See the attached screenshots for reference. > > > > > > > On Mon, Jun 15, 2015 at 4:24 PM, Matthieu Pinard > wrote: > >> Dear Muhammad, >> >> *Sharing a Dashboard* >> *- Sharing options* >> Could you send a screenshot of you sharing settings of the dashboard? >> >> *- User Access rights* >> What are the user's access rights of the user who cannot access the >> dashboard? >> >> *Sharing a chart* >> Yes it should be defined at the level of each chart by clicking the >> blue button in Favourites. >> >> Cheers, >> Matthieu >> >> >> Matthieu Pinard >> DHIS 2 Academy & Community Coordinator | University of Oslo >> >> On 15 June 2015 at 11:58, Muhammad Tahir wrote: >> >>> Hi, >>> >>> >>> I have created some reports and charts as admin user and have placed >>> these on my dashboard. >>> >>> Now, I tried to share only selected tabs on my dashboard with a >>> particular user group, but nothing appear at that user's end on its >>> dashboard. >>> >>> >>> Additionally, I would like to limit the visibility of reports/charts >>> to specific users/user groups when permitted, as of now, I have to >>> manually >>> block each report/chart to none. >>> >>> >>> >>> -- >>> *Regards,
Re: [Dhis2-devs] [Dhis2-users] How to unistall dhis2 instance
Only the DHIS2 or all the dependancies (TOMCAT, PostGres)? On 6/16/15, 3:08 AM, "gerald thomas" wrote: >Dear All, >Please can anyone help give me the steps how to uninstall an instance >in dhis2. > >-- >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
Re: [Dhis2-devs] How to unistall dhis2 instance
Hi Gerald I think you neglected to mention you are using dhis2-tools to create this instance. When you run 'dhis2-instance-create myinstance' a few things happen: 1. a new user called myinstance is created with a home dir of /var/lib/dhis2/myinstance 2. a new database role called myinstance is created; and 3. a new database called myinstance is created So to roll all that back dropdb myinstance (this will remove the database - back it up first if you need to keep a copy) dropuser myinstance userdel -r myinstance Cheers Bob On 16 June 2015 at 03:42, gerald thomas wrote: > Dear Dan, > When I drop the database, the role for such database is still there; but > that can be removed also. Now, if I try to create that instance again it > will say instance already created. So how can remove and create everything > from scratch. > Please remember I will the same instance name. > > Regards, > Gerald > > On 16 Jun 2015 00:57, "Dan Cocos" wrote: >> >> You can simply remove the war file and the directory from your servlet >> container and drop the database. >> >> >> >> >> >> > On Jun 15, 2015, at 8:08 PM, gerald thomas >> > wrote: >> > >> > Dear All, >> > Please can anyone help give me the steps how to uninstall an instance >> > in dhis2. >> > >> > -- >> > 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 > > > ___ > 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 19413: Removed now unnecessary list wrappers
revno: 19413 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 10:40:38 +0200 message: Removed now unnecessary list wrappers modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/GetCategoryOptionGroupSetListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2015-06-16 05:11:29 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2015-06-16 08:40:38 + @@ -309,7 +309,7 @@ @Override public PeriodType getPeriodType( DataElement dataElement, Collection dataSetIdentifiers ) { -Collection dataSets = getDataSets( dataSetIdentifiers ); +List dataSets = getDataSets( dataSetIdentifiers ); for ( DataSet dataSet : dataSets ) { @@ -343,7 +343,7 @@ @Override public Set getDistinctDataElements( Collection dataSetIdentifiers ) { -Collection dataSets = getDataSets( dataSetIdentifiers ); +List dataSets = getDataSets( dataSetIdentifiers ); Set dataElements = new HashSet<>(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java 2015-01-17 07:41:26 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java 2015-06-16 08:40:38 + @@ -28,7 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.ArrayList; import java.util.List; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; @@ -81,8 +80,7 @@ defaultCategoryOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo(); this.paging = createPaging( categoryService.getOptionComboCount() ); -optionCombos = new ArrayList<>( categoryService.getOptionCombosBetween( paging.getStartPos(), -paging.getPageSize() ) ); +optionCombos = categoryService.getOptionCombosBetween( paging.getStartPos(), paging.getPageSize() ); return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java 2015-01-17 07:41:26 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java 2015-06-16 08:40:38 + @@ -28,7 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -74,8 +73,7 @@ @Override public String execute() { -dataElementCategories = new ArrayList<>( dataElementCategoryService -.getAllDataElementCategories() ); +dataElementCategories = dataElementCategoryService.getAllDataElementCategories(); Collections.sort( dataElementCategories, IdentifiableObjectNameComparator.INSTANCE ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19414: event-capture: program rule - WIP
revno: 19414 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Tue 2015-06-16 11:46:37 +0200 message: event-capture: program rule - WIP modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-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-event-capture/scripts/event-capture.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-02 12:25:03 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-16 09:46:37 + @@ -1,5 +1,5 @@ -/* global dhis2, angular, i18n_ajax_login_failed, _ */ +/* global dhis2, angular, i18n_ajax_login_failed, _, selection, selection */ dhis2.util.namespace('dhis2.ec'); @@ -32,7 +32,7 @@ dhis2.ec.store = new dhis2.storage.Store({ name: 'dhis2ec', adapters: [dhis2.storage.IndexedDBAdapter, dhis2.storage.DomSessionStorageAdapter, dhis2.storage.InMemoryAdapter], -objectStores: ['programs', 'programStages', 'geoJsons', 'optionSets', 'events', 'programValidations', 'ouLevels'] +objectStores: ['programs', 'programStages', 'geoJsons', 'optionSets', 'events', 'programValidations', 'programRules', 'ouLevels'] }); (function($) { @@ -150,9 +150,11 @@ promise = promise.then( getMetaPrograms ); promise = promise.then( getPrograms ); promise = promise.then( getProgramStages ); -promise = promise.then( getOptionSets ); promise = promise.then( getMetaProgramValidations ); promise = promise.then( getProgramValidations ); +promise = promise.then( getMetaProgramRules ); +promise = promise.then( getProgramRules ); +promise = promise.then( getOptionSets ); promise.done( function() { //Enable ou selection after meta-data has downloaded $( "#orgUnitTree" ).removeClass( "disable-clicks" ); @@ -193,8 +195,7 @@ { if(localStorage['CALENDAR_SETTING']){ return; -} - +} var def = $.Deferred(); $.ajax({ @@ -467,8 +468,27 @@ }; } - function getMetaProgramValidations( programs ) +{ +return getD2MetaObject(programs, 'programValidations', '../api/programValidations.json', 'paging=false&fields=id,program[id]'); +} + +function getProgramValidations( programValidations ) +{ +return getD2Objects( programValidations, 'programValidations', '../api/programValidations', 'fields=id,name,displayName,operator,rightSide[expression,description],leftSide[expression,description],program[id]'); +} + +function getMetaProgramRules( programs ) +{ +return getD2MetaObject(programs, 'programRules', '../api/programRules.json', 'paging=false&fields=id,program[id]'); +} + +function getProgramRules( programRules ) +{ +return getD2Objects( programRules, 'programRules', '../api/programRules', 'fields=id,name,condition,description,program[id],programRuleActions[id,content,programRuleActionType,programStageSection[id,name],dataElement[id]]'); +} + +function getD2MetaObject( programs, objNames, url, filter ) { if( !programs ){ return; @@ -484,24 +504,24 @@ }); $.ajax({ -url: '../api/programValidations.json', +url: url, type: 'GET', -data:'paging=false&fields=id,program[id]' +data:filter }).done( function(response) { -var programValidations = []; -_.each( _.values( response.programValidations ), function ( programValidation ) { -if( programValidation && -programValidation.id && -programValidation.program && -programValidation.program.id && -programIds.indexOf( programValidation.program.id ) !== -1) { +var objs = []; +_.each( _.values( response[objNames]), function ( o ) { +if( o && +o.id && +o.program && +o.program.id && +programIds.indexOf( o.program.id ) !== -1) { -programValidations.push( programValidation ); +objs.push( o ); } }); -def.resolve( programValidations ); +def.resolve( {programs: programs, self: objs} ); }).fail(function(){ def.resolve( null ); @@ -510,9 +530,9 @@ return def.promise(); } -function getProgramValidations( programValidations ) +function getD2Objects( obj, store, url, filter ) { -if( !programValidations ){ +if( !obj || !obj.p
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19415: event-capture: fetching program rule variables
revno: 19415 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Tue 2015-06-16 11:57:57 +0200 message: event-capture: fetching program rule variables modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-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-event-capture/scripts/event-capture.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-16 09:46:37 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-16 09:57:57 + @@ -32,7 +32,7 @@ dhis2.ec.store = new dhis2.storage.Store({ name: 'dhis2ec', adapters: [dhis2.storage.IndexedDBAdapter, dhis2.storage.DomSessionStorageAdapter, dhis2.storage.InMemoryAdapter], -objectStores: ['programs', 'programStages', 'geoJsons', 'optionSets', 'events', 'programValidations', 'programRules', 'ouLevels'] +objectStores: ['programs', 'programStages', 'geoJsons', 'optionSets', 'events', 'programValidations', 'programRules', 'programRuleVariables', 'ouLevels'] }); (function($) { @@ -154,6 +154,8 @@ promise = promise.then( getProgramValidations ); promise = promise.then( getMetaProgramRules ); promise = promise.then( getProgramRules ); +promise = promise.then( getMetaProgramRuleVariables ); +promise = promise.then( getProgramRuleVariables ); promise = promise.then( getOptionSets ); promise.done( function() { //Enable ou selection after meta-data has downloaded @@ -488,6 +490,16 @@ return getD2Objects( programRules, 'programRules', '../api/programRules', 'fields=id,name,condition,description,program[id],programRuleActions[id,content,programRuleActionType,programStageSection[id,name],dataElement[id]]'); } +function getMetaProgramRuleVariables( programs ) +{ +return getD2MetaObject(programs, 'programRuleVariables', '../api/programRuleVariables.json', 'paging=false&fields=id,program[id]'); +} + +function getProgramRuleVariables( programRuleVariables ) +{ +return getD2Objects( programRuleVariables, 'programRuleVariables', '../api/programRuleVariables', 'fields=id,name,program[id],dataElement[id]'); +} + function getD2MetaObject( programs, objNames, url, filter ) { if( !programs ){ === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2015-06-16 09:46:37 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js 2015-06-16 09:57:57 + @@ -10,7 +10,7 @@ var store = new dhis2.storage.Store({ name: 'dhis2ec', adapters: [dhis2.storage.IndexedDBAdapter, dhis2.storage.DomSessionStorageAdapter, dhis2.storage.InMemoryAdapter], -objectStores: ['programs', 'programStages', 'geoJsons', 'optionSets', 'events', 'programValidations', 'programRules', 'ouLevels'] +objectStores: ['programs', 'programStages', 'geoJsons', 'optionSets', 'events', 'programValidations', 'programRules', 'programRuleVariables', 'ouLevels'] }); return{ currentStore: store ___ 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 19416: Changed from using Collection to List as return type in dhis-service-reporting and do fixes in dh...
revno: 19416 committer: Tran Chau branch nick: dhis2 timestamp: Tue 2015-06-16 17:36:25 +0700 message: Changed from using Collection to List as return type in dhis-service-reporting and do fixes in dhis-web modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentServiceTest.java dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentStoreTest.java dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportStoreTest.java dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregatedValueController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPeriodsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/GetConstantListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/GetPeriodTypesAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/GetLocaleListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetAssignedGroupsByDataElementAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisat
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19417: Collection to list for id object manager
revno: 19417 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 12:59:33 +0200 message: Collection to list for id object manager modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.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/attribute/AttributeService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java 2015-06-16 05:11:29 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java 2015-06-16 10:59:33 + @@ -29,7 +29,6 @@ */ import java.util.List; -import java.util.Set; /** * @author Morten Olav Hansen === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-06-16 10:36:25 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-06-16 10:59:33 + @@ -65,25 +65,25 @@ T search( Class clazz, String query ); - Collection filter( Class clazz, String query ); - - Collection getAll( Class clazz ); - - Collection getAllByName( Class clazz, String name ); - - Collection getAllByNameIgnoreCase( Class clazz, String name ); - - Collection getAllSorted( Class clazz ); - - Collection getAllSortedByLastUpdated( Class clazz ); + List filter( Class clazz, String query ); + + List getAll( Class clazz ); + + List getAllByName( Class clazz, String name ); + + List getAllByNameIgnoreCase( Class clazz, String name ); + + List getAllSorted( Class clazz ); + + List getAllSortedByLastUpdated( Class clazz ); List getByUid( Class clazz, Collection uids ); List getByUidOrdered( Class clazz, List uids ); - Collection getLikeName( Class clazz, String name ); + List getLikeName( Class clazz, String name ); - Collection getLikeShortName( Class clazz, String shortName ); + List getLikeShortName( Class clazz, String shortName ); List getBetween( Class clazz, int first, int max ); @@ -95,11 +95,11 @@ List getByLastUpdated( Class clazz, Date lastUpdated ); - Collection getByCreated( Class clazz, Date created ); - - Collection getByLastUpdatedSorted( Class clazz, Date lastUpdated ); - - Collection getByCreatedSorted( Class clazz, Date created ); + List getByCreated( Class clazz, Date created ); + + List getByLastUpdatedSorted( Class clazz, Date lastUpdated ); + + List getByCreatedSorted( Class clazz, Date created ); Date getLastUpdated( Class clazz ); @@ -153,7 +153,7 @@ int getCountNoAcl( Class clazz ); - Collection getAllNoAcl( Class clazz ); + List getAllNoAcl( Class clazz ); - Collection getBetweenNoAc
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19418: minor
revno: 19418 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Tue 2015-06-16 13:21:02 +0200 message: minor modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-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-event-capture/scripts/event-capture.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-16 09:57:57 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-16 11:21:02 + @@ -497,7 +497,7 @@ function getProgramRuleVariables( programRuleVariables ) { -return getD2Objects( programRuleVariables, 'programRuleVariables', '../api/programRuleVariables', 'fields=id,name,program[id],dataElement[id]'); +return getD2Objects( programRuleVariables, 'programRuleVariables', '../api/programRuleVariables', 'fields=id,name,displayName,programRuleVariableSourceType,program[id],dataElement[id]'); } function getD2MetaObject( programs, objNames, url, filter ) ___ 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 19419: moved services related to rules engine to dhis-web-commons-resources
revno: 19419 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Tue 2015-06-16 13:22:51 +0200 message: moved services related to rules engine to dhis-web-commons-resources modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.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/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-06-14 13:07:10 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-06-16 11:22:51 + @@ -1773,469 +1773,4 @@ return event; } }; -}) - -/* service for building variables based on the data in users fields */ -.service('VariableService', function($rootScope,$q,TrackerRuleVariableFactory,$filter,orderByFilter,$log){ -return { -getVariables: function(programid, executingEvent, allEventsByStage, allDataElements, selectedEntity) { -var thePromisedVariables = $q.defer(); -var variables = {}; - -var pushVariable = function(variablename, variableValue, variableType, variablefound) { -//First clean away single or double quotation marks at the start and end of the variable name. -variableValue = $filter('trimquotes')(variableValue); - -//Append single quotation marks in case the variable is of text type: -if(variableType === 'string') { -variableValue = "'" + variableValue + "'"; -} -else if(variableType === 'date') { -variableValue = "'" + variableValue + "'"; -} -else if(variableType === 'bool' || variableType === 'trueOnly') { -if(eval(variableValue)) { -variableValue = true; -} -else { -variableValue = false; -} -} -else if(variableType === "int" || variableType === "number") { -variableValue = Number(variableValue); -} -else{ -$log.warn("unknown datatype:" + variableType); -} - - -//Make sure that the variableValue does not contain a dollar sign anywhere -//- this would potentially mess up later use of the variable: -//if(angular.isDefined(variableValue) -//&& variableValue !== null -//&& variableValue.indexOf("$") !== -1 ) { -//variableValue = variableValue.replace(/\\$/,""); -//} - -//TODO: -//Also clean away instructions that might be erroneusly evalutated in javascript - -variables[variablename] = { -variableValue:variableValue, -variableType:variableType, -hasValue:variablefound -}; -}; - -TrackerRuleVariableFactory.getProgramRuleVariables(programid).then(function(programVariables){ - -// The following section will need a different implementation for event capture: -var allEventsSorted = []; -var currentEvent = executingEvent; -var eventsSortedPerProgramStage = []; - -for(var key in allEventsByStage){ -if(allEventsByStage.hasOwnProperty(key)){ -eventsSortedPerProgramStage[key] = []; -angular.forEach(allEventsByStage[key], function(event){ -allEventsSorted.push(event); -eventsSortedPerProgramStage[key].push(event); -}); -eventsSortedPerProgramStage[key] = orderByFilter(eventsSortedPerProgramStage[key], '-sortingDate').reverse(); -} -} -allEventsSorted = orderByFilter(allEventsSorted, '-sortingDate').reverse(); - -var allDes = allDataElements; -//angular.forEach($scope.programStages, function(programStage){ -//angular.forEach(programStage.programStageDataElemen
[Dhis2-devs] Patients & Provider List View
Hi, We have patients and providers entities registered using program. Now we want to view/download a list of all the patients/providers that are linked to organization units at one place. We can see the list under the particular organization unit. But we want to see a list with all the organization units linked or if select a parent organization unit then can view all the patients/ providers under it. -- *Regards,* *Muhammad Tahir* ___ 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] Patients & Provider List View
Hi Muhammad, You can have that using the advanced search feature. See https://www.dhis2.org/doc/snapshot/en/user/html/ch28s02.html Thank you, Abyot. On Tue, Jun 16, 2015 at 1:30 PM Muhammad Tahir wrote: > Hi, > > We have patients and providers entities registered using program. > > > Now we want to view/download a list of all the patients/providers that are > linked to organization units at one place. We can see the list under the > particular organization unit. > > But we want to see a list with all the organization units linked or if > select a parent organization unit then can view all the patients/ providers > under it. > > -- > *Regards,* > *Muhammad Tahir* > ___ > 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] DHIS2: Select multiple options
Hi, While designing forms, we wanted to have fields where user can select multiple values. E.g. Services that a particular provider offers. Is there any option to select multiple values from a list or using check boxes? -- *Regards,* *Muhammad Tahir* ___ 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: Select multiple options
No, unfortunately we don't have that kind of feature. Actually storing multiple values for a single data-element will create a problem later during aggregation/analysis. If you have a short pre-defined list of services, I would suggest creating corresponding data element of type yes/no for each service. On Tue, Jun 16, 2015 at 1:41 PM Muhammad Tahir wrote: > Hi, > > While designing forms, we wanted to have fields where user can select > multiple values. > > > E.g. Services that a particular provider offers. > > Is there any option to select multiple values from a list or using check > boxes? > > -- > *Regards,* > *Muhammad Tahir* > ___ > 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 > -- Thank you, Abyot ___ 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] Patients & Provider List View
Thanks, it does work. Additionally I have to make program available at parent organization level to view all the children. On Tue, Jun 16, 2015 at 4:37 PM, Abyot Gizaw wrote: > Hi Muhammad, > > You can have that using the advanced search feature. See > https://www.dhis2.org/doc/snapshot/en/user/html/ch28s02.html > > Thank you, > Abyot. > On Tue, Jun 16, 2015 at 1:30 PM Muhammad Tahir wrote: > >> Hi, >> >> We have patients and providers entities registered using program. >> >> >> Now we want to view/download a list of all the patients/providers that >> are linked to organization units at one place. We can see the list under >> the particular organization unit. >> >> But we want to see a list with all the organization units linked or if >> select a parent organization unit then can view all the patients/ providers >> under it. >> >> -- >> *Regards,* >> *Muhammad Tahir* >> ___ >> 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 >> > -- *Regards,* *Muhammad Tahir* ___ 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] Patients & Provider List View
yes, that is true. On Tue, Jun 16, 2015 at 1:48 PM Muhammad Tahir wrote: > Thanks, it does work. Additionally I have to make program available at > parent organization level to view all the children. > > > > On Tue, Jun 16, 2015 at 4:37 PM, Abyot Gizaw wrote: > >> Hi Muhammad, >> >> You can have that using the advanced search feature. See >> https://www.dhis2.org/doc/snapshot/en/user/html/ch28s02.html >> >> Thank you, >> Abyot. >> On Tue, Jun 16, 2015 at 1:30 PM Muhammad Tahir wrote: >> >>> Hi, >>> >>> We have patients and providers entities registered using program. >>> >>> >>> Now we want to view/download a list of all the patients/providers that >>> are linked to organization units at one place. We can see the list under >>> the particular organization unit. >>> >>> But we want to see a list with all the organization units linked or if >>> select a parent organization unit then can view all the patients/ providers >>> under it. >>> >>> -- >>> *Regards,* >>> *Muhammad Tahir* >>> ___ >>> 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 >>> >> > > > -- > *Regards,* > *Muhammad Tahir* > -- Thank you, Abyot ___ 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: Select multiple options
Hi Tahir, We attempted to do this with scripts in a custom form but stored all the selections in one field for analysis. I think you can turn options into data elements or attributes with Yes only field type. Regards On Tue, Jun 16, 2015 at 2:46 PM, Abyot Gizaw wrote: > No, unfortunately we don't have that kind of feature. > > Actually storing multiple values for a single data-element will create a > problem later during aggregation/analysis. If you have a short pre-defined > list of services, I would suggest creating corresponding data element of > type yes/no for each service. > > > On Tue, Jun 16, 2015 at 1:41 PM Muhammad Tahir wrote: > >> Hi, >> >> While designing forms, we wanted to have fields where user can select >> multiple values. >> >> >> E.g. Services that a particular provider offers. >> >> Is there any option to select multiple values from a list or using check >> boxes? >> >> -- >> *Regards,* >> *Muhammad Tahir* >> ___ >> 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 >> > -- > > Thank you, > Abyot > > ___ > 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 > > -- Prosper Behumbiize, MPH Global HISP| University Of Oslo/HISP Uganda +256 751 751 776 | +256 776 139 139 ptb3...@gmail.com | pros...@dhis2.org | Skype: prospertb ___ 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: Select multiple options
Many thanks, I'll try and let you know. On Tue, Jun 16, 2015 at 4:56 PM, Prosper BT wrote: > Hi Tahir, > > We attempted to do this with scripts in a custom form but stored all the > selections in one field for analysis. > > I think you can turn options into data elements or attributes with Yes > only field type. > > Regards > > > On Tue, Jun 16, 2015 at 2:46 PM, Abyot Gizaw wrote: > >> No, unfortunately we don't have that kind of feature. >> >> Actually storing multiple values for a single data-element will create a >> problem later during aggregation/analysis. If you have a short pre-defined >> list of services, I would suggest creating corresponding data element of >> type yes/no for each service. >> >> >> On Tue, Jun 16, 2015 at 1:41 PM Muhammad Tahir wrote: >> >>> Hi, >>> >>> While designing forms, we wanted to have fields where user can select >>> multiple values. >>> >>> >>> E.g. Services that a particular provider offers. >>> >>> Is there any option to select multiple values from a list or using check >>> boxes? >>> >>> -- >>> *Regards,* >>> *Muhammad Tahir* >>> ___ >>> 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 >>> >> -- >> >> Thank you, >> Abyot >> >> ___ >> 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 >> >> > > > -- > Prosper Behumbiize, MPH > Global HISP| University Of Oslo/HISP Uganda > +256 751 751 776 | +256 776 139 139 > ptb3...@gmail.com | pros...@dhis2.org | Skype: prospertb > > -- *Regards,* *Muhammad Tahir* ___ 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 19420: minor refactoring in tracker-capture - program rule actions now come as part of the program rule
revno: 19420 committer: Abyot Asalefew Gizaw branch nick: dhis2 timestamp: Tue 2015-06-16 14:17:07 +0200 message: minor refactoring in tracker-capture - program rule actions now come as part of the program rule modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.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-event-capture/scripts/event-capture.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-16 11:21:02 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-06-16 12:17:07 + @@ -487,7 +487,7 @@ function getProgramRules( programRules ) { -return getD2Objects( programRules, 'programRules', '../api/programRules', 'fields=id,name,condition,description,program[id],programRuleActions[id,content,programRuleActionType,programStageSection[id,name],dataElement[id]]'); +return getD2Objects( programRules, 'programRules', '../api/programRules', 'fields=id,name,condition,description,program[id],programStage[id],priority,programRuleActions[id,content,location,data,programRuleActionType,programStageSection[id],dataElement[id]]'); } function getMetaProgramRuleVariables( programs ) === modified file '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/services.js 2015-06-16 11:22:51 + +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-06-16 12:17:07 + @@ -10,7 +10,7 @@ var store = new dhis2.storage.Store({ name: "dhis2tc", adapters: [dhis2.storage.IndexedDBAdapter, dhis2.storage.DomSessionStorageAdapter, dhis2.storage.InMemoryAdapter], -objectStores: ['programs', 'programStages', 'trackedEntities', 'trackedEntityForms', 'attributes', 'relationshipTypes', 'optionSets', 'programValidations', 'ouLevels', 'programRuleVariables', 'programRules', 'programRuleActions'] +objectStores: ['programs', 'programStages', 'trackedEntities', 'trackedEntityForms', 'attributes', 'relationshipTypes', 'optionSets', 'programValidations', 'ouLevels', 'programRuleVariables', 'programRules'] }); return{ currentStore: store @@ -1086,34 +1086,21 @@ var def = $q.defer(); TCStorageService.currentStore.open().done(function(){ -TCStorageService.currentStore.getAll('programRules').done(function(rules){ -TCStorageService.currentStore.getAll('programRuleActions').done(function(actions){ -//The hash will serve as a direct-lookup for linking the actions to rules later. -var programRulesHash = {}; -//The array will ultimately be returned to the caller. -var programRulesArray = []; -//Loop through and add the rules belonging to this program and program stage -angular.forEach(rules, function(rule){ - if(rule.program.id == programUid) { - if(!rule.programStage || !rule.programStage.id || rule.programStage.id == programStageUid) { -rule.actions = []; -programRulesHash[rule.id] = rule; -programRulesArray.push(rule); -} - } -}); - -//Loop through and attach all actions to the correct rules: -angular.forEach(actions, function(action){ - if(programRulesHash[action.programRule.id]) - { - programRulesHash[action.programRule.id].actions.push(action); - } -}); - -$rootScope.$apply(function(){ -def.resolve(programRulesArray); -}); +TCStorageService.currentStore.getAll('programRules').done(function(rules){ +//The array will ultimately be returned to the caller. +var programRulesArray = []; +
[Dhis2-devs] Program - Error in Registration
Hi, I have created a program to register all the providers at organization unit level and have registered some providers. Provider has some details for input, i.e Provider Code (A unique value in whole system), Provider Name etc. Now created another program that is provider trainings. Now want to select the same provider in that area (org unit) and register provider for trainings, but getting the error "Error in Registration". -- *Regards,* *Muhammad Tahir* ___ 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] Program - Error in Registration
Hi Muhammad, I am not sure I understood what you wanted to do: 1. You have two programs - provider and provider training 2. You registered a provider under the provider program 3. Now you wanted to use the registered provider and register it again in training program Is this what you wanted to do? If true, then you can do number 3 from the provider's dashboard. Just click on the provider from the list, and it will take you to the dashboard. From this dashboard - you should see a program selection at the top. If you select your new program (which you called provider training), you will have a chance to put additional details in the "Enrollment Widget". On Tue, Jun 16, 2015 at 2:38 PM Muhammad Tahir wrote: > Hi, > > I have created a program to register all the providers at organization > unit level and have registered some providers. > > Provider has some details for input, i.e Provider Code (A unique value in > whole system), Provider Name etc. > > Now created another program that is provider trainings. Now want to select > the same provider in that area (org unit) and register provider for > trainings, but getting the error "Error in Registration". > > > > > > -- > *Regards,* > *Muhammad Tahir* > ___ > 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 > -- Thank you, Abyot ___ 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] indicator for outbreak detection and notification
Thank you Alex.I have the impression that the surveillance option does not respond to what I expect.It compares the current value (i.e the number of measles cases of the current week - week 31) with the average number of measles cases of the previous weeks (week 30, week 29, week 28).In the surveillance of measles, if the number of cases of weeks w28+w29+w30+w31 is equal of more than 3 in one district, then this district is in alert of measles. Maybe there is a way to implement this in DHIS2, or to configure the surveillance rule to do this? Le Lundi 15 juin 2015 13h51, Alex Tumwesigye a écrit : Dear Claude, if data is entered at district level, that will be easy with a surveillance rule. Please see this for more information.https://www.dhis2.org/doc/snapshot/en/user/html/ch12s05.html Alex On Mon, Jun 15, 2015 at 11:25 AM, henri claude moungui wrote: Hi to all. In disease surveillance, if a district reports 3 measles cases in 4 weeks, this district is in alert of a possible measles outbreak. I want to automatically be notified if a district reaches the alert threshold.One way could be that the control is done in data entry form. I am thinking on an indicator that could get the value yes/no if a district reaches the alert thereshold in DHIS2.I wrote this code hoping this would help but I don't know how to implement it. In fact, this code is just the way I see the procedure. Read week x ;Read District1;Write weekx ;Write number_measles_cases(week x);If number_measles_cases (week x) + number_measles_cases(week x-1) + number_measles_cases (week x-2) + number_measles_cases (week x-3)>=3 Then District1.MeaslesEpiStatus= « yes » ;End Week x isthe current week for which data are being entered.District1is the district for which data are being entered.MeaslesEpiStatusis an indicator which value could be yes/no. A warmly mercy for all the DHIS2 support team and users all around the world! Henri. ___ 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 (Consultant), Ministry of Health/AFENETKampalaUganda 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
[Dhis2-devs] DHIS2 App i18n
I have been trying to internationalize the name/description fields in our DHIS2 app manifest.webapp file. I created a "locales" section with blocks for our different languages as per: https://developer.mozilla.org/en-US/Apps/Build/Localization/Getting_started_with_app_localization but this does not seem to get picked up when I switch languages. Is this actually possible? Thanks ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19422: Minor
revno: 19422 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 18:07:21 +0200 message: Minor modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.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/common/BaseDimensionalObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2015-06-13 14:19:23 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2015-06-16 16:07:21 + @@ -143,13 +143,13 @@ @Override public boolean hasItems() { -return items != null && !items.isEmpty(); +return !getItems().isEmpty(); } @Override public boolean hasLegendSet() { -return legendSet != null; +return getLegendSet() != null; } @Override @@ -163,8 +163,8 @@ { return DimensionType.TRACKED_ENTITY_ATTRIBUTE.equals( dimensionType ) || -DimensionType.TRACKED_ENTITY_DATAELEMENT.equals( dimensionType ) ? -AnalyticsType.EVENT : AnalyticsType.AGGREGATE; +DimensionType.TRACKED_ENTITY_DATAELEMENT.equals( dimensionType ) ? +AnalyticsType.EVENT : AnalyticsType.AGGREGATE; } /** ___ 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] indicator for outbreak detection and notification
Dear Henri, HISP Uganda actually implemented the Outbreak system for Rwanda eIDSR. It does three things: Compare data collected daily and aggregates it for a week and if it exceeds a threshold, it sends an SMS/email to national iDSR group, district and sub district users and it stores the values of the outbreak for that facility/district as an event. It also does that for seasonal and non seasonal diseases where you look back in time. The implementation was done using scripts in the background. If you are interested, we can assist to look into your implementation and generate scripts for you. Alex On Tue, Jun 16, 2015 at 5:51 PM, henri claude moungui wrote: > Thank you Alex. > I have the impression that the surveillance option does not respond to > what I expect. > It compares the current value (i.e the number of measles cases of the > current week - week 31) with the average number of measles cases of the > previous weeks (week 30, week 29, week 28). > In the surveillance of measles, if the number of cases of weeks > w28+w29+w30+w31 is equal of more than 3 in one district, then this district > is in alert of measles. > > Maybe there is a way to implement this in DHIS2, or to configure the > surveillance rule to do this? > > > > > > Le Lundi 15 juin 2015 13h51, Alex Tumwesigye a > écrit : > > > Dear Claude, > > if data is entered at district level, that will be easy with a > surveillance rule. > Please see this for more information. > https://www.dhis2.org/doc/snapshot/en/user/html/ch12s05.html > > Alex > > > > On Mon, Jun 15, 2015 at 11:25 AM, henri claude moungui < > henrimoun...@yahoo.fr> wrote: > > Hi to all. > > In disease surveillance, if a district reports 3 measles cases in 4 weeks, > this district is in alert of a possible measles outbreak. I want to > automatically be notified if a district reaches the alert threshold. > One way could be that the control is done in data entry form. > > I am thinking on an indicator that could get the value yes/no if a > district reaches the alert thereshold in DHIS2. > I wrote this code hoping this would help but I don't know how to implement > it. In fact, this code is just the way I see the procedure. > > Read week x ; > Read District1; > Write week x ; > Write number_measles_cases (week x); > If number_measles_cases (week x) + number_measles_cases (week x-1) + > number_measles_cases (week x-2) + number_measles_cases (week x-3)>=3 > Then District1.MeaslesEpiStatus= « yes » ; > End > > > > Week x is the current week for which data are being entered. > District1 is the district for which data are being entered. > MeaslesEpiStatus is an indicator which value could be yes/no. > > A warmly mercy for all the DHIS2 support team and users all around the > world! > > Henri. > > > > > ___ > 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 (Consultant), > 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 " > > > -- Alex Tumwesigye Technical Advisor - DHIS2 (Consultant), 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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19423: Analytics, preventing query for reporting rates when dimensions which are not relevant to data se...
revno: 19423 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 19:25:14 +0200 message: Analytics, preventing query for reporting rates when dimensions which are not relevant to data sets are present modified: dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.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-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2015-06-16 17:25:14 + @@ -31,8 +31,10 @@ import static org.hisp.dhis.analytics.AggregationType.AVERAGE_INT_DISAGGREGATION; import static org.hisp.dhis.analytics.AggregationType.AVERAGE_SUM_INT_DISAGGREGATION; import static org.hisp.dhis.common.DimensionType.DATASET; +import static org.hisp.dhis.common.DimensionType.PERIOD; import static org.hisp.dhis.common.DimensionType.ORGANISATIONUNIT; import static org.hisp.dhis.common.DimensionType.ORGANISATIONUNIT_GROUPSET; +import static org.hisp.dhis.common.DimensionType.CATEGORYOPTION_GROUPSET; import static org.hisp.dhis.common.DimensionalObject.CATEGORYOPTIONCOMBO_DIM_ID; import static org.hisp.dhis.common.DimensionalObject.DATAELEMENT_DIM_ID; import static org.hisp.dhis.common.DimensionalObject.DATAELEMENT_OPERAND_ID; @@ -110,8 +112,10 @@ DATA_X_DIM_ID, INDICATOR_DIM_ID, DATAELEMENT_DIM_ID, DATASET_DIM_ID, PROGRAM_DATAELEMENT_DIM_ID, PERIOD_DIM_ID, ORGUNIT_DIM_ID ); private static final List DIMENSION_PERMUTATION_IGNORE_DIMS = Arrays.asList( INDICATOR_DIM_ID, DATAELEMENT_DIM_ID, CATEGORYOPTIONCOMBO_DIM_ID, DATASET_DIM_ID, PROGRAM_DATAELEMENT_DIM_ID ); - -private static final List COMPLETENESS_DIMENSION_TYPES = Arrays.asList( DATASET, ORGANISATIONUNIT, ORGANISATIONUNIT_GROUPSET ); +public static final List COMPLETENESS_DIMENSION_TYPES = Arrays.asList( +DATASET, PERIOD, ORGANISATIONUNIT, ORGANISATIONUNIT_GROUPSET, CATEGORYOPTION_GROUPSET ); +private static final List COMPLETENESS_TARGET_DIMENSION_TYPES = Arrays.asList( +DATASET, ORGANISATIONUNIT, ORGANISATIONUNIT_GROUPSET ); private static final DimensionItem[] DIM_OPT_ARR = new DimensionItem[0]; private static final DimensionItem[][] DIM_OPT_2D_ARR = new DimensionItem[0][]; @@ -376,7 +380,7 @@ for ( int i = 0; i < dimensions.size(); i++ ) { -if ( COMPLETENESS_DIMENSION_TYPES.contains( dimensions.get( i ).getDimensionType() ) ) +if ( COMPLETENESS_TARGET_DIMENSION_TYPES.contains( dimensions.get( i ).getDimensionType() ) ) { indexes.add( i ); } @@ -394,7 +398,7 @@ for ( int i = 0; i < filters.size(); i++ ) { -if ( COMPLETENESS_DIMENSION_TYPES.contains( filters.get( i ).getDimensionType() ) ) +if ( COMPLETENESS_TARGET_DIMENSION_TYPES.contains( filters.get( i ).getDimensionType() ) ) { indexes.add( i ); } @@ -907,6 +911,22 @@ } /** + * Retrieves the set of dimension types which are present in dimensions and + * filters. + */ +public Set getDimensionTypes() +{ +Set types = new HashSet<>(); + +for ( DimensionalObject dim : getDimensionsAndFilters() ) +{ +types.add( dim.getDimensionType() ); +} + +return types; +} + +/** * Indicates whether this params defines an identifier scheme different from * UID. */ @@ -1422,7 +1442,7 @@ return !dimensionOptions.isEmpty() ? dimensionOptions : getFilterOptions( key ); } - + /** * Retrieves the options for the given dimension identifier. If the dx dimension * is specified, all concrete dimensions (in|de|dc|ds) are returned as a single === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-06-16 17:25:14 + @@ -40,6 +40,7 @@ import static org.hisp.dhis.analytics.Data
Re: [Dhis2-devs] Program - Error in Registration
Thanks Abyot for the hint, I'll try it and share the results soon. On Tue, Jun 16, 2015 at 5:51 PM, Abyot Gizaw wrote: > Hi Muhammad, > > I am not sure I understood what you wanted to do: > > 1. You have two programs - provider and provider training > 2. You registered a provider under the provider program > 3. Now you wanted to use the registered provider and register it again in > training program > > Is this what you wanted to do? If true, then you can do number 3 from the > provider's dashboard. Just click on the provider from the list, and it will > take you to the dashboard. From this dashboard - you should see a program > selection at the top. If you select your new program (which you called > provider training), you will have a chance to put additional details in the > "Enrollment Widget". > > > > On Tue, Jun 16, 2015 at 2:38 PM Muhammad Tahir wrote: > >> Hi, >> >> I have created a program to register all the providers at organization >> unit level and have registered some providers. >> >> Provider has some details for input, i.e Provider Code (A unique value in >> whole system), Provider Name etc. >> >> Now created another program that is provider trainings. Now want to >> select the same provider in that area (org unit) and register provider for >> trainings, but getting the error "Error in Registration". >> >> >> >> >> >> -- >> *Regards,* >> *Muhammad Tahir* >> ___ >> 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 >> > -- > > Thank you, > Abyot > -- *Regards,* *Muhammad Tahir* ___ 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 19424: Data set update, bumping version when open future periods changes
revno: 19424 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 19:38:26 +0200 message: Data set update, bumping version when open future periods changes modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.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-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2015-06-16 17:38:26 + @@ -348,6 +348,8 @@ if ( !( equalsNullSafe( name, dataSet.getName() ) && periodType.equals( dataSet.getPeriodType() ) && +expiryDays == dataSet.getExpiryDays() && +openFuturePeriods == dataSet.getOpenFuturePeriods() && dataElements.equals( dataSet.getDataElements() ) && indicators.equals( dataSet.getIndicators() ) && renderAsTabs == dataSet.isRenderAsTabs() ) ) ___ 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 19425: Removed unused List imports
revno: 19425 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 19:43:23 +0200 message: Removed unused List imports modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStore.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/ActivityReportingService.java dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStoreTest.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/GetVisitScheduleAttributesAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ProgramEnrollmentSelectAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowActivityPlanFormAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddRelationshipFormAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggPSDataElementsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetDataElementsByDataSetAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/GetAttributeGroupAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/ShowAddProgramReminderAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/ShowAddProgramStageReminderAction.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/program/ProgramService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java 2015-06-16 13:17:59 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java 2015-06-16 17:43:23 + @@ -28,14 +28,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.util.List; + import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.trackedentity.TrackedEntity; import org.hisp.dhis.user.User; import org.hisp.dhis.validation.ValidationCriteria; -import java.util.Collection; -import java.util.List; - /** * @author Abyot Asalefew * @version $Id$ === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStore.java 2015-06-16 13:17:59 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStore.java 2015-06-16 17:43:23 + @@ -28,7 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; import java.util.List; import org.hisp.dhis.common.GenericNameableObjectStore; === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java 2015-06-16 05:11:29 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java 2015-06-16 17:43:23 + @@ -30,17 +30,16 @@ import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Collection; import java.util.List; import org.hibernate.Query; import org.hibernate.criterion.Restrictions; import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore; +import org.hisp.dhis.commons.util.SqlHelper;
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19426: Javadoc
revno: 19426 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 19:57:23 +0200 message: Javadoc modified: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/AppendingHashMap.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/ListUtils.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/LoggingHashMap.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/MimicingHashMap.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/UniqueArrayList.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/filter/Filter.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/filter/FilterUtils.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Function0.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/SystemTimer.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/Timer.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/Clock.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/ConversionUtils.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CsvUtils.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/DebugUtils.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/PageRange.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/StreamUtils.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/UUIdUtils.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-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/AppendingHashMap.java' --- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/AppendingHashMap.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/AppendingHashMap.java 2015-06-16 17:57:23 + @@ -35,7 +35,6 @@ * inserted, or inserts as usual if no entries match the key. * * @author Lars Helge Overland - * @version $Id$ */ public class AppendingHashMap extends HashMap === modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/ListUtils.java' --- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/ListUtils.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/ListUtils.java 2015-06-16 17:57:23 + @@ -40,6 +40,8 @@ import org.apache.commons.lang3.StringUtils; /** + * Utility methods for list operations. + * * @author Lars Helge Overland */ public class ListUtils === modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/LoggingHashMap.java' --- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/LoggingHashMap.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/LoggingHashMap.java 2015-06-16 17:57:23 + @@ -38,7 +38,6 @@ * HashMap that logs the key if the requested value is null. * * @author Lars Helge Overland - * @version $Id$ */ public class LoggingHashMap extends HashMap === modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/MimicingHashMap.java' --- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/MimicingHashMap.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/MimicingHashMap.java 2015-06-16 17:57:23 + @@ -34,7 +34,6 @@ * HashMap that returns as value the given key. * * @author Lars Helge Overland - * @version $Id$ */ public class MimicingHashMap extends HashMap === modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java' --- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/
[Dhis2-devs] DHIS2 as LMIS
Hi all, I've just want to know if somebody has an experience using DHIS2 as LMIS to manage heath products/commodities in a repository? regards, *Aymar* ___ 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 as LMIS
Hello Aymar, Try to see this documentation on Cold Chain Equipment Inventory : https://www.dhis2.org/doc/snapshot/en/ccei-user/html/ch01.html Sincerely,= EKANI Guy Le Mardi 16 juin 2015 19h13, Aymar Narodar SOME a écrit : Hi all, I've just want to know if somebody has an experience using DHIS2 as LMIS to manage heath products/commodities in a repository? regards, Aymar ___ 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 19428: Collection to List
revno: 19428 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 20:35:12 +0200 message: Collection to List modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.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/chart/ChartService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2015-06-16 10:36:25 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2015-06-16 18:35:12 + @@ -102,7 +102,7 @@ Chart getChartByName( String name ); -Collection getCharts( final Collection identifiers ); +List getCharts( final Collection identifiers ); List getChartsBetween( int first, int max ); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-06-16 10:36:25 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-06-16 18:35:12 + @@ -178,7 +178,7 @@ * @param identifiers the Collection of identifiers. * @return a Collection of Reports. */ -Collection getReports( final Collection identifiers ); +List getReports( final Collection identifiers ); /** * Retrieves Reports with the given uids. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-01-17 07:41:26 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-06-16 18:35:12 + @@ -111,7 +111,7 @@ * @param reportTables the identifiers of the ReportTables to retrieve. * @return a Collection of ReportTables. */ -Collection getReportTables( Collection reportTables ); +List getReportTables( Collection reportTables ); /** * Retrieves ReportTables with the given uids. === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2015-06-16 10:36:25 + +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2015-06-16 18:35:12 + @@ -969,7 +969,7 @@ } @Override -public Collection getCharts( final Collection identifiers ) +public List getCharts( final Collection identifiers ) { List charts = getAllCharts(); === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2015-06-16 18:35:12 + @@ -74,7 +74,6 @@ /** * @author Lars Helge Overland - * @version $Id$ */ @Transactional public class DefaultReportService @@ -351,9 +350,9 @@ } @Override -public Collection getReports( final Collection identifiers ) +public List getReports( final Collection identifiers ) { -Collection reports = getAllReports(); +List reports = getAllReports(); return identifiers == null ? reports : FilterUtils.filter( reports, new Filter() { === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2015-06-16 18:35:12 + @@ -187,9 +187,9 @@ } @Override -public Collection getReportTables( final Collection identifiers ) +public List getReportTables( final Collection identifiers ) { -Collection objects = getAllReportTables()
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19427: Replaced dhis util methods with commons/guava
revno: 19427 committer: Lars Helge Overland branch nick: dhis2 timestamp: Tue 2015-06-16 20:30:37 +0200 message: Replaced dhis util methods with commons/guava removed: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/UUIdUtils.java modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/ADXPeriod.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ExportPipeThread.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xls/exporter/XLSExportPipeThread.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/StreamUtils.java dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/TextUtils.java dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/UpdateUserProfileAction.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/StreamActionSupport.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/DataBrowserAction.java dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/exp/ExportDataMartAction.java dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportTemplateAction.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/adx/ADXPeriod.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/ADXPeriod.java 2015-06-11 21:37:27 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/ADXPeriod.java 2015-06-16 18:30:37 + @@ -32,6 +32,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; + import org.hisp.dhis.period.BiMonthlyPeriodType; import org.hisp.dhis.period.DailyPeriodType; import org.hisp.dhis.period.FinancialAprilPeriodType; @@ -45,7 +46,6 @@ import org.hisp.dhis.period.SixMonthlyPeriodType; import org.hisp.dhis.period.WeeklyPeriodType; import org.hisp.dhis.period.YearlyPeriodType; -import org.hisp.dhis.system.util.DateUtils; /** * ADXPeriod @@ -56,7 +56,6 @@ */ public class ADXPeriod { - public static class ADXPeriodException extends RuntimeException { @@ -68,7 +67,6 @@ public static enum Duration { - P1D, // daily P7D, // weekly P1M, // monthly @@ -83,6 +81,7 @@ public static Period parse( String periodString ) throws ADXPeriodException { String[] tokens = periodString.split( "/" ); + if ( tokens.length != 2 ) { throw new ADXPeriodException( periodString + " not in valid / format" ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2015-06-16 18:30:37 + @@ -29,9 +29,9 @@ */ import static org.hisp.dhis.common.IdentifiableObjectUtils.getIdentifiers; +import static org.hisp.dhis.commons.util.TextUtils.getCommaDelimitedString; import static org.hisp.dhis.system.util.DateUtils.getLongGmtDateString; import static org.hisp.dhis.system.util.DateUtils.getMediumDateString; -import static org.hisp.dhis.commons.util.TextUtils.getCommaDelimitedString; import java.io.OutputStream; import java.io.Writer; @@ -42,6 +42,7 @@ import java.util.Set; import org.amplecode.staxwax.factory.XMLFactory; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.calendar.Calendar; @@ -51,7 +52,6 @@ import org.hisp.dhis.dxf2.datavalue.DataValue; import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.system.util.DateUtils; -import org.hisp.dhis.commons.util.StreamUtils; import org.springframework.beans.factory.annotation.Autowire
Re: [Dhis2-devs] How to unistall dhis2 instance
Dear All, For your information the dhis instance is running on an ubuntu 14.04 server VM on an XEN Server. The XEN Server has 2Gb RAM so i am using 1Gb on the ubuntu VM that is running the dhis instance. >From the manual https://www.dhis2.org/doc/snapshot/en/implementer/html/re01.html I was informed that as per default the instance should be allocated 2Gb of heap space RAM but that i can adjust "var/lib/dhis2//bin/setenv.sh" to work with lower values of RAM sizes. Please can anyone help me with the adjustment because i had confirmed that everything is working properly but my system is below requirement for it to work properly. On 6/16/15, Bob Jolliffe wrote: > Hi Gerald > > I think you neglected to mention you are using dhis2-tools to create > this instance. When you run 'dhis2-instance-create myinstance' a few > things happen: > 1. a new user called myinstance is created with a home dir of > /var/lib/dhis2/myinstance > 2. a new database role called myinstance is created; and > 3. a new database called myinstance is created > > So to roll all that back > > dropdb myinstance (this will remove the database - back it up first if > you need to keep a copy) > dropuser myinstance > userdel -r myinstance > > Cheers > Bob > > On 16 June 2015 at 03:42, gerald thomas wrote: >> Dear Dan, >> When I drop the database, the role for such database is still there; but >> that can be removed also. Now, if I try to create that instance again it >> will say instance already created. So how can remove and create >> everything >> from scratch. >> Please remember I will the same instance name. >> >> Regards, >> Gerald >> >> On 16 Jun 2015 00:57, "Dan Cocos" wrote: >>> >>> You can simply remove the war file and the directory from your servlet >>> container and drop the database. >>> >>> >>> >>> >>> >>> > On Jun 15, 2015, at 8:08 PM, gerald thomas >>> > wrote: >>> > >>> > Dear All, >>> > Please can anyone help give me the steps how to uninstall an instance >>> > in dhis2. >>> > >>> > -- >>> > 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 >> >> >> ___ >> 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 >> > -- 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] How to unistall dhis2 instance
Hi Gerald I think you are being over ambitious to try and run in a 1G virtual machine. In fact even to run XEN server on 2G machine doesn't make a lot of sense. I can understand you might want to explore XEN features, but you are very squeezed. I am not sure what the minimum heap size required by dhis is. Postgres by default if you haven't tuned it might use about 200M. Nginx less. You might try setting your DHIS heapspace in setenv.sh to something like 700M. But even so it seems extremely tight and you will not end up with anything that is particularly useful. Bob On 16 June 2015 at 20:57, gerald thomas wrote: > Dear All, > For your information the dhis instance is running on an ubuntu 14.04 > server VM on an XEN Server. The XEN Server has 2Gb RAM so i am using > 1Gb on the ubuntu VM that is running the dhis instance. > From the manual > https://www.dhis2.org/doc/snapshot/en/implementer/html/re01.html > I was informed that as per default the instance should be allocated > 2Gb of heap space RAM but that i can adjust > "var/lib/dhis2//bin/setenv.sh" to work with lower values of RAM > sizes. Please can anyone help me with the adjustment because i had > confirmed that everything is working properly but my system is below > requirement for it to work properly. > > On 6/16/15, Bob Jolliffe wrote: >> Hi Gerald >> >> I think you neglected to mention you are using dhis2-tools to create >> this instance. When you run 'dhis2-instance-create myinstance' a few >> things happen: >> 1. a new user called myinstance is created with a home dir of >> /var/lib/dhis2/myinstance >> 2. a new database role called myinstance is created; and >> 3. a new database called myinstance is created >> >> So to roll all that back >> >> dropdb myinstance (this will remove the database - back it up first if >> you need to keep a copy) >> dropuser myinstance >> userdel -r myinstance >> >> Cheers >> Bob >> >> On 16 June 2015 at 03:42, gerald thomas wrote: >>> Dear Dan, >>> When I drop the database, the role for such database is still there; but >>> that can be removed also. Now, if I try to create that instance again it >>> will say instance already created. So how can remove and create >>> everything >>> from scratch. >>> Please remember I will the same instance name. >>> >>> Regards, >>> Gerald >>> >>> On 16 Jun 2015 00:57, "Dan Cocos" wrote: You can simply remove the war file and the directory from your servlet container and drop the database. > On Jun 15, 2015, at 8:08 PM, gerald thomas > wrote: > > Dear All, > Please can anyone help give me the steps how to uninstall an instance > in dhis2. > > -- > 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 >>> >>> >>> ___ >>> 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 >>> >> > > > -- > 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] How to unistall dhis2 instance
Dear Bob, I will try to see what I can do and I will get back to you. Thanks for your help On Tuesday, June 16, 2015, Bob Jolliffe wrote: > Hi Gerald > > I think you are being over ambitious to try and run in a 1G virtual > machine. In fact even to run XEN server on 2G machine doesn't make a > lot of sense. I can understand you might want to explore XEN > features, but you are very squeezed. > > I am not sure what the minimum heap size required by dhis is. > Postgres by default if you haven't tuned it might use about 200M. > Nginx less. You might try setting your DHIS heapspace in setenv.sh to > something like 700M. But even so it seems extremely tight and you > will not end up with anything that is particularly useful. > > Bob > > On 16 June 2015 at 20:57, gerald thomas > wrote: > > Dear All, > > For your information the dhis instance is running on an ubuntu 14.04 > > server VM on an XEN Server. The XEN Server has 2Gb RAM so i am using > > 1Gb on the ubuntu VM that is running the dhis instance. > > From the manual > > https://www.dhis2.org/doc/snapshot/en/implementer/html/re01.html > > I was informed that as per default the instance should be allocated > > 2Gb of heap space RAM but that i can adjust > > "var/lib/dhis2//bin/setenv.sh" to work with lower values of RAM > > sizes. Please can anyone help me with the adjustment because i had > > confirmed that everything is working properly but my system is below > > requirement for it to work properly. > > > > On 6/16/15, Bob Jolliffe > wrote: > >> Hi Gerald > >> > >> I think you neglected to mention you are using dhis2-tools to create > >> this instance. When you run 'dhis2-instance-create myinstance' a few > >> things happen: > >> 1. a new user called myinstance is created with a home dir of > >> /var/lib/dhis2/myinstance > >> 2. a new database role called myinstance is created; and > >> 3. a new database called myinstance is created > >> > >> So to roll all that back > >> > >> dropdb myinstance (this will remove the database - back it up first if > >> you need to keep a copy) > >> dropuser myinstance > >> userdel -r myinstance > >> > >> Cheers > >> Bob > >> > >> On 16 June 2015 at 03:42, gerald thomas > wrote: > >>> Dear Dan, > >>> When I drop the database, the role for such database is still there; > but > >>> that can be removed also. Now, if I try to create that instance again > it > >>> will say instance already created. So how can remove and create > >>> everything > >>> from scratch. > >>> Please remember I will the same instance name. > >>> > >>> Regards, > >>> Gerald > >>> > >>> On 16 Jun 2015 00:57, "Dan Cocos" > wrote: > > You can simply remove the war file and the directory from your servlet > container and drop the database. > > > > > > > On Jun 15, 2015, at 8:08 PM, gerald thomas > > > wrote: > > > > Dear All, > > Please can anyone help give me the steps how to uninstall an > instance > > in dhis2. > > > > -- > > 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 > >>> > >>> > >>> ___ > >>> 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 > >>> > >> > > > > > > -- > > Regards, > > > > Gerald > -- 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
[Dhis2-devs] Internationalization of Web API response info / conflicts?
Hi All, Is it possible to receive messages back from the web api in other languages? Specifically if there are import conflicts we would like to give these messages back to the user in their preferred language. Thanks, Lorill ___ 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] Internationalization of Web API response info / conflicts?
Hi No, this is not currently supported. We might support it in a future release, as we are changing our responses messages a bit in 2.20/2.21. -- Morten On Wed, Jun 17, 2015 at 5:58 AM, Lorill Crees wrote: > Hi All, > > Is it possible to receive messages back from the web api in other > languages? Specifically if there are import conflicts we would like to give > these messages back to the user in their preferred language. > > Thanks, > > Lorill > > > > ___ > 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 App i18n
Hi, As far as I know, this is not currently supported, it might be something to look into in the future though. Mark: how is this handled for internal apps in the menu? -- Morten On Tue, Jun 16, 2015 at 10:12 PM, Alan Hill wrote: > I have been trying to internationalize the name/description fields in our > DHIS2 app manifest.webapp file. > > I created a "locales" section with blocks for our different languages as > per: > https://developer.mozilla.org/en-US/Apps/Build/Localization/Getting_started_with_app_localization > > but this does not seem to get picked up when I switch languages. > > Is this actually possible? > > Thanks > > ___ > Mailing list: https://launchpad.net/~dhis2-devs > Post to : dhis2-devs@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-devs > More help : https://help.launchpad.net/ListHelp > > ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Detailed Import Summary message
Can you please confirm is there any possibility to get the detailed import result as web-api response. Thanks On Fri, Jun 12, 2015 at 12:35 PM, Bharath wrote: > Hi All, > > > We are trying to push bulk data using web-api (using datavalueset). User > will click SAVE button after filling the form instead filed saving it will > be form saving. When user clicks save button we push data using web-api and > the response after importing that we are getting is summary count meaning > > imported: X, updated: Y, ignored: Z, > > > Is it possible to get the detailed summary list of dataelements data is > imported, list of des updated and list of des ignored. This will help us to > mark the text fields with colors (green/red) which ones are saved and which > ones are ignored. > > Thanks. > > -- > > Regards, > Bharath Kumar. Ch > -- Regards, Bharath Kumar. Ch ___ 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] Program - Error in Registration
Thank you Abyot, it does work. And now we want to move a bit ahead. In the provider training program we also want to keep the information of trainer/worker. (Trainer/worker will registered into the system in a similar manner as provider was registered.) The provider was selected from the list, now in the new form we have some information like ProviderCode (Already filled) ProviderName (Already filled) TrainerCode TrainerName How can we add up trainer information in it from the existing list. Trainer/Worker is also unique in the entire system, so it does not allow to enter any existing Trainer here. I know we can add relations, but relations are maintained in system irrespective of a program and remains the same and it does not identify uniquely which trainer trained in which program. And same is the case when adding an existing provider to another patient program. We can use the same patient and details for other project, but how to add an existing provider to it. Any hint on how can we achieve this? On Tue, Jun 16, 2015 at 10:35 PM, Muhammad Tahir wrote: > Thanks Abyot for the hint, I'll try it and share the results soon. > > On Tue, Jun 16, 2015 at 5:51 PM, Abyot Gizaw wrote: > >> Hi Muhammad, >> >> I am not sure I understood what you wanted to do: >> >> 1. You have two programs - provider and provider training >> 2. You registered a provider under the provider program >> 3. Now you wanted to use the registered provider and register it again in >> training program >> >> Is this what you wanted to do? If true, then you can do number 3 from the >> provider's dashboard. Just click on the provider from the list, and it will >> take you to the dashboard. From this dashboard - you should see a program >> selection at the top. If you select your new program (which you called >> provider training), you will have a chance to put additional details in the >> "Enrollment Widget". >> >> >> >> On Tue, Jun 16, 2015 at 2:38 PM Muhammad Tahir wrote: >> >>> Hi, >>> >>> I have created a program to register all the providers at organization >>> unit level and have registered some providers. >>> >>> Provider has some details for input, i.e Provider Code (A unique value >>> in whole system), Provider Name etc. >>> >>> Now created another program that is provider trainings. Now want to >>> select the same provider in that area (org unit) and register provider for >>> trainings, but getting the error "Error in Registration". >>> >>> >>> >>> >>> >>> -- >>> *Regards,* >>> *Muhammad Tahir* >>> ___ >>> 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 >>> >> -- >> >> Thank you, >> Abyot >> > > > > -- > *Regards,* > *Muhammad Tahir* > -- *Regards,* *Muhammad Tahir* ___ 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] Detailed Import Summary message
Hi Bharath, I poll the api/system/tasks/DATAMART endpoint with the import script every few seconds after initiating the end point and retrieve the JSON response. When the detects that the import has completed, you can then get the detailed summary from/dhis-web-importexport/getDataValueImportSummary.action. So, not directly through the WebAPI,but maybe this will help. If there are better approaches, it would be good to know. Regards, Jason On Wed, Jun 17, 2015 at 7:24 AM, Bharath wrote: > > Can you please confirm is there any possibility to get the detailed import > result as web-api response. Thanks > > On Fri, Jun 12, 2015 at 12:35 PM, Bharath wrote: > >> Hi All, >> >> >> We are trying to push bulk data using web-api (using datavalueset). User >> will click SAVE button after filling the form instead filed saving it will >> be form saving. When user clicks save button we push data using web-api and >> the response after importing that we are getting is summary count meaning >> >> imported: X, updated: Y, ignored: Z, >> >> >> Is it possible to get the detailed summary list of dataelements data is >> imported, list of des updated and list of des ignored. This will help us to >> mark the text fields with colors (green/red) which ones are saved and which >> ones are ignored. >> >> Thanks. >> >> -- >> >> Regards, >> Bharath Kumar. Ch >> > > > > -- > > Regards, > Bharath Kumar. Ch > > ___ > 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] Detailed Import Summary message
Thanks Jason, let me try this. On Wed, Jun 17, 2015 at 11:03 AM, Jason Pickering < jason.p.picker...@gmail.com> wrote: > Hi Bharath, > > I poll the api/system/tasks/DATAMART endpoint with the import script every > few seconds after initiating the end point and retrieve the JSON response. > When the detects that the import has completed, you can then get the > detailed summary > from/dhis-web-importexport/getDataValueImportSummary.action. So, not > directly through the WebAPI,but maybe this will help. If there are better > approaches, it would be good to know. > > Regards, > Jason > > > On Wed, Jun 17, 2015 at 7:24 AM, Bharath wrote: > >> >> Can you please confirm is there any possibility to get the detailed >> import result as web-api response. Thanks >> >> On Fri, Jun 12, 2015 at 12:35 PM, Bharath wrote: >> >>> Hi All, >>> >>> >>> We are trying to push bulk data using web-api (using datavalueset). User >>> will click SAVE button after filling the form instead filed saving it will >>> be form saving. When user clicks save button we push data using web-api and >>> the response after importing that we are getting is summary count meaning >>> >>> imported: X, updated: Y, ignored: Z, >>> >>> >>> Is it possible to get the detailed summary list of dataelements data is >>> imported, list of des updated and list of des ignored. This will help us to >>> mark the text fields with colors (green/red) which ones are saved and which >>> ones are ignored. >>> >>> Thanks. >>> >>> -- >>> >>> Regards, >>> Bharath Kumar. Ch >>> >> >> >> >> -- >> >> Regards, >> Bharath Kumar. Ch >> >> ___ >> 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 > -- Regards, Bharath Kumar. Ch ___ 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] DHIS2: Default Registration option in Tracker Capture
Hi, On DHIS2 demo site -> Tracker Capture When registering without selecting any program, it asks for FirstName, Last Name and National Identifier. But I am unable to locate, how is this configured, kindly share the details how can this be achieved? -- *Regards,* *Muhammad Tahir* ___ 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: Default Registration option in Tracker Capture
Hi Muhammad, These are attributes. If you go to the programs/attributes app you will see where to find the attributes. Also if you select a program and choose edit you can see how the attributes have been added. You can find some more info here in the docs: https://www.dhis2.org/doc/snapshot/en/user/html/ch29s02.html#d5e5915 On Wed, Jun 17, 2015 at 2:49 PM, Muhammad Tahir wrote: > Hi, > > On DHIS2 demo site -> Tracker Capture > > When registering without selecting any program, it asks for FirstName, > Last Name and National Identifier. > > But I am unable to locate, how is this configured, kindly share the > details how can this be achieved? > > > > -- > *Regards,* > *Muhammad Tahir* > > ___ > 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