date:20131001


revno: 12343
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 09:04:49 +0200
message:
  Minor
modified:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.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/event/data/DefaultEventAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2013-09-29 21:05:46 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2013-10-01 07:04:49 +
@@ -187,7 +187,7 @@
 {
 IdentifiableObject item = queryItem.getItem();
 
-grid.addHeader( new GridHeader( item.getName(), item.getUid() ) );
+grid.addHeader( new GridHeader( item.getUid(), item.getName() ) );
 }
 
 // -

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-09-29 21:05:46 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-10-01 07:04:49 +
@@ -206,6 +206,10 @@
 // Supportive methods
 // -
 
+/**
+ * Returns the dynamic select columns. Dimensions come first and query items
+ * second.
+ */
 private String getSelectColumns( EventQueryParams params )
 {
 String sql = ;
@@ -267,11 +271,11 @@
 sql += and ps = ' + params.getProgramStage().getUid() + ' ;
 }
 
-for ( QueryItem filter : params.getItems() )
+for ( QueryItem item : params.getItems() )
 {
-if ( filter.hasFilter() )
+if ( item.hasFilter() )
 {
-sql += and lower( + filter.getItem().getUid() + )  + filter.getSqlOperator() +   + getSqlFilter( filter ) +  ;
+sql += and lower( + item.getItem().getUid() + )  + item.getSqlOperator() +   + getSqlFilter( item ) +  ;
 }
 }
 
@@ -286,6 +290,9 @@
 return sql;
 }
 
+/**
+ * Returns the filter value for the given query item.
+ */
 private String getSqlFilter( QueryItem item )
 {
 String operator = item.getOperator();

___
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 12345: remove unused method


revno: 12345
committer: Lai lai.hispviet...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 15:33:31 +0700
message:
  remove unused method
modified:
  
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java	2013-10-01 08:28:26 +
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java	2013-10-01 08:33:31 +
@@ -28,6 +28,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
@@ -44,7 +52,6 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.CalendarPeriodType;
 import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.period.YearlyPeriodType;
 import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.system.filter.OrganisationUnitWithDataSetsFilter;
@@ -60,14 +67,6 @@
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author Morten Olav Hansen morte...@gmail.com
  */
@@ -399,11 +398,4 @@
 return false;
 }
 
-public static String getIsoPeriod( PeriodType periodType )
-{
-if ( periodType.getName().equals(  ) )
-{}
-String result = ;
-return result;
-}
 }

___
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 12346: update some authorities in tracker controllers


revno: 12346
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 10:36:25 +0200
message:
  update some authorities in tracker controllers
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EnrollmentController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/PersonController.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EnrollmentController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EnrollmentController.java	2013-09-26 08:03:57 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EnrollmentController.java	2013-10-01 08:36:25 +
@@ -47,6 +47,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -88,7 +89,7 @@
 @RequestParam( value = program, required = false ) String programUid,
 @RequestParam( value = person, required = false ) String personUid,
 @RequestParam( value = status, required = false ) EnrollmentStatus status,
