[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16775: set flush frequence in event import to 20 instead of 100 to speed up import

2014-09-23 Thread noreply

revno: 16775
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 14:15:21 +0700
message:
  set flush frequence in event import to 20 instead of 100 to speed up import
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.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/event/JacksonEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java	2014-04-04 21:24:04 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java	2014-09-23 07:15:21 +
@@ -66,6 +66,8 @@
 @Autowired
 private SessionFactory sessionFactory;
 
+private final int FLUSH_FREQUENCY = 20;
+
 // -
 // EventService Impl
 // -
@@ -141,7 +143,7 @@
 {
 importSummaries.addImportSummary( addEvent( event, importOptions ) );
 
-if ( counter % 100 == 0 )
+if ( counter % FLUSH_FREQUENCY == 0 )
 {
 sessionFactory.getCurrentSession().flush();
 sessionFactory.getCurrentSession().clear();
@@ -217,7 +219,7 @@
 {
 importSummaries.addImportSummary( addEvent( event, importOptions ) );
 
-if ( counter % 100 == 0 )
+if ( counter % FLUSH_FREQUENCY == 0 )
 {
 sessionFactory.getCurrentSession().flush();
 sessionFactory.getCurrentSession().clear();

___
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 16776: Renamed 'Average' aggregation operator to 'Average (Sum in org unit hierarchy)', which is more de...

2014-09-23 Thread noreply

revno: 16776
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 09:43:22 +0200
message:
  Renamed 'Average' aggregation operator to 'Average (Sum in org unit 
hierarchy)', which is more descriptive of what it actually does.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
  
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DataQueryGroupsTest.java
  
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/QueryPlannerTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/AverageBoolAggregator.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/AverageIntAggregator.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/AverageIntSingleValueAggregator.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceAggregationLevelsTest.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceOrgUnitTest.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTimeDimensionTest.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/AggregationOperatorTypeHandler.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14TypeHandler.java
  
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14ExpressionConverterTest.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementPeriodTypeAllowAverageFilter.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java	2014-09-22 12:42:22 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java	2014-09-23 07:43:22 +
@@ -34,7 +34,7 @@
 public enum AggregationType
 {
 SUM( sum ), 
-AVERAGE_INT( avg_int ), 
+AVERAGE_SUM_INT( avg_int ), // Sum in organisation unit hierarchy
 AVERAGE_INT_DISAGGREGATION( avg_int_disaggregation ), 
 AVERAGE_BOOL( avg ), 
 COUNT( count ), 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2014-09-22 16:43:21 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2014-09-23 07:43:22 +
@@ -99,7 +99,7 @@
 public static final String VALUE_TYPE_LONG_TEXT = longText;
 
 public static final String AGGREGATION_OPERATOR_SUM = sum;
-public static 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16777: Fixed bug - The attribtue values doesn't displayed properly in sms messsage ( Schedule automated ...

2014-09-23 Thread noreply

revno: 16777
committer: Tran Chautran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 15:08:17 +0700
message:
  Fixed bug - The attribtue values doesn't displayed properly in sms messsage ( 
Schedule automated message reminder function )
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderService.java
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.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/trackedentity/TrackedEntityInstanceReminder.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java	2014-06-13 10:58:05 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java	2014-09-23 08:08:17 +
@@ -28,11 +28,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.regex.Pattern;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.IdentifiableObject;
@@ -50,6 +53,10 @@
 {
 private static final long serialVersionUID = 3101502417481903219L;
 
+public static final String ATTRIBUTE = attributeid;
+ 
+public static final Pattern ATTRIBUTE_PATTERN = Pattern.compile( \\{( + ATTRIBUTE + )=(\\w+)\\} );
+
 public static final String DUE_DATE_TO_COMPARE = duedate;
 
 public static final String ENROLLEMENT_DATE_TO_COMPARE = enrollmentdate;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderService.java	2014-03-18 08:10:10 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderService.java	2014-09-23 08:08:17 +
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.List;
 import java.util.Set;
 
 import org.hisp.dhis.i18n.I18nFormat;
@@ -107,4 +108,6 @@
  * @return The list of DHIS users
  */
 SetUser getUsers( TrackedEntityInstanceReminder instanceReminder, TrackedEntityInstance instance );
+
+ListString getAttributeUids( String message );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2014-08-31 09:04:30 +
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2014-09-23 08:08:17 +
@@ -56,6 +56,8 @@
 import org.hisp.dhis.system.util.TextUtils;
 import org.hisp.dhis.trackedentity.TrackedEntityInstance;
 import org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder;
+import org.hisp.dhis.trackedentity.TrackedEntityInstanceReminderService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
 /**
@@ -76,6 +78,9 @@
 this.programInstanceService = programInstanceService;
 }
 
+@Autowired
+private TrackedEntityInstanceReminderService reminderService;
+
 // -
 // Implemented methods
 // -
@@ -133,10 +138,24 @@
 
 while ( rs.next() )
 {
-String message = ;
-for ( int i = 1; i = cols; i++ )
+String message = rs.getString( templatemessage );
+
+ListString attributeUids = reminderService.getAttributeUids( message );
+SqlRowSet attributeValueRow = jdbcTemplate
+.queryForRowSet( select tea.uid ,teav.value from trackedentityattributevalue teav 
++  INNER JOIN trackedentityattribute tea on 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16779: Code style

2014-09-23 Thread noreply

revno: 16779
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 11:51:00 +0200
message:
  Code style
modified:
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.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-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2014-09-23 08:08:17 +
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2014-09-23 09:51:00 +
@@ -132,8 +132,6 @@
 
 SqlRowSet rs = jdbcTemplate.queryForRowSet( sql );
 
-int cols = rs.getMetaData().getColumnCount();
-
 CollectionSchedulingProgramObject schedulingProgramObjects = new HashSet();
 
 while ( rs.next() )
@@ -156,17 +154,17 @@
 message = message.replaceAll( key, value );
 }  
   
-String organisationunitName = rs.getString( orgunitName );
-String programName = rs.getString( programName );
-String programStageName = rs.getString( programStageName );
-String daysSinceDueDate = rs.getString( days_since_due_date );
-String dueDate = rs.getString( duedate ).split(   )[0];
+String organisationunitName = rs.getString( orgunitName );
+String programName = rs.getString( programName );
+String programStageName = rs.getString( programStageName );
+String daysSinceDueDate = rs.getString( days_since_due_date );
+String dueDate = rs.getString( duedate ).split(   )[0];
 
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_PROGRAM_NAME, programName );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_PROGAM_STAGE_NAME, programStageName );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_DUE_DATE, dueDate );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_ORGUNIT_NAME, organisationunitName );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_DAYS_SINCE_DUE_DATE, daysSinceDueDate );
+message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_PROGRAM_NAME, programName );
+message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_PROGAM_STAGE_NAME, programStageName );
+message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_DUE_DATE, dueDate );
+message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_ORGUNIT_NAME, organisationunitName );
+message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_DAYS_SINCE_DUE_DATE, daysSinceDueDate );
 
 
 SchedulingProgramObject schedulingProgramObject = new SchedulingProgramObject();

___
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] SMS Gateway Registration Error

2014-09-23 Thread Pamod Amarakoon
I'm still having this issue. Anybody could suggest a solution pls.

Thanx

On Sat, Sep 13, 2014 at 6:49 PM, Pamod Amarakoon pam...@gmail.com wrote:

 is this something similar to what's mentioned at

 https://code.google.com/p/smslib/issues/detail?id=385

 if so, how to start dhis with

 Dsmslib.serial.polling

 Thanx


 On Sat, Sep 13, 2014 at 4:42 PM, Pamod Amarakoon pam...@gmail.com wrote:

 Ok. got DHIS2 working again after clearing data in sms_config row in
 systemsettings table. Wonder what's causing system to crash in the sms
 settings I entered

 On Sat, Sep 13, 2014 at 2:26 PM, Pamod Amarakoon pam...@gmail.com
 wrote:

 Hi All,

 I was testing kannel on my local ubuntu server. I could setup Kannel,
 send and receive sms.

 then I tried to setup DHIS2 Live running on Ubuntu tomcat+PGSQL to use
 Kannel as sms gateway using usb modem. I could enter details of new sms
 gateway and on completion, dhis live server started not responding and
 noticed java exception on catalina.out.I closed the live version and
 restarted and it failed to restart.

 Thinking it was something to do with live version I tried to start
 tomcat version of DHIS2 on ubuntu linking to same PGSQL on ubuntu. But this
 instance also failed to start.

 I have attached herewith the catalina.out, I assume this is something to
 do with sms gateway registration info I have provided which is tored in DB.
 What may be going wrong here?

 Thank you


 --
 Pamod




 --
 Pamod




 --
 Pamod




-- 
Pamod
___
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 16780: event capture - empty form validation during registration and free text data entry for string typ...

2014-09-23 Thread noreply

revno: 16780
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 12:48:24 +0200
message:
  event capture - empty form validation during registration and free text data 
entry for string type dataelements
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.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-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json	2014-08-21 16:30:01 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json	2014-09-23 10:48:24 +
@@ -33,6 +33,8 @@
 done: Done,
 remove: Remove,
 are_you_sure_to_remove: Are you sure you want to remove the selected item?,
+empty_form: Empty form,
+please_fill_at_least_one_dataelement: Your form is empty. Please fill at least one dataelement.,
 use_custom_form: Custom form,
 use_default_form: Default form,
 print_list: Print list,

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2014-08-22 11:29:33 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2014-09-23 10:48:24 +
@@ -182,7 +182,7 @@
 /div
 
 /div
-/form  
+/form
 /div
 !-- event update / registration ends --
 /div

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2014-08-22 11:29:33 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2014-09-23 10:48:24 +
@@ -240,11 +240,11 @@
 
 delete $scope.dhis2Events[i].dataValues;
 }
-else{//event is empty, remove from grid
+/*else{//event is empty, remove from grid
 var index = $scope.dhis2Events.indexOf($scope.dhis2Events[i]);   
 $scope.dhis2Events.splice(index,1);
 i--;   
-}
+}*/
 }  
 
 if($scope.noteExists){
@@ -406,11 +406,27 @@
 }
 
 //the form is valid, get the values
+//but there could be a case where all dataelements are non-mandatory and
+//the event form comes empty, in this case enforce at least one value
+var valueExists = false;
 var dataValues = [];
 for(var dataElement in $scope.programStageDataElements){
+if($scope.currentEvent[dataElement]){
+valueExists = true;
+}
 dataValues.push({dataElement: dataElement, value: $scope.currentEvent[dataElement]});
 }
 
+if(!valueExists){
+var dialogOptions = {
+headerText: 'empty_form',
+bodyText: 'please_fill_at_least_one_dataelement'
+};
+
+DialogService.showDialog({}, dialogOptions);
+return false;
+}
+
 var newEvent = angular.copy($scope.currentEvent);
 
 //prepare the event to be created

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js	2014-08-28 12:23:08 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js	2014-09-23 10:48:24 +
@@ -249,13 +249,22 @@
 ' ng-required=programStageDataElements.' + deId + '.compulsory';
 }
   

[Dhis2-devs] dhis expert community

2014-09-23 Thread Lars Helge Øverland
Hi all,

we are happy to announce the DHIS 2 *expert community*. The expert
community is a group of people with expertise in DHIS 2 and experience from
DHIS 2-related project implementations.

The experts are available for consultancy services and can assist with
project planning and advice, DHIS 2 customization and configuration,
training of users and more. You can find the directory of experts here:


https://www.dhis2.org/expert-community


Establishing this community is an effort for increasing the capacity to
support the growing number of DHIS 2-related projects.

We hope that organisations and countries that seek to use DHIS 2 will find
this helpful.


regards,

Lars


PS 1.

On dhis2.org you will find the page from overview  expert community.

PS 2.

Please share this info with relevant people.
___
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 16781: Analytics, renamed AggregationType.AVERAGE_INT_DISAGGREGATION to AVERAGE_SUM_INT_DISAGGREGATION

2014-09-23 Thread noreply

revno: 16781
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 13:41:51 +0200
message:
  Analytics, renamed AggregationType.AVERAGE_INT_DISAGGREGATION to 
AVERAGE_SUM_INT_DISAGGREGATION
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
  
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsManagerTest.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/analytics/AggregationType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java	2014-09-23 07:43:22 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java	2014-09-23 11:41:51 +
@@ -35,7 +35,7 @@
 {
 SUM( sum ), 
 AVERAGE_SUM_INT( avg_int ), // Sum in organisation unit hierarchy
-AVERAGE_INT_DISAGGREGATION( avg_int_disaggregation ), 
+AVERAGE_SUM_INT_DISAGGREGATION( avg_int_disaggregation ), 
 AVERAGE_BOOL( avg ), 
 COUNT( count ), 
 STDDEV( stddev ), 

=== 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	2014-09-23 07:43:22 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2014-09-23 11:41:51 +
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import static org.hisp.dhis.analytics.AggregationType.AVERAGE_INT_DISAGGREGATION;
+import static org.hisp.dhis.analytics.AggregationType.AVERAGE_SUM_INT_DISAGGREGATION;
 import static org.hisp.dhis.common.DimensionType.DATASET;
 import static org.hisp.dhis.common.DimensionType.ORGANISATIONUNIT;
 import static org.hisp.dhis.common.DimensionType.ORGANISATIONUNIT_GROUPSET;
@@ -657,7 +657,7 @@
  */
 public void replaceAggregationPeriodsWithDataPeriods( ListMapNameableObject, NameableObject dataPeriodAggregationPeriodMap )
 {
-if ( isAggregationType( AVERAGE_INT_DISAGGREGATION )  dataPeriodType != null )
+if ( isAggregationType( AVERAGE_SUM_INT_DISAGGREGATION )  dataPeriodType != null )
 {
 this.periodType = this.dataPeriodType.getName();
 

=== 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	2014-09-23 07:43:22 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2014-09-23 11:41:51 +
@@ -30,7 +30,7 @@
 
 import static org.hisp.dhis.analytics.AggregationType.AVERAGE_BOOL;
 import static org.hisp.dhis.analytics.AggregationType.AVERAGE_SUM_INT;
-import static org.hisp.dhis.analytics.AggregationType.AVERAGE_INT_DISAGGREGATION;
+import static org.hisp.dhis.analytics.AggregationType.AVERAGE_SUM_INT_DISAGGREGATION;
 import static org.hisp.dhis.analytics.AggregationType.SUM;
 import static org.hisp.dhis.analytics.DataQueryParams.LEVEL_PREFIX;
 import static org.hisp.dhis.common.DimensionalObject.CATEGORYOPTIONCOMBO_DIM_ID;
@@ -242,7 +242,7 @@
 
 for ( DataQueryParams byAggregationType : groupedByAggregationType )
 {
-if ( AVERAGE_INT_DISAGGREGATION.equals( byAggregationType.getAggregationType() ) )
+if ( AVERAGE_SUM_INT_DISAGGREGATION.equals( byAggregationType.getAggregationType() ) )
 {
 ListDataQueryParams groupedByDataPeriodType = groupByDataPeriodType( byAggregationType );
 
@@ -734,7 +734,7 @@
 }
 else
 {
-aggregationType = AVERAGE_INT_DISAGGREGATION;
+aggregationType = AVERAGE_SUM_INT_DISAGGREGATION;
 }
 }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java'
--- 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16782: Analytics, changed some values in AggrgationType enums

2014-09-23 Thread noreply

revno: 16782
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 14:47:54 +0200
message:
  Analytics, changed some values in AggrgationType enums
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.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/analytics/AggregationType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java	2014-09-23 11:41:51 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java	2014-09-23 12:47:54 +
@@ -34,8 +34,8 @@
 public enum AggregationType
 {
 SUM( sum ), 
-AVERAGE_SUM_INT( avg_int ), // Sum in organisation unit hierarchy
-AVERAGE_SUM_INT_DISAGGREGATION( avg_int_disaggregation ), 
+AVERAGE_SUM_INT( avg_sum_int ), // Sum in organisation unit hierarchy
+AVERAGE_SUM_INT_DISAGGREGATION( avg_sum_int_disaggregation ), 
 AVERAGE_BOOL( avg ), 
 COUNT( count ), 
 STDDEV( stddev ), 

___
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 16783: Minor

2014-09-23 Thread noreply
Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 16783 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 16:03:47 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js	2014-09-23 08:06:18 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js	2014-09-23 14:00:35 +
@@ -2096,15 +2096,19 @@
 return '';
 }
 
-if (config.htmlValue || Ext.isBoolean(config.htmlValue)) {
+if (Ext.isBoolean(config.htmlValue)) {
 return config.htmlValue;
 }
 
-if (config.value) {
-return value;
-}
-
-return '';
+if (config.htmlValue  isValue) {
+return Ext.isNumber(parseFloat(config.htmlValue)) ? parseFloat(config.htmlValue).toString() : config.htmlValue;
+}
+
+if (config.value  isValue) {
+return Ext.isNumber(parseFloat(config.value)) ? parseFloat(config.value).toString() : config.value;
+}
+
+return config.htmlValue || '';
 };
 
 	if (!Ext.isObject(config)) {

___
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 16784: Fixed bug - Exception thrown when to run aggregate query build formulas.

2014-09-23 Thread noreply

revno: 16784
committer: Tran Chautran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 21:49:00 +0700
message:
  Fixed bug - Exception thrown when to run aggregate query build formulas.
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml
  
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-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml	2014-09-23 03:23:50 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml	2014-09-23 14:49:00 +
@@ -10,7 +10,7 @@
   generator class=native /
 /id
 
-set name=recipients table=outbound_sms_recipients fetch=join
+set name=recipients table=outbound_sms_recipients
   key column=outbound_sms_id /
   element type=text/
 /set

=== 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-09-22 14:40:22 +
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java	2014-09-23 14:49:00 +
@@ -982,7 +982,7 @@
 
 if (programId != null) 
 {
-sql +=  AND_pi.programid ;
+sql +=  AND _pi.programid =  + programId;
 }
  
 if (programId != null)

___
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 16785: Put fetch=join in OutboundSms.hbm.xml file again. Just removed it by mistake.

2014-09-23 Thread noreply

revno: 16785
committer: Tran Chautran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 22:00:12 +0700
message:
  Put fetch=join in  OutboundSms.hbm.xml file again. Just removed it by mistake.
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml	2014-09-23 14:49:00 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml	2014-09-23 15:00:12 +
@@ -10,7 +10,7 @@
   generator class=native /
 /id
 
-set name=recipients table=outbound_sms_recipients
+set name=recipients table=outbound_sms_recipients fetch=join
   key column=outbound_sms_id /
   element type=text/
 /set

___
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 16786: Fixed bug - The attribtue values doesn't displayed properly in sms messsages of program-instances...

2014-09-23 Thread noreply

revno: 16786
committer: Tran Chautran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-09-23 22:47:39 +0700
message:
  Fixed bug - The attribtue values doesn't displayed properly in sms messsages 
of program-instances ( Schedule automated message reminder function )
modified:
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.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-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java	2014-08-15 07:40:20 +
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java	2014-09-23 15:47:39 +
@@ -28,6 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projections;
@@ -38,15 +44,13 @@
 import org.hisp.dhis.program.ProgramInstance;
 import org.hisp.dhis.program.ProgramInstanceStore;
 import org.hisp.dhis.program.SchedulingProgramObject;
+import org.hisp.dhis.system.util.TextUtils;
 import org.hisp.dhis.trackedentity.TrackedEntityInstance;
 import org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder;
+import org.hisp.dhis.trackedentity.TrackedEntityInstanceReminderService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-
 /**
  * @author Abyot Asalefew
  */
@@ -54,6 +58,9 @@
 extends HibernateIdentifiableObjectStoreProgramInstance
 implements ProgramInstanceStore
 {
+@Autowired
+private TrackedEntityInstanceReminderService reminderService;
+
 // -
 // Implemented methods
 // -
@@ -258,27 +265,41 @@
 
 while ( rs.next() )
 {
-String message = ;
-for ( int i = 1; i = cols; i++ )
+ String message = rs.getString( templatemessage );
+
+ListString attributeUids = reminderService.getAttributeUids( message );
+SqlRowSet attributeValueRow = jdbcTemplate
+.queryForRowSet( select tea.uid ,teav.value from trackedentityattributevalue teav 
++  INNER JOIN trackedentityattribute tea on tea.trackedentityattributeid=teav.trackedentityattributeid 
++  INNER JOIN programinstance ps on teav.trackedentityinstanceid=ps.trackedentityinstanceid 
++  INNER JOIN programstageinstance psi on ps.programinstanceid=psi.programinstanceid 
++  where tea.uid in (  + TextUtils.getQuotedCommaDelimitedString( attributeUids ) + )  );
+
+while ( attributeValueRow.next() )
 {
-message = rs.getString( templatemessage );
-String organisationunitName = rs.getString( orgunitName );
-String programName = rs.getString( programName );
-String incidentDate = rs.getString( dateofincident ).split(   )[0];
-String daysSinceIncidentDate = rs.getString( days_since_incident_date );
-String erollmentDate = rs.getString( enrollmentdate ).split(   )[0];
-String daysSinceEnrollementDate = rs.getString( days_since_erollment_date );
-
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_PROGRAM_NAME, programName );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_ORGUNIT_NAME, organisationunitName );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_INCIDENT_DATE, incidentDate );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_ENROLLMENT_DATE, erollmentDate );
-message = message.replace( TrackedEntityInstanceReminder.TEMPLATE_MESSSAGE_DAYS_SINCE_ENROLLMENT_DATE,
-daysSinceEnrollementDate );
-message = message.replace( 

[Dhis2-devs] Last 12 months -- no values but last 3 months -- have values

2014-09-23 Thread Ngoc Thanh Nguyen
Is this a bug?

[image: Inline image 1]

[image: Inline image 2]
___
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 - Event capture error

2014-09-23 Thread Robin Martens
Hi devs,

I would like to ask your attention one more time for 2 bugs (?) as we're now 
very close to testing and system production:


1.   409 conflict error given in event reports and impossibility to export 
more than 1 event, probably an error on analytics level (please see below)

2.   In Single event without registration, I have a date data element which 
is marked as Allow for future in the program stage settings but still does 
not allow future dates. Recreating the data elements or programs does not help. 
There's no error log. I managed to recreate the bug on the Demo server (program 
test, data element test) with the same results. Is this a bug?

Kind regards,

Robin

From: Robin Martens
Sent: 18 September 2014 13:06
To: 'Abyot Gizaw'
Cc: DHIS 2 Developers list
Subject: RE: [Dhis2-devs] DHIS2 - Event capture error

Hi Abyot,

Analytics has no effect, let me try to give you some more details:


· Event reports on individual cases work, but when swapping to 
aggregated cases gives the 409 conflict. The aggregated case table doesn't show.

· When downloading, only the first entry is in the export file, all 
others are not.

· This issue is for each and every program I with single event without 
registration.

Actually, my program instances were not deleted, I was merely thinking about 
it. I deleted one duplicate program instance however, and that solved my 
previous problem. You're probably right that the problems are linked.

This is the query reported by catalina (only INFO, no WARN or ERROR):

* INFO  2014-09-18 12:50:28,945 Time: 6047 micros: Analytics event aggregate 
SQL: select count(psi) as value,uidlevel3,yearly,CNsby5YXfwg from 
analytics_event_2014_zxpbxmexqlw where Yearly in ('2014') and (uidlevel3 = 
'I0VKkMOZxpX' or uidlevel3 = 'glgeSKFNXPa' or uidlevel3 = 'KXilAievUdU' or 
uidlevel3 = 'z2zryIhRXae' or uidlevel3 = 'D8BN7nadgnq' or uidlevel3 = 
'vnSd7A99aQq' or uidlevel3 = 'BOFb4akeNH3' or uidlevel3 = 'ULF8Ho2cfD7' or 
uidlevel3 = 'B2RgtXQ2qes' or uidlevel3 = 'wzLzzvCxYKi' or uidlevel3 = 
'a8E8JE43lO9' or uidlevel3 = 'qXuzuo4CNka' or uidlevel3 = 'Jk5fEbW2MRy' or 
uidlevel3 = 'rHOAciJo2rS' or uidlevel3 = 'N3WWpd56AF7' or uidlevel3 = 
'lp9neuproli' or uidlevel3 = 'kDMzUcY2ZVF' or uidlevel3 = 'k16oIshfkwk' or 
uidlevel3 = 'UNA6CawrQhK' or uidlevel3 = 'l250JocutpA' or uidlevel3 = 
'PByvDxpbibx' or uidlevel3 = 'DgPyE1KSE4N' or uidlevel3 = 'wnSidr8A3Pw' or 
uidlevel3 = 'XmH5uCIONk4' or uidlevel3 = 'yJbg2GIMdnc' or uidlevel3 = 
'bcU1Jq7BOKq' or uidlevel3 = 'CeEl2ug1n6w' or uidlevel3 = 'iq4s71gcYF4' or 
uidlevel3 = 'SO5Czg58s82' or uidlevel3 = 'L6qT9m4jIOF' ) and ps = 'ZHScYfgW1HR' 
group by uidlevel3,yearly,CNsby5YXfwg limit 1 (Timer.java 
[http-bio-8080-exec-1])

I also put my program tables in annex.

Regards,

Robin

From: Abyot Gizaw [mailto:aby...@gmail.com]
Sent: 18 September 2014 12:33
To: Robin Martens
Cc: DHIS 2 Developers list
Subject: Re: [Dhis2-devs] DHIS2 - Event capture error

Hi Robin,

More details would be nice.

Often, the 409 conflict happens when there is a mismatch in identifiers. And I 
guess this is related to the earlier problem you reported, that all your 
program instances are deleted. Try to re-run the analytic and see what happens.

---
Thank you,
Abyot.

On Thu, Sep 18, 2014 at 11:50 AM, Robin Martens 
mart...@sher.bemailto:mart...@sher.be wrote:
Hi devs,

Sorry to bother you but it's pretty urgent. Do you have any idea about the 
error below?

Thanks a lot!

Robin

From: Robin Martens
Sent: 17 September 2014 17:06
To: 'Abyot Gizaw'
Cc: DHIS 2 Developers list
Subject: RE: [Dhis2-devs] DHIS2 - Event capture error

I'm again on the events, reporting here. When generating any random event 
report previously generated without problems (i.e. before upgrading), it gives 
the following error in Chrome Console (none in catalina):

GET 
http://xx.xx.xx.xx:xx/api/analytics/events/aggregate/Rz3Kk3wc7Hr.json?stage=O6kuhQjsj9bdimension=pe:THIS_YEARdimension=AWDGkLx05Wufilter=ou:l01au4APkBP
 409 Conflict

Most tables don't work, and those that do work can only export a single row 
when downloading (similar error).

The demo apparently doesn't show this issue. Any idea if this is linked to the 
upgrade? I'm in 16431 now.

Robin

From: Abyot Gizaw [mailto:aby...@gmail.com]
Sent: 17 September 2014 14:24
To: Robin Martens
Cc: DHIS 2 Developers list
Subject: Re: [Dhis2-devs] DHIS2 - Event capture error

You mean you custom form is not shown? If you are using chrome, do you see any 
log by pressing F12?


---
Thank you,
Abyot.

On Wed, Sep 17, 2014 at 1:13 PM, Robin Martens 
mart...@sher.bemailto:mart...@sher.be wrote:
To add a point (after checking my other programs for event capture): there is 
one for which my custom data form is invisible in event capture but still there 
for editing. It's a different one from the one with the error message below. 
There's no error log on this one when loading the template.

How can this happen?

Kind regards,


[Dhis2-devs] [Bug 1373147] [NEW] Pivot Table: data elements panel doesn't populate when details is selected

2014-09-23 Thread Rodolfo Melia
Public bug reported:

See attached image

** Affects: dhis2
 Importance: Undecided
 Status: New

** Attachment added: Screen Shot 2014-09-23 at 22.52.50.png
   
https://bugs.launchpad.net/bugs/1373147/+attachment/4212877/+files/Screen%20Shot%202014-09-23%20at%2022.52.50.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/1373147

Title:
  Pivot Table: data elements panel doesn't populate when details is
  selected

Status in DHIS 2:
  New

Bug description:
  See attached image

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1373147/+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] [Bug 1373147] [NEW] Pivot Table: data elements panel doesn't populate when details is selected

2014-09-23 Thread Jason Pickering
I have also see this happen on a 2.16 instance and suspect it is related to
faulty category combo options. Please check your logs and see if there are
any exceptions. Also, have you altered the COCs of these data elements?
Does it work for some data elements and not others?

Regards,
Jason


On Tue, Sep 23, 2014 at 11:58 PM, Rodolfo Melia rme...@knowming.com wrote:

 Public bug reported:

 See attached image

 ** Affects: dhis2
  Importance: Undecided
  Status: New

 ** Attachment added: Screen Shot 2014-09-23 at 22.52.50.png

 https://bugs.launchpad.net/bugs/1373147/+attachment/4212877/+files/Screen%20Shot%202014-09-23%20at%2022.52.50.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/1373147

 Title:
   Pivot Table: data elements panel doesn't populate when details is
   selected

 Status in DHIS 2:
   New

 Bug description:
   See attached image

 To manage notifications about this bug go to:
 https://bugs.launchpad.net/dhis2/+bug/1373147/+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




-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+46764147049
___
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 1373147] [NEW] Pivot Table: data elements panel doesn't populate when details is selected

2014-09-23 Thread Juan Manuel Alcantara Acosta
This problem happens only when you select a group of data elements, selecting 
[ all data elements ] the list populates correctly, except that now tracker 
data elements are included.
JM

El 23/09/2014, a las 23:02, Jason Pickering jason.p.picker...@gmail.com 
escribió:

 I have also see this happen on a 2.16 instance and suspect it is related to 
 faulty category combo options. Please check your logs and see if there are 
 any exceptions. Also, have you altered the COCs of these data elements? Does 
 it work for some data elements and not others? 
 
 Regards,
 Jason
 
 
 On Tue, Sep 23, 2014 at 11:58 PM, Rodolfo Melia rme...@knowming.com wrote:
 Public bug reported:
 
 See attached image
 
 ** Affects: dhis2
  Importance: Undecided
  Status: New
 
 ** Attachment added: Screen Shot 2014-09-23 at 22.52.50.png

 https://bugs.launchpad.net/bugs/1373147/+attachment/4212877/+files/Screen%20Shot%202014-09-23%20at%2022.52.50.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/1373147
 
 Title:
   Pivot Table: data elements panel doesn't populate when details is
   selected
 
 Status in DHIS 2:
   New
 
 Bug description:
   See attached image
 
 To manage notifications about this bug go to:
 https://bugs.launchpad.net/dhis2/+bug/1373147/+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
 
 
 
 -- 
 Jason P. Pickering
 email: jason.p.picker...@gmail.com
 tel:+46764147049
 ___
 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