[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19501: Removed class BaseMetaDataCollectionObject, moved properties into BaseAnalyticalObject
revno: 19501
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-06-23 15:02:02 +0200
message:
Removed class BaseMetaDataCollectionObject, moved properties into
BaseAnalyticalObject
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseMetaDataCollectionObject.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.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/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2015-06-18 14:35:18 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2015-06-23 13:02:02 +
@@ -56,16 +56,21 @@
import org.apache.commons.lang3.StringUtils;
import org.hisp.dhis.analytics.AggregationType;
+import org.hisp.dhis.common.adapter.JacksonPeriodDeserializer;
+import org.hisp.dhis.common.adapter.JacksonPeriodSerializer;
import org.hisp.dhis.common.annotation.Scanned;
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.DimensionalView;
import org.hisp.dhis.common.view.ExportView;
import org.hisp.dhis.dataelement.CategoryOptionGroup;
+import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryDimension;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementOperand;
+import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.i18n.I18nFormat;
+import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.period.ConfigurablePeriod;
@@ -98,7 +103,7 @@
*/
@JacksonXmlRootElement( localName = analyticalObject, namespace = DxfNamespaces.DXF_2_0 )
public abstract class BaseAnalyticalObject
-extends BaseMetaDataCollectionObject
+extends BaseIdentifiableObject
implements AnalyticalObject
{
public static final String NUMBER_FORMATTING_COMMA = comma;
@@ -112,7 +117,40 @@
// -
// Persisted properties
// -
-
+
+@Scanned
+protected ListIndicator indicators = new ArrayList();
+
+@Scanned
+protected ListDataElement dataElements = new ArrayList();
+
+@Scanned
+protected ListDataElementOperand dataElementOperands = new ArrayList();
+
+@Scanned
+protected ListDataSet dataSets = new ArrayList();
+
+@Scanned
+protected ListOrganisationUnit organisationUnits = new ArrayList();
+
+@Scanned
+protected ListPeriod periods = new ArrayList();
+
+protected RelativePeriods relatives;
+
+@Scanned
+protected ListDataElementGroup dataElementGroups = new ArrayList();
+
+@Scanned
+protected ListOrganisationUnitGroup organisationUnitGroups = new ArrayList();
+
+@Scanned
+protected ListInteger organisationUnitLevels = new ArrayList();
+
+@Scanned
+protected ListDataElementCategoryOptionCombo categoryOptionCombos = new ArrayList();
+
+@Scanned
protected ListDataElementCategoryDimension categoryDimensions = new ArrayList();
@Scanned
@@ -825,6 +863,165 @@
// -
@JsonProperty
+@JsonSerialize( contentAs = BaseNameableObject.class )
+@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlElementWrapper( localName = indicators, namespace = DxfNamespaces.DXF_2_0 )
+@JacksonXmlProperty( localName = indicator, namespace = DxfNamespaces.DXF_2_0 )
+public ListIndicator getIndicators()
+{
+return indicators;
+}
+
+public void setIndicators( ListIndicator indicators )
+{
+this.indicators = indicators;
+}
+
+@JsonProperty
+@JsonSerialize( contentAs = BaseNameableObject.class )
+@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlElementWrapper( localName = dataElements, namespace = DxfNamespaces.DXF_2_0 )
+@JacksonXmlProperty( localName = dataElement, namespace = DxfNamespaces.DXF_2_0 )
+public ListDataElement getDataElements()
+{
+return dataElements;
+}
+
+public void setDataElements( ListDataElement dataElements )
+{
+this.dataElements = dataElements;
+}
+
+@JsonProperty
+@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlElementWrapper( localName = dataElementOperands, namespace =
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19500: Analytics. Groups query by days in aggregation period for average aggregation queries. Fixes prob...
revno: 19500
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-06-23 14:28:45 +0200
message:
Analytics. Groups query by days in aggregation period for average aggregation
queries. Fixes problem with wrong factor for monthly periods
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryGroups.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/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/DataQueryGroups.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryGroups.java 2015-01-17 07:41:26 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryGroups.java 2015-06-23 12:28:45 +
@@ -70,8 +70,8 @@
* in sequence due to the typical indicator query, where few data elements
* have the average aggregation operator and many have the sum. Performance
* will increase if optimal number of queries can be run in parallel for the
- * queries which take most time, which is in this case are the ones with
- * sum aggregation type.
+ * queries which take most time, which in this case are the ones with sum
+ * aggregation type.
*/
public ListListDataQueryParams getSequentialQueries()
{
=== 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-19 13:27:23 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2015-06-23 12:28:45 +
@@ -943,6 +943,22 @@
}
/**
+ * Returns the number of days in the first dimension period in this query.
+ * If no dimension periods exist, the frequency order of the period type of
+ * the query is returned. If no period type exists, -1 is returned.
+ * @return
+ */
+public int getDaysInFirstPeriod()
+{
+ListNameableObject periods = getPeriods();
+
+Period period = !periods.isEmpty() ? (Period) periods.get( 0 ) : null;
+
+return period != null ? period.getDaysInPeriod() : periodType != null ?
+PeriodType.getPeriodTypeByName( periodType ).getFrequencyOrder() : -1;
+}
+
+/**
* Indicates whether this params defines an identifier scheme different from
* UID.
*/
=== modified file '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/DefaultQueryPlanner.java 2015-06-22 22:31:16 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2015-06-23 12:28:45 +
@@ -70,6 +70,7 @@
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.setting.SystemSettingManager;
import org.hisp.dhis.system.util.MathUtils;
@@ -265,17 +266,22 @@
ListDataQueryParams groupedByAggregationType = groupByAggregationType( byDataType );
for ( DataQueryParams byAggregationType : groupedByAggregationType )
-{
-ListDataQueryParams groupedByDataPeriodType = groupByDataPeriodType( byAggregationType );
+{
+ListDataQueryParams groupedByDaysInPeriod = groupByDaysInPeriod( byAggregationType );
-for ( DataQueryParams byDataPeriodType : groupedByDataPeriodType )
+for ( DataQueryParams byDaysInPeriod : groupedByDaysInPeriod )
{
-byDataPeriodType.setPartitions( byPartition.getPartitions() );
-
Re: [Dhis2-devs] [Dhis2-users] Web API in Excel
The excel thing is obviously something that we should address at some point. I have also made an unfinished attempt during the Ebola crisis. What I did was to provide a UI that allows users to upload excel file, do mapping between columns and data elements or attributes and finally upload the cell values. On Tue, Jun 23, 2015, 14:15 rin.chann...@gmail.com rin.chann...@gmail.com wrote: Yes, I agree with Markus, Excel is good tool to do deep formula to calculate in data elements. And offline too. Markus Bekken markus.bek...@gmail.com wrote: Thanks Bob, 1. I have not established a preference here - your point on using CSV is a good one. CSV will probably be easier to deserialize in most cases. JSON or XML on the other hand, will probably be a little more robust to changes in the WebAPI output. 2. I like it. Excel is a good tool accessible to many people. I have been using an excel sheet to manage some data through the API, but the sheet I made contains some hardcodings that is made for my specific case. I have been thinking about making a generic version of my Excel, that can be used by anyone to post, put and maybe also get data through the API. Best regards Markus p.s. I deleted the stackexchange question again, as the question and answer was generic Excel, and not so DHIS related. The link still works, but here is the code snippet. It is possible to use Excel Macros to call the Web API. Posting to the API can be done like this: Public Function postData(ByVal address As String, ByVal json As String, ByVal mode As String) If (mode = Yes Or mode = Debug) Then On Error GoTo Errorhandler Dim objHTTP As New WinHttpRequest URL = address objHTTP.Open POST, URL, False objHTTP.Option(WinHttpRequestOption_SslErrorIgnoreFlags) = 13056 objHTTP.setRequestHeader Content-Type, application/json objHTTP.setRequestHeader Authorization, Basic EncodeBase64(admin:district) objHTTP.send json If (mode = Debug) Then postData = objHTTP.ResponseText Else postData = objHTTP.statusText End If Else postData = mode End If Exit Function Errorhandler: postData = Err.Description End Function For doing a GET, you should be able to just replace the POST with a GET, and send the request without the json. 23. jun. 2015 kl. 13.40 skrev Bob Jolliffe bobjolli...@gmail.com: Hi Markus Thanks for this information. That's a really useful snippet for anyone to get started who might want to do this. I have a quick question and a comment/suggestion: 1. I can see from the link that you can indeed parse/serialize json from VBA - I guess it would have been surprising if you couldn't :-) Would you do this in preference to CSV? 2. On a a more general point, there has been interest in (and a long historical relationship) between DHIS and Excel. Ranging from its early origins in DHIS1.4 through to primitive efforts to populate spreadsheet data using mydatamart. But the use cases from excel as data collection instrument, through to excel for analysis (pivot tables) and simple metadata management are very varied. It strikes me that a library of DHIS2-web-api macros similar to those you presented in your link would be hugely interesting to a lot of people. Have you considered collecting/publishing such a thing? Cheers Bob On 23 June 2015 at 12:06, Markus Bekken markus.bek...@gmail.com wrote: Hi Channara and Bob I have been using macros to POST and PUT data to the API, and GET requests should work just as well. I added your question and put my macro code here: https://webapps.stackexchange.com/questions/79521/can-i-use-excel-to-get-json-from-the-dhis-api/79522#79522 See the comment at the end, seems it is possible to parse the JSON in a macro also. Thank you, Markus 23. jun. 2015 kl. 12.13 skrev Bob Jolliffe bobjolli...@gmail.com: You can't use excel to get json data from dhis2 web api. At least not directly. You could possibly write an excel macro to get the data through the web api (I am really not sure - it is far too many years since i wrote an excel macro), but you are still left with the problem of consuming what you have got (json) into cells in a spreadsheet. I believe all (or certainly almost all) of the data which is available as json is also available as csv. If you are looking at getting dhsi2 data into excel in general, I would look at csv rather than json if you want to minimize the processing/transformation that would otherwise have to happen in between getting the data and consuming it. https://www.dhis2.org/doc/snapshot/en/developer/html/dhis2_developer_manual.html On 23 June 2015 at 07:47, channara rin rin.chann...@gmail.com wrote: Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara
Re: [Dhis2-devs] Web API in Excel
Yes, I agree with Markus, Excel is good tool to do deep formula to calculate in data elements. And offline too. Markus Bekken markus.bek...@gmail.com wrote: Thanks Bob, 1. I have not established a preference here - your point on using CSV is a good one. CSV will probably be easier to deserialize in most cases. JSON or XML on the other hand, will probably be a little more robust to changes in the WebAPI output. 2. I like it. Excel is a good tool accessible to many people. I have been using an excel sheet to manage some data through the API, but the sheet I made contains some hardcodings that is made for my specific case. I have been thinking about making a generic version of my Excel, that can be used by anyone to post, put and maybe also get data through the API. Best regards Markus p.s. I deleted the stackexchange question again, as the question and answer was generic Excel, and not so DHIS related. The link still works, but here is the code snippet. It is possible to use Excel Macros to call the Web API. Posting to the API can be done like this: Public Function postData(ByVal address As String, ByVal json As String, ByVal mode As String) If (mode = Yes Or mode = Debug) Then On Error GoTo Errorhandler Dim objHTTP As New WinHttpRequest URL = address objHTTP.Open POST, URL, False objHTTP.Option(WinHttpRequestOption_SslErrorIgnoreFlags) = 13056 objHTTP.setRequestHeader Content-Type, application/json objHTTP.setRequestHeader Authorization, Basic EncodeBase64(admin:district) objHTTP.send json If (mode = Debug) Then postData = objHTTP.ResponseText Else postData = objHTTP.statusText End If Else postData = mode End If Exit Function Errorhandler: postData = Err.Description End Function For doing a GET, you should be able to just replace the POST with a GET, and send the request without the json. 23. jun. 2015 kl. 13.40 skrev Bob Jolliffe bobjolli...@gmail.com: Hi Markus Thanks for this information. That's a really useful snippet for anyone to get started who might want to do this. I have a quick question and a comment/suggestion: 1. I can see from the link that you can indeed parse/serialize json from VBA - I guess it would have been surprising if you couldn't :-) Would you do this in preference to CSV? 2. On a a more general point, there has been interest in (and a long historical relationship) between DHIS and Excel. Ranging from its early origins in DHIS1.4 through to primitive efforts to populate spreadsheet data using mydatamart. But the use cases from excel as data collection instrument, through to excel for analysis (pivot tables) and simple metadata management are very varied. It strikes me that a library of DHIS2-web-api macros similar to those you presented in your link would be hugely interesting to a lot of people. Have you considered collecting/publishing such a thing? Cheers Bob On 23 June 2015 at 12:06, Markus Bekken markus.bek...@gmail.com wrote: Hi Channara and Bob I have been using macros to POST and PUT data to the API, and GET requests should work just as well. I added your question and put my macro code here: https://webapps.stackexchange.com/questions/79521/can-i-use-excel-to-get-json-from-the-dhis-api/79522#79522 See the comment at the end, seems it is possible to parse the JSON in a macro also. Thank you, Markus 23. jun. 2015 kl. 12.13 skrev Bob Jolliffe bobjolli...@gmail.com: You can't use excel to get json data from dhis2 web api. At least not directly. You could possibly write an excel macro to get the data through the web api (I am really not sure - it is far too many years since i wrote an excel macro), but you are still left with the problem of consuming what you have got (json) into cells in a spreadsheet. I believe all (or certainly almost all) of the data which is available as json is also available as csv. If you are looking at getting dhsi2 data into excel in general, I would look at csv rather than json if you want to minimize the processing/transformation that would otherwise have to happen in between getting the data and consuming it. https://www.dhis2.org/doc/snapshot/en/developer/html/dhis2_developer_manual.html On 23 June 2015 at 07:47, channara rin rin.chann...@gmail.com wrote: Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara ___ 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] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19502: added a feedback widget for giving user feedback with program rules
revno: 19502
committer: Markus Bekken markus.bek...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-06-23 15:17:50 +0200
message:
added a feedback widget for giving user feedback with program rules
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_ar.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2015-06-21 22:18:40 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2015-06-23 13:17:50 +
@@ -83,6 +83,11 @@
$rootScope.dashboardWidgets.push($rootScope.indicatorWidget);
$scope.dashboardStatus[widget.title] = angular.copy(widget);
break;
+case 'feedback':
+$rootScope.feedbackWidget = widget;
+$rootScope.dashboardWidgets.push($rootScope.feedbackWidget);
+$scope.dashboardStatus[widget.title] = angular.copy(widget);
+break;
case 'dataentry':
$rootScope.dataentryWidget = widget;
$rootScope.dashboardWidgets.push($rootScope.dataentryWidget);
=== modified file '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/components/dataentry/dataentry-controller.js 2015-06-22 08:45:36 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-06-23 13:17:50 +
@@ -220,7 +220,7 @@
sortEventsByStage(null);
$scope.showDataEntry($scope.currentEvent, true);
-}
+}
};
var setEventEditing = function(dhis2Event, stage){
@@ -250,14 +250,14 @@
});
};
-$scope.stageNeedsEvent = function(stage){
+$scope.stageNeedsEvent = function(stage){
//In case the event is a table, we sould always allow adding more events(rows)
if(stage.displayEventsInTable) {
return true;
}
-if($scope.eventsByStage[stage.id].length 1){
+if($scope.eventsByStage[stage.id].length 1){
return true;
}
@@ -266,7 +266,7 @@
if(!$scope.eventsByStage[stage.id][j].eventDate $scope.eventsByStage[stage.id][j].status !== 'SKIPPED'){
return false;
}
-}
+}
return true;
}
return false;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js 2015-06-14 13:07:10 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js 2015-06-23 13:17:50 +
@@ -8,7 +8,7 @@
$scope.widget = $scope.$parent.$parent.biggerWidget ? $scope.$parent.$parent.biggerWidget
: $scope.$parent.$parent.smallerWidget ? $scope.$parent.$parent.smallerWidget : null;
$scope.widgetTitle = $scope.widget.title;
-$scope.widgetCode = $scope.widget.code;
+
$scope.displayTextEffects = {};
@@ -21,7 +21,7 @@
//Bind non-bound rule effects, if any.
angular.forEach($rootScope.ruleeffects[args.event], function(effect) {
-if(effect.location === $scope.widgetCode){
+if(effect.location === $scope.widgetTitle){
//This effect is affecting the local widget
if(effect.action ===
Re: [Dhis2-devs] [Dhis2-users] dhis2 2.18, 2.17. 2.16 reporting Error. Please Help.
Hi Fatema, I have made a fix for the problem with inaccurate aggregate values for data elements with average aggregation operator (e.g. 51.7 instead of 50) now in trunk and 2.19. New build is available from https://www.dhis2.org/downloads in 40 minutes. regards, Lars On Tue, Jun 23, 2015 at 12:48 PM, Lars Helge Øverland larshe...@gmail.com wrote: Okay. Can can you please - provide the output of the tomcat log for when it fails - try by downloading 2.18 from https://www.dhis2.org/downloads to rule out build issues regards, Lars On Tue, Jun 23, 2015 at 12:30 PM, Uddin Fatema fatema...@gmail.com wrote: Dear Lars, Thanks a lot I just download 2.18 branch code and build the war file. Now i am running my database with this war file with UTC +6 Dhaka time zone but still shows same error. Is it cash problem or anything else. On Tue, Jun 23, 2015 at 2:22 AM, Lars Helge Øverland larshe...@gmail.com wrote: Hi Fatema, we have made a fix to prevent time zone issues for resource table generation in 2.18 and 2.19 now. regards, Lars On Wed, Jun 17, 2015 at 11:57 AM, Uddin Fatema fatema...@gmail.com wrote: Yes Lars i found same error in 2.18 too. Actually I updated version in 2.18 in test server but still time zone error remains for (UTC+60 )Dhaka . You know that some time zone has time zone problem in resource table generation. So I Changes time zone UTC+6:30) Yaangoon) and update resource table and analytic. And still I found same error which is described me and Nayeem Al Miftah. Thanks On Wed, Jun 17, 2015 at 3:44 PM, Nayeem Al Mifthah n.mift...@gmail.com wrote: Dear Lars There are monthly datasets on which a data entry operator input 50 in a cell. Analytic shows that same number as 51.7 in those months which have 31 days (Jan, Mar, May, July, Aug, Oct, Dec), Also it shows less value in February as it have 28 days. It has happened as the analytic table calculate the data as Ms. Fatema has described. Nayeem Al Mifthah HMIS Consultant Management Information System Directorate General of Health Services (DGHS), Bangladesh Supported by: UNICEF-Bangladesh Email: n.mift...@gmail.com | nay...@mis.dghs.gov.bd Cell:+8801914030574 On Wed, Jun 17, 2015 at 3:19 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi Fatema, do you think you could explain a bit more about the data elements and calculation? Do you think you cold try with 2.18 / 2.19 ? regards, Lars On Wed, Jun 17, 2015 at 11:06 AM, Uddin Fatema fatema...@gmail.com wrote: Dear All, Data Analytic table retrieve wrong data in Pivot table, data visualizer and GIS and same error remain 2.17 and 2.16 too Here i attach screen short of Pivote Table Analysis and Data Entry Screen In pivote table value shows = 51.7 but originally dataentry screen shows = 50 Calculation it is dividing daysxvalue / 30 = 50* 31/30 = 51.7 But it should do daysxvalue/daysno = 50*31/31 =50 Please have a look on it. Thanks Fatema --- Forwarded message -- rom: Uddin Fatema fatema...@gmail.com Date: Tue, May 5, 2015 at 5:56 PM Subject: DHIS2 2.16 Data Analytic table retrieve wrong data in Pivot table, data visualizer and GIS. To: Jan Henrik Øverland janhenrik.overl...@gmail.com Dear Jan, DHIS2 2.16 analytics (pivote table, data-visualizer and gis mapping retrieve wrong data from Analytics_2015 or all analytics table. The problem is in analytics table it store daysxvalue , daysno and value column but when it retrieve data for pivote table, data-visualizer and gis that time it is dividing daysxvalue / 30 But it should do daysxvalue/daysno As a result in pivot table, data visualizer and gis mapping shows wrong data. Could you please solved it additionally, can you please tell me in source code in which file i have to change. Thanks a lot in advance. Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH German House House 10/A-2, Road 90 Gulshan 2, Dhaka 1212, Bangladesh T +880 9666701000 F +880 28823099 M +880 19 6206 4721 I www.giz.de https://owa.giz.de/owa/redir.aspx?C=mPQMujasE0-yL6Aa4ocPcnkcfUThJNEIi4h1DwsYjO3Ua20UR_COt6aTH1s4JIdR4p-jCoFsP6A.URL=http%3a%2f%2fwww.giz.de%2f -- Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH German House House 10/A-2, Road 90 Gulshan 2, Dhaka 1212, Bangladesh T +880 9666701000 F +880 28823099 M +880 19 6206 4721 I www.giz.de https://owa.giz.de/owa/redir.aspx?C=mPQMujasE0-yL6Aa4ocPcnkcfUThJNEIi4h1DwsYjO3Ua20UR_COt6aTH1s4JIdR4p-jCoFsP6A.URL=http%3a%2f%2fwww.giz.de%2f -- Lars Helge Øverland Lead developer, DHIS 2 University of Oslo Skype: larshelgeoverland http://www.dhis2.org
[Dhis2-devs] FW: ProgramRule setup - Skip logic
Hi all, We are trying to apply skiplogic on our Tracker program for a school health project and were advised that this can be done by creating a program rule for the program. We have created a program rule where if a user chooses that the learner was absent for the 1st vaccination then the date field for the vaccination should be hidden/skip. Although we have applied this a user can still capture a vaccination date using tracker capture even though the learner is absent. Could you please look into the issue or test it on your side if you can replicate such an issue on your instance , we have also upgrade our version to 2.20 SNAPSHOT. Have a great day further. Regards, Elmarie Claasen Hisp logo Project Manager Health Information Systems Program Tel: 041-367 1027 Cell: 082 374 2209 E-mail: mailto:elma...@hisp.org elma...@hisp.org Skype: elmarie.claasen52 This message and any attachments are subject to a disclaimer published at http://www.hisp.org/policies.html#comms_disclaimer http://www.hisp.org/policies.html#comms_disclaimer . Please read the disclaimer before opening any attachment or taking any other action in terms of this electronic transmission. If you cannot access the disclaimer, kindly send an email to mailto:disclai...@hisp.org disclai...@hisp.org and a copy will be provided to you. By replying to this e-mail or opening any attachment you agree to be bound by the provisions of the disclaimer. ___ 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 19503: Merged dhis-service-tracker and dhis-service-sms into dhis-service-core project
revno: 19503 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Tue 2015-06-23 17:59:19 +0200 message: Merged dhis-service-tracker and dhis-service-sms into dhis-service-core project removed: dhis-2/dhis-services/dhis-service-sms/ dhis-2/dhis-services/dhis-service-sms/pom.xml dhis-2/dhis-services/dhis-service-sms/src/ dhis-2/dhis-services/dhis-service-sms/src/main/ dhis-2/dhis-services/dhis-service-sms/src/main/java/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/DefaultSMSCommandService.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/SMSCommand.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/SMSCommandDeletionHandler.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/SMSCommandService.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/SMSSpecialCharacter.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/code/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/code/SMSCode.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/code/SMSCodesDeletionHandler.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/hibernate/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/hibernate/HibernateSMSCommandStore.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/command/hibernate/SMSCommandStore.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/listener/ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/listener/DHISMessageAlertListener.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/listener/J2MEDataValueSMSListener.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/listener/ProgramStageDataEntrySMSListener.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/listener/TrackedEntityRegistrationSMSListener.java dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/listener/UnregisteredSMSListener.java dhis-2/dhis-services/dhis-service-sms/src/main/resources/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/sms/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/sms/hibernate/ dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCode.hbm.xml dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCommand.hbm.xml dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/sms/hibernate/SMSSpecialCharacter.hbm.xml dhis-2/dhis-services/dhis-service-sms/src/test/ dhis-2/dhis-services/dhis-service-sms/src/test/java/ dhis-2/dhis-services/dhis-service-tracker/ dhis-2/dhis-services/dhis-service-tracker/pom.xml dhis-2/dhis-services/dhis-service-tracker/src/ dhis-2/dhis-services/dhis-service-tracker/src/main/ dhis-2/dhis-services/dhis-service-tracker/src/main/java/ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/DefaultEventChartService.java dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventreport/ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventreport/DefaultEventReportService.java dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventreport/EventReportDeletionHandler.java
Re: [Dhis2-devs] FW: ProgramRule setup - Skip logic
Hi Elmarie! Great to hear that you are working with the skip logic. The scenario you mention should work in general. Could you kindly provide some detail on the program rule you have set up, how does the expression look? Did you add a hidefield action? Markus Den 23. jun. 2015 kl. 17.54 skrev Elmarie Claasen elma...@hisp.org: Hi all, We are trying to apply skiplogic on our Tracker program for a school health project and were advised that this can be done by creating a program rule for the program. We have created a program rule where if a user chooses that the learner was absent for the 1st vaccination then the date field for the vaccination should be hidden/skip. Although we have applied this a user can still capture a vaccination date using tracker capture even though the learner is absent. Could you please look into the issue or test it on your side if you can replicate such an issue on your instance , we have also upgrade our version to 2.20 SNAPSHOT. Have a great day further. Regards, Elmarie Claasen Project Manager Health Information Systems Program Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 This message and any attachments are subject to a disclaimer published at http://www.hisp.org/policies.html#comms_disclaimer . Please read the disclaimer before opening any attachment or taking any other action in terms of this electronic transmission. If you cannot access the disclaimer, kindly send an email to disclai...@hisp.org and a copy will be provided to you. By replying to this e-mail or opening any attachment you agree to be bound by the provisions of the disclaimer. ___ 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 19499: Don't import internal google library deps. Messes with dependency graph.
revno: 19499 committer: Halvdan Hoem Grelland halvda...@gmail.com branch nick: dhis2 timestamp: Tue 2015-06-23 13:51:15 +0200 message: Don't import internal google library deps. Messes with dependency graph. modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2015-06-15 13:44:20 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2015-06-23 11:51:15 + @@ -47,6 +47,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; +import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -79,8 +80,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.rowset.SqlRowSet; -import com.google.inject.internal.Lists; - /** * @author Jim Grace */ ___ 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] Web API in Excel
Thanks Bob, 1. I have not established a preference here - your point on using CSV is a good one. CSV will probably be easier to deserialize in most cases. JSON or XML on the other hand, will probably be a little more robust to changes in the WebAPI output. 2. I like it. Excel is a good tool accessible to many people. I have been using an excel sheet to manage some data through the API, but the sheet I made contains some hardcodings that is made for my specific case. I have been thinking about making a generic version of my Excel, that can be used by anyone to post, put and maybe also get data through the API. Best regards Markus p.s. I deleted the stackexchange question again, as the question and answer was generic Excel, and not so DHIS related. The link still works, but here is the code snippet. It is possible to use Excel Macros to call the Web API. Posting to the API can be done like this: Public Function postData(ByVal address As String, ByVal json As String, ByVal mode As String) If (mode = Yes Or mode = Debug) Then On Error GoTo Errorhandler Dim objHTTP As New WinHttpRequest URL = address objHTTP.Open POST, URL, False objHTTP.Option(WinHttpRequestOption_SslErrorIgnoreFlags) = 13056 objHTTP.setRequestHeader Content-Type, application/json objHTTP.setRequestHeader Authorization, Basic EncodeBase64(admin:district) objHTTP.send json If (mode = Debug) Then postData = objHTTP.ResponseText Else postData = objHTTP.statusText End If Else postData = mode End If Exit Function Errorhandler: postData = Err.Description End Function For doing a GET, you should be able to just replace the POST with a GET, and send the request without the json. 23. jun. 2015 kl. 13.40 skrev Bob Jolliffe bobjolli...@gmail.com: Hi Markus Thanks for this information. That's a really useful snippet for anyone to get started who might want to do this. I have a quick question and a comment/suggestion: 1. I can see from the link that you can indeed parse/serialize json from VBA - I guess it would have been surprising if you couldn't :-) Would you do this in preference to CSV? 2. On a a more general point, there has been interest in (and a long historical relationship) between DHIS and Excel. Ranging from its early origins in DHIS1.4 through to primitive efforts to populate spreadsheet data using mydatamart. But the use cases from excel as data collection instrument, through to excel for analysis (pivot tables) and simple metadata management are very varied. It strikes me that a library of DHIS2-web-api macros similar to those you presented in your link would be hugely interesting to a lot of people. Have you considered collecting/publishing such a thing? Cheers Bob On 23 June 2015 at 12:06, Markus Bekken markus.bek...@gmail.com wrote: Hi Channara and Bob I have been using macros to POST and PUT data to the API, and GET requests should work just as well. I added your question and put my macro code here: https://webapps.stackexchange.com/questions/79521/can-i-use-excel-to-get-json-from-the-dhis-api/79522#79522 See the comment at the end, seems it is possible to parse the JSON in a macro also. Thank you, Markus 23. jun. 2015 kl. 12.13 skrev Bob Jolliffe bobjolli...@gmail.com: You can't use excel to get json data from dhis2 web api. At least not directly. You could possibly write an excel macro to get the data through the web api (I am really not sure - it is far too many years since i wrote an excel macro), but you are still left with the problem of consuming what you have got (json) into cells in a spreadsheet. I believe all (or certainly almost all) of the data which is available as json is also available as csv. If you are looking at getting dhsi2 data into excel in general, I would look at csv rather than json if you want to minimize the processing/transformation that would otherwise have to happen in between getting the data and consuming it. https://www.dhis2.org/doc/snapshot/en/developer/html/dhis2_developer_manual.html On 23 June 2015 at 07:47, channara rin rin.chann...@gmail.com wrote: Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara ___ 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:
Re: [Dhis2-devs] Web API in Excel
Agree very much with Bob's point 2 - most of the existing legacy data in the world is either on paper or in Excel. And if it is in some other format, people will typically use Excel to rearrange it into DHIS2 format (CSV or JSON or XML) On Tue, Jun 23, 2015 at 1:40 PM, Bob Jolliffe bobjolli...@gmail.com wrote: Hi Markus Thanks for this information. That's a really useful snippet for anyone to get started who might want to do this. I have a quick question and a comment/suggestion: 1. I can see from the link that you can indeed parse/serialize json from VBA - I guess it would have been surprising if you couldn't :-) Would you do this in preference to CSV? 2. On a a more general point, there has been interest in (and a long historical relationship) between DHIS and Excel. Ranging from its early origins in DHIS1.4 through to primitive efforts to populate spreadsheet data using mydatamart. But the use cases from excel as data collection instrument, through to excel for analysis (pivot tables) and simple metadata management are very varied. It strikes me that a library of DHIS2-web-api macros similar to those you presented in your link would be hugely interesting to a lot of people. Have you considered collecting/publishing such a thing? Cheers Bob On 23 June 2015 at 12:06, Markus Bekken markus.bek...@gmail.com wrote: Hi Channara and Bob I have been using macros to POST and PUT data to the API, and GET requests should work just as well. I added your question and put my macro code here: https://webapps.stackexchange.com/questions/79521/can-i-use-excel-to-get-json-from-the-dhis-api/79522#79522 See the comment at the end, seems it is possible to parse the JSON in a macro also. Thank you, Markus 23. jun. 2015 kl. 12.13 skrev Bob Jolliffe bobjolli...@gmail.com: You can't use excel to get json data from dhis2 web api. At least not directly. You could possibly write an excel macro to get the data through the web api (I am really not sure - it is far too many years since i wrote an excel macro), but you are still left with the problem of consuming what you have got (json) into cells in a spreadsheet. I believe all (or certainly almost all) of the data which is available as json is also available as csv. If you are looking at getting dhsi2 data into excel in general, I would look at csv rather than json if you want to minimize the processing/transformation that would otherwise have to happen in between getting the data and consuming it. https://www.dhis2.org/doc/snapshot/en/developer/html/dhis2_developer_manual.html On 23 June 2015 at 07:47, channara rin rin.chann...@gmail.com wrote: Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara ___ 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 -- Knut Staring Dept. of Informatics, University of Oslo Norway: +4791880522 Skype: knutstar http://dhis2.org ___ 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 19507: use grantTypes and redirectUris from OAuth2Client in DefaultClientDetailsService
revno: 19507
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2015-06-24 12:47:58 +0700
message:
use grantTypes and redirectUris from OAuth2Client in
DefaultClientDetailsService
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/oauth2/OAuth2Client.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/DefaultClientDetailsService.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/oauth2/OAuth2Client.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/oauth2/OAuth2Client.java 2015-06-24 05:11:33 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/oauth2/OAuth2Client.java 2015-06-24 05:47:58 +
@@ -45,15 +45,27 @@
/**
* @author Morten Olav Hansen morte...@gmail.com
*/
-@JacksonXmlRootElement( localName = client, namespace = DxfNamespaces.DXF_2_0 )
+@JacksonXmlRootElement( localName = oAuth2Client, namespace = DxfNamespaces.DXF_2_0 )
public class OAuth2Client extends BaseIdentifiableObject
{
+/**
+ * client_id
+ */
private String cid;
+/**
+ * client_secret
+ */
private String secret = UUID.randomUUID().toString();
+/**
+ * List of allowed redirect URI targets for this client.
+ */
private ListString redirectUris = new ArrayList();
+/**
+ * List of allowed grant types for this client.
+ */
private ListString grantTypes = new ArrayList();
public OAuth2Client()
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/DefaultClientDetailsService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/DefaultClientDetailsService.java 2015-06-21 12:44:37 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/DefaultClientDetailsService.java 2015-06-24 05:47:58 +
@@ -37,6 +37,7 @@
import org.springframework.security.oauth2.provider.ClientRegistrationException;
import org.springframework.security.oauth2.provider.client.BaseClientDetails;
+import java.util.HashSet;
import java.util.Set;
/**
@@ -47,13 +48,8 @@
@Autowired
private OAuth2ClientService oAuth2ClientService;
-private final SetString GRANT_TYPES =
-Sets.newHashSet( password, authorization_code, refresh_token, implicit );
-
private final SetString SCOPES = Sets.newHashSet( ALL );
-private final SetString REDIRECT_URIS = Sets.newHashSet( http://www.example.org; );
-
@Override
public ClientDetails loadClientByClientId( String clientId ) throws ClientRegistrationException
{
@@ -77,9 +73,9 @@
BaseClientDetails clientDetails = new BaseClientDetails();
clientDetails.setClientId( client.getCid() );
clientDetails.setClientSecret( client.getSecret() );
-clientDetails.setAuthorizedGrantTypes( GRANT_TYPES );
+clientDetails.setAuthorizedGrantTypes( new HashSet( client.getGrantTypes() ) );
clientDetails.setScope( SCOPES );
-clientDetails.setRegisteredRedirectUri( REDIRECT_URIS );
+clientDetails.setRegisteredRedirectUri( new HashSet( client.getRedirectUris() ) );
return clientDetails;
}
___
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 19497: Support for tracked entity attributes as variables in Add/Update Program Rule form.
revno: 19497
committer: Tran Chautran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-06-23 16:02:05 +0700
message:
Support for tracked entity attributes as variables in Add/Update Program Rule
form.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programRule.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java 2015-05-13 02:28:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java 2015-06-23 09:02:05 +
@@ -69,7 +69,7 @@
* within the current event. dataelement_previous_event Get a specific
* data elements value, specifically from the event preceding the current
* event, if this exists. calculated_value Do not assign the variable a
- * hard-linked source, it will be populated by rules with “assignvariable”
+ * hard-linked source, it will be populated by rules with assignvariable
* actions(i.e. calculation rules). tei_attribute Get a specific attribute
* from the current tracked entity. the linked attribute will be used to
* lookup the attributes uID value.
@@ -89,7 +89,7 @@
* ul
* lidataelement_newest_event_program_stage/li
* lidataelement_newest_event_program/li
- * lidataelement_current_event/li
+ * lidataelement_current_even/li
* /ul
*/
private DataElement dataElement;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-06-19 10:59:39 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-06-23 09:02:05 +
@@ -546,4 +546,5 @@
expression_items=Expression items
filter_items=Filter items
filter_description=Filter description
-select_program_stage=Select program stage
\ No newline at end of file
+select_program_stage=Select program stage
+tei_attribute = Tracked entity attribute
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm 2015-05-24 15:56:22 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm 2015-06-23 09:02:05 +
@@ -180,10 +180,11 @@
select type= id=sourceType name=sourceType onchange=sourceTypeOnChange() style=width:250px;
option value=DATAELEMENT_NEWEST_EVENT_PROGRAM$i18n.getString(data_element_newest_event_program)/option
option value=DATAELEMENT_NEWEST_EVENT_PROGRAM_STAGE$i18n.getString(data_element_newest_event_program_stage)/option
+ option value=TEI_ATTRIBUTE$i18n.getString(tei_attribute)/option
/select
/td
/td
- tr
+ tr name=deSourceType
td$i18n.getString('source_program_stage')/td
td
select type= id=programStageId disabled style=width:250px; onchange=getDataElementsByStage();
@@ -194,7 +195,7 @@
/select
/td
/td
- tr
+ tr name=deSourceType
td$i18n.getString('source_dataElement') em title=$i18n.getString( required ) class=required*/em/td
td
select type= id=dataElementId style=width:250px;
@@ -207,6 +208,18 @@
span style=color:red;display:none; id=dataElementIdError /span
/td
/td
+
+ tr name=teiAttrSourceType style='display:none'
+ td$i18n.getString('tei_attribute') em title=$i18n.getString( required ) class=required*/em/td
+ td
+select type= id=attributeId style=width:250px;
+ #foreach( $programAttribute in $program.programAttributes )
+ option value=$programAttribute.attribute.uid$programAttribute.attribute.displayName/option
+ #end
+/select
+
[Dhis2-devs] Web API in Excel
Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara ___ 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] Including Numerator + Denominator values in WebAPI outputs: 2.20
Hi Devs I came across the following blue-print: https://blueprints.launchpad.net/dhis2/+spec/analytics-numerator-denominator targeted for 2.20 Does anyone know if this has been done for the snapshot version or will be made part of 2.20 final? Thanks, Greg -- *Health Information Systems Program - South Africa* *- - - - - - - **- - - - - - - **- - - - - - - **- - - - - - - **- - - - - * Mobile :073 246 2992 Landline: 021 554 3130 Fax: 086 733 8432 Skype: gregory_rowles ___ 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] Including Numerator + Denominator values in WebAPI outputs: 2.20
Hi Greg, this one is not yet started. We hope to get it done by 2.20 but cannot guarantee it... Lars On Tue, Jun 23, 2015 at 9:12 AM, Greg Rowles greg.row...@gmail.com wrote: Hi Devs I came across the following blue-print: https://blueprints.launchpad.net/dhis2/+spec/analytics-numerator-denominator targeted for 2.20 Does anyone know if this has been done for the snapshot version or will be made part of 2.20 final? Thanks, Greg -- *Health Information Systems Program - South Africa* *- - - - - - - **- - - - - - - **- - - - - - - **- - - - - - - **- - - - - * Mobile :073 246 2992 Landline: 021 554 3130 Fax: 086 733 8432 Skype: gregory_rowles ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Lars Helge Øverland Lead developer, DHIS 2 University of Oslo Skype: larshelgeoverland http://www.dhis2.org https://www.dhis2.org ___ 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] Web API in Excel
Hi Markus Thanks for this information. That's a really useful snippet for anyone to get started who might want to do this. I have a quick question and a comment/suggestion: 1. I can see from the link that you can indeed parse/serialize json from VBA - I guess it would have been surprising if you couldn't :-) Would you do this in preference to CSV? 2. On a a more general point, there has been interest in (and a long historical relationship) between DHIS and Excel. Ranging from its early origins in DHIS1.4 through to primitive efforts to populate spreadsheet data using mydatamart. But the use cases from excel as data collection instrument, through to excel for analysis (pivot tables) and simple metadata management are very varied. It strikes me that a library of DHIS2-web-api macros similar to those you presented in your link would be hugely interesting to a lot of people. Have you considered collecting/publishing such a thing? Cheers Bob On 23 June 2015 at 12:06, Markus Bekken markus.bek...@gmail.com wrote: Hi Channara and Bob I have been using macros to POST and PUT data to the API, and GET requests should work just as well. I added your question and put my macro code here: https://webapps.stackexchange.com/questions/79521/can-i-use-excel-to-get-json-from-the-dhis-api/79522#79522 See the comment at the end, seems it is possible to parse the JSON in a macro also. Thank you, Markus 23. jun. 2015 kl. 12.13 skrev Bob Jolliffe bobjolli...@gmail.com: You can't use excel to get json data from dhis2 web api. At least not directly. You could possibly write an excel macro to get the data through the web api (I am really not sure - it is far too many years since i wrote an excel macro), but you are still left with the problem of consuming what you have got (json) into cells in a spreadsheet. I believe all (or certainly almost all) of the data which is available as json is also available as csv. If you are looking at getting dhsi2 data into excel in general, I would look at csv rather than json if you want to minimize the processing/transformation that would otherwise have to happen in between getting the data and consuming it. https://www.dhis2.org/doc/snapshot/en/developer/html/dhis2_developer_manual.html On 23 June 2015 at 07:47, channara rin rin.chann...@gmail.com wrote: Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara ___ 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] Web API in Excel
You can't use excel to get json data from dhis2 web api. At least not directly. You could possibly write an excel macro to get the data through the web api (I am really not sure - it is far too many years since i wrote an excel macro), but you are still left with the problem of consuming what you have got (json) into cells in a spreadsheet. I believe all (or certainly almost all) of the data which is available as json is also available as csv. If you are looking at getting dhsi2 data into excel in general, I would look at csv rather than json if you want to minimize the processing/transformation that would otherwise have to happen in between getting the data and consuming it. https://www.dhis2.org/doc/snapshot/en/developer/html/dhis2_developer_manual.html On 23 June 2015 at 07:47, channara rin rin.chann...@gmail.com wrote: Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Dhis2-users] dhis2 2.18, 2.17. 2.16 reporting Error. Please Help.
Dear Lars, Thanks a lot I just download 2.18 branch code and build the war file. Now i am running my database with this war file with UTC +6 Dhaka time zone but still shows same error. Is it cash problem or anything else. On Tue, Jun 23, 2015 at 2:22 AM, Lars Helge Øverland larshe...@gmail.com wrote: Hi Fatema, we have made a fix to prevent time zone issues for resource table generation in 2.18 and 2.19 now. regards, Lars On Wed, Jun 17, 2015 at 11:57 AM, Uddin Fatema fatema...@gmail.com wrote: Yes Lars i found same error in 2.18 too. Actually I updated version in 2.18 in test server but still time zone error remains for (UTC+60 )Dhaka . You know that some time zone has time zone problem in resource table generation. So I Changes time zone UTC+6:30) Yaangoon) and update resource table and analytic. And still I found same error which is described me and Nayeem Al Miftah. Thanks On Wed, Jun 17, 2015 at 3:44 PM, Nayeem Al Mifthah n.mift...@gmail.com wrote: Dear Lars There are monthly datasets on which a data entry operator input 50 in a cell. Analytic shows that same number as 51.7 in those months which have 31 days (Jan, Mar, May, July, Aug, Oct, Dec), Also it shows less value in February as it have 28 days. It has happened as the analytic table calculate the data as Ms. Fatema has described. Nayeem Al Mifthah HMIS Consultant Management Information System Directorate General of Health Services (DGHS), Bangladesh Supported by: UNICEF-Bangladesh Email: n.mift...@gmail.com | nay...@mis.dghs.gov.bd Cell:+8801914030574 On Wed, Jun 17, 2015 at 3:19 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi Fatema, do you think you could explain a bit more about the data elements and calculation? Do you think you cold try with 2.18 / 2.19 ? regards, Lars On Wed, Jun 17, 2015 at 11:06 AM, Uddin Fatema fatema...@gmail.com wrote: Dear All, Data Analytic table retrieve wrong data in Pivot table, data visualizer and GIS and same error remain 2.17 and 2.16 too Here i attach screen short of Pivote Table Analysis and Data Entry Screen In pivote table value shows = 51.7 but originally dataentry screen shows = 50 Calculation it is dividing daysxvalue / 30 = 50* 31/30 = 51.7 But it should do daysxvalue/daysno = 50*31/31 =50 Please have a look on it. Thanks Fatema --- Forwarded message -- rom: Uddin Fatema fatema...@gmail.com Date: Tue, May 5, 2015 at 5:56 PM Subject: DHIS2 2.16 Data Analytic table retrieve wrong data in Pivot table, data visualizer and GIS. To: Jan Henrik Øverland janhenrik.overl...@gmail.com Dear Jan, DHIS2 2.16 analytics (pivote table, data-visualizer and gis mapping retrieve wrong data from Analytics_2015 or all analytics table. The problem is in analytics table it store daysxvalue , daysno and value column but when it retrieve data for pivote table, data-visualizer and gis that time it is dividing daysxvalue / 30 But it should do daysxvalue/daysno As a result in pivot table, data visualizer and gis mapping shows wrong data. Could you please solved it additionally, can you please tell me in source code in which file i have to change. Thanks a lot in advance. Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH German House House 10/A-2, Road 90 Gulshan 2, Dhaka 1212, Bangladesh T +880 9666701000 F +880 28823099 M +880 19 6206 4721 I www.giz.de https://owa.giz.de/owa/redir.aspx?C=mPQMujasE0-yL6Aa4ocPcnkcfUThJNEIi4h1DwsYjO3Ua20UR_COt6aTH1s4JIdR4p-jCoFsP6A.URL=http%3a%2f%2fwww.giz.de%2f -- Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH German House House 10/A-2, Road 90 Gulshan 2, Dhaka 1212, Bangladesh T +880 9666701000 F +880 28823099 M +880 19 6206 4721 I www.giz.de https://owa.giz.de/owa/redir.aspx?C=mPQMujasE0-yL6Aa4ocPcnkcfUThJNEIi4h1DwsYjO3Ua20UR_COt6aTH1s4JIdR4p-jCoFsP6A.URL=http%3a%2f%2fwww.giz.de%2f -- Lars Helge Øverland Lead developer, DHIS 2 University of Oslo Skype: larshelgeoverland http://www.dhis2.org https://www.dhis2.org ___ 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 -- Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH German House House 10/A-2, Road 90 Gulshan 2, Dhaka 1212, Bangladesh T +880 9666701000 F +880 28823099 M +880 19 6206 4721 I www.giz.de
Re: [Dhis2-devs] [Dhis2-users] dhis2 2.18, 2.17. 2.16 reporting Error. Please Help.
Okay. Can can you please - provide the output of the tomcat log for when it fails - try by downloading 2.18 from https://www.dhis2.org/downloads to rule out build issues regards, Lars On Tue, Jun 23, 2015 at 12:30 PM, Uddin Fatema fatema...@gmail.com wrote: Dear Lars, Thanks a lot I just download 2.18 branch code and build the war file. Now i am running my database with this war file with UTC +6 Dhaka time zone but still shows same error. Is it cash problem or anything else. On Tue, Jun 23, 2015 at 2:22 AM, Lars Helge Øverland larshe...@gmail.com wrote: Hi Fatema, we have made a fix to prevent time zone issues for resource table generation in 2.18 and 2.19 now. regards, Lars On Wed, Jun 17, 2015 at 11:57 AM, Uddin Fatema fatema...@gmail.com wrote: Yes Lars i found same error in 2.18 too. Actually I updated version in 2.18 in test server but still time zone error remains for (UTC+60 )Dhaka . You know that some time zone has time zone problem in resource table generation. So I Changes time zone UTC+6:30) Yaangoon) and update resource table and analytic. And still I found same error which is described me and Nayeem Al Miftah. Thanks On Wed, Jun 17, 2015 at 3:44 PM, Nayeem Al Mifthah n.mift...@gmail.com wrote: Dear Lars There are monthly datasets on which a data entry operator input 50 in a cell. Analytic shows that same number as 51.7 in those months which have 31 days (Jan, Mar, May, July, Aug, Oct, Dec), Also it shows less value in February as it have 28 days. It has happened as the analytic table calculate the data as Ms. Fatema has described. Nayeem Al Mifthah HMIS Consultant Management Information System Directorate General of Health Services (DGHS), Bangladesh Supported by: UNICEF-Bangladesh Email: n.mift...@gmail.com | nay...@mis.dghs.gov.bd Cell:+8801914030574 On Wed, Jun 17, 2015 at 3:19 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi Fatema, do you think you could explain a bit more about the data elements and calculation? Do you think you cold try with 2.18 / 2.19 ? regards, Lars On Wed, Jun 17, 2015 at 11:06 AM, Uddin Fatema fatema...@gmail.com wrote: Dear All, Data Analytic table retrieve wrong data in Pivot table, data visualizer and GIS and same error remain 2.17 and 2.16 too Here i attach screen short of Pivote Table Analysis and Data Entry Screen In pivote table value shows = 51.7 but originally dataentry screen shows = 50 Calculation it is dividing daysxvalue / 30 = 50* 31/30 = 51.7 But it should do daysxvalue/daysno = 50*31/31 =50 Please have a look on it. Thanks Fatema --- Forwarded message -- rom: Uddin Fatema fatema...@gmail.com Date: Tue, May 5, 2015 at 5:56 PM Subject: DHIS2 2.16 Data Analytic table retrieve wrong data in Pivot table, data visualizer and GIS. To: Jan Henrik Øverland janhenrik.overl...@gmail.com Dear Jan, DHIS2 2.16 analytics (pivote table, data-visualizer and gis mapping retrieve wrong data from Analytics_2015 or all analytics table. The problem is in analytics table it store daysxvalue , daysno and value column but when it retrieve data for pivote table, data-visualizer and gis that time it is dividing daysxvalue / 30 But it should do daysxvalue/daysno As a result in pivot table, data visualizer and gis mapping shows wrong data. Could you please solved it additionally, can you please tell me in source code in which file i have to change. Thanks a lot in advance. Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH German House House 10/A-2, Road 90 Gulshan 2, Dhaka 1212, Bangladesh T +880 9666701000 F +880 28823099 M +880 19 6206 4721 I www.giz.de https://owa.giz.de/owa/redir.aspx?C=mPQMujasE0-yL6Aa4ocPcnkcfUThJNEIi4h1DwsYjO3Ua20UR_COt6aTH1s4JIdR4p-jCoFsP6A.URL=http%3a%2f%2fwww.giz.de%2f -- Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH German House House 10/A-2, Road 90 Gulshan 2, Dhaka 1212, Bangladesh T +880 9666701000 F +880 28823099 M +880 19 6206 4721 I www.giz.de https://owa.giz.de/owa/redir.aspx?C=mPQMujasE0-yL6Aa4ocPcnkcfUThJNEIi4h1DwsYjO3Ua20UR_COt6aTH1s4JIdR4p-jCoFsP6A.URL=http%3a%2f%2fwww.giz.de%2f -- Lars Helge Øverland Lead developer, DHIS 2 University of Oslo Skype: larshelgeoverland http://www.dhis2.org https://www.dhis2.org ___ 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 -- Regards, *Fatema Uddin* Technical Advisor (HIS)-Support to the Health Sector Program II
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19498: Program attribute hbm mapping, renamed legendset foreign key
revno: 19498 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Tue 2015-06-23 12:51:45 +0200 message: Program attribute hbm mapping, renamed legendset foreign key modified: dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.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/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml' --- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml 2015-04-08 23:26:45 + +++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml 2015-06-23 10:51:45 + @@ -31,7 +31,7 @@ column=trackedentityid foreign-key=fk_trackedentityattribute_trackedentityid / many-to-one name=legendSet class=org.hisp.dhis.legend.LegendSet column=legendsetid - foreign-key=fk_dataelement_legendset / + foreign-key=fk_trackedentityattribute_legendset / property name=inherit column=inherit / ___ 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] Web API in Excel
Hi Channara and Bob I have been using macros to POST and PUT data to the API, and GET requests should work just as well. I added your question and put my macro code here: https://webapps.stackexchange.com/questions/79521/can-i-use-excel-to-get-json-from-the-dhis-api/79522#79522 https://webapps.stackexchange.com/questions/79521/can-i-use-excel-to-get-json-from-the-dhis-api/79522#79522 See the comment at the end, seems it is possible to parse the JSON in a macro also. Thank you, Markus 23. jun. 2015 kl. 12.13 skrev Bob Jolliffe bobjolli...@gmail.com: You can't use excel to get json data from dhis2 web api. At least not directly. You could possibly write an excel macro to get the data through the web api (I am really not sure - it is far too many years since i wrote an excel macro), but you are still left with the problem of consuming what you have got (json) into cells in a spreadsheet. I believe all (or certainly almost all) of the data which is available as json is also available as csv. If you are looking at getting dhsi2 data into excel in general, I would look at csv rather than json if you want to minimize the processing/transformation that would otherwise have to happen in between getting the data and consuming it. https://www.dhis2.org/doc/snapshot/en/developer/html/dhis2_developer_manual.html On 23 June 2015 at 07:47, channara rin rin.chann...@gmail.com wrote: Hi all DHIS2 developer, Do you know can i use Microsoft Excel to get json data from DHIS2 web API? thank you channara ___ 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 19505: enable form-based login for grant type authorization_code (oauth2)
revno: 19505 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Wed 2015-06-24 11:39:19 +0700 message: enable form-based login for grant type authorization_code (oauth2) modified: dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.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/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2015-06-23 19:48:46 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2015-06-24 04:39:19 + @@ -31,11 +31,11 @@ sec:http-basic / sec:anonymous / -!-- -form-login authentication-failure-url=/login.jsp?authentication_error=true - default-target-url=http://www.ourwebsite.com/; login-page=/login.jsp - login-processing-url=/login.do / - -- +sec:form-login authentication-failure-url=/dhis-web-commons/security/login.action?failed=true + username-parameter=j_username password-parameter=j_password + login-page=/dhis-web-commons/security/login.action + login-processing-url=/dhis-web-commons-security/login.action / + /sec:http !-- End OAuth2 -- ___ 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