-@RequestParam MapString, String parameters, Model model, HttpServletRequest request ) throws NotFoundException
+@RequestParam MapString, String parameters, Model model ) throws NotFoundException
 {
 WebOptions options = new WebOptions( parameters );
 Enrollments enrollments;
@@ -152,6 +153,7 @@
 // -
 
 @RequestMapping( value = , method = RequestMethod.POST, consumes = MediaType.APPLICATION_XML_VALUE )
+@PreAuthorize(hasRole('ALL') or hasRole('F_PROGRAM_ENROLLMENT'))
 public void postEnrollmentXml( HttpServletRequest request, HttpServletResponse response ) throws IOException
 {
 ImportSummaries importSummaries = enrollmentService.saveEnrollmentsXml( request.getInputStream() );
@@ -176,6 +178,7 @@
 }
 
 @RequestMapping( value = , method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE )
+@PreAuthorize(hasRole('ALL') or hasRole('F_PROGRAM_ENROLLMENT'))
 public void postEnrollmentJson( HttpServletRequest request, HttpServletResponse response ) throws IOException
 {
 ImportSummaries importSummaries = enrollmentService.saveEnrollmentsJson( request.getInputStream() );
@@ -205,6 +208,7 @@
 
 @RequestMapping( value = /{id}, method = RequestMethod.PUT, consumes = MediaType.APPLICATION_XML_VALUE )
 @ResponseStatus( value = HttpStatus.NO_CONTENT )
+@PreAuthorize(hasRole('ALL') or hasRole('F_PROGRAM_UNENROLLMENT'))
 public void updateEnrollmentXml( @PathVariable String id, HttpServletRequest request, HttpServletResponse response ) throws IOException
 {
 ImportSummary importSummary = enrollmentService.updateEnrollmentXml( id, request.getInputStream() );
@@ -213,6 +217,7 @@
 
 @RequestMapping( value = /{id}, method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE )
 @ResponseStatus( value = HttpStatus.NO_CONTENT )
+@PreAuthorize(hasRole('ALL') or hasRole('F_PROGRAM_UNENROLLMENT'))
 public void updateEnrollmentJson( @PathVariable String id, HttpServletRequest request, HttpServletResponse response ) throws IOException
 {
 ImportSummary importSummary = enrollmentService.updateEnrollmentJson( id, request.getInputStream() );
@@ -221,7 +226,8 @@
 
 @RequestMapping( value = /{id}/cancelled, method = RequestMethod.PUT )
 @ResponseStatus( HttpStatus.NO_CONTENT )
-public void cancelEnrollment( @PathVariable String id, @RequestParam MapString, String parameters, Model model ) throws NotFoundException
+@PreAuthorize(hasRole('ALL') or hasRole('F_PROGRAM_UNENROLLMENT'))
+public void cancelEnrollment( @PathVariable String id ) throws NotFoundException
 {
 Enrollment enrollment = getEnrollment( id );
 enrollmentService.cancelEnrollment( enrollment );
@@ -229,7 +235,8 @@
 
 @RequestMapping( value = /{id}/completed, method = RequestMethod.PUT )
 @ResponseStatus( HttpStatus.NO_CONTENT )
-public void completedEnrollment( @PathVariable String id, @RequestParam MapString, String parameters, Model model ) throws NotFoundException

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 12347: Analytics, including yes only data elements in analytics tables


revno: 12347
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 10:49:54 +0200
message:
  Analytics, including yes only data elements in analytics tables
modified:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.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/table/JdbcAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java	2013-08-23 16:05:01 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java	2013-10-01 08:49:54 +
@@ -40,6 +40,7 @@
 
 import org.hisp.dhis.analytics.AnalyticsTable;
 import org.hisp.dhis.analytics.DataQueryParams;
+import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategory;
 import org.hisp.dhis.dataelement.DataElementGroupSet;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -126,9 +127,11 @@
 
 populateTable( table, cast(dv.value as  + dbl + ), int, intClause );
 
-populateTable( table, 1 , bool, dv.value = 'true' );
+populateTable( table, 1 , DataElement.VALUE_TYPE_BOOL, dv.value = 'true' );
 
-populateTable( table, 0 , bool, dv.value = 'false' );
+populateTable( table, 0 , DataElement.VALUE_TYPE_BOOL, dv.value = 'false' );
+
+populateTable( table, 1 , DataElement.VALUE_TYPE_TRUE_ONLY, dv.value = 'true' );
 }
 
 return 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 12348: Cleanup, removed interface methods for external period format


revno: 12348
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 10:54:05 +0200
message:
  Cleanup, removed interface methods for external period format
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/DefaultPeriodService.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java	2013-09-26 07:38:27 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java	2013-10-01 08:54:05 +
@@ -28,6 +28,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang.Validate;
+import org.hisp.dhis.common.view.SharingBasicView;
+import org.hisp.dhis.common.view.SharingDetailedView;
+import org.hisp.dhis.common.view.SharingExportView;
+import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserGroupAccess;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
@@ -35,20 +49,6 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.apache.commons.lang.Validate;
-import org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.SharingBasicView;
-import org.hisp.dhis.common.view.SharingDetailedView;
-import org.hisp.dhis.common.view.SharingExportView;
-import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserGroupAccess;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * @author Bob Jolliffe

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java	2013-08-23 15:56:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java	2013-10-01 08:54:05 +
@@ -167,17 +167,6 @@
 }
 
 /**
- * Generates an String which uniquely identifies this Period based on its
- * core properties.
- *
- * @return an identifier String.
- */
-public String getExternalId()
-{
-return periodType.getName() + SEPARATOR + getMediumDateString( startDate ) + SEPARATOR + getMediumDateString( endDate );
-}
-
-/**
  * Returns the frequency order of the period type of the period.
  *
  * @return the frequency order.

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java	2013-09-27 12:55:38 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java	2013-10-01 08:54:05 +
@@ -115,16 +115,6 @@
 CollectionPeriod getPeriods( CollectionInteger identifiers );
 
 /**
- * Generates the Period with the corresponding external identifier. If the
- * Period doesn't exist it will be created and persisted.
- * 
- * @param externalId the external identifier.
- * @return a Period.
- */
-@Deprecated
-Period getPeriodByExternalId( String externalId );
-
-/**
  * Returns all Periods with start date after or equal the specified start
  * date and end date before or equal the specified end date.
  * 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/DefaultPeriodService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/DefaultPeriodService.java	2013-09-27 12:55:38 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/DefaultPeriodService.java	2013-10-01 08:54:05 +
@@ -120,12 +120,6 @@
 } );
 }
 
-@Deprecated
-public Period getPeriodByExternalId( String externalId )
-{
-return periodStore.reloadForceAddPeriod( new Period( externalId ) );
-}
-
 public CollectionPeriod getPeriodsByPeriodType( PeriodType periodType )
 {
 return periodStore.getPeriodsByPeriodType(

Re: [Dhis2-devs] [Dhis2-users] Entering Monthly Data for Future Periods - beyond December 2013

2013-10-01 Thread Busoye Anifalaje

Hi Jason,

Your reply was much appreciated.

I had populated the period table with the months I needed and can actually
see this in the pdf data entry version (see attachments from previous
email). The problem I am having is that I can't see these months in the
data entry screen. Is there a way around this or anything else I need to do
to allow the later periods to be visible for data entry?

Many thanks.

Busoye



On 30 September 2013 07:11, Jason Pickering jason.p.picker...@gmail.comwrote:

 Hi Busoye,
 I think the problem is that these periods have not been generated yet. In
 the past, we have generated them using SQL. Something like


 INSERT INTO period
 SELECT nextval('hibernate_sequence'::regclass) as periodid ,
 (SELECT periodtypeid from periodtype where name = 'Monthly')  periodtypeid,
  (startdate + '1 year'::interval)::date as startdate,
  (enddate + '1 year'::interval)::date as enddate
  from period
  where periodtypeid = (SELECT periodtypeid from periodtype where name =
 'Monthly')
  and startdate = '2013-01-01' and enddate ='2013-12-31'

 This is a really basic statement, and would not check for things like
 periods which already exist so you might need to tweak it a bit.

 There should really be a method to pre-generate future periods, but I am
 not sure this exists.

 Regards,
 Jason




 On Sun, Sep 29, 2013 at 5:20 PM, Adebusoye Anifalaje bus...@hisp.orgwrote:

 Just an update

 I have added 2014 monthly data to the Period table. I still can't see the
 periods in the data entry screen (see file attached) but when I use the
 Get pdf for Data Entry function in the data set module, I can see the
 future periods displayed (see attached).

 Any insight would be much appreciated.

 Many thanks.

 Regards,
 Busoye


 On 29 Sep 2013, at 09:17, Adebusoye Anifalaje bus...@hisp.org wrote:

 Hi all,

 Can anyone help with getting around entering monthly data for future
 periods beyond what is available by default?

 I have a use case where users need to enter data for months in 2014
 (these are advance monthly payments) but currently the future periods
 allowed do not extend beyond December 2013. The Next Year function does
 not make a difference here.

 It is critical that the data is entered monthly rather than yearly. It is
 also important that users can enter data in (theoretically) unlimited
 periods in the future if the case arises that payment is made up until tim
 t.

 Thaks

 Busoye

 DHIS2.12
 Build: 11285
 ___
 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-users
 Post to : dhis2-us...@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-users
 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 12349: Moved project dhis-service-aggregationengine from dhis-services to local/in/dhis-in-services


revno: 12349
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 11:02:04 +0200
message:
  Moved project dhis-service-aggregationengine from dhis-services to 
local/in/dhis-in-services
renamed:
  dhis-2/dhis-services/dhis-service-aggregationengine-default/ = 
local/in/dhis-in-services/dhis-service-aggregationengine/
modified:
  dhis-2/dhis-services/pom.xml
  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/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml	2013-08-22 13:19:57 +
+++ dhis-2/dhis-services/pom.xml	2013-10-01 09:02:04 +
@@ -24,7 +24,6 @@
 moduledhis-service-core/module
 !-- Level 2 --
 moduledhis-service-administration/module
-moduledhis-service-aggregationengine-default/module
 moduledhis-service-datamart-default/module
 moduledhis-service-i18n/module
 moduledhis-service-patient/module

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2013-09-26 16:34:42 +
+++ dhis-2/pom.xml	2013-10-01 09:02:04 +
@@ -268,11 +268,6 @@
   /dependency
   dependency
 groupIdorg.hisp.dhis/groupId
-artifactIddhis-service-aggregationengine-default/artifactId
-version${project.version}/version
-  /dependency
-  dependency
-groupIdorg.hisp.dhis/groupId
 artifactIddhis-service-importexport/artifactId
 version${project.version}/version
   /dependency

=== renamed directory 'dhis-2/dhis-services/dhis-service-aggregationengine-default' = 'local/in/dhis-in-services/dhis-service-aggregationengine'
___
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] Observations

2013-10-01 Thread riddy ndoma

I'm Riddy Ndoma  from DRC. I wanted to make my oservations developers of
DHIS2 just to move the system.
I hope that adds personalization sections also allow the use of an
indicator in another indicator ... it will ease a lot.

-- 
Riddy NDOMA
Software Developer
*Skype:* riddyndoma, *G+:* riddyndoma, *FB:* riddy ndoma
*Twitter:* riddyndoma, *LinkedIn:* riddy ndoma
*Blog:* http://riddyndoma.blogspot.com/

Vous servir est mon désire (Serving you is my desire)
___
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 12352: Minor


revno: 12352
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 11:13:50 +0200
message:
  Minor
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/DefaultPdfDataEntryFormService.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/pdfform/DefaultPdfDataEntryFormService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/DefaultPdfDataEntryFormService.java	2013-08-23 16:05:01 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/DefaultPdfDataEntryFormService.java	2013-10-01 09:13:50 +
@@ -748,7 +748,7 @@
 
 for ( int i = 0; i  periods.size(); i++ )
 {
-periodValues[i] = periods.get( i ).getExternalId();
+periodValues[i] = periods.get( i ).getIsoDate(); //TODO update forms
 }
 
 return periodValues;

___
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] Observations

2013-10-01 Thread Ola Hodne Titlestad

Hi Riddy,

Thanks for sharing your ideas and suggestions for improvements with us.

To better understand your requirements it would be good if you could give
us some real life examples of what you need to achieve.
Then we can discuss what the best way to address that in DHIS 2 is.

Thanks.

Ola
---

--
Ola Hodne Titlestad (Mr)
HISP
Department of Informatics
University of Oslo

Mobile: +47 48069736
Home address: Eftasåsen 68, 0687 Oslo, Norway. Googlemaps
linkhttps://maps.google.com/maps?q=Eftas%C3%A5sen+68,+0687+Oslo,+Norgehl=enie=UTF8sll=59.893855,10.785116sspn=0.222842,0.585709oq=eftas%C3%A5sen+68,+0687+Oslo,+t=hhnear=Eftas%C3%A5sen+68,+%C3%98stensj%C3%B8,+0687+Oslo,+Norwayz=16

On 1 October 2013 11:08, riddy ndoma riddynd...@gmail.com wrote:

I'm Riddy Ndoma from DRC. I wanted to make my oservations developers of
DHIS2 just to move the system.
I hope that adds personalization sections also allow the use of an
indicator in another indicator ... it will ease a lot.

--
Riddy NDOMA
Software Developer
*Skype:* riddyndoma, *G+:* riddyndoma, *FB:* riddy ndoma
*Twitter:* riddyndoma, *LinkedIn:* riddy ndoma
*Blog:* http://riddyndoma.blogspot.com/

Vous servir est mon désire (Serving you is my desire)

___
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 12353: (Minor) Adjusted Akros logo.


revno: 12353
committer: Jason P. Pickering jason.p.picker...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 11:17:36 +0200
message:
  (Minor) Adjusted Akros logo.
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/akros.png


--
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/flags/akros.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/akros.png	2013-09-30 04:12:11 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/akros.png	2013-10-01 09:17:36 + differ
___
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 12351: minor fix


revno: 12351
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 11:11:23 +0200
message:
  minor fix
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java	2013-09-27 10:43:38 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java	2013-10-01 09:11:23 +
@@ -153,9 +153,9 @@
 allExportClasses.put( MapView.class, mapViews );
 allExportClasses.put( org.hisp.dhis.mapping.Map.class, maps );
 
+allExportClasses.put( UserAuthorityGroup.class, userRoles );
 allExportClasses.put( User.class, users );
 allExportClasses.put( UserGroup.class, userGroups );
-allExportClasses.put( UserAuthorityGroup.class, userRoles );
 
 allExportClasses.put( MessageConversation.class, messageConversations );
 allExportClasses.put( Interpretation.class, interpretations );

___
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 12354: Merge with lp:~sis-ma/dhis2/SISMA-84: allow import of users, clearing passwords

Merge authors:
  Leandro Soares (lssoares)
Related merge proposals:
  https://code.launchpad.net/~sis-ma/dhis2/SISMA-84/+merge/186329
  proposed by: Leandro Soares (lssoares)

revno: 12354 [merge]
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 11:34:05 +0200
message:
  Merge with lp:~sis-ma/dhis2/SISMA-84: allow import of users, clearing 
passwords
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
  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/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-08-25 21:44:57 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-09-18 13:26:26 +
@@ -209,9 +209,14 @@
  */
 public static boolean canWrite( User user, IdentifiableObject object )
 {
+SetString authorities = user != null ? user.getUserCredentials().getAllAuthorities() : new HashSetString();
+
+//TODO ( (object instanceof User)  canCreatePrivate( user, object ) ): review possible security breaches and best way to give update access upon user import
 if ( sharingOverrideAuthority( user )
 || (object.getUser() == null  canCreatePublic( user, object )  PRIVATE_AUTHORITIES.get( object.getClass() ) != null)
 || user.equals( object.getUser() )
+//|| authorities.contains( PRIVATE_AUTHORITIES.get( object.getClass() ) )
+|| ( (object instanceof User)  canCreatePrivate( user, object ) )
 || AccessStringHelper.canWrite( object.getPublicAccess() ) )
 {
 return true;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-08-23 15:56:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-09-18 13:26:26 +
@@ -97,6 +97,7 @@
 
 private Date lastCheckedInterpretations;
 
+@Scanned
 private UserCredentials userCredentials;
 
 private SetUserGroup groups = new HashSetUserGroup();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-08-23 15:56:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-09-18 13:26:26 +
@@ -37,6 +37,7 @@
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.IdentifiableObjectUtils;
+import org.hisp.dhis.common.annotation.Scanned;
 import org.hisp.dhis.common.view.DetailedView;
 import org.hisp.dhis.common.view.ExportView;
 import org.hisp.dhis.dataset.DataSet;
@@ -53,19 +54,19 @@
  */
 @JacksonXmlRootElement( localName = userCredentials, namespace = DxfNamespaces.DXF_2_0)
 public class UserCredentials
-implements Serializable
+extends BaseIdentifiableObject implements Serializable
 {
 /**
  * Determines if a de-serialized file is compatible with this class.
  */
 private static final long serialVersionUID = -8919501679702302098L;
 
-private int id;
+//private int id;
 
 /**
  * Required and unique.
  */
-private User user;
+//private User user;
 
 /**
  * Required and unique.
@@ -80,6 +81,7 @@
 /**
  * Set of user roles.
  */
+@Scanned
 private SetUserAuthorityGroup userAuthorityGroups = new HashSetUserAuthorityGroup();
 
 /**
@@ -286,6 +288,11 @@
 return user != null ? user.getName() : username;
 }
 
+public String getCode()
+{
+return username;
+}
+
 /**
  * Tests whether the given input arguments can perform a valid restore of the
  * user account for these credentials. Returns false if any of the input arguments

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-09-30 10:39:35

[Dhis2-devs] [Merge] lp:~sis-ma/dhis2/SISMA-84 into lp:dhis2

The proposal to merge lp:~sis-ma/dhis2/SISMA-84 into lp:dhis2 has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~sis-ma/dhis2/SISMA-84/+merge/186329
-- 
https://code.launchpad.net/~sis-ma/dhis2/SISMA-84/+merge/186329
Your team DHIS 2 developers is subscribed to branch lp:dhis2.

___
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] Observations

2013-10-01 Thread riddy ndoma

Thanks Ola,
for example, if i have a Dataset with many sections and that I just want to
customize a section from the HTML editor. it's not possible in DHIS2.
second example, if I have an indicator that demand the result of another
indicator that the system is already ...
To clarify, suppose I want to add an indicator that as a DataElement
numerator and denominator as another indicator, no way to directly call the
indicator in the form of another indicator.

2013/10/1 Ola Hodne Titlestad ol...@ifi.uio.no

Hi Riddy,

Thanks for sharing your ideas and suggestions for improvements with us.

To better understand your requirements it would be good if you could give
us some real life examples of what you need to achieve.
Then we can discuss what the best way to address that in DHIS 2 is.

Thanks.

Ola
---

--
Ola Hodne Titlestad (Mr)
HISP
Department of Informatics
University of Oslo

On 1 October 2013 11:08, riddy ndoma riddynd...@gmail.com wrote:

--
Riddy NDOMA
Software Developer
*Skype:* riddyndoma, *G+:* riddyndoma, *FB:* riddy ndoma
*Twitter:* riddyndoma, *LinkedIn:* riddy ndoma
*Blog:* http://riddyndoma.blogspot.com/

Vous servir est mon désire (Serving you is my desire)

___
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

--
Riddy NDOMA
Software Developer
*Skype:* riddyndoma, *G+:* riddyndoma, *FB:* riddy ndoma
*Twitter:* riddyndoma, *LinkedIn:* riddy ndoma
*Blog:* http://riddyndoma.blogspot.com/

Vous servir est mon désire (Serving you is my desire)
___
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 12355: Minor


revno: 12355
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 11:45:16 +0200
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
  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/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-09-18 13:26:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-10-01 09:45:16 +
@@ -28,7 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
@@ -54,15 +53,13 @@
  */
 @JacksonXmlRootElement( localName = userCredentials, namespace = DxfNamespaces.DXF_2_0)
 public class UserCredentials
-extends BaseIdentifiableObject implements Serializable
+extends BaseIdentifiableObject
 {
 /**
  * Determines if a de-serialized file is compatible with this class.
  */
 private static final long serialVersionUID = -8919501679702302098L;
 
-//private int id;
-
 /**
  * Required and unique.
  */

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2013-10-01 09:34:05 +
+++ dhis-2/pom.xml	2013-10-01 09:45:16 +
@@ -26,7 +26,6 @@
 moduledhis-api/module
 moduledhis-services/module
 moduledhis-support/module
-	moduledhis-web/module
   /modules
 
   licenses

___
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] Observations

2013-10-01 Thread Ola Hodne Titlestad

Hi Riddy,

That was two different feature requests I guess.

Your first is to be able to have a dataset with multiple sections and for
each section decide whether to use the default form or a custom form.
Correct? For now the workaround would be to split this into multiple
datasets, and use custom forms where needed.

The indicator issue. I would still like to see a real example. Can you
please show us a real formula that you need to calculate?

Ola

--
Ola Hodne Titlestad (Mr)
HISP
Department of Informatics
University of Oslo

On 1 October 2013 11:41, riddy ndoma riddynd...@gmail.com wrote:

Thanks Ola,
for example, if i have a Dataset with many sections and that I just want
to customize a section from the HTML editor. it's not possible in DHIS2.
second example, if I have an indicator that demand the result of another
indicator that the system is already ...
To clarify, suppose I want to add an indicator that as a DataElement
numerator and denominator as another indicator, no way to directly call the
indicator in the form of another indicator.

2013/10/1 Ola Hodne Titlestad ol...@ifi.uio.no

Hi Riddy,

Thanks for sharing your ideas and suggestions for improvements with us.

To better understand your requirements it would be good if you could give
us some real life examples of what you need to achieve.
Then we can discuss what the best way to address that in DHIS 2 is.

Thanks.

Ola
---

--
Ola Hodne Titlestad (Mr)
HISP
Department of Informatics
University of Oslo

On 1 October 2013 11:08, riddy ndoma riddynd...@gmail.com wrote:

--
Riddy NDOMA
Software Developer
*Skype:* riddyndoma, *G+:* riddyndoma, *FB:* riddy ndoma
*Twitter:* riddyndoma, *LinkedIn:* riddy ndoma
*Blog:* http://riddyndoma.blogspot.com/

Vous servir est mon désire (Serving you is my desire)

___
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

--
Riddy NDOMA
Software Developer
*Skype:* riddyndoma, *G+:* riddyndoma, *FB:* riddy ndoma
*Twitter:* riddyndoma, *LinkedIn:* riddy ndoma
*Blog:* http://riddyndoma.blogspot.com/

Vous servir est mon désire (Serving you is my desire)

___
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 12356: minor fixes


revno: 12356
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 11:57:01 +0200
message:
  minor fixes
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-09-18 13:26:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-10-01 09:57:01 +
@@ -216,7 +216,7 @@
 || (object.getUser() == null  canCreatePublic( user, object )  PRIVATE_AUTHORITIES.get( object.getClass() ) != null)
 || user.equals( object.getUser() )
 //|| authorities.contains( PRIVATE_AUTHORITIES.get( object.getClass() ) )
-|| ( (object instanceof User)  canCreatePrivate( user, object ) )
+|| ((object instanceof User)  canCreatePrivate( user, object ))
 || AccessStringHelper.canWrite( object.getPublicAccess() ) )
 {
 return true;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-09-18 13:26:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-10-01 09:57:01 +
@@ -28,11 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.apache.commons.collections.CollectionUtils;
 import org.hisp.dhis.attribute.AttributeValue;
 import org.hisp.dhis.common.BaseIdentifiableObject;
@@ -44,12 +45,10 @@
 import org.hisp.dhis.common.view.ExportView;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author Nguyen Hong Duc

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-10-01 09:45:16 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-10-01 09:57:01 +
@@ -28,11 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.IdentifiableObjectUtils;
@@ -41,19 +42,17 @@
 import org.hisp.dhis.common.view.ExportView;
 import org.hisp.dhis.dataset.DataSet;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;

[Dhis2-devs] [Bug 438623] Invitation to connect on LinkedIn

LinkedIn



Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/t4411e-hm8y9n7f-a/isd/16396468216/vC1NBcUK/?hs=falsetok=1OG_BTgtcO75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/t4411e-hm8y9n7f-a/zeJSSP1C1-U2HHYckaxEWGKCUQkpqBNgDy9eKDW/goo/438623%40bugs%2Elaunchpad%2Enet/20061/I5640017505_1/?hs=falsetok=2WN6SARA0O75Y1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA
94043, USA.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/438623

Title:
  Expression does not appear when click select button

Status in DHIS 2:
  Fix Committed

Bug description:
  When create new report item. The expression doesn't appear after
  choose data element  default  click select button.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/438623/+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 568385] Invitation to connect on LinkedIn

Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/sz0blz-hm8y9npn-61/isd/16396468276/p-TN3C26/?hs=falsetok=2oz0YBKogO75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/sz0blz-hm8y9npn-61/Isyxye6K5Q3FKv75wmR4MUTKL-cuVBXW9f-5emX/goo/568385%40bugs%2Elaunchpad%2Enet/20061/I5640017596_1/?hs=falsetok=3P8Eif5rsO75Y1

--
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/568385

Title:
gis-export-image-fails-firefox

Status in DHIS 2:
Incomplete

Bug description:
Using rev 1799, exports of images from the GIS client (after pressing
export map as image then right-clicking on the image to save it to
disk) fails with Firefox 3.0.19. Opera 10.10 on Ubuntu successfully
exports the image as a PNG, but there is no background. Trying to copy
and paste the image with FireFox into a word document, results in the
image with a black background.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/568385/+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 637024] Invitation to connect on LinkedIn

LinkedIn



Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/-6rm4bc-hm8y9nbz-25/isd/16396468239/M1rixe3y/?hs=falsetok=0wfVv05roO75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/-6rm4bc-hm8y9nbz-25/Ac0p6JZtqCGQ-7_9GIDGA2Atgnwssx9fY1vJ1fM/goo/637024%40bugs%2Elaunchpad%2Enet/20061/I5640017533_1/?hs=falsetok=1Ud2N13jIO75Y1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA
94043, USA.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/637024

Title:
  Message should be appear in dataset management while deleting any
  dataset which has dataelements and data .

Status in DHIS 2:
  New

Bug description:
  In dataset management  a warning message should be appear on deleting
  datasets  which has dataelements assign and has data .

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/637024/+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 654203] Invitation to connect on LinkedIn

LinkedIn



Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/3og29s-hm8y9qxf-3g/isd/16396468283/CakG3uAT/?hs=falsetok=2FNAUTss0O75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/3og29s-hm8y9qxf-3g/VpMvEksigzQPVrOyjMlI1__iqk5eKNw11kWgAaY/goo/654203%40bugs%2Elaunchpad%2Enet/20061/I5640017499_1/?hs=falsetok=0a3arB1asO75Y1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA
94043, USA.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/654203

Title:
  Clicking logout after timeout gives exception

Status in DHIS 2:
  Fix Committed

Bug description:
  When clicking logout after the session has timed out one is presented
  with the something went wrong message. The user should be redirected
  to the login screen instead.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/654203/+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 627231] Invitation to connect on LinkedIn

LinkedIn



Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/lqmfl7-hm8y9n3g-2x/isd/16396468264/qC5Y9aSP/?hs=falsetok=0WmcFHJT0O75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/lqmfl7-hm8y9n3g-2x/qdEoX9gncWCTQdnwslgFwI9nF0zZ_fUXkpV0YOG/goo/627231%40bugs%2Elaunchpad%2Enet/20061/I5640017481_1/?hs=falsetok=1bQQFzOS4O75Y1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA
94043, USA.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/627231

Title:
  Filter by name doesn't work mostly everywhere

Status in DHIS 2:
  Fix Committed

Bug description:
  Filter by name doesn't work mostly everywhere: daels, ous, ds, etc.,
  Check out common.js (row 62): function filterValues( filter, columnIndex )

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/627231/+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 623174] Invitation to connect on LinkedIn

LinkedIn



Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/-x792jb-hm8y9nr7-4c/isd/16396468240/0XCdfv5G/?hs=falsetok=0KAqcXL6UO75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/-x792jb-hm8y9nr7-4c/TKe-S8LKaFm4LVu-5C4NWbCKjHpQVbk4GfGVPdJ/goo/623174%40bugs%2Elaunchpad%2Enet/20061/I5640017566_1/?hs=falsetok=2jkRDWj3wO75Y1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA
94043, USA.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/623174

Title:
  error in dataelement module

Status in DHIS 2:
  Fix Committed

Bug description:
  In dataelement module ,the operation show details in dataelement
  management  is not working .

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/623174/+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 627714] Invitation to connect on LinkedIn

