[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13030: NPE checks in enrollmentservice
revno: 13030
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 09:25:46 +0100
message:
NPE checks in enrollmentservice
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.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/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2013-11-14 08:17:57 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2013-11-27 08:25:46 +
@@ -107,6 +107,7 @@
ListProgramInstance programInstances = new ArrayListProgramInstance(
programInstanceService.getProgramInstances( programs ) );
+
return getEnrollments( programInstances );
}
@@ -216,7 +217,10 @@
for ( ProgramInstance programInstance : programInstances )
{
-enrollments.getEnrollments().add( getEnrollment( programInstance ) );
+if ( programInstance != null )
+{
+enrollments.getEnrollments().add( getEnrollment( programInstance ) );
+}
}
return enrollments;
@@ -225,9 +229,9 @@
@Override
public Enrollment getEnrollment( String id )
{
-ProgramInstance pi = programInstanceService.getProgramInstance( id );
-
-return pi != null ? getEnrollment( pi ) : null;
+ProgramInstance programInstance = programInstanceService.getProgramInstance( id );
+
+return programInstance != null ? getEnrollment( programInstance ) : null;
}
@Override
___
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 13031: more NPE checks in enrollmentService, there are DBs out there where program.type = 1/2, and patie...
revno: 13031
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 10:35:17 +0100
message:
more NPE checks in enrollmentService, there are DBs out there where
program.type = 1/2, and patient == null, so need to check for this, and ignore
PI if true
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.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/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2013-11-27 08:25:46 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2013-11-27 09:35:17 +
@@ -217,7 +217,9 @@
for ( ProgramInstance programInstance : programInstances )
{
-if ( programInstance != null )
+// check for null, both for pi, and for pi.patient, there are DBs out there where patientid == null
+// even if the program is of type 1/2.
+if ( programInstance != null programInstance.getPatient() != null )
{
enrollments.getEnrollments().add( getEnrollment( programInstance ) );
}
___
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 1249110] Re: tabular reports aggregate sum/average not working
** Changed in: dhis2 Milestone: None = 2.14 ** Changed in: dhis2 Assignee: (unassigned) = Thu Tran (tran-hispvietnam) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249110 Title: tabular reports aggregate sum/average not working Status in DHIS 2: New Bug description: The sum and average function in the aggregate tabular report does not work. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249110/+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] [Bug 1249454] Re: mobile light tracking does not seem to register orgunit of stages
** Changed in: dhis2 Milestone: None = 2.14 -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249454 Title: mobile light tracking does not seem to register orgunit of stages Status in DHIS 2: New Bug description: I looks like the Mobile light interface to Tracker does not register at which orgunit a stage is completed. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249454/+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] [Bug 1249105] Re: tabular-report-filtering-numbers
** Changed in: dhis2 Milestone: None = 2.14 ** Changed in: dhis2 Assignee: (unassigned) = Thu Tran (tran-hispvietnam) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249105 Title: tabular-report-filtering-numbers Status in DHIS 2: New Bug description: Filtering on numbers in tabular report filters on the first digit only. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249105/+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] [Bug 1249107] Re: tabbing in tabular report selection
** Changed in: dhis2 Milestone: None = 2.14 ** Changed in: dhis2 Assignee: (unassigned) = Thu Tran (tran-hispvietnam) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249107 Title: tabbing in tabular report selection Status in DHIS 2: New Bug description: Tabbing from the End date filed in tabular report makes the next panel (orgunits or periods) unusable. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249107/+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] [Bug 1249109] Re: tabular reports aggregate without data items
** Changed in: dhis2 Milestone: None = 2.14 ** Changed in: dhis2 Assignee: (unassigned) = Thu Tran (tran-hispvietnam) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249109 Title: tabular reports aggregate without data items Status in DHIS 2: New Bug description: Runing an aggregate report in tabular report without selecting a data elements gives a warning. It should be possible to run this report without selecting data items. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249109/+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 13032: add includeChildren/includeDescendants to event export UI
revno: 13032
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 11:00:19 +0100
message:
add includeChildren/includeDescendants to event export UI
modified:
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.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-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2013-10-30 12:51:03 +
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2013-11-27 10:00:19 +
@@ -444,3 +444,8 @@
select_all_values=Select All Values
deselect_all_values=Deselect All Values
+
+inclusion=Inclusion
+include_selected=Selected organisation unit
+include_children=Include children of organisation unit
+include_descendants=Include descendants of organisation unit
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm 2013-09-04 08:11:01 +
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm 2013-11-27 10:00:19 +
@@ -9,6 +9,7 @@
var compression = $( '#compression' ).val();
var program = $( '#programs' ).val();
var programStage = $( '#programStages' ).val();
+var inclusion = $( '#inclusion' ).val();
var url = '../api/events' + format + compression + ?program= + program;
@@ -31,6 +32,14 @@
var startDate = $('#startDate' ).val();
var endDate = $('#endDate' ).val();
+if( inclusion ) {
+ if( children == inclusion ) {
+url += includeChildren=true;
+ } else if( descendants == inclusion ) {
+url += includeDescendants=true;
+ }
+}
+
url += startDate= + startDate;
url += endDate= + endDate;
url += links=false;
@@ -131,15 +140,26 @@
tdinput type=text id=endDate name=endDate value=$!endDate style=width:296px/td
/tr
-tr
-td$i18n.getString( format )/td
-td
-select id=format style=width: 300px;
-option value=.xmlXML/option
-option value=.jsonJson/option
-/select
-/td
-/tr
+tr
+td$i18n.getString( inclusion )/td
+td
+select id=inclusion style=width: 300px;
+option value=selected$i18n.getString( include_selected )/option
+option value=children$i18n.getString( include_children )/option
+option value=descendants$i18n.getString( include_descendants )/option
+/select
+/td
+/tr
+
+tr
+td$i18n.getString( format )/td
+td
+select id=format style=width: 300px;
+option value=.xmlXML/option
+option value=.jsonJson/option
+/select
+/td
+/tr
tr
td$i18n.getString( compression )/td
___
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 1249111] Re: aggregation queries on demo database does not work
** Changed in: dhis2 Milestone: None = 2.14 ** Changed in: dhis2 Assignee: (unassigned) = Thu Tran (tran-hispvietnam) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249111 Title: aggregation queries on demo database does not work Status in DHIS 2: New Bug description: Aggregation queries for the inpatient (anonymous) program in the demo database does not work. Not sure if it is a bug or if the issue is with the database. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249111/+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] [Bug 1249454] Re: mobile light tracking does not seem to register orgunit of stages
** Changed in: dhis2 Assignee: (unassigned) = Ngo Thanh Long (thanhlongngo1988) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249454 Title: mobile light tracking does not seem to register orgunit of stages Status in DHIS 2: New Bug description: I looks like the Mobile light interface to Tracker does not register at which orgunit a stage is completed. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249454/+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] [Bug 1250416] Re: Tabular report downloads give ids
** Changed in: dhis2 Milestone: None = 2.14 ** Changed in: dhis2 Assignee: (unassigned) = Lars Helge Øverland (larshelge) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1250416 Title: Tabular report downloads give ids Status in DHIS 2: New Bug description: Downloads to Excel from the tabular report show uids instead of names. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1250416/+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] [Bug 1249456] Re: problem with mobile light tracker DOB format
** Changed in: dhis2 Milestone: None = 2.14 -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1249456 Title: problem with mobile light tracker DOB format Status in DHIS 2: New Bug description: The mobile light tracker DOB format has no indication of what the right format is, and gives exception if the wrong format is used rather than a warning that the format is invalid. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1249456/+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 13033: CCEI: work in progress CSV Import functionality
revno: 13033 committer: Bharath chbhara...@gmail.com branch nick: dhis2 timestamp: Wed 2013-11-27 12:27:57 + message: CCEI: work in progress CSV Import functionality added: local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/importexport/ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/importexport/action/ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/importexport/action/CSVImportAction.java local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/csvImportResult.vm modified: local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelService.java local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelStore.java local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeService.java local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeStore.java local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelService.java local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelTypeAttributeService.java local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelStore.java local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelTypeAttributeStore.java local/in/dhis-web-maintenance-ccem/pom.xml local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/importDataForm.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-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelService.java 2013-09-05 11:11:36 + +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelService.java 2013-11-27 12:27:57 + @@ -21,6 +21,8 @@ Model getModelByName( String name ); +Model getModelByDescription( String description ); + CollectionModel getModels( ModelType modelType ); int createModel( Model model, ListModelAttributeValue modelAttributeValues ); @@ -40,7 +42,6 @@ CollectionModel getModelsBetweenByName( String name, int first, int max ); - int getCountModel( ModelType modelType ); CollectionModel getModels( ModelType modelType, int min, int max ); === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelStore.java 2013-09-05 11:11:36 + +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelStore.java 2013-11-27 12:27:57 + @@ -18,6 +18,8 @@ Model getModel( int id ); Model getModelByName( String name ); + +Model getModelByDescription( String description ); CollectionModel getAllModels(); === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeService.java 2013-09-05 11:11:36 + +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeService.java 2013-11-27 12:27:57 + @@ -16,6 +16,8 @@ ModelTypeAttribute getModelTypeAttributeByName( String name ); +ModelTypeAttribute getModelTypeAttributeByDescription( String description ); + //ModelType getModelTypeByAttribute( ModelType modelType, ModelTypeAttribute modelTypeAttribute); CollectionModelTypeAttribute getAllModelTypeAttributes(); === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeStore.java 2013-09-05 11:11:36 + +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeStore.java 2013-11-27 12:27:57 + @@ -19,6 +19,8 @@ ModelTypeAttribute getModelTypeAttributeByName( String name ); +ModelTypeAttribute getModelTypeAttributeByDescription( String description ); + CollectionModelTypeAttribute getAllModelTypeAttributes(); } === modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelService.java' ---
[Dhis2-devs] [Bug 1255520] [NEW] Encoding problem
Public bug reported: Hi all, Any idea of what might be causing this problem, please see attach. Regards, Paulo Grácio - I can at least confirm that I see it here also. But I don't see it everywhere, running dhis2 locally (jetty or tomcat) doesn't give me the issue at all.. but using our /dev server, I can see it.. unsure why this is happening. Do you mind creating a bug report for it? -- Morten ** Affects: dhis2 Importance: Undecided Status: New ** Attachment added: encoding.png https://bugs.launchpad.net/bugs/1255520/+attachment/3918299/+files/encoding.png -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1255520 Title: Encoding problem Status in DHIS 2: New Bug description: Hi all, Any idea of what might be causing this problem, please see attach. Regards, Paulo Grácio - I can at least confirm that I see it here also. But I don't see it everywhere, running dhis2 locally (jetty or tomcat) doesn't give me the issue at all.. but using our /dev server, I can see it.. unsure why this is happening. Do you mind creating a bug report for it? -- Morten To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1255520/+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 13034: replace icons with contextual menu, wip (only implemented in concept list)
revno: 13034
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 13:48:33 +0100
message:
replace icons with contextual menu, wip (only implemented in concept list)
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.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-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-11-12 17:09:25 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-11-27 12:48:33 +
@@ -191,6 +191,49 @@
}
/**/
+/* Context Menu */
+/**/
+
+.contextMenu {
+ position : absolute;
+ font-size : 9pt;
+ color : #000;
+ border : 1px solid #ddd;
+ padding-left : 4px;
+ padding-right : 4px;
+ width : 189px;
+ max-height : 610px;
+ overflow-y : auto;
+ background-color : #f7f7f7;
+ display: none;
+ z-index: 10;
+ filter : alpha(opacity=94);
+ opacity: 0.94;
+ border-bottom-left-radius : 3px;
+ border-bottom-right-radius : 3px;
+ box-shadow : #ccc 0px 1px 1px 0px;
+}
+
+.contextMenuItems {
+ list-style-type : none;
+ padding : 0;
+ margin : 10px 0;
+}
+
+.contextMenuItems a {
+ display : block;
+ padding : 10px 10px;
+ color : #000;
+ border-radius : 3px;
+ cursor: pointer;
+}
+
+.contextMenuItems a:hover {
+ text-decoration : none;
+ background-color : #eee;
+}
+
+/**/
/* Left bar */
/**/
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-11-12 17:09:25 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-11-27 12:48:33 +
@@ -191,6 +191,49 @@
}
/**/
+/* Context Menu */
+/**/
+
+.contextMenu {
+ position : absolute;
+ font-size : 9pt;
+ color : #000;
+ border : 1px solid #ddd;
+ padding-left : 4px;
+ padding-right : 4px;
+ width : 189px;
+ max-height : 610px;
+ overflow-y : auto;
+ background-color : #f7f7f7;
+ display: none;
+ z-index: 10;
+ filter : alpha(opacity=94);
+ opacity: 0.94;
+ border-bottom-left-radius : 3px;
+ border-bottom-right-radius : 3px;
+ box-shadow : #ccc 0px 1px 1px 0px;
+}
+
+.contextMenuItems {
+ list-style-type : none;
+ padding : 0;
+ margin : 10px 0;
+}
+
+.contextMenuItems a {
+ display : block;
+ padding : 10px 10px;
+ color : #000;
+ border-radius : 3px;
+ cursor: pointer;
+}
+
+.contextMenuItems a:hover {
+ text-decoration : none;
+ background-color : #eee;
+}
+
+/**/
/* Left
[Dhis2-devs] [Bug 1255418] Re: Populating analytics tables failing
I've attached a snippet that contains the stack trace near the error. ** Attachment added: bug-1255418-log.txt https://bugs.launchpad.net/dhis2/+bug/1255418/+attachment/3918350/+files/bug-1255418-log.txt -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1255418 Title: Populating analytics tables failing Status in DHIS 2: New Bug description: Hi, I noticed that ‘populating anaytics tables’ are failing. We are using Version 2.13 Build revision 12878. I think same thing is happening on DHIS Dev and Demo. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1255418/+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] DHIS2 WSDL?
DHIS2 provides a REST or REST-like interface over HTTP. So with just those 4 obvious verbs, I dont see that we really need a WSDL. To send data from an EHR to DHIS2, you should create a report within your EHR to match the reporting frequency, data elements + catcombos and add those as an XML dataValueSet This is documented here - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s09.html You would probably need to exchange metadata before to get the UUIDs for the dataelements etc. If this is fairly fixed, should be fairly easy... if it isn't fixed you should read the metadata using - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s05.html and then read from those and compare them with your EHR. It can be quite challenging to make it work in the first pass... but if you come back with specific questions, once you start integrating, we can help you better. --- Regards, Saptarshi PURKAYASTHA From: eddi...@gmail.com To: sun...@gmail.com Subject: DHIS2 WSDL? Date: Wed, 27 Nov 2013 12:21:24 + Hi, Does DHIS2 have a WSDL that I can use? I want to build a module in our java based EHR system that will automatically upload data into our DHIS2 instance. Eddie -- This message was sent from Launchpad by Edwin Mulwa (https://launchpad.net/~eddiemu) using the Contact this team's admins link on the DHIS 2 Users team page (https://launchpad.net/~dhis2-users). For more information see https://help.launchpad.net/YourAccount/ContactingPeople ___ 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 13035: Removed duplicate aop pointcut
revno: 13035 committer: Lars Helge Øverland larshe...@gmail.com branch nick: dhis2 timestamp: Wed 2013-11-27 15:32:10 +0100 message: Removed duplicate aop pointcut modified: dhis-2/dhis-services/dhis-service-patient/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 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2013-11-25 03:07:49 + +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2013-11-27 14:32:10 + @@ -566,9 +566,6 @@ pointcut=execution( * org.hisp.dhis.program.ProgramValidationService.delete*(..) ) method=intercept / aop:before -pointcut=execution( * org.hisp.dhis.program.ProgramStageInstanceService.delete*(..) ) -method=intercept / - aop:before pointcut=execution( * org.hisp.dhis.patientdatavalue.PatientDataValueService.delete*(..) ) method=intercept / aop:before ___ 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 1255418] Re: Populating analytics tables failing
The column degs.ekhnymxor8e should be degs.ekhnYMxOr8e. Not sure why everything is being lower-cased. Could you post more of the logs, specifically when the analytics process starts with the resource table generation? We are using several builds of 2.13, and do not have this issue. Regards, Jason On Wed, Nov 27, 2013 at 3:17 PM, Dan Cocos 1255...@bugs.launchpad.netwrote: I've attached a snippet that contains the stack trace near the error. ** Attachment added: bug-1255418-log.txt https://bugs.launchpad.net/dhis2/+bug/1255418/+attachment/3918350/+files/bug-1255418-log.txt -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1255418 Title: Populating analytics tables failing Status in DHIS 2: New Bug description: Hi, I noticed that ‘populating anaytics tables’ are failing. We are using Version 2.13 Build revision 12878. I think same thing is happening on DHIS Dev and Demo. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1255418/+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
Re: [Dhis2-devs] DHIS2 WSDL?
Hi Saptarsh, I have the same thought process as you have described below. I will let the group know how it progresses and/or if I have any questions. Thanks a lot! Edwin On Wed, Nov 27, 2013 at 4:31 PM, Saptarshi Purkayastha sun...@gmail.comwrote: DHIS2 provides a REST or REST-like interface over HTTP. So with just those 4 obvious verbs, I dont see that we really need a WSDL. To send data from an EHR to DHIS2, you should create a report within your EHR to match the reporting frequency, data elements + catcombos and add those as an XML dataValueSet This is documented here - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s09.html You would probably need to exchange metadata before to get the UUIDs for the dataelements etc. If this is fairly fixed, should be fairly easy... if it isn't fixed you should read the metadata using - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s05.html and then read from those and compare them with your EHR. It can be quite challenging to make it work in the first pass... but if you come back with specific questions, once you start integrating, we can help you better. --- Regards, Saptarshi PURKAYASTHA From: eddi...@gmail.com To: sun...@gmail.com Subject: DHIS2 WSDL? Date: Wed, 27 Nov 2013 12:21:24 + Hi, Does DHIS2 have a WSDL that I can use? I want to build a module in our java based EHR system that will automatically upload data into our DHIS2 instance. Eddie -- This message was sent from Launchpad by Edwin Mulwa (https://launchpad.net/~eddiemu) using the Contact this team's admins link on the DHIS 2 Users team page (https://launchpad.net/~dhis2-users). For more information see https://help.launchpad.net/YourAccount/ContactingPeople ___ 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 1255418] Re: Populating analytics tables failing
I'll look deeper into it, my initial instinct is that Postgres is lower- casing the column names, which it does unless they are wrapped in quotes. Did something change recently in the analytics code that may not take this into account? -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1255418 Title: Populating analytics tables failing Status in DHIS 2: New Bug description: Hi, I noticed that ‘populating anaytics tables’ are failing. We are using Version 2.13 Build revision 12878. I think same thing is happening on DHIS Dev and Demo. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1255418/+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] DHIS2 WSDL?
Hi Saptarshi, I thought the whole point of using WSDL was to answer to You would probably need to exchange metadata before to get the UUIDs for the dataelements etc. If this is fairly fixed, should be fairly easy... if it isn't fixed you should read the metadata using and all is fairly easy after. That is not just 4 words, that is lots of coordination and research. regards, murod On Wed, Nov 27, 2013 at 7:44 PM, Edwin Mulwa eddi...@gmail.com wrote: Hi Saptarsh, I have the same thought process as you have described below. I will let the group know how it progresses and/or if I have any questions. Thanks a lot! Edwin On Wed, Nov 27, 2013 at 4:31 PM, Saptarshi Purkayastha sun...@gmail.comwrote: DHIS2 provides a REST or REST-like interface over HTTP. So with just those 4 obvious verbs, I dont see that we really need a WSDL. To send data from an EHR to DHIS2, you should create a report within your EHR to match the reporting frequency, data elements + catcombos and add those as an XML dataValueSet This is documented here - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s09.html You would probably need to exchange metadata before to get the UUIDs for the dataelements etc. If this is fairly fixed, should be fairly easy... if it isn't fixed you should read the metadata using - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s05.html and then read from those and compare them with your EHR. It can be quite challenging to make it work in the first pass... but if you come back with specific questions, once you start integrating, we can help you better. --- Regards, Saptarshi PURKAYASTHA From: eddi...@gmail.com To: sun...@gmail.com Subject: DHIS2 WSDL? Date: Wed, 27 Nov 2013 12:21:24 + Hi, Does DHIS2 have a WSDL that I can use? I want to build a module in our java based EHR system that will automatically upload data into our DHIS2 instance. Eddie -- This message was sent from Launchpad by Edwin Mulwa (https://launchpad.net/~eddiemu) using the Contact this team's admins link on the DHIS 2 Users team page (https://launchpad.net/~dhis2-users). For more information see https://help.launchpad.net/YourAccount/ContactingPeople ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] DHIS2 WSDL?
Hi Murod, Good to hear from you. The standard way in which WSDL is used (atleast 2.0 in context of SOAP), is to describe the Service in terms of Endpoints, Binding, Interface, Operation and Types. Most of this is self-descriptive in REST paradigm and infact not recommended for RESTful services that should support HATEOAS. I know there is the WADL standard, but its a rarely used standard and doesn't have much to offer for well documented web services. So, I wouldn't imagine that the WSDL document will give metadata information. A WSDL document allows clients of web services to generate stubs surrounding the service. Instead, I think an XForm or DHISReport template will represent the metadata information in a better way. I agree its not 4 words!! But once Edwin and his team starts the integration process and comes back with specific questions, we can guide them better. --- Regards, Saptarshi PURKAYASTHA Date: Wed, 27 Nov 2013 20:01:27 +0500 Subject: Re: [Dhis2-devs] DHIS2 WSDL? From: mlati...@gmail.com To: eddi...@gmail.com CC: sun...@gmail.com; dhis2-devs@lists.launchpad.net Hi Saptarshi, I thought the whole point of using WSDL was to answer to You would probably need to exchange metadata before to get the UUIDs for the dataelements etc. If this is fairly fixed, should be fairly easy... if it isn't fixed you should read the metadata using and all is fairly easy after. That is not just 4 words, that is lots of coordination and research. regards,murod On Wed, Nov 27, 2013 at 7:44 PM, Edwin Mulwa eddi...@gmail.com wrote: Hi Saptarsh, I have the same thought process as you have described below. I will let the group know how it progresses and/or if I have any questions. Thanks a lot! Edwin On Wed, Nov 27, 2013 at 4:31 PM, Saptarshi Purkayastha sun...@gmail.com wrote: DHIS2 provides a REST or REST-like interface over HTTP. So with just those 4 obvious verbs, I dont see that we really need a WSDL. To send data from an EHR to DHIS2, you should create a report within your EHR to match the reporting frequency, data elements + catcombos and add those as an XML dataValueSet This is documented here - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s09.html You would probably need to exchange metadata before to get the UUIDs for the dataelements etc. If this is fairly fixed, should be fairly easy... if it isn't fixed you should read the metadata using - http://www.dhis2.org/doc/snapshot/en/user/html/ch25s05.html and then read from those and compare them with your EHR. It can be quite challenging to make it work in the first pass... but if you come back with specific questions, once you start integrating, we can help you better. --- Regards, Saptarshi PURKAYASTHA From: eddi...@gmail.com To: sun...@gmail.com Subject: DHIS2 WSDL? Date: Wed, 27 Nov 2013 12:21:24 + Hi, Does DHIS2 have a WSDL that I can use? I want to build a module in our java based EHR system that will automatically upload data into our DHIS2 instance. Eddie -- This message was sent from Launchpad by Edwin Mulwa (https://launchpad.net/~eddiemu) using the Contact this team's admins link on the DHIS 2 Users team page (https://launchpad.net/~dhis2-users). For more information see https://help.launchpad.net/YourAccount/ContactingPeople ___ 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 13036: when context menu is shown, mark current td in blue color (from menu)
revno: 13036
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 16:32:03 +0100
message:
when context menu is shown, mark current td in blue color (from menu)
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.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-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-11-27 12:48:33 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-11-27 15:32:03 +
@@ -233,6 +233,11 @@
background-color : #eee;
}
+.contextMenuItemActive {
+ background-color: #276696;
+ color: #fff;
+}
+
/**/
/* Left bar */
/**/
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-11-27 12:48:33 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-11-27 15:32:03 +
@@ -233,6 +233,11 @@
background-color : #eee;
}
+.contextMenuItemActive {
+ background-color: #276696;
+ color: #fff;
+}
+
/**/
/* Left bar */
/**/
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-11-27 12:48:33 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-11-27 15:32:03 +
@@ -207,8 +207,8 @@
background-color : #f7f7f7;
display: none;
z-index: 10;
- filter : alpha(opacity=94);
- opacity: 0.94;
+ filter : alpha(opacity=98);
+ opacity: 0.98;
border-bottom-left-radius : 3px;
border-bottom-right-radius : 3px;
box-shadow : #ccc 0px 1px 1px 0px;
@@ -233,6 +233,11 @@
background-color : #eee;
}
+.contextMenuItemActive {
+ background-color: #276696;
+ color: #fff;
+}
+
/**/
/* Left bar */
/**/
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-11-27 12:48:33 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-11-27 15:32:03 +
@@ -233,6 +233,11 @@
background-color : #eee;
}
+.contextMenuItemActive {
+ background-color: #276696;
+ color: #fff;
+}
+
/**/
/* Left bar */
/**/
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js'
---
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13037: Removed spring security config from web.xml in web api, makes it possible to run web api as web m...
revno: 13037 committer: Lars Helge Øverland larshe...@gmail.com branch nick: dhis2 timestamp: Wed 2013-11-27 18:14:16 +0100 message: Removed spring security config from web.xml in web api, makes it possible to run web api as web module, good for short debug cycles. modified: dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.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-api/src/main/webapp/WEB-INF/web.xml' --- dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml 2013-10-30 12:51:03 + +++ dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml 2013-11-27 17:14:16 + @@ -14,10 +14,6 @@ filter-classorg.springframework.orm.hibernate4.support.OpenSessionInViewFilter/filter-class /filter filter -filter-namefilterChainProxy/filter-name -filter-classorg.springframework.web.filter.DelegatingFilterProxy/filter-class -/filter -filter filter-nameencoding-filter/filter-name filter-classorg.springframework.web.filter.CharacterEncodingFilter/filter-class init-param @@ -38,10 +34,6 @@ filter-nameOpenSessionInViewFilter/filter-name url-pattern/api/*/url-pattern /filter-mapping -filter-mapping -filter-namefilterChainProxy/filter-name -url-pattern/*/url-pattern -/filter-mapping listener listener-classorg.springframework.web.context.ContextLoaderListener/listener-class ___ 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 13038: moved contextmenu js = dhis2.contextmenu.js
revno: 13038
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 18:34:02 +0100
message:
moved contextmenu js = dhis2.contextmenu.js
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js 2013-08-23 16:11:13 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js 2013-11-27 17:34:02 +
@@ -26,7 +26,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
dhis2.util.namespace( 'dhis2.availability' );
dhis2.availability._isAvailable = -1;
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js 1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js 2013-11-27 17:34:02 +
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+dhis2.util.namespace('dhis2.contextmenu');
+dhis2.util.namespace('dhis2.contextmenu.utils');
+
+/**
+ * Tried to find a function with fnName in window scope.
+ *
+ * TODO: extend to search for more scopes
+ *
+ * @param fnName Name of function to search for
+ * @returns Function
+ */
+dhis2.contextmenu.utils.findFnInWindowScope = function( fnName ) {
+ if( typeof window[fnName] !== 'function' ) {
+throw new Error('target-fn \'' + fnName + '\' does not point to a valid function.')
+ }
+
+ return window[fnName];
+};
+
+dhis2.contextmenu.defaultOptions = {
+ listId: 'list',
+ menuId: 'menu',
+ menuItemActiveClass: 'menuItemActive',
+ listItemProps: ['id', 'uid', 'name'],
+ functionResolver: dhis2.contextmenu.utils.findFnInWindowScope
+};
+
+dhis2.contextmenu.makeContextMenu = function( options ) {
+ var config = $.extend({}, dhis2.contextmenu.defaultOptions, options);
+
+ var $list = $('#' + config.listId);
+ var $menu = $('#' + config.menuId);
+ var $menuItems = $menu.find('ul');
+
+ $menuItems.on('touchend click', 'li', function( e ) {
+var context = {};
+
+$.each(config.listItemProps, function( idx, val ) {
+ context[val] = $menu.data(val);
+});
+
+var $target = $(e.target);
+var targetFn
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13039: Analytics, consistently quoting column names
revno: 13039
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 20:02:17 +0100
message:
Analytics, consistently quoting column names
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2013-11-04 18:14:47 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2013-11-27 19:02:17 +
@@ -587,11 +587,11 @@
if ( getPeriods() != null ) // Period is dimension
{
-setDimensionOptions( PERIOD_DIM_ID, DimensionType.PERIOD, dataPeriodType.getName(), new ArrayListNameableObject( dataPeriodAggregationPeriodMap.keySet() ) );
+setDimensionOptions( PERIOD_DIM_ID, DimensionType.PERIOD, dataPeriodType.getName().toLowerCase(), new ArrayListNameableObject( dataPeriodAggregationPeriodMap.keySet() ) );
}
else // Period is filter
{
-setFilterOptions( PERIOD_DIM_ID, DimensionType.PERIOD, dataPeriodType.getName(), new ArrayListNameableObject( dataPeriodAggregationPeriodMap.keySet() ) );
+setFilterOptions( PERIOD_DIM_ID, DimensionType.PERIOD, dataPeriodType.getName().toLowerCase(), new ArrayListNameableObject( dataPeriodAggregationPeriodMap.keySet() ) );
}
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2013-10-16 20:10:21 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2013-11-27 19:02:17 +
@@ -401,7 +401,7 @@
for ( String periodType : periodTypePeriodMap.keySet() )
{
DataQueryParams query = params.instance();
-query.setDimensionOptions( PERIOD_DIM_ID, DimensionType.PERIOD, periodType, periodTypePeriodMap.get( periodType ) );
+query.setDimensionOptions( PERIOD_DIM_ID, DimensionType.PERIOD, periodType.toLowerCase(), periodTypePeriodMap.get( periodType ) );
query.setPeriodType( periodType );
queries.add( query );
}
@@ -416,7 +416,7 @@
for ( String periodType : periodTypePeriodMap.keySet() )
{
-params.getFilters().add( new BaseDimensionalObject( filter.getDimension(), filter.getType(), periodType, periodTypePeriodMap.get( periodType ) ) );
+params.getFilters().add( new BaseDimensionalObject( filter.getDimension(), filter.getType(), periodType.toLowerCase(), periodTypePeriodMap.get( periodType ) ) );
}
queries.add( params );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java 2013-08-31 18:07:17 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java 2013-11-27 19:02:17 +
@@ -59,6 +59,7 @@
import org.hisp.dhis.common.DimensionalObject;
import org.hisp.dhis.common.ListMap;
import org.hisp.dhis.common.NameableObject;
+import org.hisp.dhis.jdbc.StatementBuilder;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodType;
import
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13040: Debug code
revno: 13040
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 20:08:59 +0100
message:
Debug code
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java 2013-11-27 19:02:17 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java 2013-11-27 19:08:59 +
@@ -188,7 +188,6 @@
if ( params.isAggregationType( AVERAGE_INT ) )
{
-System.out.println(type name + params.getPeriodType());
int days = PeriodType.getPeriodTypeByName( params.getPeriodType() ).getFrequencyOrder();
sql += sum(daysxvalue) / + days;
___
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 13041: CCEI: work in progress - csv import functionality
revno: 13041
committer: Bharath chbhara...@gmail.com
branch nick: dhis2
timestamp: Wed 2013-11-27 19:15:40 +
message:
CCEI: work in progress - csv import functionality
modified:
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/importexport/action/CSVImportAction.java
local/in/dhis-web-maintenance-ccem/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-ccem/src/main/java/org/hisp/dhis/ccem/importexport/action/CSVImportAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/importexport/action/CSVImportAction.java 2013-11-27 12:27:57 +
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/importexport/action/CSVImportAction.java 2013-11-27 19:15:40 +
@@ -6,6 +6,7 @@
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -14,19 +15,17 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
import org.hisp.dhis.coldchain.model.Model;
import org.hisp.dhis.coldchain.model.ModelAttributeValue;
-import org.hisp.dhis.coldchain.model.ModelAttributeValueService;
import org.hisp.dhis.coldchain.model.ModelService;
import org.hisp.dhis.coldchain.model.ModelType;
import org.hisp.dhis.coldchain.model.ModelTypeAttribute;
-import org.hisp.dhis.coldchain.model.ModelTypeAttributeOption;
import org.hisp.dhis.coldchain.model.ModelTypeAttributeService;
import org.hisp.dhis.coldchain.model.ModelTypeService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.user.CurrentUserService;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.jdbc.core.JdbcTemplate;
import com.csvreader.CsvReader;
import com.opensymphony.xwork2.Action;
@@ -38,6 +37,13 @@
// -
// Dependencies
// -
+
+private OrganisationUnitService organisationUnitService;
+
+public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+{
+this.organisationUnitService = organisationUnitService;
+}
private CurrentUserService currentUserService;
@@ -67,6 +73,13 @@
this.modelTypeService = modelTypeService;
}
+private JdbcTemplate jdbcTemplate;
+
+public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+{
+this.jdbcTemplate = jdbcTemplate;
+}
+
// -
// Getter Setter
// -
@@ -120,7 +133,9 @@
*/
ModelType refrigeratorModel = modelTypeService.getModelTypeByName( Refrigerator Catalog );
-importRefrigeratorCatalogData( uncompressedFolderPath, refrigeratorModel );
+importAdminHierarchy( uncompressedFolderPath );
+
+//importRefrigeratorCatalogData( uncompressedFolderPath, refrigeratorModel, lookupDataMap );
/*
for( String lookupKey : lookupDataMap.keySet() )
@@ -145,7 +160,91 @@
return SUCCESS;
}
-public void importRefrigeratorCatalogData( String refrigeratorCatalogDataCSVFilePath, ModelType refrigeratorModel )
+public void importAdminHierarchy( String adminHierarchyCSVFilePath )
+{
+ adminHierarchyCSVFilePath += File.separator + AdminHierarchy.csv;
+
+ MapInteger, ListOrganisationUnit levelwiseOrgunits = new HashMapInteger, ListOrganisationUnit();
+ MapInteger, OrganisationUnit orgUnitMap = new HashMapInteger, OrganisationUnit();
+
+ ListInteger ouLevels = new ArrayListInteger();
+
+ try
+ {
+ CsvReader csvReader = new CsvReader( adminHierarchyCSVFilePath, ',', Charset.forName( UTF-8 ) );
+ csvReader.readHeaders();
+ String headers[] = csvReader.getHeaders();
+
+ Integer colCount = headers.length;
+ while( csvReader.readRecord() )
+ {
+ String nodeId = csvReader.get( NodeID );
+ String ouName = csvReader.get( Name );
+ Integer ouLevel = Integer.parseInt( csvReader.get( Level ) );
+ String parentId = csvReader.get( Parent );
+ String ouCode = csvReader.get( Code );
+
+
Re: [Dhis2-devs] Urgent: Analytics Tables Not Generating or Populating
This bug has been fixed and back-ported to version 2.13. It was a weakness which only surfaced when having UIDs in the system starting with a numeric character, meaning they must have been created outside DHIS and imported. A consequence, related to upgrading to the latest 2.13 build, is that the analytics tables must be re-generated for the system to work properly, so a tip is up upgrade shortly before the scheduled analytics task is being run. Lars ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13043: Add comments for service methods in CaseAggregationCondition
revno: 13043
committer: Tran Chau tran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-11-28 14:29:37 +0700
message:
Add comments for service methods in CaseAggregationCondition
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.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/caseaggregation/CaseAggregationConditionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java 2013-11-28 06:19:32 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java 2013-11-28 07:29:37 +
@@ -34,9 +34,11 @@
import org.hisp.dhis.common.Grid;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.datavalue.DataValue;
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientAttribute;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.program.Program;
@@ -48,32 +50,126 @@
*/
public interface CaseAggregationConditionService
{
+/**
+ * Adds an {@link CaseAggregationCondition}
+ *
+ * @param patientAttributeGroup The to CaseAggregationCondition add.
+ *
+ * @return A generated unique id of the added
+ * {@link CaseAggregationCondition}.
+ */
int addCaseAggregationCondition( CaseAggregationCondition caseAggregationCondition );
+/**
+ * Updates a {@link CaseAggregationCondition}.
+ *
+ * @param patientAttributeGroup the CaseAggregationCondition to update.
+ */
void updateCaseAggregationCondition( CaseAggregationCondition caseAggregationCondition );
+/**
+ * Deletes a {@link CaseAggregationCondition}.
+ *
+ * @param patientAttributeGroup the CaseAggregationCondition to delete.
+ */
void deleteCaseAggregationCondition( CaseAggregationCondition caseAggregationCondition );
+/**
+ * Returns a {@link CaseAggregationCondition}.
+ *
+ * @param id the id of the CaseAggregationCondition to return.
+ *
+ * @return the CaseAggregationCondition with the given id
+ */
CaseAggregationCondition getCaseAggregationCondition( int id );
+/**
+ * Returns a {@link CaseAggregationCondition} with a given name.
+ *
+ * @param name the name of the CaseAggregationCondition to return.
+ *
+ * @return the CaseAggregationCondition with the given name, or null if no
+ * match.
+ */
CaseAggregationCondition getCaseAggregationCondition( String name );
+/**
+ * Returns all {@link CaseAggregationCondition}
+ *
+ * @return A collection of all CaseAggregationCondition, or an empty
+ * collection if there are no CaseAggregationConditions.
+ */
CollectionCaseAggregationCondition getAllCaseAggregationCondition();
+/**
+ * Retrieve {@link CaseAggregationCondition} by a {@link DataElement}
+ *
+ * @param dataElement DataElement
+ *
+ * @return A collection of CaseAggregationCondition
+ */
CollectionCaseAggregationCondition getCaseAggregationCondition( DataElement dataElement );
+/**
+ * Retrieve a {@link CaseAggregationCondition} by a {@link DataElement} and
+ * {@link DataElementCategoryOptionCombo}
+ *
+ * @param dataElement DataElement
+ * @param optionCombo DataElementCategoryOptionCombo
+ *
+ * @return A CaseAggregationCondition
+ */
CaseAggregationCondition getCaseAggregationCondition( DataElement dataElement,
DataElementCategoryOptionCombo optionCombo );
+/**
+ * Retrieve a {@link CaseAggregationCondition} by a collection of
+ * {@link DataElement}
+ *
+ * @param dataElements DataElement collection
+ *
+ * @return A collection of CaseAggregationCondition
+ */
CollectionCaseAggregationCondition getCaseAggregationCondition( CollectionDataElement dataElements );
+/**
+ * Retrieve a collection of {@link DataElement} by a
+ * {@link CaseAggregationCondition} formula
+ *
+ * @param aggregationExpression Aggregate Expression
+ *
+ *
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13044: update to spring 3.2.5
revno: 13044 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2013-11-28 08:38:50 +0100 message: update to spring 3.2.5 modified: dhis-2/pom.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2013-10-28 13:17:58 + +++ dhis-2/pom.xml 2013-11-28 07:38:50 + @@ -934,7 +934,7 @@ properties rootDir/rootDir project.build.sourceEncodingUTF-8/project.build.sourceEncoding -spring.version3.2.4.RELEASE/spring.version +spring.version3.2.5.RELEASE/spring.version spring.security.version3.1.4.RELEASE/spring.security.version hibernate.version4.2.0.Final/hibernate.version hibernate-validator.version4.3.1.Final/hibernate-validator.version ___ 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
