[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15275: RBF: Minor fixes on MaxScore
revno: 15275
committer: Bharath chbhara...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-05-15 07:51:53 +0100
message:
RBF: Minor fixes on MaxScore
modified:
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/GetDataElementforTariffAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/LoadQualityScoreDetailsAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/QualityMaxInitAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/QualityScoreInitAction.java
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataElementsforTariff.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 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/GetDataElementforTariffAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/GetDataElementforTariffAction.java 2014-04-30 05:26:01 +
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/GetDataElementforTariffAction.java 2014-05-15 06:51:53 +
@@ -1,9 +1,11 @@
package org.hisp.dhis.rbf.action;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.TreeSet;
import org.hisp.dhis.attribute.AttributeValue;
import org.hisp.dhis.constant.Constant;
@@ -98,6 +100,10 @@
this.orgUnitGroupId = orgUnitGroupId;
}
+public Integer getOrgUnitGroupId()
+{
+return orgUnitGroupId;
+}
// -
// Action implementation
@@ -130,63 +136,38 @@
orgUnitGroups = new ArrayListOrganisationUnitGroup( orgUnitGroupService.getOrganisationUnitGroupSet( (int) tariff_authority.getValue() ).getOrganisationUnitGroups() );
+SetDataElement dataElements = new TreeSetDataElement();
+for( OrganisationUnitGroup orgUnitGroup : orgUnitGroups )
+{
+for( DataSet dataSet : orgUnitGroup.getDataSets() )
+{
+dataElements.addAll( dataSet.getDataElements() );
+}
+}
+
+for( DataElement de : dataElements )
+{
+if( dataElementList != null !( dataElementList.contains( {\name\ : \ + de.getName() + \} ) ) )
+{
+dataElementList.add( {\name\ : \ + de.getName() + \} );
+}
+}
+
/*
-if ( orgUnitGroupId != null )
+for ( DataElement de : dataElements )
{
-ListDataElement dataElements = new ArrayListDataElement();
-
-OrganisationUnitGroup orgUnitGroup = orgUnitGroupService.getOrganisationUnitGroup( orgUnitGroupId );
-ListDataSet dataSets = new ArrayListDataSet( orgUnitGroup.getDataSets() );
-for ( DataSet ds : dataSets )
-{
-dataElements.addAll( ds.getDataElements() );
-}
-
-for ( DataElement de : dataElements )
-{
-SetAttributeValue attrValueSet = new HashSetAttributeValue( de.getAttributeValues() );
-for ( AttributeValue attValue : attrValueSet )
+SetAttributeValue attrValueSet = new HashSetAttributeValue( de.getAttributeValues() );
+for ( AttributeValue attValue : attrValueSet )
+{
+if ( dataElementList != null !( dataElementList.contains( {\name\ : \ + de.getName() + \} ) )
+ attValue.getAttribute().getId() == tariffDataElement.getValue() )
{
-if ( dataElementList != null !( dataElementList.contains( {\name\ : \ + de.getName() + \} ) )
- attValue.getAttribute().getId() == tariffDataElement.getValue() )
-{
-dataElementList.add( {\name\ : \ + de.getName() + \} );
-}
+dataElementList.add( {\name\ : \ + de.getName() + \} );
}
}
-
}
*/
-
-//else
-//{
-ListDataElement dataElements = new ArrayListDataElement( dataElementService.getAllDataElements() );
-for ( DataElement de : dataElements )
-{
-SetAttributeValue attrValueSet = new HashSetAttributeValue( de.getAttributeValues() );
-for ( AttributeValue attValue : attrValueSet )
-{
-if ( dataElementList != null !(
[Dhis2-devs] SystemSettings API to post other data types
Hello all,
While trying to store ***keyHideUnapprovedDataInAnalytics* as
*false*using the system settings api, we realised that it stores it as
a String,
while the DefaultAnalyticsSecurityManager when reading the value back tries
to type cast it to a Boolean and it fails.
Right now, the system settings api does not expose an endpoint to store
other data types except String.
We were thinking of exposing another api all together, which can take a
JSON as post body,
ex: *{keyHideUnapprovedDataInAnalytics:true}* and then store the values
along with type information.
Please suggest if there are better alternatives.
Thanks,
Aravind
___
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] SystemSettings API to post other data types
Hi Aravind,
you are correct. We only support string based values in the API at the
moment, which is a weakness. I think your suggestion makes sense. Could you
provide an example payload with type information the way you envision it?
best regards,
Lars
On Thu, May 15, 2014 at 10:40 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hello all,
While trying to store ***keyHideUnapprovedDataInAnalytics* as *false*using
the system settings api, we realised that it stores it as a String,
while the DefaultAnalyticsSecurityManager when reading the value back
tries to type cast it to a Boolean and it fails.
Right now, the system settings api does not expose an endpoint to store
other data types except String.
We were thinking of exposing another api all together, which can take a
JSON as post body,
ex: *{keyHideUnapprovedDataInAnalytics:true}* and then store the values
along with type information.
Please suggest if there are better alternatives.
Thanks,
Aravind
___
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] SystemSettings API to post other data types
Hi Lars,
Sample payload looks like this:
{
key0: true,
key1: true
key2: {
name: some name
},
key3: 3
}
key0 will be stored as boolean, key1 will be stored as string, key2 will be
stored as a map, key3 will be stored as integer.
Thanks,
Aravind
On Thu, May 15, 2014 at 2:17 PM, Lars Helge Øverland larshe...@gmail.comwrote:
Hi Aravind,
you are correct. We only support string based values in the API at the
moment, which is a weakness. I think your suggestion makes sense. Could you
provide an example payload with type information the way you envision it?
best regards,
Lars
On Thu, May 15, 2014 at 10:40 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hello all,
While trying to store ***keyHideUnapprovedDataInAnalytics* as *false*using
the system settings api, we realised that it stores it as a String,
while the DefaultAnalyticsSecurityManager when reading the value back
tries to type cast it to a Boolean and it fails.
Right now, the system settings api does not expose an endpoint to store
other data types except String.
We were thinking of exposing another api all together, which can take a
JSON as post body,
ex: *{keyHideUnapprovedDataInAnalytics:true}* and then store the
values along with type information.
Please suggest if there are better alternatives.
Thanks,
Aravind
___
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] SystemSettings API to post other data types
I think that is a good idea. Much appreciated if you take that on.
best regards,
Lars
On Thu, May 15, 2014 at 10:51 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hi Lars,
Sample payload looks like this:
{
key0: true,
key1: true
key2: {
name: some name
},
key3: 3
}
key0 will be stored as boolean, key1 will be stored as string, key2 will
be stored as a map, key3 will be stored as integer.
Thanks,
Aravind
On Thu, May 15, 2014 at 2:17 PM, Lars Helge Øverland
larshe...@gmail.comwrote:
Hi Aravind,
you are correct. We only support string based values in the API at the
moment, which is a weakness. I think your suggestion makes sense. Could you
provide an example payload with type information the way you envision it?
best regards,
Lars
On Thu, May 15, 2014 at 10:40 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hello all,
While trying to store ***keyHideUnapprovedDataInAnalytics* as
*false*using the system settings api, we realised that it stores it as a
String,
while the DefaultAnalyticsSecurityManager when reading the value back
tries to type cast it to a Boolean and it fails.
Right now, the system settings api does not expose an endpoint to store
other data types except String.
We were thinking of exposing another api all together, which can take a
JSON as post body,
ex: *{keyHideUnapprovedDataInAnalytics:true}* and then store the
values along with type information.
Please suggest if there are better alternatives.
Thanks,
Aravind
___
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] SystemSettings API to post other data types
Thanks Lars. We will pick this up.
-Aravind
On Thu, May 15, 2014 at 2:24 PM, Lars Helge Øverland larshe...@gmail.comwrote:
I think that is a good idea. Much appreciated if you take that on.
best regards,
Lars
On Thu, May 15, 2014 at 10:51 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hi Lars,
Sample payload looks like this:
{
key0: true,
key1: true
key2: {
name: some name
},
key3: 3
}
key0 will be stored as boolean, key1 will be stored as string, key2 will
be stored as a map, key3 will be stored as integer.
Thanks,
Aravind
On Thu, May 15, 2014 at 2:17 PM, Lars Helge Øverland larshe...@gmail.com
wrote:
Hi Aravind,
you are correct. We only support string based values in the API at the
moment, which is a weakness. I think your suggestion makes sense. Could you
provide an example payload with type information the way you envision it?
best regards,
Lars
On Thu, May 15, 2014 at 10:40 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hello all,
While trying to store ***keyHideUnapprovedDataInAnalytics* as
*false*using the system settings api, we realised that it stores it as a
String,
while the DefaultAnalyticsSecurityManager when reading the value back
tries to type cast it to a Boolean and it fails.
Right now, the system settings api does not expose an endpoint to store
other data types except String.
We were thinking of exposing another api all together, which can take a
JSON as post body,
ex: *{keyHideUnapprovedDataInAnalytics:true}* and then store the
values along with type information.
Please suggest if there are better alternatives.
Thanks,
Aravind
___
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] SystemSettings API to post other data types
Great. Let us know how it goes.
regards,
Lars
On Thu, May 15, 2014 at 11:04 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Thanks Lars. We will pick this up.
-Aravind
On Thu, May 15, 2014 at 2:24 PM, Lars Helge Øverland
larshe...@gmail.comwrote:
I think that is a good idea. Much appreciated if you take that on.
best regards,
Lars
On Thu, May 15, 2014 at 10:51 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hi Lars,
Sample payload looks like this:
{
key0: true,
key1: true
key2: {
name: some name
},
key3: 3
}
key0 will be stored as boolean, key1 will be stored as string, key2 will
be stored as a map, key3 will be stored as integer.
Thanks,
Aravind
On Thu, May 15, 2014 at 2:17 PM, Lars Helge Øverland
larshe...@gmail.com wrote:
Hi Aravind,
you are correct. We only support string based values in the API at the
moment, which is a weakness. I think your suggestion makes sense. Could you
provide an example payload with type information the way you envision it?
best regards,
Lars
On Thu, May 15, 2014 at 10:40 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hello all,
While trying to store ***keyHideUnapprovedDataInAnalytics* as
*false* using the system settings api, we realised that it stores it
as a String, while the DefaultAnalyticsSecurityManager when reading
the value back tries to type cast it to a Boolean and it fails.
Right now, the system settings api does not expose an endpoint to
store other data types except String.
We were thinking of exposing another api all together, which can take
a JSON as post body,
ex: *{keyHideUnapprovedDataInAnalytics:true}* and then store the
values along with type information.
Please suggest if there are better alternatives.
Thanks,
Aravind
___
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-documenters/dhis2/dhis2-docbook-docs] Rev 1068: CCEI changes
revno: 1068 committer: Bharath chbhara...@gmail.com branch nick: dhis2-docbook-docs timestamp: Thu 2014-05-15 10:40:17 +0100 message: CCEI changes removed: src/docbkx/en/ccei_user_man_equipment_type_attribute.xml src/docbkx/en/ccei_user_man_model.xml src/docbkx/en/ccei_user_man_model_attribute.xml src/docbkx/en/ccei_user_man_periodic_data_flow.xml src/docbkx/en/ccei_user_man_service_module.xml added: src/docbkx/en/resources/images/ccei/PeriodicDataFlow.JPG src/docbkx/en/resources/images/ccei/add_aggregation_query.PNG src/docbkx/en/resources/images/ccei/add_equip_type.PNG src/docbkx/en/resources/images/ccei/aggregation_query_list.PNG src/docbkx/en/resources/images/ccei/aggregation_query_type.PNG src/docbkx/en/resources/images/ccei/dataset.PNG src/docbkx/en/resources/images/ccei/dataset_assigning.PNG src/docbkx/en/resources/images/ccei/equipment_type.PNG src/docbkx/en/resources/images/ccei/manual_aggregation.PNG src/docbkx/en/resources/images/ccei/ref_temperature_alarm.PNG src/docbkx/en/resources/images/ccei/ref_utilization.PNG src/docbkx/en/resources/images/ccei/ref_work_status.PNG src/docbkx/en/resources/images/ccei/ref_work_status_by_type.PNG src/docbkx/en/resources/images/ccei/storage_capacity.PNG src/docbkx/en/resources/images/ccei/translate.PNG modified: src/docbkx/en/ccei_user_man_introduction.xml src/docbkx/en/ccei_user_manual_en.xml src/docbkx/en/resources/images/ccei/data_entry_screen.PNG src/docbkx/en/resources/images/ccei/delete.PNG src/docbkx/en/resources/images/ccei/detail.PNG src/docbkx/en/resources/images/ccei/edit.PNG src/docbkx/en/resources/images/ccei/group_list.PNG The size of the diff (1099 lines) is larger than your specified limit of 1000 lines -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription ___ 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] SystemSettings API to post other data types
Hello Lars,
We have committed the changes to tw-msf branch of DHIS2.
Commit message: Aravind,Simij | Exposed an endpoint to create system
settings with json payload
Please review it, and merge it to trunk if it looks ok.
Thanks,
Aravind
On Thu, May 15, 2014 at 3:05 PM, Lars Helge Øverland larshe...@gmail.comwrote:
Great. Let us know how it goes.
regards,
Lars
On Thu, May 15, 2014 at 11:04 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Thanks Lars. We will pick this up.
-Aravind
On Thu, May 15, 2014 at 2:24 PM, Lars Helge Øverland larshe...@gmail.com
wrote:
I think that is a good idea. Much appreciated if you take that on.
best regards,
Lars
On Thu, May 15, 2014 at 10:51 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hi Lars,
Sample payload looks like this:
{
key0: true,
key1: true
key2: {
name: some name
},
key3: 3
}
key0 will be stored as boolean, key1 will be stored as string, key2
will be stored as a map, key3 will be stored as integer.
Thanks,
Aravind
On Thu, May 15, 2014 at 2:17 PM, Lars Helge Øverland
larshe...@gmail.com wrote:
Hi Aravind,
you are correct. We only support string based values in the API at the
moment, which is a weakness. I think your suggestion makes sense. Could
you
provide an example payload with type information the way you envision it?
best regards,
Lars
On Thu, May 15, 2014 at 10:40 AM, Aravind Muralikrishnan
aravi...@thoughtworks.com wrote:
Hello all,
While trying to store ***keyHideUnapprovedDataInAnalytics* as
*false* using the system settings api, we realised that it stores it
as a String, while the DefaultAnalyticsSecurityManager when reading
the value back tries to type cast it to a Boolean and it fails.
Right now, the system settings api does not expose an endpoint to
store other data types except String.
We were thinking of exposing another api all together, which can take
a JSON as post body,
ex: *{keyHideUnapprovedDataInAnalytics:true}* and then store the
values along with type information.
Please suggest if there are better alternatives.
Thanks,
Aravind
___
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 15276: searching tracked entity - wip
revno: 15276
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-05-15 14:45:17 +0200
message:
searching tracked entity - wip
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html
dhis-2/dhis-web/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-14 13:04:39 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-15 12:45:17 +
@@ -12,6 +12,7 @@
advanced_search: Advanced search,
search_for: Search for,
your_search_input_here: Your search input here,
+search_input_required: Please specify a search criteria,
registered_entities: Registered Entities,
empty_entity_list: There are no reigstered entities,
empty: Empty,
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-14 15:42:24 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-15 12:45:17 +
@@ -13,6 +13,7 @@
SelectedEntity,
storage,
AttributesFactory,
+EntityQueryFactory,
TrackedEntityInstanceService) {
//Selection
@@ -35,6 +36,7 @@
//Searching
$scope.showSearchDiv = false;
$scope.searchText = null;
+$scope.emptySearchText = false;
$scope.searchFilterExists = false;
$scope.attributes = AttributesFactory.getWithoutProgram();
$scope.searchMode = {listAll: 'LIST_ALL', freeText: 'FREE_TEXT', attributeBased: 'ATTRIBUTE_BASED'};
@@ -99,7 +101,9 @@
}
};
-$scope.search = function(mode){
+$scope.search = function(mode){
+
+$scope.emptySearchText = false;
var queryUrl = null,
programUrl = null,
attributeUrl = null;
@@ -125,52 +129,20 @@
if( mode === $scope.searchMode.freeText ){
$scope.trackedEntityList = null;
-if(!$scope.searchText){
-console.log('empty search query');
+if(!$scope.searchText){
+$scope.emptySearchText = true;
return;
}
$scope.showTrackedEntityDiv = true;
-queryUrl = 'query=' + $scope.searchText;
-
+queryUrl = 'query=' + $scope.searchText;
}
else if( mode === $scope.searchMode.attributeBased ){
$scope.showTrackedEntityDiv = true;
-angular.forEach($scope.attributes, function(attribute){
-
-if(attribute.value attribute.value !== ){
-$scope.searchFilterExists = true;
-if(angular.isArray(attribute.value)){
-angular.forEach(attribute.value, function(val){
-if(attributeUrl){
-attributeUrl = attributeUrl + 'attribute=' + attribute.id + ':EQ:' + val;
-}
-else{
-attributeUrl = 'attribute=' + attribute.id + ':EQ:' + val;
-}
-});
-}
-else{
-if(attributeUrl){
-attributeUrl = attributeUrl + 'attribute=' + attribute.id + ':EQ:' + attribute.value;
-}
-else{
-attributeUrl = 'attribute=' + attribute.id + ':EQ:' + attribute.value;
-}
-}
-}
-else{
-if(attributeUrl){
-
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15277: User administration restrictions
revno: 15277 committer: jimgr...@gmail.com branch nick: dhis2 timestamp: Thu 2014-05-15 09:16:11 -0400 message: User administration restrictions modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAccessSettings.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.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-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-05-06 16:34:26 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-05-15 13:16:11 + @@ -90,6 +90,7 @@ final String KEY_OPENID_PROVIDER = keyOpenIdProvider; final String KEY_OPENID_PROVIDER_LABEL = keyOpenIdProviderLabel; final String KEY_CAN_GRANT_OWN_USER_AUTHORITY_GROUPS = keyCanGrantOwnUserAuthorityGroups; +final String KEY_ONLY_MANAGE_WITHIN_USER_GROUPS = keyOnlyManageWithinUserGroups; final String KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS = keyHideUnapprovedDataInAnalytics; final String KEY_ANALYTICS_MAX_LIMIT = keyAnalyticsMaxLimit; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java 2014-05-13 17:35:09 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java 2014-05-15 13:16:11 + @@ -83,7 +83,7 @@ /** * Retrieves the User with the given unique identifier. * - * @param id the identifier of the User to retrieve. + * @param uid the identifier of the User to retrieve. * @return the User. */ User getUser( String uid ); @@ -278,7 +278,7 @@ /** * Retrieves the UserAuthorityGroup with the given identifier. * - * @param id the identifier of the UserAuthorityGroup to retrieve. + * @param uid the identifier of the UserAuthorityGroup to retrieve. * @return the UserAuthorityGroup. */ UserAuthorityGroup getUserAuthorityGroup( String uid ); @@ -301,21 +301,21 @@ /** * Retrieves all UserAuthorityGroups. * - * @return a Collectio of UserAuthorityGroups. + * @return a Collection of UserAuthorityGroups. */ CollectionUserAuthorityGroup getAllUserAuthorityGroups(); /** * Retrieves all UserAuthorityGroups. * - * @return a Collectio of UserAuthorityGroups. + * @return a Collection of UserAuthorityGroups. */ CollectionUserAuthorityGroup getUserRolesBetween( int first, int max ); /** * Retrieves all UserAuthorityGroups. * - * @return a Collectio of UserAuthorityGroups. + * @return a Collection of UserAuthorityGroups. */ CollectionUserAuthorityGroup getUserRolesBetweenByName( String name, int first, int max ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java 2014-05-13 17:35:09 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java 2014-05-15 13:16:11 + @@ -45,13 +45,17 @@ import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.PeriodType; +import org.hisp.dhis.security.SecurityService;
[Dhis2-devs] [Bug 1317818] Re: option set list anddrop down arrow missing for Tracker Events
Anybody able to help with this problem? -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1317818 Title: option set list anddrop down arrow missing for Tracker Events Status in DHIS 2: New Bug description: All option lists for Tracker Event data elements are not loading with new 2.15 build. I checked this on the demo site and it is the same. I have attached a screenshot of the TB program on the demo site with the TB Disease Classification not showing the drop down arrow. If you used the down arrow you can see the options. However with my database, some data elements still give you options without the drop down arrow while others don't. There was no problem with my previous build so it's unlikely to have anything to do with my database. Version: 2.15 Build revision: 15017 Regards, Busoye To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1317818/+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 15279: Minor
revno: 15279
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-05-15 19:03:49 +0200
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.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/translation/Translation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java 2014-05-15 16:58:37 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java 2014-05-15 17:03:49 +
@@ -132,7 +132,7 @@
this.value = value;
}
-
+// -
// hashCode, equals and toString
// -
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-05-15 16:58:37 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-05-15 17:03:49 +
@@ -1047,8 +1047,7 @@
{
ListInteger foreignIds = new ArrayListInteger();
-ResultSet resultSet = stat
-alter table translation modify column locale varchar(45) null;ement.executeQuery( SELECT + col2 + FROM + table + WHERE + col1
+ResultSet resultSet = statement.executeQuery( SELECT + col2 + FROM + table + WHERE + col1
+ = + distinctId );
while ( resultSet.next() )
___
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 15280: searching tei - wip
revno: 15280
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-05-15 19:16:31 +0200
message:
searching tei - wip
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/enrollment.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html
--
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-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-15 12:45:17 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-15 17:16:31 +
@@ -3,6 +3,7 @@
registering_unit: Registering unit,
program: Program,
please_select: [Please Select],
+please_select_a_program: [Please select a program],
not_selected: Not Selected,
view_all: [View All],
list_all_entities: List All Entities,
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-15 12:45:17 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-15 17:16:31 +
@@ -39,7 +39,11 @@
$scope.emptySearchText = false;
$scope.searchFilterExists = false;
$scope.attributes = AttributesFactory.getWithoutProgram();
-$scope.searchMode = {listAll: 'LIST_ALL', freeText: 'FREE_TEXT', attributeBased: 'ATTRIBUTE_BASED'};
+$scope.searchMode = {
+listAll: 'LIST_ALL',
+freeText: 'FREE_TEXT',
+attributeBased: 'ATTRIBUTE_BASED'
+};
//Registration
$scope.showRegistrationDiv = false;
@@ -92,6 +96,7 @@
};
$scope.getProgramAttributes = function(program){
+$scope.trackedEntityList = null;
$scope.selectedProgram = program;
if($scope.selectedProgram){
$scope.attributes = AttributesFactory.getByProgram($scope.selectedProgram);
@@ -102,20 +107,21 @@
};
$scope.search = function(mode){
-
+
$scope.emptySearchText = false;
+$scope.emptySearchAttribute = false;
+$scope.showSearchDiv = false;
+$scope.showRegistrationDiv = false;
+$scope.gridColumns = $scope.attributes;
+$scope.trackedEntityList = null;
+
var queryUrl = null,
programUrl = null,
-attributeUrl = null;
+attributeUrl = {url: null, hasValue: false};
if($scope.selectedProgram){
programUrl = 'program=' + $scope.selectedProgram.id;
-}
-
-$scope.showSearchDiv = false;
-$scope.showRegistrationDiv = false;
-
-$scope.gridColumns = $scope.attributes;
+}
//generate grid column for the selected program
angular.forEach($scope.gridColumns, function(gridColumn){
@@ -126,9 +132,7 @@
}
});
-if( mode === $scope.searchMode.freeText ){
-$scope.trackedEntityList = null;
-
+if( mode === $scope.searchMode.freeText ){
if(!$scope.searchText){
$scope.emptySearchText = true;
return;
@@ -138,22 +142,20 @@
queryUrl = 'query=' + $scope.searchText;
}
else if( mode === $scope.searchMode.attributeBased ){
-$scope.showTrackedEntityDiv = true;
-
+$scope.showTrackedEntityDiv = true;
attributeUrl = EntityQueryFactory.getQueryForAttributes($scope.attributes);
-
+
if(!attributeUrl.hasValue){
-console.log('empty search filter');
+$scope.emptySearchAttribute = true;
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15281: Applied patch from TW. Implements post of system settings map.
Merge authors:
Aravind M (arav-psgtech)
revno: 15281 [merge]
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-05-15 23:07:04 +0200
message:
Applied patch from TW. Implements post of system settings map.
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemSettingController.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemSettingController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemSettingController.java 2014-05-15 16:58:37 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemSettingController.java 2014-05-15 21:07:04 +
@@ -79,6 +79,18 @@
ContextUtils.okResponse( response, System setting + key + set as value ' + value + '. );
}
+@RequestMapping( method = RequestMethod.POST, consumes = { ContextUtils.CONTENT_TYPE_JSON } )
+@PreAuthorize(hasRole('ALL') or hasRole('F_SYSTEM_SETTING'))
+public void setSystemSetting( @RequestBody MapString,Object settings, HttpServletResponse response )
+{
+for ( String key : settings.keySet() )
+{
+systemSettingManager.saveSystemSetting( key, (Serializable) settings.get( key ) );
+}
+
+ContextUtils.okResponse( response, System settings imported );
+}
+
@RequestMapping(value = /{key}, method = RequestMethod.GET, produces = ContextUtils.CONTENT_TYPE_TEXT)
public @ResponseBody String getSystemSetting( @PathVariable(key) String key )
{
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 1314949] [NEW] Error starting up tomcat (version 2.15)
Hi Busoye, this is not a critical problem - we renamed some foreign key constraints which hibernate complains about since it tries to recreate them while they already exist. We will fix (but you can safely ignore them). Lars On Thu, May 1, 2014 at 11:52 AM, Adebusoye Anifalaje bus...@hisp.orgwrote: Public bug reported: Hi This is related to some of the issues I've reported recently. Can anyone shed some light into how to resolve the following errors I get when I start up my servlet? ERROR 2014-05-01 10:47:33,128 HHH000388: Unsuccessful: alter table program_attributes add constraint fk_program_attributeid foreign key (trackedenti yattributeid) references trackedentityattribute (SchemaUpdate.java [pool-2-thread-1]) ERROR 2014-05-01 10:47:33,128 ERROR: constraint fk_program_attributeid for relation program_attributes already exists (SchemaUpdate.java [pool-2 thread-1]) ERROR 2014-05-01 10:47:33,128 HHH000388: Unsuccessful: alter table programstage add constraint fk_programstage_dataentryform foreign key (dataentryf rmid) references dataentryform (SchemaUpdate.java [pool-2-thread-1]) ERROR 2014-05-01 10:47:33,128 ERROR: constraint fk_programstage_dataentryform for relation programstage already exists (SchemaUpdate.java [pool- -thread-1]) ERROR 2014-05-01 10:47:33,128 HHH000388: Unsuccessful: alter table trackedentityform add constraint fk_trackedentityform_dataentryformid foreign key (dataentryformid) references dataentryform (SchemaUpdate.java [pool-2-thread-1]) ERROR 2014-05-01 10:47:33,144 ERROR: constraint fk_trackedentityform_dataentryformid for relation trackedentityform already exists (SchemaUpdate java [pool-2-thread-1]) Many thanks. Regards, Busoye Version 2.15 Build: 14986 ** Affects: dhis2 Importance: Undecided Status: New -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1314949 Title: Error starting up tomcat (version 2.15) Status in DHIS 2: New Bug description: Hi This is related to some of the issues I've reported recently. Can anyone shed some light into how to resolve the following errors I get when I start up my servlet? ERROR 2014-05-01 10:47:33,128 HHH000388: Unsuccessful: alter table program_attributes add constraint fk_program_attributeid foreign key (trackedenti yattributeid) references trackedentityattribute (SchemaUpdate.java [pool-2-thread-1]) ERROR 2014-05-01 10:47:33,128 ERROR: constraint fk_program_attributeid for relation program_attributes already exists (SchemaUpdate.java [pool-2 thread-1]) ERROR 2014-05-01 10:47:33,128 HHH000388: Unsuccessful: alter table programstage add constraint fk_programstage_dataentryform foreign key (dataentryf rmid) references dataentryform (SchemaUpdate.java [pool-2-thread-1]) ERROR 2014-05-01 10:47:33,128 ERROR: constraint fk_programstage_dataentryform for relation programstage already exists (SchemaUpdate.java [pool- -thread-1]) ERROR 2014-05-01 10:47:33,128 HHH000388: Unsuccessful: alter table trackedentityform add constraint fk_trackedentityform_dataentryformid foreign key (dataentryformid) references dataentryform (SchemaUpdate.java [pool-2-thread-1]) ERROR 2014-05-01 10:47:33,144 ERROR: constraint fk_trackedentityform_dataentryformid for relation trackedentityform already exists (SchemaUpdate java [pool-2-thread-1]) Many thanks. Regards, Busoye Version 2.15 Build: 14986 To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1314949/+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 ___ 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] Compiling a data dictionary from DHIS2
Hi Devs, I have tried to pull out full indicator definitions from the DHIS2(in form of a data dictionary) – The API doesn’t give numerators and denominators like an ideal data dictionary should. The indicator table in postgres represents the numerators and denominators as Dataelement uids and categoryoptioncombo uids. I could eventually get something out using multiple find and replace macros in excel but the process was not very linear and has to be done each time a change is done to the metadata outside the DHIS. Does anyone have any ideas on a simpler way to do this? The old data dictionary functionality could do this…. Regards, Dapo Adejumo +2348033683677 skype : dapojorge ___ 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 15282: Fixed bug - Error when saving aggregate data values from Manual Aggregate.
revno: 15282 committer: Tran Chau tran.hispviet...@gmail.com branch nick: dhis2 timestamp: Fri 2014-05-16 10:03:50 +0800 message: Fixed bug - Error when saving aggregate data values from Manual Aggregate. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java 2014-03-21 09:29:10 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java 2014-05-16 02:03:50 + @@ -141,8 +141,8 @@ OrganisationUnit orgunit = organisationUnitService.getOrganisationUnit( orgunitId ); -DataValue dataValue = dataValueService.getDataValue( dataElement, period, orgunit, optionCombo ); - +DataValue dataValue = dataValueService.getDataValue( dataElement, period, orgunit, optionCombo , optionCombo ); + // - // Save/Update/Delete data-values // - === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2014-04-12 05:07:54 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2014-05-16 02:03:50 + @@ -44,6 +44,8 @@ #set($organisationunitid=$col) #elseif($velocityCount==7) #set($periodid=$col) + #elseif($velocityCount==11) + #set($value=$col) #end #end #set($item=$dataelementid + '_' + $categoryoptioncomboid + '_' + $periodid + '_' + $organisationunitid + '_' + $value) ___ 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 15283: Exception thrown when clicking on the details icon of Aggregate query result.
revno: 15283
committer: Tran Chau tran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-05-16 10:37:15 +0800
message:
Exception thrown when clicking on the details icon of Aggregate query result.
modified:
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.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-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2014-05-12 14:37:40 +
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2014-05-16 02:37:15 +
@@ -663,19 +663,19 @@
sql += inner join programstageinstance _psi on _pi.programinstanceid=_psi.programinstanceid ;
attributeId = attributeId.split( SEPARATOR_ID )[0];
-sql += WHERE _pav.patientid=pi.patientid AND _pav.trackedentityattributeid= + attributeId + AND DATE(_psi.executiondate) - DATE( _pav.value ) ;
+sql += WHERE _pav.trackedentityinstanceid=pi.trackedentityinstanceid AND _pav.trackedentityattributeid= + attributeId + AND DATE(_psi.executiondate) - DATE( _pav.value ) ;
}
else if ( attributeId.split( SEPARATOR_ID )[1].equals( CaseAggregationCondition.FORMULA_AGE ) )
{
sql += inner join programinstance _pi on _pav.trackedentityinstanceid=_pi.trackedentityinstanceid ;
attributeId = attributeId.split( SEPARATOR_ID )[0];
-sql += WHERE _pav.patientid=pi.patientid AND _pav.trackedentityattributeid= + attributeId + AND DATE(_psi.enrollmentdate) - DATE( _pav.value ) ;
+sql += WHERE _pav.trackedentityinstanceid=pi.trackedentityinstanceid AND _pav.trackedentityattributeid= + attributeId + AND DATE(_psi.enrollmentdate) - DATE( _pav.value ) ;
}
}
else
{
-sql += WHERE _pav.patientid=pi.patientid AND _pav.trackedentityattributeid= + attributeId + AND _pav.value ;
+sql += WHERE _pav.trackedentityinstanceid=pi.trackedentityinstanceid AND _pav.trackedentityattributeid= + attributeId + AND _pav.value ;
}
if ( isExist )
@@ -915,11 +915,6 @@
}
else
{
-if ( hasEntityInstances || operator.equals( CaseAggregationCondition.AGGRERATION_COUNT ) )
-{
-sql += p.name,;
-}
-
if ( hasDataelement )
{
sql += pdv.value,pgs.name as program_stage, psi.executiondate as report_date,;
___
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