LinkedIn



Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/-w0234v-hm8y9n9y-37/isd/16396468275/Q7HgeVXS/?hs=falsetok=1zSitPJlUO75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/-w0234v-hm8y9n9y-37/TkZJszXQCwbgWh9nYQmeQDrQPOjc71_hZLPBYij/goo/627714%40bugs%2Elaunchpad%2Enet/20061/I5640017531_1/?hs=falsetok=0qGbxL9c8O75Y1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA
94043, USA.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/627714

Title:
  status message not shown during import

Status in DHIS 2:
  New

Bug description:
  When you import a file through the import module the status message is
  no longer being updated.  It seems the problem might be related to
  recent refactoring of ajax libraries - was good as of revision 1920.

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


revno: 12357
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 12:06:54 +0200
message:
  minor fixes
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-10-01 09:57:01 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-10-01 10:06:54 +
@@ -214,7 +214,7 @@
 //TODO ( (object instanceof User)  canCreatePrivate( user, object ) ): review possible security breaches and best way to give update access upon user import
 if ( sharingOverrideAuthority( user )
 || (object.getUser() == null  canCreatePublic( user, object )  PRIVATE_AUTHORITIES.get( object.getClass() ) != null)
-|| user.equals( object.getUser() )
+|| (user != null  user.equals( object.getUser() ))
 //|| authorities.contains( PRIVATE_AUTHORITIES.get( object.getClass() ) )
 || ((object instanceof User)  canCreatePrivate( user, object ))
 || AccessStringHelper.canWrite( object.getPublicAccess() ) )

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2013-10-01 09:57:01 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2013-10-01 10:06:54 +
@@ -411,6 +411,7 @@
 nonIdentifiableObjects.extract( object );
 
 UserCredentials userCredentials = null;
