[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17606: Category option add/edit, offline ouwt level to 1
revno: 17606
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-11-28 09:10:13 +0100
message:
Category option add/edit, offline ouwt level to 1
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm 2014-11-21 09:58:37 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm 2014-11-28 08:10:13 +
@@ -6,6 +6,7 @@
$('#startDate').calendarsPicker('option', 'maxDate', dhis2.period.calendar.add(dhis2.period.calendar.today(), 100, 'y'));
$('#endDate').calendarsPicker('option', 'maxDate', dhis2.period.calendar.add(dhis2.period.calendar.today(), 100, 'y'));
+selection.setOfflineLevel( 1 );
selection.setMultipleSelectionAllowed( true );
selection.setUnselectAllowed( true );
selection.setAutoSelectRoot( false );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm 2014-11-21 09:58:37 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm 2014-11-28 08:10:13 +
@@ -9,6 +9,7 @@
$('#endDate').calendarsPicker('option', 'maxDate', dhis2.period.calendar.add(dhis2.period.calendar.today(), 100, 'y'));
selection.clearSelected(); // Sync ouwt from server
+selection.setOfflineLevel( 1 );
selection.setMultipleSelectionAllowed( true );
selection.setUnselectAllowed( true );
selection.setAutoSelectRoot( false );
___
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] Tracker Capture: Program Relationship Errors
Hi devs, Working with program relationships in the Tracker Capture. A few problems I noticed: 1) Even though a relationship type is defined, this is not reflected when you open Tracker Capture program stage. In Individual Records you are able to see the Shortcut description from the program stage instance e.g. Add Child. This is not available in the Tracker Capture although if you clicked on Add Relationship you then see the options. 2) After selecting the new program to add, the registration/enrolment date (i.e. 1st Post Certification Date) is not in date format 3) When you click on Save Relationship, nothing happens even though the relationship is actually saved! Regards, Busoye Version: 2.17 Build revision: 17568 ___ 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] Defect in metadata import for optionSets?
Hello Lars,
We are trying to create 'options' and 'optionSets' on empty Database.
Request Payload:
{
optionSets: [{
id: b73c773,
name: Hours,
options: [{
code: b64365ac185,
id: b64365ac185,
name: One
}]
}, {
id: b640fd0cc0f,
name: Minutes,
options: [{
code: b65ad0e22c5,
id: b65ad0e22c5,
name: One
}]
}],
options: [{
code: b64365ac185,
id: b64365ac185,
name: One
}, {
code: b65ad0e22c5,
id: b65ad0e22c5,
name: One
}]
}
Api Call: /api/metadata
After the api call, the Hour option set is empty while the Minute option
set has One.
Is this a defect in DHIS or we are missing something in our payload ?
--
Regards,
Mansi Singhal
___
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 17607: local/in Maintenance RBF work in progress
revno: 17607
committer: Mithilesh Kumar Thakur mithilesh.h...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-11-28 09:40:56 +
message:
local/in Maintenance RBF work in progress
modified:
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernatePartnerStore.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/RemovePartnerAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/SavePartnerDetailsResultAction.java
local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.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 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java 2014-11-20 06:34:00 +
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java 2014-11-28 09:40:56 +
@@ -7,7 +7,9 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.option.Option;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.period.Period;
/**
* @author Mithilesh Kumar Thakur
@@ -36,4 +38,6 @@
SetOrganisationUnit getPartnerOrganisationUnits( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate );
+MapInteger, Option getPartners( OrganisationUnit organisationUnit, DataSet dataSet, Period period );
+
}
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java 2014-11-20 06:34:00 +
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java 2014-11-28 09:40:56 +
@@ -7,7 +7,9 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.option.Option;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.period.Period;
/**
* @author Mithilesh Kumar Thakur
@@ -36,4 +38,6 @@
SetOrganisationUnit getPartnerOrganisationUnits( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate );
+MapInteger, Option getPartners( OrganisationUnit organisationUnit, DataSet dataSet, Period period );
+
}
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java 2014-11-12 09:32:10 +
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java 2014-11-28 09:40:56 +
@@ -41,6 +41,7 @@
import org.hisp.dhis.rbf.api.LookupService;
import org.hisp.dhis.rbf.api.PBFDataValue;
import org.hisp.dhis.rbf.api.PBFDataValueService;
+import org.hisp.dhis.rbf.api.PartnerService;
import org.hisp.dhis.rbf.api.TariffDataValueService;
import org.hisp.dhis.rbf.api.UtilizationRateService;
import org.hisp.dhis.user.CurrentUserService;
@@ -144,6 +145,10 @@
private DataElementService dataElementService;
@Autowired
+private PartnerService partnerService;
+
+
+@Autowired
private DataElementCategoryService categoryService;
private I18nService i18nService;
@@ -403,6 +408,7 @@
// find parent
Constant tariff_authority = constantService.getConstantByName( TARIFF_SETTING_AUTHORITY );
+
int tariff_setting_authority = 0;
if ( tariff_authority == null )
{
@@ -424,16 +430,61 @@
}
-
-
-
-
OrganisationUnitGroup orgUnitGroup = findPBFOrgUnitGroupforTariff( organisationUnit, dataSet.getId(), orgUnitBranchIds );
if( orgUnitGroup != null )
{
tariffDataValueMap.putAll( tariffDataValueService.getTariffDataValues( orgUnitGroup, orgUnitBranchIds, dataSet, period ) );
}
+MapInteger, Option partnerMap = new HashMapInteger, Option();
+
+if( organisationUnit != null dataSet != null period != null )
[Dhis2-devs] Exception with Meta Data Export for Programs
Hi devs, I got an exception, trying to export Programs. The error log is below. Just in case it’s important, my programs have relationships. Regards, Busoye Version: 2.17 Build revision: 17568 type Exception report message description The server encountered an internal error () that prevented it from fulfilling this request. exception com.fasterxml.jackson.databind.JsonMappingException: Infinite recursion (StackOverflowError) (through reference chain:
Re: [Dhis2-devs] Tracker Capture: Program/Program Stage Indicators
Hi Busoye, The indicators are not yet made available in the tracker capture app. --- Thank you, Abyot. On Fri, Nov 28, 2014 at 8:29 AM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, I can’t see where program indicators are implemented in the new Tracker Capture app. It was great to see that the indicators can now be assigned to a particular program stage but when I tested this on the demo I couldn’t see my indicator. Best regards, Busoye ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Tracker Capture: Program Relationship Errors
Hi Busoye, Thanks for reporting. I know the issue with 1 - will display the label defined under program setting. 2 should be a bug, will take a close look and fix. I am not sure about 3. The idea is when you click Save Relationship, the dialog (the one you have been specifying relationship details) should close. And the new relationship you just added listed in the Relationships widget. Are you saying, you are seeing a different behavior? --- Thank you, Abyot. On Fri, Nov 28, 2014 at 10:10 AM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, Working with program relationships in the Tracker Capture. A few problems I noticed: 1) Even though a relationship type is defined, this is not reflected when you open Tracker Capture program stage. In Individual Records you are able to see the Shortcut description from the program stage instance e.g. Add Child. This is not available in the Tracker Capture although if you clicked on Add Relationship you then see the options. 2) After selecting the new program to add, the registration/enrolment date (i.e. 1st Post Certification Date) is not in date format 3) When you click on Save Relationship, nothing happens even though the relationship is actually saved! Regards, Busoye Version:2.17Build revision:17568 ___ 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] Tracker Capture: Program Relationship Errors
Hi Abyot, Thanks for replying. When you click Save Relationship, nothing happens. You have to click “Close” for the dialog window to close. Do you have a scheduled release for including indicators in the Tracker Capture? Cheers. Busoye On 28 Nov 2014, at 13:42, Abyot Gizaw aby...@gmail.com wrote: Hi Busoye, Thanks for reporting. I know the issue with 1 - will display the label defined under program setting. 2 should be a bug, will take a close look and fix. I am not sure about 3. The idea is when you click Save Relationship, the dialog (the one you have been specifying relationship details) should close. And the new relationship you just added listed in the Relationships widget. Are you saying, you are seeing a different behavior? --- Thank you, Abyot. On Fri, Nov 28, 2014 at 10:10 AM, Adebusoye Anifalaje bus...@hisp.org mailto:bus...@hisp.org wrote: Hi devs, Working with program relationships in the Tracker Capture. A few problems I noticed: 1) Even though a relationship type is defined, this is not reflected when you open Tracker Capture program stage. In Individual Records you are able to see the Shortcut description from the program stage instance e.g. Add Child. This is not available in the Tracker Capture although if you clicked on Add Relationship you then see the options. Relationship Exists.png 2) After selecting the new program to add, the registration/enrolment date (i.e. 1st Post Certification Date) is not in date format Enrolment Date not in date format.png 3) When you click on Save Relationship, nothing happens even though the relationship is actually saved! Regards, Busoye Version: 2.17 Build revision: 17568 ___ Mailing list: https://launchpad.net/~dhis2-devs https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net mailto:dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp 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] [Bug 1397323] [NEW] Meta-data import-export not working for cascading collections
Public bug reported: Meta-data import-export is not working for cascading collections. Examples are report table data element operands. ** Affects: dhis2 Importance: Medium Assignee: Morten Olav Hansen (mortenoh) Status: Confirmed ** Changed in: dhis2 Assignee: (unassigned) = Morten Olav Hansen (mortenoh) ** Changed in: dhis2 Milestone: None = 2.18 ** Changed in: dhis2 Importance: Undecided = Medium ** Changed in: dhis2 Status: New = Confirmed -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1397323 Title: Meta-data import-export not working for cascading collections Status in DHIS 2: Confirmed Bug description: Meta-data import-export is not working for cascading collections. Examples are report table data element operands. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1397323/+subscriptions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Tracker Capture: Program Relationship Errors
On Fri, Nov 28, 2014 at 2:35 PM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi Abyot, Thanks for replying. When you click Save Relationship, nothing happens. You have to click “Close” for the dialog window to close. Hmm... the save button should close the dialog. There must be something in log (either console or network tab). Did this thing happened while trying to enroll the relative also? What happened if you try to register a relative without enrollment? The enrollment might fail because of the bug you mentioned in 2. I am looking at it right now. Do you have a scheduled release for including indicators in the Tracker Capture? May be the next release (2.18), definitely not to be back-ported to 2.17. Cheers. Busoye On 28 Nov 2014, at 13:42, Abyot Gizaw aby...@gmail.com wrote: Hi Busoye, Thanks for reporting. I know the issue with 1 - will display the label defined under program setting. 2 should be a bug, will take a close look and fix. I am not sure about 3. The idea is when you click Save Relationship, the dialog (the one you have been specifying relationship details) should close. And the new relationship you just added listed in the Relationships widget. Are you saying, you are seeing a different behavior? --- Thank you, Abyot. On Fri, Nov 28, 2014 at 10:10 AM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, Working with program relationships in the Tracker Capture. A few problems I noticed: 1) Even though a relationship type is defined, this is not reflected when you open Tracker Capture program stage. In Individual Records you are able to see the Shortcut description from the program stage instance e.g. Add Child. This is not available in the Tracker Capture although if you clicked on Add Relationship you then see the options. Relationship Exists.png 2) After selecting the new program to add, the registration/enrolment date (i.e. 1st Post Certification Date) is not in date format Enrolment Date not in date format.png 3) When you click on Save Relationship, nothing happens even though the relationship is actually saved! Regards, Busoye Version:2.17Build revision:17568 ___ 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] Tracker Capture: Program Relationship Errors
This is the error I get from the console when I clock on Save Relationship: PUT https://www.ecole-village-assainis-bdd.cd/api/trackedEntityInstances/HaHEl4iTYw8 500 (Internal Server Error)angular.js:8113 (anonymous function)angular.js:7915 sendReqangular.js:7655 serverRequestangular.js:11046 wrappedCallbackangular.js:11046 wrappedCallbackangular.js:11132 (anonymous function)angular.js:12075 Scope.$evalangular.js:11903 Scope.$digestangular.js:12179 Scope.$applyangular.js:18228 (anonymous function)jquery.min.js:2 p.event.dispatchjquery.min.js:2 g.handle.h Just to let you know, I don’t get error #2 in 2.16. On 28 Nov 2014, at 14:45, Abyot Gizaw aby...@gmail.com wrote: On Fri, Nov 28, 2014 at 2:35 PM, Adebusoye Anifalaje bus...@hisp.org mailto:bus...@hisp.org wrote: Hi Abyot, Thanks for replying. When you click Save Relationship, nothing happens. You have to click “Close” for the dialog window to close. Hmm... the save button should close the dialog. There must be something in log (either console or network tab). Did this thing happened while trying to enroll the relative also? What happened if you try to register a relative without enrollment? The enrollment might fail because of the bug you mentioned in 2. I am looking at it right now. Do you have a scheduled release for including indicators in the Tracker Capture? May be the next release (2.18), definitely not to be back-ported to 2.17. Cheers. Busoye On 28 Nov 2014, at 13:42, Abyot Gizaw aby...@gmail.com mailto:aby...@gmail.com wrote: Hi Busoye, Thanks for reporting. I know the issue with 1 - will display the label defined under program setting. 2 should be a bug, will take a close look and fix. I am not sure about 3. The idea is when you click Save Relationship, the dialog (the one you have been specifying relationship details) should close. And the new relationship you just added listed in the Relationships widget. Are you saying, you are seeing a different behavior? --- Thank you, Abyot. On Fri, Nov 28, 2014 at 10:10 AM, Adebusoye Anifalaje bus...@hisp.org mailto:bus...@hisp.org wrote: Hi devs, Working with program relationships in the Tracker Capture. A few problems I noticed: 1) Even though a relationship type is defined, this is not reflected when you open Tracker Capture program stage. In Individual Records you are able to see the Shortcut description from the program stage instance e.g. Add Child. This is not available in the Tracker Capture although if you clicked on Add Relationship you then see the options. Relationship Exists.png 2) After selecting the new program to add, the registration/enrolment date (i.e. 1st Post Certification Date) is not in date format Enrolment Date not in date format.png 3) When you click on Save Relationship, nothing happens even though the relationship is actually saved! Regards, Busoye Version: 2.17 Build revision: 17568 ___ Mailing list: https://launchpad.net/~dhis2-devs https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net mailto:dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp 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 17608: BaseAnalyticalObject, added annotations for categroyDimenions
revno: 17608
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-11-28 15:02:17 +0100
message:
BaseAnalyticalObject, added annotations for categroyDimenions
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 2014-11-10 19:46:15 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2014-11-28 14:02:17 +
@@ -807,6 +807,10 @@
// Getters and setters
// -
+@JsonProperty
+@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlElementWrapper( localName = categoryDimensions, namespace = DxfNamespaces.DXF_2_0 )
+@JacksonXmlProperty( localName = categoryDimension, namespace = DxfNamespaces.DXF_2_0 )
public ListDataElementCategoryDimension getCategoryDimensions()
{
return categoryDimensions;
___
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] [Bug 1397323] Re: Meta-data import-export not working for update of cascading collections
** Summary changed: - Meta-data import-export not working for cascading collections + Meta-data import-export not working for update of cascading collections ** Description changed: - Meta-data import-export is not working for cascading collections. - Examples are report table data element operands. + Meta-data import-export is not working for update of cascading + collections. Examples are report table data element operands. -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1397323 Title: Meta-data import-export not working for update of cascading collections Status in DHIS 2: Confirmed Bug description: Meta-data import-export is not working for update of cascading collections. Examples are report table data element operands. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1397323/+subscriptions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17609: use relationship text from setting; make sure z-index of calendar popup is greater than others; a...
revno: 17609
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-11-28 15:54:12 +0100
message:
use relationship text from setting; make sure z-index of calendar popup is
greater than others; apply option name/code formatting in relationship UI
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/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-tracker-capture/components/relationship/add-relationship.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2014-07-04 21:04:49 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2014-11-28 14:54:12 +
@@ -19,7 +19,7 @@
div class='align-center bold'{{relationship.selected.aIsToB}}/div
div class='relationship-container'
table class=table table-striped table-compact table-borderless
-tr ng-repeat=attribute in selectedTei.attributes
+tr ng-repeat=attribute in selectedTeiForDisplay.attributes
td
{{attribute.displayName}}
/td
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html 2014-10-13 15:05:01 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html 2014-11-28 14:54:12 +
@@ -1,4 +1,4 @@
-div ng-controller=RelativeRegistrationController
+div ng-controller=RelativeRegistrationController class=modal-dialog
hr
form name=outerForm novalidate
@@ -34,7 +34,7 @@
ng-form name=innerForm
div ng-switch=attribute.valueType
div ng-switch-when=date
-input type=text name=foo class=form-control d2-date ng-model=attribute.value ng-required=attribute.mandatory /
+input type=text placeholder={{dhis2CalendarFormat.keyDateFormat}} name=foo class=form-control d2-date ng-model=attribute.value ng-required=attribute.mandatory /
span ng-show=outerForm.submitted innerForm.foo.$invalid class=error{{'required'| translate}}/span
/div
div ng-switch-when=trueOnly
@@ -48,22 +48,57 @@
option value=true{{'yes'| translate}}/option
/select
span ng-show=outerForm.submitted innerForm.foo.$invalid class=error{{'required'| translate}}/span
-/div
+/div
div ng-switch-when=optionSet
-input type=text
+div ng-if=!selectedProgramForRelative
+input type=text
name=foo
class=form-control
ng-model=attribute.value
- typeahead=option.code as option.name for option in attribute.optionSet.options | filter:$viewValue | limitTo:20
+ typeahead=option.name as option.name for option in optionSets.optionSets[attribute.optionSet.id].options | filter:$viewValue | limitTo:20
typeahead-open-on-focus
- ng-required=attribute.mandatory
- /
+ ng-required=attribute.mandatory/
+/div
+div ng-if=selectedProgramForRelative
+
Re: [Dhis2-devs] Tracker Capture: Program Relationship Errors
Hi Busoye, This thing is fixed now in both trunk and 2.17 (Rev. 17585). --- Thank you, Abyot. On Fri, Nov 28, 2014 at 2:52 PM, Adebusoye Anifalaje bus...@hisp.org wrote: This is the error I get from the console when I clock on Save Relationship: PUT https://www.ecole-village-assainis-bdd.cd/api/trackedEntityInstances/HaHEl4iTYw8 500 (Internal Server Error)angular.js:8113 (anonymous function)angular.js:7915 sendReqangular.js:7655 serverRequestangular.js:11046 wrappedCallbackangular.js:11046 wrappedCallbackangular.js:11132 (anonymous function)angular.js:12075 Scope.$evalangular.js:11903 Scope.$digestangular.js:12179 Scope.$applyangular.js:18228 (anonymous function)jquery.min.js:2 p.event.dispatchjquery.min.js:2 g.handle.h Just to let you know, I don’t get error #2 in 2.16. On 28 Nov 2014, at 14:45, Abyot Gizaw aby...@gmail.com wrote: On Fri, Nov 28, 2014 at 2:35 PM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi Abyot, Thanks for replying. When you click Save Relationship, nothing happens. You have to click “Close” for the dialog window to close. Hmm... the save button should close the dialog. There must be something in log (either console or network tab). Did this thing happened while trying to enroll the relative also? What happened if you try to register a relative without enrollment? The enrollment might fail because of the bug you mentioned in 2. I am looking at it right now. Do you have a scheduled release for including indicators in the Tracker Capture? May be the next release (2.18), definitely not to be back-ported to 2.17. Cheers. Busoye On 28 Nov 2014, at 13:42, Abyot Gizaw aby...@gmail.com wrote: Hi Busoye, Thanks for reporting. I know the issue with 1 - will display the label defined under program setting. 2 should be a bug, will take a close look and fix. I am not sure about 3. The idea is when you click Save Relationship, the dialog (the one you have been specifying relationship details) should close. And the new relationship you just added listed in the Relationships widget. Are you saying, you are seeing a different behavior? --- Thank you, Abyot. On Fri, Nov 28, 2014 at 10:10 AM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, Working with program relationships in the Tracker Capture. A few problems I noticed: 1) Even though a relationship type is defined, this is not reflected when you open Tracker Capture program stage. In Individual Records you are able to see the Shortcut description from the program stage instance e.g. Add Child. This is not available in the Tracker Capture although if you clicked on Add Relationship you then see the options. Relationship Exists.png 2) After selecting the new program to add, the registration/enrolment date (i.e. 1st Post Certification Date) is not in date format Enrolment Date not in date format.png 3) When you click on Save Relationship, nothing happens even though the relationship is actually saved! Regards, Busoye Version:2.17Build revision:17568 ___ 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 17610: bug fix - directive not updating custom form when program stage is changed
revno: 17610
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-11-28 18:14:38 +0100
message:
bug fix - directive not updating custom form when program stage is changed
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/custom-form.html
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/scripts/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-tracker-capture/components/dataentry/custom-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/custom-form.html 2014-07-13 13:08:50 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/custom-form.html 2014-11-28 17:14:38 +
@@ -1,1 +1,1 @@
-d2-custom-form custom-form-type=PROGRAM_STAGE custom-form-object=currentStage/d2-custom-form
\ No newline at end of file
+d2-custom-form custom-form=customForm/d2-custom-form
\ No newline at end of file
=== 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 2014-10-22 15:36:30 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2014-11-28 17:14:38 +
@@ -9,6 +9,7 @@
ModalService,
DialogService,
CurrentSelection,
+CustomFormService,
TranslationService) {
TranslationService.translate();
@@ -304,7 +305,7 @@
$scope.programStageDataElements[prStDe.dataElement.id] = prStDe;
});
-$scope.customForm = $scope.currentStage.dataEntryForm ? $scope.currentStage.dataEntryForm.htmlCode : null;
+$scope.customForm = CustomFormService.getForProgramStage($scope.currentStage);
$scope.displayCustomForm = $scope.customForm ? true:false;
$scope.allowProvidedElsewhereExists = false;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js 2014-11-03 11:11:25 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js 2014-11-28 17:14:38 +
@@ -34,19 +34,14 @@
};
})
-.directive('d2CustomForm', function($compile, $parse, CustomFormService) {
+.directive('d2CustomForm', function($compile) {
return{
restrict: 'E',
-link: function(scope, elm, attrs){
-
-var customFormType = attrs.customFormType;
-var customFormObject = $parse(attrs.customFormObject)(scope);
-
-if(customFormType === 'PROGRAM_STAGE'){
-var customForm = CustomFormService.getForProgramStage(customFormObject);
-elm.html(customForm ? customForm : '');
-$compile(elm.contents())(scope);
-}
+link: function(scope, elm, attrs){
+scope.$watch('customForm', function(){
+elm.html(scope.customForm);
+$compile(elm.contents())(scope);
+});
}
};
})
___
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] [Bug 1397457] [NEW] Data import user notifications not updated on failure
Public bug reported: The user notifications on meta-data and data import are not detecting errors in the import process. ** Affects: dhis2 Importance: Medium Assignee: Lars Helge Øverland (larshelge) Status: Confirmed ** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) ** Changed in: dhis2 Milestone: None = 2.18 ** Changed in: dhis2 Importance: Undecided = Medium ** Changed in: dhis2 Status: New = Confirmed -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1397457 Title: Data import user notifications not updated on failure Status in DHIS 2: Confirmed Bug description: The user notifications on meta-data and data import are not detecting errors in the import process. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1397457/+subscriptions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17611: wip, fixes for dataElementOperands
revno: 17611
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Sat 2014-11-29 12:00:47 +0700
message:
wip, fixes for dataElementOperands
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseMetaDataCollectionObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.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/BaseMetaDataCollectionObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseMetaDataCollectionObject.java 2014-10-25 21:58:41 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseMetaDataCollectionObject.java 2014-11-29 05:00:47 +
@@ -129,8 +129,7 @@
}
@JsonProperty
-@JsonSerialize( contentAs = BaseIdentifiableObject.class )
-@JsonView( DetailedView.class )
+@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlElementWrapper( localName = dataElementOperands, namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = dataElementOperand, namespace = DxfNamespaces.DXF_2_0 )
public ListDataElementOperand getDataElementOperands()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2014-11-18 11:35:52 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2014-11-29 05:00:47 +
@@ -31,6 +31,8 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import org.apache.commons.lang.StringUtils;
import org.hisp.dhis.common.BaseIdentifiableObject;
@@ -149,6 +151,12 @@
// -
@Override
+public boolean haveUniqueNames()
+{
+return false;
+}
+
+@Override
public String getUid()
{
if ( uid != null )
@@ -254,7 +262,7 @@
public Integer getRelevantAggregationLevel( int organisationUnitLevel )
{
ListInteger levels = new ArrayList( aggregationLevels );
-
+
Collections.sort( levels );
for ( final Integer aggregationLevel : levels )
@@ -426,6 +434,7 @@
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public DataElement getDataElement()
{
return dataElement;
@@ -439,6 +448,7 @@
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public DataElementCategoryOptionCombo getCategoryOptionCombo()
{
return categoryOptionCombo;
@@ -451,6 +461,7 @@
@JsonProperty
@JsonView( { DetailedView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getDataElementId()
{
return dataElementId;
@@ -463,6 +474,7 @@
@JsonProperty
@JsonView( { DetailedView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getOptionComboId()
{
return optionComboId;
@@ -475,6 +487,7 @@
@JsonProperty
@JsonView( { DetailedView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getOperandId()
{
return operandId;
@@ -487,6 +500,7 @@
@JsonProperty
@JsonView( { DetailedView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getOperandName()
{
return operandName;
@@ -499,6 +513,7 @@
@JsonProperty
@JsonView( { DetailedView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getValueType()
{
return valueType;
@@ -511,6 +526,7 @@
@JsonProperty
@JsonView( { DetailedView.class } )
+@JacksonXmlProperty( namespace =
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17612: minor fix
revno: 17612
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Sat 2014-11-29 12:27:08 +0700
message:
minor fix
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.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/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2014-11-29 05:00:47 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2014-11-29 05:27:08 +
@@ -38,7 +38,7 @@
/set
set name=compulsoryDataElementOperands table=datasetoperands cascade=all-delete-orphan
-g key column=datasetid foreign-key=fk_datasetoperands_datasetid /
+ key column=datasetid foreign-key=fk_datasetoperands_datasetid /
many-to-many class=org.hisp.dhis.dataelement.DataElementOperand column=dataelementoperandid
foreign-key=fk_dataset_dataelementoperandid /
/set
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2014-11-29 05:00:47 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2014-11-29 05:27:08 +
@@ -1004,22 +1004,29 @@
private void saveDataElementOperands( T object, String fieldName, CollectionDataElementOperand dataElementOperands )
{
+CollectionDataElementOperand detachedDataElementOperands = ReflectionUtils.invokeGetterMethod( fieldName, object );
+
+if ( detachedDataElementOperands == null )
+{
+return;
+}
+
for ( DataElementOperand dataElementOperand : dataElementOperands )
{
MapField, Object identifiableObjects = detachFields( dataElementOperand );
reattachFields( dataElementOperand, identifiableObjects );
+dataElementOperand.setId( 0 );
dataElementOperandService.addDataElementOperand( dataElementOperand );
-sessionFactory.getCurrentSession().flush();
}
-CollectionDataElementOperand detachedDataElementOperands = ReflectionUtils.invokeGetterMethod( fieldName, object );
-
+/*
if ( detachedDataElementOperands == null )
{
detachedDataElementOperands = ReflectionUtils.newCollectionInstance( dataElementOperands.getClass() );
ReflectionUtils.invokeSetterMethod( fieldName, object, detachedDataElementOperands );
}
+*/
detachedDataElementOperands.clear();
detachedDataElementOperands.addAll( dataElementOperands );
___
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 17613: minor fixes to operands importer
revno: 17613
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Sat 2014-11-29 12:33:04 +0700
message:
minor fixes to operands importer
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.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/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2014-11-29 05:27:08 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2014-11-29 05:33:04 +
@@ -1020,14 +1020,6 @@
dataElementOperandService.addDataElementOperand( dataElementOperand );
}
-/*
-if ( detachedDataElementOperands == null )
-{
-detachedDataElementOperands = ReflectionUtils.newCollectionInstance( dataElementOperands.getClass() );
-ReflectionUtils.invokeSetterMethod( fieldName, object, detachedDataElementOperands );
-}
-*/
-
detachedDataElementOperands.clear();
detachedDataElementOperands.addAll( dataElementOperands );
sessionFactory.getCurrentSession().flush();
___
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 17614: local/in Maintenance RBF work in progress
revno: 17614 committer: Mithilesh Kumar Thakur mithilesh.h...@gmail.com branch nick: dhis2 timestamp: Sat 2014-11-29 05:51:57 + message: local/in Maintenance RBF work in progress modified: dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-25 16:39:09 + +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-11-29 05:51:57 + @@ -71,6 +71,7 @@ dhis-web-sms=SMS dhis-web-maintenance-in=Configuration dhis-web-linelisting-mp=Manpower +dhis-web-maintenance-rbf=Maintenance RBF #-- Intro modules -# === modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm' --- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm 2014-10-24 11:05:35 + +++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm 2014-11-29 05:51:57 + @@ -4,13 +4,13 @@ #foreach( $dataElement in $dataElements ) dataelement id$dataElement.id/id - name$dataElement.getName()/name + name$encoder.xmlEncode( $dataElement.getName() )/name /dataelement #end #foreach( $period in $periods ) period id$period.id/id - name$period.name/name + name$encoder.xmlEncode( $period.name )/name /period #end /dataElements ___ 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] [Bug 1397323] Re: Meta-data import-export not working for update of cascading collections
Should be working now, please try again and confirm ** Changed in: dhis2 Status: Confirmed = Fix Committed -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1397323 Title: Meta-data import-export not working for update of cascading collections Status in DHIS 2: Fix Committed Bug description: Meta-data import-export is not working for update of cascading collections. Examples are report table data element operands. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1397323/+subscriptions ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Exception with Meta Data Export for Programs
Hi Seems like you have 1 program, and its related property is pointing to itself? -- Morten On Fri, Nov 28, 2014 at 5:28 PM, Adebusoye Anifalaje bus...@hisp.org wrote: Hi devs, I got an exception, trying to export Programs. The error log is below. Just in case it’s important, my programs have relationships. Regards, Busoye Version:2.17Build revision:17568 *type* Exception report *message* *description* *The server encountered an internal error () that prevented it from fulfilling this request.* *exception* com.fasterxml.jackson.databind.JsonMappingException: Infinite recursion (StackOverflowError) (through reference chain:
Re: [Dhis2-devs] Defect in metadata import for optionSets?
Hi
Please remember that the way we handle options/optionSets have been changed
now. You need to have options option code=codea name=Option A /
/options optionSets optionSet optionsoption code=codea /
/options /optionSets
This now works as any other metadata... you first define the options, then
create optionsets with references to these options.. this allow for option
reuse, and also translation
--
Morten
On Fri, Nov 28, 2014 at 4:28 PM, Mansi Singhal msing...@thoughtworks.com
wrote:
Hello Lars,
We are trying to create 'options' and 'optionSets' on empty Database.
Request Payload:
{
optionSets: [{
id: b73c773,
name: Hours,
options: [{
code: b64365ac185,
id: b64365ac185,
name: One
}]
}, {
id: b640fd0cc0f,
name: Minutes,
options: [{
code: b65ad0e22c5,
id: b65ad0e22c5,
name: One
}]
}],
options: [{
code: b64365ac185,
id: b64365ac185,
name: One
}, {
code: b65ad0e22c5,
id: b65ad0e22c5,
name: One
}]
}
Api Call: /api/metadata
After the api call, the Hour option set is empty while the Minute option
set has One.
Is this a defect in DHIS or we are missing something in our payload ?
--
Regards,
Mansi Singhal
___
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
