[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18477: ER css fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 18477 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-03-04 17:18:59 +0100
message:
ER css fixes.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css
--
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-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-03 17:54:42 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-04 16:03:20 +
@@ -7765,18 +7765,17 @@
ns.app.centerRegion = this;
},
afterrender: function(p) {
- var liStyle = 'padding:3px 10px; color:#333',
- html = '';
+ var html = '';
- html += 'div style=padding:20px';
- html += 'div style=font-size:14px; padding-bottom:8px' + NS.i18n.example1 + '/div';
- html += 'div style=' + liStyle + '- ' + NS.i18n.example2 + '/div';
- html += 'div style=' + liStyle + '- ' + NS.i18n.example3 + '/div';
- html += 'div style=' + liStyle + '- ' + NS.i18n.example4 + '/div';
- html += 'div style=font-size:14px; padding-top:20px; padding-bottom:8px' + NS.i18n.example5 + '/div';
- html += 'div style=' + liStyle + '- ' + NS.i18n.example6 + '/div';
- html += 'div style=' + liStyle + '- ' + NS.i18n.example7 + '/div';
- html += 'div style=' + liStyle + '- ' + NS.i18n.example8 + '/div';
+ html += 'div class=ns-viewport-text style=padding:20px';
+ html += 'h3' + NS.i18n.example1 + '/h3';
+ html += 'div- ' + NS.i18n.example2 + '/div';
+ html += 'div- ' + NS.i18n.example3 + '/div';
+ html += 'div- ' + NS.i18n.example4 + '/div';
+ html += 'h3 style=padding-top:20px' + NS.i18n.example5 + '/h3';
+ html += 'div- ' + NS.i18n.example6 + '/div';
+ html += 'div- ' + NS.i18n.example7 + '/div';
+ html += 'div- ' + NS.i18n.example8 + '/div';
html += '/div';
p.update(html);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-03-03 17:14:13 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-03-04 12:34:20 +
@@ -2349,8 +2349,6 @@
rowSpan = config.rowSpan ? 'rowspan=' + config.rowSpan + ' ' : '';
htmlValue = config.collapsed ? '' : config.htmlValue || config.value || '';
htmlValue = config.type !== 'dimension' ? support.prototype.number.prettyPrint(htmlValue, xLayout.digitGroupSeparator) : htmlValue;
- displayDensity = conf.report.displayDensity[config.displayDensity] || conf.report.displayDensity[xLayout.displayDensity];
- fontSize = conf.report.fontSize[config.fontSize] || conf.report.fontSize[xLayout.fontSize];
cls += config.hidden ? ' td-hidden' : '';
cls += config.collapsed ? ' td-collapsed' : '';
@@ -2394,7 +2392,7 @@
//}
//else {
//html += 'style=padding:' + displayDensity + '; font-size:' + fontSize + ';' + '' + htmlValue + '/td';
-html += 'style=' + (bgColor isValue ? 'color:' + bgColor + '; ' : '') + 'padding:' + displayDensity + '; font-size:' + fontSize + ';' + '' + htmlValue + '/td';
+html += 'style=' + (bgColor isValue ? 'color:' + bgColor + '; ' : '') + '' + htmlValue + '/td';
//}
return html;
@@ -3054,13 +3052,19 @@
};
getHtml = function() {
- var s = 'table id=' + xLayout.tableUuid + ' class=pivot';
+var cls = 'pivot',
+table;
+
+cls += xLayout.displayDensity xLayout.displayDensity !== 'normal' ? ' displaydensity-' + xLayout.displayDensity : '';
+cls += xLayout.fontSize xLayout.fontSize !== 'normal' ? ' fontsize-' + xLayout.fontSize : '';
+
+ table = 'table id=' + xLayout.tableUuid + ' class=' + cls + '';
for (var i = 0; i htmlArray.length; i++) {
- s += 'tr' + htmlArray[i].join('') + '/tr';
+ table += 'tr' + htmlArray[i].join('') + '/tr';
}
- return s += '/table';
+ return table += '/table';
};
// get html
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css
[Dhis2-devs] Events capture not loading
Hi,
I am having hard time loading event capture on the new instance on server.
The system normally works fine on another server running 2.17 but when i
restore the back up to another server, all other functions (event report,
pivot report, reports, data entry etc) are working fine excluding event
capture.
Could you please provide a hint and the root causes
Here are the browser logs:
[image: Inline images 1]
Error: error:modulerr
Module Error
Failed to instantiate module eventCapture due to:
Error: [$injector:modulerr]
http://errors.angularjs.org/1.2.26/$injector/modulerr?p0=...
http://errors.angularjs.org/1.2.26/$injector/modulerr?p0=d2Filtersp1=Error%3A%20%5B%24injector%3Anomod%5D%20http%3A%2F%2Ferrors.angularjs.org%2F1.2.26%2F%24injector%2Fnomod%3Fp0%3Dd2Filters%0A%20%20%20%20at%20Error%20(native)%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A6%3A450%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A20%3A494%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A21%3A502%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A267%0A%20%20%20%20at%20r%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A7%3A290)%0A%20%20%20%20at%20e%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A207)%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A284%0A%20%20%20%20at%20r%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A7%3A290)%0A%20%20%20%20at%20e%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A207)
at Error (native)
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:6:450
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:34:97
at r
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:7:290)
at e
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:207)
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:284
at r
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:7:290)
at e
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:207)
at gc
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:36:309)
at c
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:18:170
Description
This error occurs when a module fails to load due to some exception. The
error message above should provide additional context.
Using ngRoute
In AngularJS 1.2.0 and later, ngRoute has been moved to its own module. If
you are getting this error after upgrading to 1.2.x or later, be sure that
you've installed ngRoute https://docs.angularjs.org/api/ngRoute.
Monkey-patching Angular's ng module
This error can also occur if you have tried to add your own components to
the ng module. This has never been supported and from1.3.0 it will actually
trigger this error. For instance the following code could trigger this
error.
angular.module('ng').filter('tel', function (){});
Instead create your own module and add it as a dependency to your
application's top-level module. See #9692
https://github.com/angular/angular.js/issues/9692 and #7709
https://github.com/angular/angular.js/issues/7709 for more information
Adolphe
--
=
Adolphe Kamugunga
Email:kaa...@gmail.com
Phone: +250 788 740 578
skype: ka.adolphe
Home Location:
https://www.google.com/maps/d/edit?mid=z_nDt3VYFvEg.kyEClsJPCMgE
___
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 18478: Analytics. Checking if dynamic dimensions in request are defined as data dimensions, to avoid fai...
revno: 18478
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-03-04 17:26:17 +0100
message:
Analytics. Checking if dynamic dimensions in request are defined as data
dimensions, to avoid failed sql queries.
modified:
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/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-02-22 18:31:40 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-03-04 16:26:17 +
@@ -839,11 +839,11 @@
for ( String param : dimensionParams )
{
String dimension = DimensionalObjectUtils.getDimensionFromParam( param );
-ListString options = DimensionalObjectUtils.getDimensionItemsFromParam( param );
+ListString items = DimensionalObjectUtils.getDimensionItemsFromParam( param );
-if ( dimension != null options != null )
+if ( dimension != null items != null )
{
-list.addAll( getDimension( dimension, options, null, format, false ) );
+list.addAll( getDimension( dimension, items, null, format, false ) );
}
}
}
@@ -867,7 +867,7 @@
ListNameableObject dataSets = new ArrayList();
ListNameableObject operandDataElements = new ArrayList();
-options:
+itemLoop:
for ( String uid : items )
{
if ( uid != null uid.startsWith( KEY_DE_GROUP ) )
@@ -881,7 +881,7 @@
dataElementGroups.add( group );
}
-continue options;
+continue itemLoop;
}
Indicator in = indicatorService.getIndicator( uid );
@@ -889,7 +889,7 @@
if ( in != null )
{
indicators.add( in );
-continue options;
+continue itemLoop;
}
DataElement de = dataElementService.getDataElement( uid );
@@ -897,7 +897,7 @@
if ( de != null )
{
dataElements.add( de );
-continue options;
+continue itemLoop;
}
DataSet ds = dataSetService.getDataSet( uid );
@@ -905,7 +905,7 @@
if ( ds != null )
{
dataSets.add( ds );
-continue options;
+continue itemLoop;
}
DataElementOperand dc = operandService.getDataElementOperandByUid( uid );
@@ -913,7 +913,7 @@
if ( dc != null )
{
operandDataElements.add( dc.getDataElement() );
-continue options;
+continue itemLoop;
}
throw new IllegalQueryException( Data dimension option identifier does not reference any option: + uid );
@@ -1112,7 +1112,7 @@
OrganisationUnitGroupSet ougs = organisationUnitGroupService.getOrganisationUnitGroupSet( dimension );
-if ( ougs != null )
+if ( ougs != null ougs.isDataDimension() )
{
ListNameableObject ous = asList( organisationUnitGroupService.getOrganisationUnitGroupsByUid( items ) );
@@ -1123,7 +1123,7 @@
DataElementGroupSet degs = dataElementService.getDataElementGroupSet( dimension );
-if ( degs != null )
+if ( degs != null degs.isDataDimension() )
{
ListNameableObject des = asList( dataElementService.getDataElementGroupsByUid( items ) );
@@ -1134,7 +1134,7 @@
CategoryOptionGroupSet cogs = categoryService.getCategoryOptionGroupSet( dimension );
-if ( cogs != null )
+if ( cogs != null cogs.isDataDimension() )
{
ListNameableObject cogz = asList( categoryService.getCategoryOptionGroupsByUid( items ) );
@@ -1219,7 +1219,7 @@
boolean orgUnitHierarchy = hierarchyMeta DimensionType.ORGANISATIONUNIT.equals( dimension.getDimensionType() );
// -
-// If dimension is not fixed and
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18479: Analytics. Inserting all dimension items explicitly when no items are selected for a dimension.
revno: 18479 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Wed 2015-03-04 18:49:02 +0100 message: Analytics. Inserting all dimension items explicitly when no items are selected for a dimension. modified: 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/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.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/data/DefaultAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-03-04 16:26:17 + +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-03-04 17:49:02 + @@ -28,6 +28,55 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.analytics.AnalyticsTableManager.ANALYTICS_TABLE_NAME; +import static org.hisp.dhis.analytics.AnalyticsTableManager.COMPLETENESS_TABLE_NAME; +import static org.hisp.dhis.analytics.AnalyticsTableManager.COMPLETENESS_TARGET_TABLE_NAME; +import static org.hisp.dhis.analytics.AnalyticsTableManager.ORGUNIT_TARGET_TABLE_NAME; +import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_CATEGORYOPTIONCOMBO; +import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_DATA_X; +import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_LATITUDE; +import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_LONGITUDE; +import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_ORGUNIT; +import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_PERIOD; +import static org.hisp.dhis.analytics.DataQueryParams.KEY_DE_GROUP; +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.DATASET_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.DATA_X_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.DIMENSION_SEP; +import static org.hisp.dhis.common.DimensionalObject.INDICATOR_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.LATITUDE_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.LONGITUDE_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.ORGUNIT_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID; +import static org.hisp.dhis.common.DimensionalObjectUtils.toDimension; +import static org.hisp.dhis.common.IdentifiableObjectUtils.getLocalPeriodIdentifier; +import static org.hisp.dhis.common.IdentifiableObjectUtils.getLocalPeriodIdentifiers; +import static org.hisp.dhis.common.IdentifiableObjectUtils.getUids; +import static org.hisp.dhis.common.NameableObjectUtils.asList; +import static org.hisp.dhis.common.NameableObjectUtils.asTypedList; +import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_LEVEL; +import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_ORGUNIT_GROUP; +import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT; +import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT_CHILDREN; +import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT_GRANDCHILDREN; +import static org.hisp.dhis.organisationunit.OrganisationUnit.getParentGraphMap; +import static org.hisp.dhis.organisationunit.OrganisationUnit.getParentNameGraphMap; +import static org.hisp.dhis.period.PeriodType.getPeriodTypeFromIsoString; +import static org.hisp.dhis.reporttable.ReportTable.IRT2D; +import static org.hisp.dhis.reporttable.ReportTable.addIfEmpty; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Future; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,7 +94,6 @@ import org.hisp.dhis.common.BaseDimensionalObject; import org.hisp.dhis.common.CodeGenerator; import org.hisp.dhis.common.CombinationGenerator; -import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.common.DimensionType; import org.hisp.dhis.common.DimensionalObject; import org.hisp.dhis.common.DimensionalObjectUtils; @@ -98,31 +146,6 @@ import org.hisp.dhis.util.Timer; import
Re: [Dhis2-devs] Events capture not loading
Hi,
I suspect this is related to caching. What happens if you do full browser
cache cleaning?
-
Thank you,
Abyot.
(sent from mobile)
On Mar 4, 2015 5:44 PM, Kamugunga Adolphe kaa...@gmail.com wrote:
Hi,
I am having hard time loading event capture on the new instance on
server. The system normally works fine on another server running 2.17 but
when i restore the back up to another server, all other functions (event
report, pivot report, reports, data entry etc) are working fine excluding
event capture.
Could you please provide a hint and the root causes
Here are the browser logs:
[image: Inline images 1]
Error: error:modulerr
Module Error
Failed to instantiate module eventCapture due to:
Error: [$injector:modulerr]
http://errors.angularjs.org/1.2.26/$injector/modulerr?p0=...
http://errors.angularjs.org/1.2.26/$injector/modulerr?p0=d2Filtersp1=Error%3A%20%5B%24injector%3Anomod%5D%20http%3A%2F%2Ferrors.angularjs.org%2F1.2.26%2F%24injector%2Fnomod%3Fp0%3Dd2Filters%0A%20%20%20%20at%20Error%20(native)%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A6%3A450%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A20%3A494%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A21%3A502%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A267%0A%20%20%20%20at%20r%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A7%3A290)%0A%20%20%20%20at%20e%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A207)%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A284%0A%20%20%20%20at%20r%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A7%3A290)%0A%20%20%20%20at%20e%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A207)
at Error (native)
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:6:450
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:34:97
at r
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:7:290)
at e
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:207)
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:284
at r
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:7:290)
at e
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:207)
at gc
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:36:309)
at c
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:18:170
Description
This error occurs when a module fails to load due to some exception. The
error message above should provide additional context.
Using ngRoute
In AngularJS 1.2.0 and later, ngRoute has been moved to its own module.
If you are getting this error after upgrading to 1.2.x or later, be sure
that you've installed ngRoute https://docs.angularjs.org/api/ngRoute.
Monkey-patching Angular's ng module
This error can also occur if you have tried to add your own components to
the ng module. This has never been supported and from1.3.0 it will
actually trigger this error. For instance the following code could trigger
this error.
angular.module('ng').filter('tel', function (){});
Instead create your own module and add it as a dependency to your
application's top-level module. See #9692
https://github.com/angular/angular.js/issues/9692 and #7709
https://github.com/angular/angular.js/issues/7709 for more information
Adolphe
--
=
Adolphe Kamugunga
Email:kaa...@gmail.com
Phone: +250 788 740 578
skype: ka.adolphe
Home Location:
https://www.google.com/maps/d/edit?mid=z_nDt3VYFvEg.kyEClsJPCMgE
___
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 18482: Removed maven.dhis2.org repository. Added smslib repository.
revno: 18482 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Wed 2015-03-04 22:41:38 +0100 message: Removed maven.dhis2.org repository. Added smslib repository. modified: dhis-2/pom.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2015-03-02 07:40:45 + +++ dhis-2/pom.xml 2015-03-04 21:41:38 + @@ -65,11 +65,6 @@ urlhttp://uk.maven.org/maven2/url /repository repository - idamplecode_maven2_repo/id - nameAmpleCode Maven 2 repository/name - urlhttp://maven.dhis2.org/amplecode-local/url -/repository -repository idosgeo/id nameOpen Source Geospatial Foundation Repository/name urlhttp://download.osgeo.org/webdav/geotools//url @@ -79,6 +74,11 @@ nameFreeHEP/name urlhttp://java.freehep.org/maven2/url /repository +repository + idsmslib/id + nameSMSLib/name + urlhttp://smslib.org/maven2/v3/url +/repository /repositories issueManagement ___ 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 18481: Script
revno: 18481
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-03-04 22:09:59 +0100
message:
Script
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java
resources/sql/integritychecks.sql
--
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/dataset/Section.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2015-02-26 15:21:29 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2015-03-04 21:09:59 +
@@ -127,7 +127,7 @@
public DataElementCategoryCombo getCategoryCombo()
{
-return dataElements != null dataElements.size() 0 ? dataElements.iterator().next().getCategoryCombo() : null;
+return dataElements != null !dataElements.isEmpty() ? dataElements.iterator().next().getCategoryCombo() : null;
}
public boolean hasMultiDimensionalDataElement()
=== modified file 'resources/sql/integritychecks.sql'
--- resources/sql/integritychecks.sql 2015-02-19 18:23:12 +
+++ resources/sql/integritychecks.sql 2015-03-04 21:09:59 +
@@ -114,6 +114,16 @@
and cco.categoryid=492298)
where cco.sort_order is null;
+-- Identify sections where sort_order is wrong
+
+select ds.name as dataset, s.name as section, sd.sectionid,
+max(sd.sort_order) as max_sort_order, count(distinct dataelementid) as dataelement_count
+from sectiondataelements sd
+inner join section s on sd.sectionid=s.sectionid
+inner join dataset ds on s.datasetid=ds.datasetid
+group by ds.name, s.name, sd.sectionid
+order by max(sd.sort_order) desc;
+
-- Get category option combos from data values which are not part of the category combo of the data element
select distinct de.name as data_element, dv.dataelementid, de_cc.name as data_element_category_combo, oc_cc.name as option_combo_category_combo, con.categoryoptioncomboname, dv.categoryoptioncomboid
___
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 18480: Analytics. Better implementation of max records limit, which breaks the query response rather tha...
revno: 18480
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-03-04 19:36:19 +0100
message:
Analytics. Better implementation of max records limit, which breaks the query
response rather than guessing the possible records.
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsManager.java
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
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/QueryPlannerTest.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/AnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsManager.java 2015-01-17 07:41:26 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsManager.java 2015-03-04 18:36:19 +
@@ -31,6 +31,7 @@
import java.util.Map;
import java.util.concurrent.Future;
+import org.hisp.dhis.common.IllegalQueryException;
import org.hisp.dhis.common.ListMap;
import org.hisp.dhis.common.NameableObject;
@@ -46,9 +47,11 @@
* asynchronously. The value class can be Double or String.
*
* @param params the query to retrieve aggregated data for.
+ * @param maxLimit the max number of records to retrieve.
* @return a map.
+ * @throws IllegalQueryException if query result set exceeds the max limit.
*/
-FutureMapString, Object getAggregatedDataValues( DataQueryParams params );
+FutureMapString, Object getAggregatedDataValues( DataQueryParams params, int maxLimit );
/**
* Inserts entries for the aggregation periods mapped to each data period
=== 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-02-25 15:59:31 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2015-03-04 18:36:19 +
@@ -28,8 +28,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+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.analytics.AggregationType.AVERAGE_INT_DISAGGREGATION;
import static org.hisp.dhis.common.DimensionType.DATASET;
import static org.hisp.dhis.common.DimensionType.ORGANISATIONUNIT;
import static org.hisp.dhis.common.DimensionType.ORGANISATIONUNIT_GROUPSET;
@@ -44,7 +44,6 @@
import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID;
import static org.hisp.dhis.common.NameableObjectUtils.asList;
import static org.hisp.dhis.common.NameableObjectUtils.getList;
-import static org.hisp.dhis.system.util.CollectionUtils.emptyIfNull;
import java.util.ArrayList;
import java.util.Arrays;
@@ -65,6 +64,7 @@
import org.hisp.dhis.common.DimensionalObjectUtils;
import org.hisp.dhis.common.DisplayProperty;
import org.hisp.dhis.common.ListMap;
+import org.hisp.dhis.common.MapMap;
import org.hisp.dhis.common.NameableObject;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
@@ -78,7 +78,6 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.system.util.CollectionUtils;
import org.hisp.dhis.system.util.ListUtils;
-import org.hisp.dhis.common.MapMap;
import org.hisp.dhis.system.util.MathUtils;
/**
@@ -544,35 +543,7 @@
return null;
}
-
-/**
- * Returns the number of dimension option permutations. Merges the three data
- * dimensions into one prior to the calculation.
- */
-public int getNumberOfDimensionOptionPermutations()
-{
-int total = 1;
-
-DataQueryParams query = this.instance();
-
-query.getDimensions().add( new BaseDimensionalObject( DATA_X_DIM_ID ) );
-
-query.getDimension( DATA_X_DIM_ID ).getItems().addAll( emptyIfNull( query.getDimensionOptions( INDICATOR_DIM_ID ) ) );
-query.getDimension( DATA_X_DIM_ID ).getItems().addAll(
Re: [Dhis2-devs] Code build error 2.18
Hi Paul, this is now fixed. We have moved some libraries to maven central and gotten out of the maven repository business. regards, Lars ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18483: use CollectionPersister to set manyToMany/oneToMany properties on Property class
revno: 18483
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2015-03-05 11:09:14 +0700
message:
use CollectionPersister to set manyToMany/oneToMany properties on Property
class
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.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/schema/Property.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java 2015-02-25 08:23:37 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java 2015-03-05 04:09:14 +
@@ -195,6 +195,16 @@
*/
private String cascade;
+/**
+ * Is collection many-to-many.
+ */
+private boolean manyToMany;
+
+/**
+ * Is collection one-to-many.
+ */
+private boolean oneToMany;
+
public Property()
{
}
@@ -534,6 +544,30 @@
this.cascade = cascade;
}
+@JsonProperty
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+public boolean isManyToMany()
+{
+return manyToMany;
+}
+
+public void setManyToMany( boolean manyToMany )
+{
+this.manyToMany = manyToMany;
+}
+
+@JsonProperty
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+public boolean isOneToMany()
+{
+return oneToMany;
+}
+
+public void setOneToMany( boolean oneToMany )
+{
+this.oneToMany = oneToMany;
+}
+
public String key()
{
return isCollection() ? collectionName : name;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java 2015-01-23 04:34:37 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java 2015-03-05 04:09:14 +
@@ -32,14 +32,13 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.hibernate.SessionFactory;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.metadata.ClassMetadata;
-import org.hibernate.type.AnyType;
-import org.hibernate.type.AssociationType;
+import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.type.CollectionType;
-import org.hibernate.type.EntityType;
import org.hibernate.type.SingleColumnType;
import org.hibernate.type.TextType;
import org.hibernate.type.Type;
@@ -158,29 +157,21 @@
property.setName( hibernateProperty.getName() );
property.setCascade( hibernateProperty.getCascade() );
+property.setCollection( type.isCollectionType() );
property.setSetterMethod( hibernateProperty.getSetter( klass ).getMethod() );
property.setGetterMethod( hibernateProperty.getGetter( klass ).getMethod() );
-if ( type.isCollectionType() )
+if ( property.isCollection() )
{
CollectionType collectionType = (CollectionType) type;
-property.setCollection( true );
Collection collection = sessionFactoryBean.getConfiguration().getCollectionMapping( collectionType.getRole() );
property.setOwner( !collection.isInverse() );
-}
-else if ( type.isEntityType() )
-{
-EntityType entityType = (EntityType) type;
-}
-else if ( type.isAssociationType() )
-{
-AssociationType associationType = (AssociationType) type;
-}
-else if ( type.isAnyType() )
-{
-AnyType anyType = (AnyType) type;
+
+CollectionPersister collectionPersister = ((SessionFactoryImplementor) sessionFactory).getCollectionPersister( collection.getRole() );
+property.setOneToMany( collectionPersister.isOneToMany() );
+property.setManyToMany( collectionPersister.isManyToMany() );
}
if ( SingleColumnType.class.isInstance( type ) )
___
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] Events capture not loading
I tried both clearing browser and system caches but it doesn't resolve
the it. The issue is that when i browser the a copy of this instance
hosted somewhere else where i took the backup to restore it is is working
fine.
On 4 March 2015 at 20:17, Abyot Gizaw aby...@gmail.com wrote:
Hi,
I suspect this is related to caching. What happens if you do full browser
cache cleaning?
-
Thank you,
Abyot.
(sent from mobile)
On Mar 4, 2015 5:44 PM, Kamugunga Adolphe kaa...@gmail.com wrote:
Hi,
I am having hard time loading event capture on the new instance on
server. The system normally works fine on another server running 2.17 but
when i restore the back up to another server, all other functions (event
report, pivot report, reports, data entry etc) are working fine excluding
event capture.
Could you please provide a hint and the root causes
Here are the browser logs:
[image: Inline images 1]
Error: error:modulerr
Module Error
Failed to instantiate module eventCapture due to:
Error: [$injector:modulerr]
http://errors.angularjs.org/1.2.26/$injector/modulerr?p0=...
http://errors.angularjs.org/1.2.26/$injector/modulerr?p0=d2Filtersp1=Error%3A%20%5B%24injector%3Anomod%5D%20http%3A%2F%2Ferrors.angularjs.org%2F1.2.26%2F%24injector%2Fnomod%3Fp0%3Dd2Filters%0A%20%20%20%20at%20Error%20(native)%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A6%3A450%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A20%3A494%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A21%3A502%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A267%0A%20%20%20%20at%20r%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A7%3A290)%0A%20%20%20%20at%20e%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A207)%0A%20%20%20%20at%20https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A284%0A%20%20%20%20at%20r%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A7%3A290)%0A%20%20%20%20at%20e%20(https%3A%2F%2F197.243.47.210%2Ffmis%2Fdhis-web-commons%2Fjavascripts%2Fangular%2Fangular.js%3A33%3A207)
at Error (native)
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:6:450
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:34:97
at r
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:7:290)
at e
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:207)
at
https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:284
at r
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:7:290)
at e
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:33:207)
at gc
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:36:309)
at c
(https://197.243.47.210/fmis/dhis-web-commons/javascripts/angular/angular.js:18:170
Description
This error occurs when a module fails to load due to some exception. The
error message above should provide additional context.
Using ngRoute
In AngularJS 1.2.0 and later, ngRoute has been moved to its own module.
If you are getting this error after upgrading to 1.2.x or later, be sure
that you've installed ngRoute https://docs.angularjs.org/api/ngRoute.
Monkey-patching Angular's ng module
This error can also occur if you have tried to add your own components to
the ng module. This has never been supported and from1.3.0 it will
actually trigger this error. For instance the following code could trigger
this error.
angular.module('ng').filter('tel', function (){});
Instead create your own module and add it as a dependency to your
application's top-level module. See #9692
https://github.com/angular/angular.js/issues/9692 and #7709
https://github.com/angular/angular.js/issues/7709 for more information
Adolphe
--
=
Adolphe Kamugunga
Email:kaa...@gmail.com
Phone: +250 788 740 578
skype: ka.adolphe
Home Location:
https://www.google.com/maps/d/edit?mid=z_nDt3VYFvEg.kyEClsJPCMgE
___
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
--
=
Adolphe Kamugunga
Email:kaa...@gmail.com
Phone: +250 788 740 578
skype: ka.adolphe
Home Location:
Re: [Dhis2-devs] [trunk]Issue in trackedEntityInstance updation through web API
One issue that is there with making the user able to see the TEI data at any orgunit is of confidentiality. Because with this approach the user at district1 (which let's say handles TB programs) can see the TEIs at district2(which handles HIV data).This can be a big issue with private data like that of HIV or name based data in general. Even when facilities are not categorized based on the programs they offer , still , giving the user the power to see any TEI data at any org unit is a bit risky. We are facing a similar requirement as above, that is why we wanted to change location of the TEI.I understand that doing that will result in loss of data. But I am not sure how else to fulfill this requirement(perhaps we have to maintain location history as well)Do you have any idea on how we can we tackle this issue? Thank You On 4 March 2015 at 16:46, Abyot Gizaw aby...@gmail.com wrote: I see your point. But, the situation that you have referred a patient from orgunit A to orgunit B does not change the fact that the patient was registered/enrolled at orgunit A. By doing migration, we are destroying this information which for me is wrong. What we need to probably do is provide a feature for users to decide how to see a list of patients. Currently, by default, you see those patients registered under your orgunit - but of course you can go to advanced search and see those patients from another orgunit. It would be nice if users can for example say - show patients who are enrolled in my orgunit, - show me patients who are diagnosed (have data recorded) in my orgunit - ... --- Thank you, Abyot. On Wed, Mar 4, 2015 at 11:51 AM, Harsh Atal harsh.a...@gmail.com wrote: By migration I meant the same feature as 'change location' in individual records. Now, as abyot said if it is possible to access a TEI at any org unit and enter data for any org unit then that is one way to do it but its not the same as 'change location' in individual records. The need for 'migration' came in case a TEI was referred to another orgunit. For eg: a patient diagnosed with HIV is referred to a OU which handles the program for HIV, and now all the enrollment and data entry have to be done in that OU i.e. now the patient is in the jurisdiction of the user who handles the OU for HIV based programs, in this case shouldn't that patient come under the TEI list of that org unit(in the home page). Even when we consider the possibility of having data entered for a TEI at any OU, still i feel that the 'change location' feature seems relevant. Thank You harsh On 4 March 2015 at 14:24, Pierre Dane pie...@jembi.org wrote: I agree. What we are doing is having a placeholder org unit for the TEI, and then registering the events against the actual org unit. Then the event reports and aggregations work against the event org unit . This makes it easy (possible!) to look the TEI up as you will always know the org unit (api TEI lookup requires know orgunit) On Wed, Mar 4, 2015 at 10:45 AM, Abyot Gizaw aby...@gmail.com wrote: Ok, you know what your needs are. Are you also going to migrate events? What will happen to already submitted/acted report? You need to carefully look into the migration requirement. I am strongly against the idea of migration. With migration, you will lose information. If it is possible to access a TEI and do data entry at orgunit which is not necessarily the same as the registration/enrollment orgunit, then I don't think we need migration. --- Thank you, Abyot. On Wed, Mar 4, 2015 at 9:20 AM, Harsh Atal harsh.a...@gmail.com wrote: thanks morten ,I thought it was a bug @abyot I want to migrate the tracked entity instance into another organisation unit. So when the next time i select the orgunit from which i migrated i dont want to see the tracked instance there but instead it has to come up in the new org unit. This is a functionality that we require for a project. On 4 March 2015 at 13:39, Abyot Gizaw aby...@gmail.com wrote: Hi Harsh, Do you really want to migrate? Or you want to register data in another org unit? - Thank you, Abyot. (sent from mobile) On Mar 4, 2015 9:07 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the
Re: [Dhis2-devs] [trunk]Issue in trackedEntityInstance updation through web API
Hi Harsh, Do you really want to migrate? Or you want to register data in another org unit? - Thank you, Abyot. (sent from mobile) On Mar 4, 2015 9:07 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [trunk]Issue in trackedEntityInstance updation through web API
thanks morten ,I thought it was a bug @abyot I want to migrate the tracked entity instance into another organisation unit. So when the next time i select the orgunit from which i migrated i dont want to see the tracked instance there but instead it has to come up in the new org unit. This is a functionality that we require for a project. On 4 March 2015 at 13:39, Abyot Gizaw aby...@gmail.com wrote: Hi Harsh, Do you really want to migrate? Or you want to register data in another org unit? - Thank you, Abyot. (sent from mobile) On Mar 4, 2015 9:07 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [trunk]Issue in trackedEntityInstance updation through web API
Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ 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-core] org unit association from TEI to enrollment
We already have a blueprint on this [1], I can take on the job of changing the web-api (require orgUnit in enrollment, and remove orgUnit from trackedEntityInstance), if someone else can take care of SQL upgrade.. that would be good, since its not really what I'm good at.. I guess we should default all old enrollments to be tei.orgUnit, and then also remove tei.orgUnit from the table Abyot also need to update his apps, so that he is sending this new orgUnit ptr.. what about others? thoughtworks? Maybe we should send out a message on the dev list also -- Morten On Tue, Mar 3, 2015 at 7:59 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi devs, on the last meeting we discussed removing the org unit association on tracked entity instance, and rather have it on program instance (enrollment). This means we can capture where enrollments for multiple programs took place for a person, and sounds like a sensible thing to do. Should we go ahead? Who is most suited to take this on, Abyot, Morten? Lars -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [trunk]Issue in trackedEntityInstance updation through web API
Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ 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] [trunk]Issue in trackedEntityInstance updation through web API
Ok, you know what your needs are. Are you also going to migrate events? What will happen to already submitted/acted report? You need to carefully look into the migration requirement. I am strongly against the idea of migration. With migration, you will lose information. If it is possible to access a TEI and do data entry at orgunit which is not necessarily the same as the registration/enrollment orgunit, then I don't think we need migration. --- Thank you, Abyot. On Wed, Mar 4, 2015 at 9:20 AM, Harsh Atal harsh.a...@gmail.com wrote: thanks morten ,I thought it was a bug @abyot I want to migrate the tracked entity instance into another organisation unit. So when the next time i select the orgunit from which i migrated i dont want to see the tracked instance there but instead it has to come up in the new org unit. This is a functionality that we require for a project. On 4 March 2015 at 13:39, Abyot Gizaw aby...@gmail.com wrote: Hi Harsh, Do you really want to migrate? Or you want to register data in another org unit? - Thank you, Abyot. (sent from mobile) On Mar 4, 2015 9:07 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ 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 18473: minor change, add new supported date format in DateUtils (including ms)
revno: 18473
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-03-04 16:47:54 +0700
message:
minor change, add new supported date format in DateUtils (including ms)
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.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-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java 2015-02-22 20:02:00 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java 2015-03-04 09:47:54 +
@@ -51,6 +51,7 @@
public class DateUtils
{
public static final SimpleDateFormat[] SUPPORTED_DATE_FORMATS = new SimpleDateFormat[]{
+new SimpleDateFormat( -MM-dd'T'HH:mm:ss.SSSZ ),
new SimpleDateFormat( -MM-dd'T'HH:mm:ssZ ),
new SimpleDateFormat( -MM-dd'T'HH:mm:ss ),
new SimpleDateFormat( -MM-dd'T'HH:mm ),
___
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] Code build error 2.18
Hello, can anyone help me solve this error, I wm building dhis2 2.18 code , I m running this command : I m using mvn clean -Dmaven.test.skip=true install [INFO] BUILD FAILURE [INFO] [INFO] Total time: 03:35 min [INFO] Finished at: 2015-03-04T09:36:13+02:00 [INFO] Final Memory: 43M/103M [INFO] [ERROR] Failed to execute goal on project dhis-support-test: Could not resolve dependencies for project org.hisp.dhis:dhis-support-test:jar:2.18: Failed to collect dependencies at org.amplecode:quick:jar:1.11: Failed to read artifact descriptor for org.amplecode:quick:jar:1.11: Could not transfer artifact org.amplecode:quick:pom:1.11 from/to amplecode_maven2_repo (http://maven.dhis2.org/amplecode-local): Connect to maven.dhis2.org:80 [maven.dhis2.org/178.79.143.102] failed: Connection timed out - [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/DependencyResolutionException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn goals -rf :dhis-support-test regards -- *-* *JEAN PAUL MUTALI* Tel: +250 78-862-8000, +1 845-584-1789 Kicukiro, Av 21, P.O.Box 371 Kigali - RWANDA Skype: mutali.rw http://mutali.rw ___ 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 18474: applied patch from TW, adds full date+time info when exporting data values
revno: 18474
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-03-04 17:13:19 +0700
message:
applied patch from TW, adds full date+time info when exporting data values
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.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/datavalueset/SpringDataValueSetStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2015-02-17 06:00:52 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2015-03-04 10:13:19 +
@@ -54,7 +54,7 @@
import java.util.Set;
import static org.hisp.dhis.common.IdentifiableObjectUtils.getIdentifiers;
-import static org.hisp.dhis.system.util.DateUtils.getLongDateString;
+import static org.hisp.dhis.system.util.DateUtils.getLongGmtDateString;
import static org.hisp.dhis.system.util.TextUtils.getCommaDelimitedString;
/**
@@ -134,7 +134,7 @@
OrganisationUnit orgUnit, final DataValueSet dataValueSet )
{
dataValueSet.setDataSet( (dataSets != null dataSets.size() == 1) ? dataSets.iterator().next().getUid() : null );
-dataValueSet.setCompleteDate( getLongDateString( completeDate ) );
+dataValueSet.setCompleteDate( getLongGmtDateString( completeDate ) );
dataValueSet.setPeriod( period != null ? period.getIsoDate() : null );
dataValueSet.setOrgUnit( orgUnit != null ? orgUnit.getUid() : null );
@@ -155,8 +155,8 @@
dataValue.setAttributeOptionCombo( rs.getString( aocid ) );
dataValue.setValue( rs.getString( value ) );
dataValue.setStoredBy( rs.getString( storedby ) );
-dataValue.setCreated( getLongDateString( rs.getDate( created ) ) );
-dataValue.setLastUpdated( getLongDateString( rs.getDate( lastupdated ) ) );
+dataValue.setCreated( getLongGmtDateString( rs.getTimestamp( created ) ) );
+dataValue.setLastUpdated( getLongGmtDateString( rs.getTimestamp( lastupdated ) ) );
dataValue.setComment( rs.getString( comment ) );
dataValue.setFollowup( rs.getBoolean( followup ) );
dataValue.close();
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java 2015-03-04 09:47:54 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java 2015-03-04 10:13:19 +
@@ -41,6 +41,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.TimeZone;
import static org.hisp.dhis.period.Period.DEFAULT_DATE_FORMAT;
@@ -68,6 +69,7 @@
public static final SimpleDateFormat ACCESS_DATE_FORMAT = new SimpleDateFormat( /MM/dd HH:mm:ss );
public static final SimpleDateFormat HTTP_DATE_FORMAT = new SimpleDateFormat( EEE, dd MMM HH:mm:ss );
+
public static final double DAYS_IN_YEAR = 365.0;
private static final long MS_PER_DAY = 8640;
@@ -85,6 +87,25 @@
}
/**
+ * Converts a Date to the GMT timezone and formats it to the format -MM-dd HH:mm:ssZ.
+ *
+ * @param date the Date to parse.
+ * @return A formatted date string.
+ */
+public static String getLongGmtDateString( Date date )
+{
+if ( date == null )
+{
+return null;
+}
+
+SimpleDateFormat simpleDateFormat = new SimpleDateFormat( -MM-dd'T'HH:mm:ss.SSSZ );
+simpleDateFormat.setTimeZone( TimeZone.getTimeZone( UTC ) );
+return simpleDateFormat.format( date );
+}
+
+
+/**
* Formats a Date to the format -MM-dd HH:mm:ss.
*
* @param date the Date to parse.
___
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] [trunk]Issue in trackedEntityInstance updation through web API
I agree. What we are doing is having a placeholder org unit for the TEI, and then registering the events against the actual org unit. Then the event reports and aggregations work against the event org unit . This makes it easy (possible!) to look the TEI up as you will always know the org unit (api TEI lookup requires know orgunit) On Wed, Mar 4, 2015 at 10:45 AM, Abyot Gizaw aby...@gmail.com wrote: Ok, you know what your needs are. Are you also going to migrate events? What will happen to already submitted/acted report? You need to carefully look into the migration requirement. I am strongly against the idea of migration. With migration, you will lose information. If it is possible to access a TEI and do data entry at orgunit which is not necessarily the same as the registration/enrollment orgunit, then I don't think we need migration. --- Thank you, Abyot. On Wed, Mar 4, 2015 at 9:20 AM, Harsh Atal harsh.a...@gmail.com wrote: thanks morten ,I thought it was a bug @abyot I want to migrate the tracked entity instance into another organisation unit. So when the next time i select the orgunit from which i migrated i dont want to see the tracked instance there but instead it has to come up in the new org unit. This is a functionality that we require for a project. On 4 March 2015 at 13:39, Abyot Gizaw aby...@gmail.com wrote: Hi Harsh, Do you really want to migrate? Or you want to register data in another org unit? - Thank you, Abyot. (sent from mobile) On Mar 4, 2015 9:07 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [trunk]Issue in trackedEntityInstance updation through web API
By migration I meant the same feature as 'change location' in individual records. Now, as abyot said if it is possible to access a TEI at any org unit and enter data for any org unit then that is one way to do it but its not the same as 'change location' in individual records. The need for 'migration' came in case a TEI was referred to another orgunit. For eg: a patient diagnosed with HIV is referred to a OU which handles the program for HIV, and now all the enrollment and data entry have to be done in that OU i.e. now the patient is in the jurisdiction of the user who handles the OU for HIV based programs, in this case shouldn't that patient come under the TEI list of that org unit(in the home page). Even when we consider the possibility of having data entered for a TEI at any OU, still i feel that the 'change location' feature seems relevant. Thank You harsh On 4 March 2015 at 14:24, Pierre Dane pie...@jembi.org wrote: I agree. What we are doing is having a placeholder org unit for the TEI, and then registering the events against the actual org unit. Then the event reports and aggregations work against the event org unit . This makes it easy (possible!) to look the TEI up as you will always know the org unit (api TEI lookup requires know orgunit) On Wed, Mar 4, 2015 at 10:45 AM, Abyot Gizaw aby...@gmail.com wrote: Ok, you know what your needs are. Are you also going to migrate events? What will happen to already submitted/acted report? You need to carefully look into the migration requirement. I am strongly against the idea of migration. With migration, you will lose information. If it is possible to access a TEI and do data entry at orgunit which is not necessarily the same as the registration/enrollment orgunit, then I don't think we need migration. --- Thank you, Abyot. On Wed, Mar 4, 2015 at 9:20 AM, Harsh Atal harsh.a...@gmail.com wrote: thanks morten ,I thought it was a bug @abyot I want to migrate the tracked entity instance into another organisation unit. So when the next time i select the orgunit from which i migrated i dont want to see the tracked instance there but instead it has to come up in the new org unit. This is a functionality that we require for a project. On 4 March 2015 at 13:39, Abyot Gizaw aby...@gmail.com wrote: Hi Harsh, Do you really want to migrate? Or you want to register data in another org unit? - Thank you, Abyot. (sent from mobile) On Mar 4, 2015 9:07 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18475: tracker|event-capture: capture coordiante - WIP
revno: 18475
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-03-04 12:34:55 +0100
message:
tracker|event-capture: capture coordiante - WIP
removed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/map.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/custom-overlay.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/map.html
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/coordinatecapture/
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/coordinatecapture/map.html
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.map.textoverlay.js
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
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
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.controllers.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.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/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-02-02 13:42:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-03-04 11:34:55 +
@@ -7,6 +7,13 @@
meta name=description content=DHIS 2
meta name=keywords content=DHIS 2
meta http-equiv=Content-Type content=text/html; charset=UTF-8
+
+script type=text/javascript
+window.google = null;
+/script
+
+script type=text/javascript src=https://maps.google.com/maps/api/js?sensor=false;/script
+script type=text/javascript src=../dhis-web-commons/javascripts/dhis2/dhis2.map.textoverlay.js/script
script type=text/javascript src=../dhis-web-commons/javascripts/jQuery/jquery.min.js/script
script type=text/javascript src=../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.min.js/script
@@ -73,7 +80,7 @@
script type=text/javascript src=scripts/app.js/script
script type=text/javascript src=scripts/services.js/script
-script type=text/javascript src=scripts/directives.js/script
+script type=text/javascript src=scripts/directives.js/script
script type=text/javascript src=scripts/controllers.js/script
script type=text/javascript src=scripts/notes-controller.js/script
script type=text/javascript src=scripts/filters.js/script
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-02-02 13:42:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-03-04 11:34:55 +
@@ -10,6 +10,7 @@
$timeout,
$translate,
$anchorScroll,
+orderByFilter,
storage,
Paginator,
OptionSetService,
@@ -23,7 +24,9 @@
CalendarService,
GridColumnService,
CustomFormService,
+ECStorageService,
ErrorMessageService,
+CurrentSelection,
ModalService,
DialogService) {
//selected org unit
@@ -49,7 +52,7 @@
$scope.currentElement = {id: '', update: false};
$scope.optionSets = [];
$scope.proceedSelection = true;
-$scope.formUnsaved = false;
+
Re: [Dhis2-devs] [trunk]Issue in trackedEntityInstance updation through web API
I see your point. But, the situation that you have referred a patient from orgunit A to orgunit B does not change the fact that the patient was registered/enrolled at orgunit A. By doing migration, we are destroying this information which for me is wrong. What we need to probably do is provide a feature for users to decide how to see a list of patients. Currently, by default, you see those patients registered under your orgunit - but of course you can go to advanced search and see those patients from another orgunit. It would be nice if users can for example say - show patients who are enrolled in my orgunit, - show me patients who are diagnosed (have data recorded) in my orgunit - ... --- Thank you, Abyot. On Wed, Mar 4, 2015 at 11:51 AM, Harsh Atal harsh.a...@gmail.com wrote: By migration I meant the same feature as 'change location' in individual records. Now, as abyot said if it is possible to access a TEI at any org unit and enter data for any org unit then that is one way to do it but its not the same as 'change location' in individual records. The need for 'migration' came in case a TEI was referred to another orgunit. For eg: a patient diagnosed with HIV is referred to a OU which handles the program for HIV, and now all the enrollment and data entry have to be done in that OU i.e. now the patient is in the jurisdiction of the user who handles the OU for HIV based programs, in this case shouldn't that patient come under the TEI list of that org unit(in the home page). Even when we consider the possibility of having data entered for a TEI at any OU, still i feel that the 'change location' feature seems relevant. Thank You harsh On 4 March 2015 at 14:24, Pierre Dane pie...@jembi.org wrote: I agree. What we are doing is having a placeholder org unit for the TEI, and then registering the events against the actual org unit. Then the event reports and aggregations work against the event org unit . This makes it easy (possible!) to look the TEI up as you will always know the org unit (api TEI lookup requires know orgunit) On Wed, Mar 4, 2015 at 10:45 AM, Abyot Gizaw aby...@gmail.com wrote: Ok, you know what your needs are. Are you also going to migrate events? What will happen to already submitted/acted report? You need to carefully look into the migration requirement. I am strongly against the idea of migration. With migration, you will lose information. If it is possible to access a TEI and do data entry at orgunit which is not necessarily the same as the registration/enrollment orgunit, then I don't think we need migration. --- Thank you, Abyot. On Wed, Mar 4, 2015 at 9:20 AM, Harsh Atal harsh.a...@gmail.com wrote: thanks morten ,I thought it was a bug @abyot I want to migrate the tracked entity instance into another organisation unit. So when the next time i select the orgunit from which i migrated i dont want to see the tracked instance there but instead it has to come up in the new org unit. This is a functionality that we require for a project. On 4 March 2015 at 13:39, Abyot Gizaw aby...@gmail.com wrote: Hi Harsh, Do you really want to migrate? Or you want to register data in another org unit? - Thank you, Abyot. (sent from mobile) On Mar 4, 2015 9:07 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Harsh You are not allowed to update the orgUnit pointer, this was supposed to be the point of registration.. and was thought of as being read-only after initial registration. That said, I'm 90% sure we are changing this for 2.19, we are having discussion about that now (we would rather have the orgUnit pointer on the enrollment) -- Morten On Wed, Mar 4, 2015 at 3:04 PM, Harsh Atal harsh.a...@gmail.com wrote: Dear All I am trying to shift a trackedentityinstance from one organisationunit to another. For this i tried to use the web API resource for the updation of trackedEntityInstance. This ,i have found, is not working for the organisationunit as it is not changed while the changes in other information like attributes etc are reflected. I am not getting any error and the web api response status is SUCCESS but the organisationunitid doesn't change in the trackedEntityInstance table in the db. Have you encountered such a problem? Thank You Harsh ___ 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 :
Re: [Dhis2-devs-core] org unit association from TEI to enrollment
Okay. I can do the SQL updgrade, just tell me about what database columns/tables will change, and let Abyot know about the API changes. On Wed, Mar 4, 2015 at 9:04 AM, Morten Olav Hansen morte...@gmail.com wrote: We already have a blueprint on this [1], I can take on the job of changing the web-api (require orgUnit in enrollment, and remove orgUnit from trackedEntityInstance), if someone else can take care of SQL upgrade.. that would be good, since its not really what I'm good at.. I guess we should default all old enrollments to be tei.orgUnit, and then also remove tei.orgUnit from the table Abyot also need to update his apps, so that he is sending this new orgUnit ptr.. what about others? thoughtworks? Maybe we should send out a message on the dev list also -- Morten On Tue, Mar 3, 2015 at 7:59 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi devs, on the last meeting we discussed removing the org unit association on tracked entity instance, and rather have it on program instance (enrollment). This means we can capture where enrollments for multiple programs took place for a person, and sounds like a sensible thing to do. Should we go ahead? Who is most suited to take this on, Abyot, Morten? Lars -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp -- Mailing list: https://launchpad.net/~dhis2-devs-core Post to : dhis2-devs-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs-core More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] BUG(s) - Data Element Group Editor
Hi Just picked up a significant bug in the Data Element Group Editor: 1. Open DEG editor, and select a DE group with existing members. 2. If required, filter the list of available elements. 3. First bug: data elements that already ARE group members are not excluded from the available list. 4. Second bug: you can select an existing group member and select it - that element gets duplicated at the bottom of the group member list. I have not checked if that duplicated member records is actually added to the database, messing it up - or whether the duplication is a display/interface issue only. Regards from Maseru Calle *** Calle Hedberg 46D Alma Road, 7700 Rosebank, SOUTH AFRICA Tel/fax (home): +27-21-685-6472 Cell: +27-82-853-5352 Iridium SatPhone: +8816-315-19274 Email: calle.hedb...@gmail.com Skype: calle_hedberg *** ___ 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