+
 if ( object instanceof User )
 {
 userCredentials = ((User) object).getUserCredentials();
@@ -488,6 +489,7 @@
 nonIdentifiableObjects.delete( persistedObject );
 
 UserCredentials userCredentials = null;
+
 if ( object instanceof User )
 {
 userCredentials = ((User) object).getUserCredentials();

___
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 627977] Invitation to connect on LinkedIn

LinkedIn



Bug,

I'd like to add you to my professional network on LinkedIn.

- Tri

Tri Tran Thanh
Developer at Officience
Vietnam

Confirm that you know Tri Tran Thanh:
https://www.linkedin.com/e/-royxoe-hm8y9nhw-5s/isd/16396468255/3EE2X4h6/?hs=falsetok=01qYzoTlwO75Y1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/-royxoe-hm8y9nhw-5s/pPizoQyt9TnKkIkwM7Nudvit87uivZIX2-7kPaQ/goo/627977%40bugs%2Elaunchpad%2Enet/20061/I5640017565_1/?hs=falsetok=3LRLYoS9AO75Y1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA
94043, USA.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/627977

Title:
  Exception when adding a new data set section

Status in DHIS 2:
  Fix Committed

Bug description:
  I got this exception when adding a new dataset section. Using build
  1984 from Aug 27.

  [-] Exception
  (org.springframework.dao.DataIntegrityViolationException): Could not
  execute JDBC batch update; SQL [insert into section (name, datasetid,
  sortorder, sectionid) values (?, ?, ?, ?)]; constraint [null]; nested
  exception is org.hibernate.exception.ConstraintViolationException:
  Could not execute JDBC batch update

  * 
org.springframework.orm.hibernate3.SessionFactoryUtils.convertHibernateAccessException(SessionFactoryUtils.java:637)
  * 
org.springframework.orm.hibernate3.HibernateTransactionManager.convertHibernateAccessException(HibernateTransactionManager.java:793)
  * 
org.springframework.orm.hibernate3.HibernateTransactionManager.doCommit(HibernateTransactionManager.java:664)
  * 
org.springframework.transaction.support.AbstractPlatformTransactionManager.processCommit(AbstractPlatformTransactionManager.java:754)
  * 
org.springframework.transaction.support.AbstractPlatformTransactionManager.commit(AbstractPlatformTransactionManager.java:723)
  * 
org.springframework.transaction.interceptor.TransactionAspectSupport.commitTransactionAfterReturning(TransactionAspectSupport.java:375)
  * 
org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:120)
  * 
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
  * 
org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:202)
  * $Proxy29.addSection(Unknown source)
  * 
org.hisp.dhis.dataset.action.section.AddSectionAction.execute(AddSectionAction.java:217)
  * 
sun.reflect.NativeMethodAccessorImpl.invoke0(NativeMethodAccessorImpl.java:-2)
  * 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
  * 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
  * java.lang.reflect.Method.invoke(Method.java:597)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invokeAction(DefaultActionInvocation.java:441)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invokeActionOnly(DefaultActionInvocation.java:280)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:243)
  * 
org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor.intercept(XWorkPortalUserInterceptor.java:82)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor.intercept(XWorkPortalModuleInterceptor.java:85)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor.intercept(XWorkPortalMenuInterceptor.java:91)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor.intercept(XWorkPortalParamsInterceptor.java:117)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.interceptor.ContextInterceptor.intercept(ContextInterceptor.java:67)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.interceptor.StyleInterceptor.intercept(StyleInterceptor.java:89)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.interceptor.SystemSettingInterceptor.intercept(SystemSettingInterceptor.java:103)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.interceptor.DataDictionaryModeInterceptor.intercept(DataDictionaryModeInterceptor.java:109)
  * 
com.opensymphony.xwork2.DefaultActionInvocation.invoke(DefaultActionInvocation.java:237)
  * 
org.hisp.dhis.interceptor.DisplayPropertyInterceptor.intercept(DisplayPropertyInterceptor.java:90)

Re: [Dhis2-devs] Hello, can you help me with a query with web api.

Thanks Namrata for the good explanation.

Sushil, you cannot use start and end dates for the /analytics resource, you
must use the standard period types (frequencies) as described
herehttp://www.dhis2.org/doc/snapshot/en/user/html/ch25s03.html.
Note that you can define fixed and relative periods in your query. Docs
here:

http://www.dhis2.org/doc/snapshot/en/user/html/ch25s21.html

Lars

On Mon, Sep 30, 2013 at 6:52 PM, Namrata Nehete n.neh...@gmail.com wrote:

Hi,

To get data for relative period (last week, last month etc) we use,

http://
serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:LAST_WEEKfilter=ou:ImspTQPwCqd

To get data by specifying period we use,

http://
serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:20130924;20130930filter=ou:ImspTQPwCqd

I am not sure how to get data for indicator by specifying start date and
end date.

You should ask on dev list for that.

---
Regards,
Namrata Nehete.

On Mon, Sep 30, 2013 at 3:54 PM, Knut Staring knu...@gmail.com wrote:

Hi Sushil,

Remember you can also ask such questions on the dev list (are you a
member)?

DHIS 2 developers dhis2-devs@lists.launchpad.net

Knut

On Mon, Sep 30, 2013 at 11:32 AM, Sushil Chitrakar sushilch...@gmail.com
wrote:

Hello Namrata, I hope you are all doing well.

I was going though a issue in api checking if you know the solution.

I was trying to get data for couple of indicators on the daily basis
from a startdate to a enddate or say a yearly data for a whole year daily
basis.

I tried putting StartDate and enddate and chekced the daily parameter as
well.

But was not help, can you give a example for this if you have one or
suggest me a solution.

Let me know.

Regards,
Sushil

--
Knut Staring
Dept. of Informatics, University of Oslo
+4791880522
http://dhis2.org

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp

[Dhis2-devs] Removing camel integration module

We have decided to remove the camel integration module from the dhis2 war
file in the next release.

As the web api has matured it is now more feasible to run the likes of
apache camel or mule or similar software as external clients of the api.

Regards
Bob
___
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 12358: bugfixes for user import, verify that userCredentials part is available


revno: 12358
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 12:32:30 +0200
message:
  bugfixes for user import, verify that userCredentials part is available
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2013-10-01 10:06:54 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2013-10-01 10:32:30 +
@@ -415,6 +415,14 @@
 if ( object instanceof User )
 {
 userCredentials = ((User) object).getUserCredentials();
+
+if ( userCredentials == null )
+{
+summaryType.getImportConflicts().add(
+new ImportConflict( ImportUtils.getDisplayName( object ), User is missing userCredentials part. ) );
+
+return false;
+}
 }
 
 MapField, Object fields = detachFields( object );
@@ -433,7 +441,7 @@
 if ( object instanceof User )
 {
 userCredentials.setUser( (User) object );
-userCredentials.setId( ((User) object).getId() );
+userCredentials.setId( object.getId() );
 
 MapField, CollectionObject collectionFieldsUserCredentials = detachCollectionFields( userCredentials );
 
@@ -445,7 +453,7 @@
 
 ((User) object).setUserCredentials( userCredentials );
 
-objectBridge.updateObject( (User) object );
+objectBridge.updateObject( object );
 }
 
 if ( !options.isDryRun() )
@@ -493,6 +501,14 @@
 if ( object instanceof User )
 {
 userCredentials = ((User) object).getUserCredentials();
+
+if ( userCredentials == null )
+{
+summaryType.getImportConflicts().add(
+new ImportConflict( ImportUtils.getDisplayName( object ), User is missing userCredentials part. ) );
+
+return false;
+}
 }
 
 MapField, Object fields = detachFields( object );

___
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 12359: Deprecation fix


revno: 12359
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 12:35:04 +0200
message:
  Deprecation fix
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java
  
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java	2013-08-23 16:05:01 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java	2013-10-01 10:35:04 +
@@ -30,7 +30,7 @@
 
 import org.hisp.dhis.security.PasswordManager;
 import org.hisp.dhis.security.UsernameSaltSource;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
 
 /**
  * @author Torgeir Lorange Ostby
@@ -43,9 +43,9 @@
 // Dependencies
 // -
 
-private PasswordEncoder passwordEncoder;
+private Md5PasswordEncoder passwordEncoder;
 
-public void setPasswordEncoder( PasswordEncoder passwordEncoder )
+public void setPasswordEncoder( Md5PasswordEncoder passwordEncoder )
 {
 this.passwordEncoder = passwordEncoder;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2013-09-30 07:50:50 +
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2013-10-01 10:35:04 +
@@ -397,7 +397,6 @@
 @RequestMapping( method = RequestMethod.GET, value = {clientVersion}/LWUIT/orgUnits/{id}/findLostToFollowUp )
 @ResponseBody
 public String findLostToFollowUp( @PathVariable int id, @RequestHeader( programId ) String programId )
-throws NotAllowedException
 {
 return ;
 }

___
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] Hello, can you help me with a query with web api.

2013-10-01 Thread Knut Staring

Hi Sushil,

The API does not have extensive support for daily data yet. There are no
relative periods for days, so you have to list them each explicitly, using
the MMdd format:
http://www.dhis2.org/doc/snapshot/en/user/html/ch25s03.html

Unfortunately, I think this means you cannot get daily data for a whole
year in one query, because the URL would be more than 9*365 (over 3000)
characters long. So you would probably have to split it.

I agree that for daily data (what is the use case?), start and end date
would be much more convenient. But you could build that logic in the
javascript that constructs the query URL.

Knut

On Tue, Oct 1, 2013 at 12:20 PM, Lars Helge Øverland larshe...@gmail.comwrote:

Thanks Namrata for the good explanation.

Sushil, you cannot use start and end dates for the /analytics resource,
you must use the standard period types (frequencies) as described
herehttp://www.dhis2.org/doc/snapshot/en/user/html/ch25s03.html.
Note that you can define fixed and relative periods in your query. Docs
here:

http://www.dhis2.org/doc/snapshot/en/user/html/ch25s21.html

Lars

On Mon, Sep 30, 2013 at 6:52 PM, Namrata Nehete n.neh...@gmail.comwrote:

Hi,

To get data for relative period (last week, last month etc) we use,

http://
serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:LAST_WEEKfilter=ou:ImspTQPwCqd

To get data by specifying period we use,

http://
serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:20130924;20130930filter=ou:ImspTQPwCqd

I am not sure how to get data for indicator by specifying start date and
end date.

You should ask on dev list for that.

---
Regards,
Namrata Nehete.

On Mon, Sep 30, 2013 at 3:54 PM, Knut Staring knu...@gmail.com wrote:

Hi Sushil,

Remember you can also ask such questions on the dev list (are you a
member)?

DHIS 2 developers dhis2-devs@lists.launchpad.net

Knut

On Mon, Sep 30, 2013 at 11:32 AM, Sushil Chitrakar
sushilch...@gmail.com wrote:

Hello Namrata, I hope you are all doing well.

I was going though a issue in api checking if you know the solution.

I was trying to get data for couple of indicators on the daily basis
from a startdate to a enddate or say a yearly data for a whole year daily
basis.

I tried putting StartDate and enddate and chekced the daily parameter
as well.

But was not help, can you give a example for this if you have one or
suggest me a solution.

Let me know.

Regards,
Sushil

--
Knut Staring
Dept. of Informatics, University of Oslo
+4791880522
http://dhis2.org

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp

--
Knut Staring
Dept. of Informatics, University of Oslo
+4791880522
http://dhis2.org
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 12360: more fixes for user import, do matching on usernames (not names\!)


revno: 12360
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 13:56:18 +0200
message:
  more fixes for user import, do matching on usernames (not names\!)
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-10-01 09:57:01 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-10-01 11:56:18 +
@@ -96,7 +96,6 @@
 
 private Date lastCheckedInterpretations;
 
-@Scanned
 private UserCredentials userCredentials;
 
 private SetUserGroup groups = new HashSetUserGroup();
@@ -215,6 +214,12 @@
 // Getters and setters
 // -
 
+@Override
+public boolean haveUniqueNames()
+{
+return false;
+}
+
 @JsonProperty
 @JsonView( { DetailedView.class, ExportView.class } )
 @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-10-01 09:57:01 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-10-01 11:56:18 +
@@ -361,20 +361,16 @@
 return [ + username + ];
 }
 
+@Override
+public boolean haveUniqueNames()
+{
+return false;
+}
+
 // -
 // Getters and setters
 // -
 
-public int getId()
-{
-return id;
-}
-
-public void setId( int id )
-{
-this.id = id;
-}
-
 public String getPassword()
 {
 return password;

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java	2013-08-23 16:05:01 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java	2013-10-01 11:56:18 +
@@ -34,6 +34,9 @@
 import org.hisp.dhis.common.IdentifiableObjectManager;
 import org.hisp.dhis.period.PeriodStore;
 import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserCredentials;
+import org.hisp.dhis.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
@@ -63,6 +66,9 @@
 @Autowired
 private PeriodStore periodStore;
 
+@Autowired
+private UserService userService;
+
 //---
 // Internal and Semi-Public maps
 //---
@@ -79,6 +85,8 @@
 
 private MapClass? extends IdentifiableObject, MapString, IdentifiableObject nameMap;
 
+private MapString, UserCredentials usernameMap;
+
 private boolean writeEnabled = true;
 
 //---
@@ -88,6 +96,7 @@
 static
 {
 registeredTypes.add( PeriodType.class );
+registeredTypes.add( UserCredentials.class );
 
 for ( Class? clazz : ExchangeClasses.getImportClasses() )
 {
@@ -105,9 +114,11 @@
 uidMap = new HashMapClass? extends IdentifiableObject, MapString, IdentifiableObject();
 codeMap = new HashMapClass? extends IdentifiableObject, MapString, IdentifiableObject();
 nameMap = new HashMapClass? extends IdentifiableObject, MapString, IdentifiableObject();
+usernameMap = new HashMapString, UserCredentials();
 
 for ( Class? type : registeredTypes )
 {
+populateUsernameMap( type );
 populatePeriodTypeMap( type );
 populateIdentifiableObjectMap( type );
 populateIdentifiableObjectMap( type, IdentifiableObject.IdentifiableProperty.UID );
@@ -218,6 +229,26 @@
 masterMap.put( clazz, new HashSetObject( periodTypes

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 12362: properly add back userAuthorityGroups and report on unknown userAuthorityGroup references


revno: 12362
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 14:52:30 +0200
message:
  properly add back userAuthorityGroups and report on unknown 
userAuthorityGroup references
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2013-10-01 12:07:27 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2013-10-01 12:52:30 +
@@ -876,7 +876,7 @@
 }
 else
 {
-if ( ExchangeClasses.getImportMap().get( idObject.getClass() ) != null )
+if ( ExchangeClasses.getImportMap().get( idObject.getClass() ) != null || UserCredentials.class.isAssignableFrom( idObject.getClass() ) )
 {
 reportReferenceError( idObject, object );
 }

___
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 12364: Removed dependency on integration service from import-export web module


revno: 12364
committer: Bob Jolliffe bobjolli...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 14:18:53 +0100
message:
  Removed dependency on integration service from import-export web module 
modified:
  dhis-2/dhis-web/dhis-web-importexport/pom.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/pom.xml'
--- dhis-2/dhis-web/dhis-web-importexport/pom.xml	2013-09-19 14:01:30 +
+++ dhis-2/dhis-web/dhis-web-importexport/pom.xml	2013-10-01 13:18:53 +
@@ -51,10 +51,6 @@
 /dependency
 dependency
   groupIdorg.hisp.dhis/groupId
-  artifactIddhis-service-integration/artifactId
-/dependency
-dependency
-  groupIdorg.hisp.dhis/groupId
   artifactIddhis-service-administration/artifactId
 /dependency
 dependency

___
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 12366: don't generate links for user.userCredentials


revno: 12366
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 15:32:53 +0200
message:
  don't generate links for user.userCredentials
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.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/user/User.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-10-01 11:56:18 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2013-10-01 13:32:53 +
@@ -389,6 +389,9 @@
 this.languages = languages;
 }
 
+@JsonProperty
+@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
 public Date getLastCheckedInterpretations()
 {
 return lastCheckedInterpretations;
@@ -412,6 +415,11 @@
 this.userCredentials = userCredentials;
 }
 
+@JsonProperty
+@JsonSerialize( contentAs = BaseIdentifiableObject.class )
+@JsonView( { DetailedView.class } )
+@JacksonXmlElementWrapper( localName = userGroups, namespace = DxfNamespaces.DXF_2_0 )
+@JacksonXmlProperty( localName = userGroup, namespace = DxfNamespaces.DXF_2_0 )
 public SetUserGroup getGroups()
 {
 return groups;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-10-01 11:56:18 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2013-10-01 13:32:53 +
@@ -61,6 +61,7 @@
 
 /**
  * Required and unique.
+ * TODO: This must be renamed before we start using idObjectStore for UserCredentials
  */
 //private User user;
 
@@ -111,11 +112,6 @@
  */
 private boolean disabled;
 
-/**
- * The date this credentials was created.
- */
-private Date created;
-
 // -
 // Constructor
 // -
@@ -381,16 +377,6 @@
 this.password = password;
 }
 
-public User getUser()
-{
-return user;
-}
-
-public void setUser( User user )
-{
-this.user = user;
-}
-
 @JsonProperty
 @JsonSerialize(contentAs = BaseIdentifiableObject.class)
 @JsonView({ DetailedView.class, ExportView.class })
@@ -487,14 +473,4 @@
 {
 this.disabled = disabled;
 }
-
-public Date getCreated()
-{
-return created;
-}
-
-public void setCreated( Date created )
-{
-this.created = created;
-}
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2013-09-27 15:16:29 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2013-10-01 13:32:53 +
@@ -35,6 +35,7 @@
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.common.Pager;
 import org.hisp.dhis.system.util.ReflectionUtils;
+import org.hisp.dhis.user.UserCredentials;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -126,7 +127,7 @@
 generateLinks( object, true );
 }
 
-@SuppressWarnings( unchecked )
+@SuppressWarnings(unchecked)
 public static void generateLinks( Object object, boolean deep )
 {
 if ( IdentifiableObject.class.isAssignableFrom( object.getClass() ) )
@@ -148,7 +149,7 @@
 {
 Object fieldObject = ReflectionUtils.getFieldObject( field, object );
 
-if ( fieldObject != null )
+if ( fieldObject != null  !UserCredentials.class.isAssignableFrom( fieldObject.getClass() ) )
 {
 IdentifiableObject idObject = (IdentifiableObject) fieldObject;
 idObject.setHref( ContextUtils.getPathWithUid( idObject ) );

___
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] Hello, can you help me with a query with web api.

2013-10-01 Thread Saptarshi Purkayastha

Hi Sushil,

I've tried that the dataValueSets allows for reading data values, based on 
startDate and endDate... but not indicators.
http://www.dhis2.org/doc/snapshot/en/user/html/ch25s11.html

So you will have to calculate indicators based on their definition on your own.
There is a small bug that I remember seeing sometime back that throws a 
NullPointerException if you pass only one orgUnit. The workaround is that you 
will have to pass a dummy orgunit (say the root orgUnit) that will not have 
data for the required dataset.

Does this work for you??

---
Regards,
Saptarshi PURKAYASTHA
From: knu...@gmail.com
Date: Tue, 1 Oct 2013 13:05:43 +0200
To: larshe...@gmail.com
CC: sushilch...@gmail.com; dhis2-devs@lists.launchpad.net
Subject: Re: [Dhis2-devs] Hello, can you help me with a query with web api.

Hi Sushil,
The API does not have extensive support for daily data yet. There are no 
relative periods for days, so you have to list them each explicitly, using the 
MMdd format:

http://www.dhis2.org/doc/snapshot/en/user/html/ch25s03.html

Unfortunately, I think this means you cannot get daily data for a whole year in 
one query, because the URL would be more than 9*365 (over 3000) characters 
long. So you would probably have to split it.


I agree that for daily data (what is the use case?), start and end date would 
be much more convenient. But you could build that logic in the javascript that 
constructs the query URL.


Knut



On Tue, Oct 1, 2013 at 12:20 PM, Lars Helge Øverland larshe...@gmail.com 
wrote:


Thanks Namrata for the good explanation.
Sushil, you cannot use start and end dates for the /analytics resource, you 
must use the standard period types (frequencies) as described here. Note that 
you can define fixed and relative periods in your query. Docs here:



http://www.dhis2.org/doc/snapshot/en/user/html/ch25s21.html

Lars




On Mon, Sep 30, 2013 at 6:52 PM, Namrata Nehete n.neh...@gmail.com wrote:



Hi,

To get data for relative period (last week, last month etc) we use,

http://serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:LAST_WEEKfilter=ou:ImspTQPwCqd






To get data by specifying period we use,

http://serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:20130924;20130930filter=ou:ImspTQPwCqd

I am not sure how to get data for indicator by specifying start date and end 
date.






You should ask on dev list for that. 
---
Regards,
Namrata Nehete.


On Mon, Sep 30, 2013 at 3:54 PM, Knut Staring knu...@gmail.com wrote:





Hi Sushil,
Remember you can also ask such questions on the dev list (are you a member)?
DHIS 2 developers dhis2-devs@lists.launchpad.net







Knut




On Mon, Sep 30, 2013 at 11:32 AM, Sushil Chitrakar sushilch...@gmail.com 
wrote:







Hello Namrata, I hope you are all doing well.
I was going though a issue in api checking if you know the solution.








I was trying to get data for couple of indicators on the daily basis from a 
startdate to a enddate or say a yearly data for a whole year daily basis.

I tried putting StartDate and enddate and chekced the daily parameter as well. 
But was not help, can you give a example for this if you have one or suggest me 
a solution.








Let me know.
Regards,Sushil


-- 
Knut StaringDept. of Informatics, University of Oslo+4791880522




http://dhis2.org





___

Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help   : https://help.launchpad.net/ListHelp






-- 
Knut StaringDept. of Informatics, University of Oslo+4791880522http://dhis2.org



___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp   
  ___
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] Removing camel integration module

2013-10-01 Thread Saptarshi Purkayastha

I would like to see Etags supported with our web API, if removing camel
The point is that then we can listen to the changes using ETags and check 
modification for data when new ETags are generated for the same request.
Even shallow ETags would be a good first pass, if camel is removed.

---
Regards,
Saptarshi PURKAYASTHA
Date: Tue, 1 Oct 2013 11:26:55 +0100
From: bobjolli...@gmail.com
To: dhis2-devs@lists.launchpad.net
Subject: [Dhis2-devs] Removing camel integration module

We have decided to remove the camel integration module from the dhis2 war file 
in the next release.
As the web api has matured it is now more feasible to run the likes of apache 
camel or mule or similar software as external clients of the api. 

RegardsBob

___
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] Removing camel integration module

Agree etags would be good for tracking changes - in some ways regardless of
integrated camel, but monitoring changes in resources from the outside is
even more challenging.


On 1 October 2013 14:48, Saptarshi Purkayastha sun...@gmail.com wrote:

 I would like to see Etags supported with our web API, if removing camel
 The point is that then we can listen to the changes using ETags and check
 modification for data when new ETags are generated for the same request.
 Even shallow ETags would be a good first pass, if camel is removed.

 ---
 Regards,
 Saptarshi PURKAYASTHA
 --
 Date: Tue, 1 Oct 2013 11:26:55 +0100
 From: bobjolli...@gmail.com
 To: dhis2-devs@lists.launchpad.net
 Subject: [Dhis2-devs] Removing camel integration module


 We have decided to remove the camel integration module from the dhis2 war
 file in the next release.

 As the web api has matured it is now more feasible to run the likes of
 apache camel or mule or similar software as external clients of the api.

 Regards
 Bob

 ___ Mailing list:
 https://launchpad.net/~dhis2-devs Post to : 
 dhis2-devs@lists.launchpad.netUnsubscribe :
 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] Removing camel integration module

Hi Rodolfo, we are not removing the functionality, rather just making it an
independent module which can be set up alongside DHIS. Bob will know the
details.

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

Re: [Dhis2-devs] Removing camel integration module

2013-10-01 Thread Jason Pickering

Nothing against Camel, but not sure what the issue with executing a task on
the database might be. Just wrap it up as a shell script and schedule it
with cron.

Maybe I am missing some security issue there, but we use this approach
extensively for this type of task.

Regards,
jason



On Tue, Oct 1, 2013 at 3:59 PM, Rodolfo Melia rme...@knowming.com wrote:

 Hi - we were thinking about using Camel for automating certain jobs that
 we want to run every 24 hours (update some Data Elements based on some
 custom calculations that cannot be run as indicators). We ruled out pgAdmin
 because we feel is too insecure. Now that camel is out, how can we schedule
 task to run every day? Do you plan to have a scheduler for an app, so
 certain routines can run on the basis of a schedule?

 Rodolfo

 *Rodolfo Meliá*
 *Principal*
 rme...@knowming.com
 www.knowming.com
 +1 708 872 7636
 +44 777 576 4090
 Skype: rod.melia


 On Tue, Oct 1, 2013 at 11:26 AM, Bob Jolliffe bobjolli...@gmail.comwrote:

 We have decided to remove the camel integration module from the dhis2 war
 file in the next release.

 As the web api has matured it is now more feasible to run the likes of
 apache camel or mule or similar software as external clients of the api.

 Regards
 Bob

 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp



 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp


___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Removing camel integration module

2013-10-01 Thread Rodolfo Melia

Hi - we were thinking about using Camel for automating certain jobs that we
want to run every 24 hours (update some Data Elements based on some custom
calculations that cannot be run as indicators). We ruled out pgAdmin
because we feel is too insecure. Now that camel is out, how can we schedule
task to run every day? Do you plan to have a scheduler for an app, so
certain routines can run on the basis of a schedule?

Rodolfo

*Rodolfo Meliá*
*Principal*
rme...@knowming.com
www.knowming.com
+1 708 872 7636
+44 777 576 4090
Skype: rod.melia


On Tue, Oct 1, 2013 at 11:26 AM, Bob Jolliffe bobjolli...@gmail.com wrote:

 We have decided to remove the camel integration module from the dhis2 war
 file in the next release.

 As the web api has matured it is now more feasible to run the likes of
 apache camel or mule or similar software as external clients of the api.

 Regards
 Bob

 ___
 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] Removing camel integration module

Note that the danger of using sql directly is not so much securing a cron
executed script (that can be done reasonably well), but more that it is
quite easy to mess up the metadata integrity.


On 1 October 2013 15:19, Bob Jolliffe bobjolli...@gmail.com wrote:

 Well by taking it out of the jvm we do remove some functionality .. mostly
 access to all the dhis2 beans and whatever is not immediately available
 through the api.

 But it is quite straightforward to run a standalone camel instance which
 talks to dhis2 via the api.

 Unfortunately there are always some times when you have to resort to the
 database :-(  If you only want to schedule some sql script to run then I
 agree with Jason that a cron job which pipes the script to psql (not
 pgadmin) can often suffice.

 If you find yourself (in addition to just scheduling), also doing more
 complex data transformations and the like then it can make sense to have an
 integration engine like camel - which also has a jdbc endpoint.  But again,
 if the only thing your camel context is doing is running the sql then it
 really doesn't need to be in the dhis.war.  Thats really why we have
 removed it.  You can do the same thing with camel (and/or other tools)
 without having it loaded in the virtual machine.


 On 1 October 2013 15:04, Jason Pickering jason.p.picker...@gmail.comwrote:

 Nothing against Camel, but not sure what the issue with executing a task
 on the database might be. Just wrap it up as a shell script and schedule it
 with cron.

 Maybe I am missing some security issue there, but we use this approach
 extensively for this type of task.

 Regards,
 jason



 On Tue, Oct 1, 2013 at 3:59 PM, Rodolfo Melia rme...@knowming.comwrote:

 Hi - we were thinking about using Camel for automating certain jobs that
 we want to run every 24 hours (update some Data Elements based on some
 custom calculations that cannot be run as indicators). We ruled out pgAdmin
 because we feel is too insecure. Now that camel is out, how can we schedule
 task to run every day? Do you plan to have a scheduler for an app, so
 certain routines can run on the basis of a schedule?

 Rodolfo

 *Rodolfo Meliá*
 *Principal*
 rme...@knowming.com
 www.knowming.com
 +1 708 872 7636
 +44 777 576 4090
 Skype: rod.melia


 On Tue, Oct 1, 2013 at 11:26 AM, Bob Jolliffe bobjolli...@gmail.comwrote:

 We have decided to remove the camel integration module from the dhis2
 war file in the next release.

 As the web api has matured it is now more feasible to run the likes of
 apache camel or mule or similar software as external clients of the api.

 Regards
 Bob

 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp



 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp




___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Hello, can you help me with a query with web api.

Hi,

I would not start calculating aggregated data from the raw data
(dataValueSets resource) as there are lots of business logic and
performance concerns involved in that process. Rather construct daily
period identifiers in your app like Knut suggests and use the
analytics webhttp://www.dhis2.org/doc/snapshot/en/user/html/ch25.html
api
or
javahttp://www.dhis2.org/download/apidocs/org/hisp/dhis/analytics/AnalyticsService.htmlapi.
Pulling out daily values for a full year in a single report sounds
like a lot in any case.

Lars

On Tue, Oct 1, 2013 at 3:43 PM, Saptarshi Purkayastha sun...@gmail.comwrote:

Hi Sushil,

I've tried that the dataValueSets allows for reading data values, based on
startDate and endDate... but not indicators.
http://www.dhis2.org/doc/snapshot/en/user/html/ch25s11.html

So you will have to calculate indicators based on their definition on your
own.
There is a small bug that I remember seeing sometime back that throws a
NullPointerException if you pass only one orgUnit. The workaround is that
you will have to pass a dummy orgunit (say the root orgUnit) that will not
have data for the required dataset.

Does this work for you??

---
Regards,
Saptarshi PURKAYASTHA
--
From: knu...@gmail.com
Date: Tue, 1 Oct 2013 13:05:43 +0200
To: larshe...@gmail.com
CC: sushilch...@gmail.com; dhis2-devs@lists.launchpad.net
Subject: Re: [Dhis2-devs] Hello, can you help me with a query with web api.

Hi Sushil,

I agree that for daily data (what is the use case?), start and end date
would be much more convenient. But you could build that logic in the
javascript that constructs the query URL.

Knut

On Tue, Oct 1, 2013 at 12:20 PM, Lars Helge Øverland
larshe...@gmail.comwrote:

Thanks Namrata for the good explanation.

Sushil, you cannot use start and end dates for the /analytics resource,
you must use the standard period types (frequencies) as described
herehttp://www.dhis2.org/doc/snapshot/en/user/html/ch25s03.html.
Note that you can define fixed and relative periods in your query. Docs
here:

http://www.dhis2.org/doc/snapshot/en/user/html/ch25s21.html

Lars

On Mon, Sep 30, 2013 at 6:52 PM, Namrata Nehete n.neh...@gmail.comwrote:

Hi,

To get data for relative period (last week, last month etc) we use,

http://
serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:LAST_WEEKfilter=ou:ImspTQPwCqd

To get data by specifying period we use,

http://
serverURL/api/analytics.json?dimension=dx:Uvn6LCg7dVUdimension=pe:20130924;20130930filter=ou:ImspTQPwCqd

I am not sure how to get data for indicator by specifying start date and
end date.

You should ask on dev list for that.

---
Regards,
Namrata Nehete.

On Mon, Sep 30, 2013 at 3:54 PM, Knut Staring knu...@gmail.com wrote:

Hi Sushil,

Remember you can also ask such questions on the dev list (are you a
member)?

DHIS 2 developers dhis2-devs@lists.launchpad.net

Knut

On Mon, Sep 30, 2013 at 11:32 AM, Sushil Chitrakar
sushilch...@gmail.comwrote:

Hello Namrata, I hope you are all doing well.

I was going though a issue in api checking if you know the solution.

I was trying to get data for couple of indicators on the daily basis from
a startdate to a enddate or say a yearly data for a whole year daily basis.

I tried putting StartDate and enddate and chekced the daily parameter as
well.

But was not help, can you give a example for this if you have one or
suggest me a solution.

Let me know.

Regards,
Sushil

--
Knut Staring
Dept. of Informatics, University of Oslo
+4791880522
http://dhis2.org

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp

--
Knut Staring
Dept. of Informatics, University of Oslo
+4791880522
http://dhis2.org

___ Mailing list:
https://launchpad.net/~dhis2-devs Post to :
dhis2-devs@lists.launchpad.netUnsubscribe :
https://launchpad.net/~dhis2-devs More help :
https://help.launchpad.net/ListHelp

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp

___
Mailing list: https://launchpad.net/~dhis2-devs

Re: [Dhis2-devs] Removing camel integration module

Well by taking it out of the jvm we do remove some functionality .. mostly
access to all the dhis2 beans and whatever is not immediately available
through the api.

But it is quite straightforward to run a standalone camel instance which
talks to dhis2 via the api.

Unfortunately there are always some times when you have to resort to the
database :-(  If you only want to schedule some sql script to run then I
agree with Jason that a cron job which pipes the script to psql (not
pgadmin) can often suffice.

If you find yourself (in addition to just scheduling), also doing more
complex data transformations and the like then it can make sense to have an
integration engine like camel - which also has a jdbc endpoint.  But again,
if the only thing your camel context is doing is running the sql then it
really doesn't need to be in the dhis.war.  Thats really why we have
removed it.  You can do the same thing with camel (and/or other tools)
without having it loaded in the virtual machine.


On 1 October 2013 15:04, Jason Pickering jason.p.picker...@gmail.comwrote:

 Nothing against Camel, but not sure what the issue with executing a task
 on the database might be. Just wrap it up as a shell script and schedule it
 with cron.

 Maybe I am missing some security issue there, but we use this approach
 extensively for this type of task.

 Regards,
 jason



 On Tue, Oct 1, 2013 at 3:59 PM, Rodolfo Melia rme...@knowming.com wrote:

 Hi - we were thinking about using Camel for automating certain jobs that
 we want to run every 24 hours (update some Data Elements based on some
 custom calculations that cannot be run as indicators). We ruled out pgAdmin
 because we feel is too insecure. Now that camel is out, how can we schedule
 task to run every day? Do you plan to have a scheduler for an app, so
 certain routines can run on the basis of a schedule?

 Rodolfo

 *Rodolfo Meliá*
 *Principal*
 rme...@knowming.com
 www.knowming.com
 +1 708 872 7636
 +44 777 576 4090
 Skype: rod.melia


 On Tue, Oct 1, 2013 at 11:26 AM, Bob Jolliffe bobjolli...@gmail.comwrote:

 We have decided to remove the camel integration module from the dhis2
 war file in the next release.

 As the web api has matured it is now more feasible to run the likes of
 apache camel or mule or similar software as external clients of the api.

 Regards
 Bob

 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp



 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp



___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] Error building web maintenance orgunit module

Anyone else seeing this from trunk?

[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
(default-compile) on project dhis-web-maintenance-organisationunit:
Compilation failure
[ERROR]
/home/bobj/src/dhis/trunk/dhis2/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitlevel/SaveOrganisationUnitLevelsAction.java:[69,98]
error: cannot access HttpServletRequest
___
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] Removing camel integration module

2013-10-01 Thread Jason Pickering

For me the issue here is choosing the right tool. I do not know much about
Camel, but it seems like a good tool. There are others which perform
similar things like Pentaho and Kettle. Personally (as you have probably
noted from my previous posts on this list) I tend to personally prefer a
combination of R and SQL. We run some small tasks, like trimming data
element and orgunit names on a regular basis. In my mind, there is no need
for a heavy hammer for this. It is a single SQL statement, and can be
easily scheduled on a regular basis to run with cron (or pgagent). Other
tasks are more suited to things that R is good at, such as more complex
data manipulation  Since R can work easily with both SQL as well as the web
API (and can be automated to execute from the shell) I have never seen a
need for Camel, but again, I think it is a matter of which tools you prefer
to get the job done and are most familiar with.

Personally, I think it makes sense to remove this from the core build. It
makes sense to continue to document how it Camel can be used with DHIS2,
but in the long run, I think the loose coupling of the two probably makes a
lot of sense.

Regards,
Jason



On Tue, Oct 1, 2013 at 4:24 PM, Bob Jolliffe bobjolli...@gmail.com wrote:

 Note that the danger of using sql directly is not so much securing a cron
 executed script (that can be done reasonably well), but more that it is
 quite easy to mess up the metadata integrity.


 On 1 October 2013 15:19, Bob Jolliffe bobjolli...@gmail.com wrote:

 Well by taking it out of the jvm we do remove some functionality ..
 mostly access to all the dhis2 beans and whatever is not immediately
 available through the api.

 But it is quite straightforward to run a standalone camel instance which
 talks to dhis2 via the api.

 Unfortunately there are always some times when you have to resort to the
 database :-(  If you only want to schedule some sql script to run then I
 agree with Jason that a cron job which pipes the script to psql (not
 pgadmin) can often suffice.

 If you find yourself (in addition to just scheduling), also doing more
 complex data transformations and the like then it can make sense to have an
 integration engine like camel - which also has a jdbc endpoint.  But again,
 if the only thing your camel context is doing is running the sql then it
 really doesn't need to be in the dhis.war.  Thats really why we have
 removed it.  You can do the same thing with camel (and/or other tools)
 without having it loaded in the virtual machine.


 On 1 October 2013 15:04, Jason Pickering jason.p.picker...@gmail.comwrote:

 Nothing against Camel, but not sure what the issue with executing a task
 on the database might be. Just wrap it up as a shell script and schedule it
 with cron.

 Maybe I am missing some security issue there, but we use this approach
 extensively for this type of task.

 Regards,
 jason



 On Tue, Oct 1, 2013 at 3:59 PM, Rodolfo Melia rme...@knowming.comwrote:

 Hi - we were thinking about using Camel for automating certain jobs
 that we want to run every 24 hours (update some Data Elements based on some
 custom calculations that cannot be run as indicators). We ruled out pgAdmin
 because we feel is too insecure. Now that camel is out, how can we schedule
 task to run every day? Do you plan to have a scheduler for an app, so
 certain routines can run on the basis of a schedule?

 Rodolfo

 *Rodolfo Meliá*
 *Principal*
 rme...@knowming.com
 www.knowming.com
 +1 708 872 7636
 +44 777 576 4090
 Skype: rod.melia


 On Tue, Oct 1, 2013 at 11:26 AM, Bob Jolliffe bobjolli...@gmail.comwrote:

 We have decided to remove the camel integration module from the dhis2
 war file in the next release.

 As the web api has matured it is now more feasible to run the likes of
 apache camel or mule or similar software as external clients of the api.

 Regards
 Bob

 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp



 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp





___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Error building web maintenance orgunit module

It shouldn't really happen.

Can you please add this dependency to the dashboard, organisation unit and
visualizer web modules? (Having a merged branch in my checkout so cannot
commit myself)


dependency
  groupIdjavax.servlet/groupId
  artifactIdservlet-api/artifactId
/dependency





On Tue, Oct 1, 2013 at 5:25 PM, Bob Jolliffe bobjolli...@gmail.com wrote:

 Answering my own question ... I see jenkins is also choking
 http://apps.dhis2.org/ci/job/dhis-web-trunk/8269/changes#detail2

 I don't really understand how any of my changes are having any effect on
 this module but it seems they are.


 On 1 October 2013 15:46, Bob Jolliffe bobjolli...@gmail.com wrote:

 Anyone else seeing this from trunk?

 [ERROR] Failed to execute goal
 org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
 (default-compile) on project dhis-web-maintenance-organisationunit:
 Compilation failure
 [ERROR]
 /home/bobj/src/dhis/trunk/dhis2/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitlevel/SaveOrganisationUnitLevelsAction.java:[69,98]
 error: cannot access HttpServletRequest



 ___
 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] Error building web maintenance orgunit module

Should be ok now.  The same problem was also there in web import-export
module.  I guess servlet-api was being picked up as a dependency of camel.
 Should we put it in web commons instead of dotted around all these poms?


On 1 October 2013 16:45, Lars Helge Øverland larshe...@gmail.com wrote:

 It shouldn't really happen.

 Can you please add this dependency to the dashboard, organisation unit and
 visualizer web modules? (Having a merged branch in my checkout so cannot
 commit myself)


 dependency
   groupIdjavax.servlet/groupId
   artifactIdservlet-api/artifactId
 /dependency





 On Tue, Oct 1, 2013 at 5:25 PM, Bob Jolliffe bobjolli...@gmail.comwrote:

 Answering my own question ... I see jenkins is also choking
 http://apps.dhis2.org/ci/job/dhis-web-trunk/8269/changes#detail2

 I don't really understand how any of my changes are having any effect on
 this module but it seems they are.


 On 1 October 2013 15:46, Bob Jolliffe bobjolli...@gmail.com wrote:

 Anyone else seeing this from trunk?

 [ERROR] Failed to execute goal
 org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
 (default-compile) on project dhis-web-maintenance-organisationunit:
 Compilation failure
 [ERROR]
 /home/bobj/src/dhis/trunk/dhis2/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitlevel/SaveOrganisationUnitLevelsAction.java:[69,98]
 error: cannot access HttpServletRequest



 ___
 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] Error building web maintenance orgunit module

Answering my own question ... I see jenkins is also choking
http://apps.dhis2.org/ci/job/dhis-web-trunk/8269/changes#detail2

I don't really understand how any of my changes are having any effect on
this module but it seems they are.


On 1 October 2013 15:46, Bob Jolliffe bobjolli...@gmail.com wrote:

 Anyone else seeing this from trunk?

 [ERROR] Failed to execute goal
 org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
 (default-compile) on project dhis-web-maintenance-organisationunit:
 Compilation failure
 [ERROR]
 /home/bobj/src/dhis/trunk/dhis2/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitlevel/SaveOrganisationUnitLevelsAction.java:[69,98]
 error: cannot access HttpServletRequest


___
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] Error building web maintenance orgunit module

On Tue, Oct 1, 2013 at 6:03 PM, Bob Jolliffe bobjolli...@gmail.com wrote:

 Should be ok now.  The same problem was also there in web import-export
 module.  I guess servlet-api was being picked up as a dependency of camel.
  Should we put it in web commons instead of dotted around all these poms?


Funny thing is it's already in commons... But is seems Maven is not picking
it up properly. Could be some exclusions going on.
___
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] Error building web maintenance orgunit module

Yes well the important short term thing is to get trunk building again.
 Then we can investigate this further.  (My local build is happy again.
 And I see jenkins has just completed)  Hate it when a 1 hour job takes the
whole afternoon :-(

The integration module is now completely gone.  Just need to purge from the
docs.


On 1 October 2013 17:09, Lars Helge Øverland larshe...@gmail.com wrote:




 On Tue, Oct 1, 2013 at 6:03 PM, Bob Jolliffe bobjolli...@gmail.comwrote:

 Should be ok now.  The same problem was also there in web import-export
 module.  I guess servlet-api was being picked up as a dependency of camel.
  Should we put it in web commons instead of dotted around all these poms?


 Funny thing is it's already in commons... But is seems Maven is not
 picking it up properly. Could be some exclusions going on.


___
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] Error building web maintenance orgunit module

Good.


On Tue, Oct 1, 2013 at 6:28 PM, Bob Jolliffe bobjolli...@gmail.com wrote:

 Yes well the important short term thing is to get trunk building again.
  Then we can investigate this further.  (My local build is happy again.
  And I see jenkins has just completed)  Hate it when a 1 hour job takes the
 whole afternoon :-(

 The integration module is now completely gone.  Just need to purge from
 the docs.


 On 1 October 2013 17:09, Lars Helge Øverland larshe...@gmail.com wrote:




 On Tue, Oct 1, 2013 at 6:03 PM, Bob Jolliffe bobjolli...@gmail.comwrote:

 Should be ok now.  The same problem was also there in web import-export
 module.  I guess servlet-api was being picked up as a dependency of camel.
  Should we put it in web commons instead of dotted around all these poms?


 Funny thing is it's already in commons... But is seems Maven is not
 picking it up properly. Could be some exclusions going on.




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


revno: 12369
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 18:47:42 +0200
message:
  Minor
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-09-14 11:24:50 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-10-01 16:47:42 +
@@ -56,7 +56,6 @@
 		result name=success type=velocity/main.vm/result
 		param name=page/dhis-web-maintenance-dataadmin/localeList.vm/param
 		param name=menu/dhis-web-maintenance-dataadmin/menu.vm/param
-		param name=javascriptsjavascript/locale.js/param
 		 param name=requiredAuthoritiesF_LOCALE_MANAGEMENT/param
 	/action
 
@@ -92,7 +91,6 @@
 		class=org.hisp.dhis.dataadmin.action.locale.ShowAddLocaleFormAction
 		result name=success type=velocity/main.vm/result
 		param name=page/dhis-web-maintenance-dataadmin/addLocaleForm.vm/param
-		param name=javascriptsjavascript/localeForm.js/param
 		param name=requiredAuthoritiesF_LOCALE_ADD/param
 	/action
 
@@ -100,7 +98,6 @@
 		class=org.hisp.dhis.dataadmin.action.locale.ShowUpdateLocaleFormAction
 		result name=success type=velocity/main.vm/result
 		param name=page/dhis-web-maintenance-dataadmin/updateLocaleForm.vm/param
-		param name=javascriptsjavascript/localeForm.js/param
 		param name=requiredAuthoritiesF_LOCALE_UPDATE/param
 	/action
 

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] [Dhis2-users] Entering Monthly Data for Future Periods - beyond December 2013

2013-10-01 Thread Adebusoye Anifalaje

Hi Lars,

I would not suggest removing the restrictions completely. A suggestion for 
monthly period types would be to have no more than 36 months into the future. 
If you consider use cases that deal with monthly subscriptions, it is possible 
to have a scenario where a year or two is paid in advance. 

If there are no objects, could you do this fairly quickly?

Many thanks.

Regards,

Busoye

 


On 1 Oct 2013, at 10:01, Lars Helge Øverland larshe...@gmail.com wrote:

 Hi Busoye,
 
 as you observe we have some restrictions on future periods even though the 
 allow future periods setting is enabled.
 
 We could of course lift all these restrictions and allow any future period 
 when the setting is enabled. This comes at the risk of users inadvertently 
 selecting a future year.
 
 Any opposition against doing this out there?
 
 Lars
 
 
 
 
 
 
 On Tue, Oct 1, 2013 at 10:58 AM, Busoye Anifalaje bus...@hisp.org wrote:
 Hi Jason,
 
 Your reply was much appreciated. 
 
 I had populated the period table with the months I needed and can actually 
 see this in the pdf data entry version (see attachments from previous email). 
 The problem I am having is that I can't see these months in the data entry 
 screen. Is there a way around this or anything else I need to do to allow the 
 later periods to be visible for data entry?
 
 Many thanks.
 
 Busoye
 
 
 
 On 30 September 2013 07:11, Jason Pickering jason.p.picker...@gmail.com 
 wrote:
 Hi Busoye,
 I think the problem is that these periods have not been generated yet. In the 
 past, we have generated them using SQL. Something like
 
 
 INSERT INTO period
 SELECT nextval('hibernate_sequence'::regclass) as periodid ,
 (SELECT periodtypeid from periodtype where name = 'Monthly')  periodtypeid,
  (startdate + '1 year'::interval)::date as startdate,
  (enddate + '1 year'::interval)::date as enddate
  from period
  where periodtypeid = (SELECT periodtypeid from periodtype where name = 
 'Monthly')
  and startdate = '2013-01-01' and enddate ='2013-12-31'
 
 This is a really basic statement, and would not check for things like periods 
 which already exist so you might need to tweak it a bit. 
 
 There should really be a method to pre-generate future periods, but I am not 
 sure this exists. 
 
 Regards,
 Jason
 
 
 
 
 On Sun, Sep 29, 2013 at 5:20 PM, Adebusoye Anifalaje bus...@hisp.org wrote:
 Just an update
 
 I have added 2014 monthly data to the Period table. I still can't see the 
 periods in the data entry screen (see file attached) but when I use the Get 
 pdf for Data Entry function in the data set module, I can see the future 
 periods displayed (see attached). 
 
 Any insight would be much appreciated.
 
 Many thanks.
 
 Regards,
 Busoye
 
 
 
 On 29 Sep 2013, at 09:17, Adebusoye Anifalaje bus...@hisp.org wrote:
 
 Hi all,
 
 Can anyone help with getting around entering monthly data for future periods 
 beyond what is available by default?
 
 I have a use case where users need to enter data for months in 2014 (these 
 are advance monthly payments) but currently the future periods allowed do 
 not extend beyond December 2013. The Next Year function does not make a 
 difference here.
 
 It is critical that the data is entered monthly rather than yearly. It is 
 also important that users can enter data in (theoretically) unlimited 
 periods in the future if the case arises that payment is made up until tim 
 t.
 
 Thaks
 
 Busoye
 
 DHIS2.12 
 Build: 11285
 ___
 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-users
 Post to : dhis2-us...@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-users
 More help   : https://help.launchpad.net/ListHelp
 
 
 
 
 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp
 
 

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 12370: Minor fixed.

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 12370 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 19:10:53 +0200
message:
  Minor fixed.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js
  
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js	2013-09-30 14:47:45 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js	2013-10-01 16:18:07 +
@@ -1,7 +1,7 @@
 Ext.onReady( function() {
 	
-	// css	
-	var css = 'body { font-family: arial, sans-serif, liberation sans, consolas !important; font-size: 11px; } \n';
+	// css
+	var css = 'body { font-family: arial, sans-serif, liberation sans, consolas; font-size: 11px; } \n';
 	css += '.x-panel-body { font-size: 11px; } \n';
 	css += '.x-panel-header { height: 30px; padding: 7px 4px 4px 7px; border: 0 none; } \n';
 	css += '.olControlPanel { position: absolute; top: 0; right: 0; border: 0 none; } \n';
@@ -248,7 +248,7 @@
 			}
 
 			Ext.data.JsonP.request({
-url: '../initialize.action',
+url: config.url + '/dhis-web-mapping/initialize.action',
 success: function(r) {
 	gis = GIS.core.getInstance(r);
 	

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-09-27 14:57:00 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-10-01 16:03:39 +
@@ -1063,6 +1063,7 @@
 getDefaultStore,
 getDefaultNumericAxis,
 getDefaultCategoryAxis,
+getDefaultSeriesTitle,
 getDefaultSeries,
 getDefaultTrendLines,
 getDefaultTargetLine,

___
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 12371: Minor.

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 12371 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Tue 2013-10-01 19:16:53 +0200
message:
  Minor.
modified:
  
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.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-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js	2013-08-14 11:51:10 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js	2013-10-01 17:16:31 +
@@ -6,13 +6,14 @@
 Ext.require('regression.simpleRegression');
 
 	// chart tips css
-	var css = '.dv-chart-tips { \n border-radius: 2px; \n padding: 0px 3px 1px; \n border: 2px solid #777; \n background-color: #f1f1f1; \n } \n';
-	css += '.dv-chart-tips .x-tip-body { \n background-color: #f1f1f1; \n font-size: 13px; \n font-weight: normal; \n color: #444; \n -webkit-text-stroke: 0; \n } \n';
+	var css = '.dv-chart-tips { border-radius: 2px; padding: 0px 3px 1px; border: 2px solid #777; background-color: #f1f1f1; } \n';
+	css += '.dv-chart-tips .x-tip-body { background-color: #f1f1f1; font-size: 13px; font-weight: normal; color: #444; -webkit-text-stroke: 0; } \n';
+	css += '.dv-chart-tips .x-tip-body div { font-family: arial,sans-serif,ubuntu,consolas !important; } \n';
 
 	// load mask css
-	css += '.x-mask-msg { \n padding: 0; \n	border: 0 none; \n background-image: none; \n background-color: transparent; \n } \n';
-	css += '.x-mask-msg div { \n background-position: 11px center; \n } \n';
-	css += '.x-mask-msg .x-mask-loading { \n border: 0 none; \n	background-color: #000; \n color: #fff; \n border-radius: 2px; \n padding: 12px 14px 12px 30px; \n opacity: 0.65; \n } \n';
+	css += '.x-mask-msg { padding: 0; \n	border: 0 none; background-image: none; background-color: transparent; } \n';
+	css += '.x-mask-msg div { background-position: 11px center; } \n';
+	css += '.x-mask-msg .x-mask-loading { border: 0 none; \n background-color: #000; color: #fff; border-radius: 2px; padding: 12px 14px 12px 30px; opacity: 0.65; } \n';
 
 	Ext.util.CSS.createStyleSheet(css);
 

___
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] Removing camel integration module

2013-10-01 Thread Rodolfo Melia

I actually meant pgAgent. Sorry for the confusion. It looks like we will be 
looking at cron jobs, while dhis apps gain some sort of scheduling 
capabilities. 

Rodolfo Meliá
+44 777 576 4090 | +1 708 872-7636

Please ignore any typos on this email sent from my mobile, probably written 
while I was at the park with the kids, at the airport walking to the gate, or 
sleepless (although exhausted). Grammatical faults? I'm sorry- I do my best

 On 1 Oct 2013, at 15:19, Bob Jolliffe bobjolli...@gmail.com wrote:
 
 Well by taking it out of the jvm we do remove some functionality .. mostly 
 access to all the dhis2 beans and whatever is not immediately available 
 through the api.
 
 But it is quite straightforward to run a standalone camel instance which 
 talks to dhis2 via the api.
 
 Unfortunately there are always some times when you have to resort to the 
 database :-(  If you only want to schedule some sql script to run then I 
 agree with Jason that a cron job which pipes the script to psql (not pgadmin) 
 can often suffice.
 
 If you find yourself (in addition to just scheduling), also doing more 
 complex data transformations and the like then it can make sense to have an 
 integration engine like camel - which also has a jdbc endpoint.  But again, 
 if the only thing your camel context is doing is running the sql then it 
 really doesn't need to be in the dhis.war.  Thats really why we have removed 
 it.  You can do the same thing with camel (and/or other tools) without having 
 it loaded in the virtual machine.   
 
 
 On 1 October 2013 15:04, Jason Pickering jason.p.picker...@gmail.com wrote:
 Nothing against Camel, but not sure what the issue with executing a task on 
 the database might be. Just wrap it up as a shell script and schedule it 
 with cron. 
 
 Maybe I am missing some security issue there, but we use this approach 
 extensively for this type of task. 
 
 Regards,
 jason
 
 
 
 On Tue, Oct 1, 2013 at 3:59 PM, Rodolfo Melia rme...@knowming.com wrote:
 Hi - we were thinking about using Camel for automating certain jobs that we 
 want to run every 24 hours (update some Data Elements based on some custom 
 calculations that cannot be run as indicators). We ruled out pgAdmin 
 because we feel is too insecure. Now that camel is out, how can we schedule 
 task to run every day? Do you plan to have a scheduler for an app, so 
 certain routines can run on the basis of a schedule?
 
 Rodolfo
 
 Rodolfo Meliá
 Principal
 rme...@knowming.com
 www.knowming.com
 +1 708 872 7636
 +44 777 576 4090
 Skype: rod.melia
 
 
 On Tue, Oct 1, 2013 at 11:26 AM, Bob Jolliffe bobjolli...@gmail.com 
 wrote:
 We have decided to remove the camel integration module from the dhis2 war 
 file in the next release.
 
 As the web api has matured it is now more feasible to run the likes of 
 apache camel or mule or similar software as external clients of the api. 
 
 Regards
 Bob
 
 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp
 
 
 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp
 
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] Removing camel integration module

2013-10-01 Thread Juan Manuel Alcantara Acosta

Hi Jason 
To complement what Rodolfo mentioned, the issue we had with pgAgent is the 
requirement to set the password in ~/.pgpass We felt this was insecure because 
it allows access to the database just by using the correct username.
Best regards,
JM

El 01/10/2013, a las 09:04, Jason Pickering jason.p.picker...@gmail.com 
escribió:

 Nothing against Camel, but not sure what the issue with executing a task on 
 the database might be. Just wrap it up as a shell script and schedule it with 
 cron. 
 
 Maybe I am missing some security issue there, but we use this approach 
 extensively for this type of task. 
 
 Regards,
 jason
 
 
 
 On Tue, Oct 1, 2013 at 3:59 PM, Rodolfo Melia rme...@knowming.com wrote:
 Hi - we were thinking about using Camel for automating certain jobs that we 
 want to run every 24 hours (update some Data Elements based on some custom 
 calculations that cannot be run as indicators). We ruled out pgAdmin because 
 we feel is too insecure. Now that camel is out, how can we schedule task to 
 run every day? Do you plan to have a scheduler for an app, so certain 
 routines can run on the basis of a schedule?
 
 Rodolfo
 
 Rodolfo Meliá
 Principal
 rme...@knowming.com
 www.knowming.com
 +1 708 872 7636
 +44 777 576 4090
 Skype: rod.melia
 
 
 On Tue, Oct 1, 2013 at 11:26 AM, Bob Jolliffe bobjolli...@gmail.com wrote:
 We have decided to remove the camel integration module from the dhis2 war 
 file in the next release.
 
 As the web api has matured it is now more feasible to run the likes of apache 
 camel or mule or similar software as external clients of the api. 
 
 Regards
 Bob
 
 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp
 
 
 
 ___
 Mailing list: https://launchpad.net/~dhis2-devs
 Post to : dhis2-devs@lists.launchpad.net
 Unsubscribe : https://launchpad.net/~dhis2-devs
 More help   : https://help.launchpad.net/ListHelp
 
 

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 12372: Use web-api for aggregate tabular report ( WIP ).