date:20141112

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17448: Data entry, fixed bug, must check if data set is accessible to current user when fetching org uni...

2014-11-12 Thread noreply


revno: 17448
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 10:21:19 +0100
message:
  Data entry, fixed bug, must check if data set is accessible to current user 
when fetching org unit data set assignment from server
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java	2014-10-01 11:05:44 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java	2014-11-12 09:21:19 +
@@ -129,6 +129,12 @@
  */
 CollectionOrganisationUnit getOrganisationUnitsByNameAndGroups( String query, CollectionOrganisationUnitGroup groups, boolean limit );
 
+/**
+ * Creates a mapping between organisation unit UID and set of data set UIDs
+ * being assigned to the organisation unit.
+ * 
+ * @return a map of sets.
+ */
 MapString, SetString getOrganisationUnitDataSetAssocationMap();
 
 SetInteger getOrganisationUnitIdsWithoutData();

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-10-28 16:22:52 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-11-12 09:21:19 +
@@ -986,6 +986,8 @@
 });
 }
 
+/* TODO check if data sets are accessible for current user */
+
 return def.promise();
 };
 
@@ -1003,12 +1005,16 @@
 $.safeEach( orgUnitDataSets, function( idx, item ) 
 {
 var dataSetId = orgUnitDataSets[idx];
-var dataSetName = dhis2.de.dataSets[dataSetId].name;
-
-var row = [];
-row['id'] = dataSetId;
-row['name'] = dataSetName;
-dataSetList[idx] = row;
+
+if ( dhis2.de.dataSets[dataSetId] )
+{
+	var dataSetName = dhis2.de.dataSets[dataSetId].name;
+	
+	var row = [];
+	row['id'] = dataSetId;
+	row['name'] = dataSetName;
+	dataSetList[idx] = row;
+}
 } );
 
 dataSetList.sort( function( a, b )

___
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 17449: local/in add validated role in maintancance rbf

2014-11-12 Thread noreply


revno: 17449
committer: Mithilesh Kumar Thakur mithilesh.h...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 09:32:10 +
message:
  local/in add validated role in maintancance rbf
modified:
  
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/Lookup.java
  
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java
  
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPBFAggregationService.java
  local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml
  
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/Lookup.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/Lookup.java	2014-10-29 08:07:54 +
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/Lookup.java	2014-11-12 09:32:10 +
@@ -28,6 +28,9 @@
 
 public static final String OPTION_SET_PARTNER = OPTION_SET_PARTNER;
 
+public static final String CATEGORY_QUANTITY_REPORTED = CATEGORY_QUANTITY_REPORTED;
+public static final String CATEGORY_QUANTITY_VALIDATED = CATEGORY_QUANTITY_VALIDATED;
+public static final String CATEGORY_QUANTITY_EXTERNAL_VERIFICATION = CATEGORY_QUANTITY_EXTERNAL_VERIFICATION;
 
 private String type;
 

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java	2014-10-29 08:07:54 +
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java	2014-11-12 09:32:10 +
@@ -316,21 +316,26 @@
 totalDataElementId = totalDataElement.getId();
 }
 
+optionsMap = new HashMapInteger, Option();
+
 Lookup partnerOptionSetLookup = lookupService.getLookupByName( Lookup.OPTION_SET_PARTNER );
 
-OptionSet activitesOptionSet = optionService.getOptionSet( Integer.parseInt( partnerOptionSetLookup.getValue() ) );
-
-ListOption options = new ArrayListOption();
-if( activitesOptionSet != null )
-{
-options.addAll( activitesOptionSet.getOptions() );
-}
-
-for( Option option : options )
-{
-optionsMap.put( option.getId(), option );
-}
-
+if( partnerOptionSetLookup != null )
+{
+OptionSet activitesOptionSet = optionService.getOptionSet( Integer.parseInt( partnerOptionSetLookup.getValue() ) );
+
+ListOption options = new ArrayListOption();
+if( activitesOptionSet != null )
+{
+options.addAll( activitesOptionSet.getOptions() );
+}
+
+for( Option option : options )
+{
+optionsMap.put( option.getId(), option );
+}
+}
+
 /*
 String abc = null;
 System.out.println(  Test ABC  +  abc );

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPBFAggregationService.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPBFAggregationService.java	2014-09-04 10:07:26 +
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPBFAggregationService.java	2014-11-12 09:32:10 +
@@ -24,6 +24,7 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.rbf.api.Lookup;
+import org.hisp.dhis.rbf.api.LookupService;
 import org.hisp.dhis.user.CurrentUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -81,6 +82,9 @@
 @Autowired
 private OrganisationUnitService organisationUnitService;
 
+@Autowired
+private LookupService lookupService;
+
 // -
 //
 // -
@@ -139,8 +143,6 @@
 
 SimpleDateFormat simpleDateFormat = new SimpleDateFormat( -MM-dd );
 
-
-
 try
 {
 MapString, Double maxScoreResultMap = new HashMapString, Double();
@@ -236,6 +238,8 @@
 Integer periodId = rs.getInt( 2 );
 Double value = rs.getDouble( 3 );

[Dhis2-devs] Pull Visit Data of a Tracked Entity Instance - Web API

2014-11-12 Thread Pamod Amarakoon

Dear all,

I'm trying to use web API to pull visit data (data elements)  of a tracked
entity instance across programme stage in a defined time period.

Is it possible  to use trackedentity instance uid as a dimention.
Documentation says only data elemenets, attributes, org units and periods
can be used as dimensions.

Any suggestions.

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

[Dhis2-devs] category combination still show, even not use

2014-11-12 Thread rin.channara

Hi all dev,

I created one data element with category combination like: 
age+gender+HIVstatus. And then I change category combination to: age+gender 
only. but when I view in the pivot table, it showed previous category 
combination that I didn’t use.


What should I do?


thank you

CHANNARA___
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 17450: MathUtils, specified locale for double validation

2014-11-12 Thread noreply


revno: 17450
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 11:19:24 +0100
message:
  MathUtils, specified locale for double validation
modified:
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java	2014-11-03 00:24:32 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java	2014-11-12 10:19:24 +
@@ -28,6 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import static org.hisp.dhis.i18n.locale.LocaleManager.DHIS_STANDARD_LOCALE;
+
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.util.List;
@@ -50,7 +52,7 @@
 private static DoubleValidator DOUBLE_VALIDATOR = new DoubleValidator();
 private static IntegerValidator INT_VALIDATOR = new IntegerValidator();
 
-private static final double TOLERANCE = 0.01; 
+private static final double TOLERANCE = 0.01;
 
 public static final String NUMERIC_REGEXP = ^(-?0|-?[1-9]\\d*)(\\.\\d+)?(E\\d+)?$;
 public static final String NUMERIC_LENIENT_REGEXP = ^(-?[0-9]+)(\\.[0-9]+)?(E\\d+)?$;
@@ -317,7 +319,7 @@
  */
 public static boolean isNumeric( String value )
 {
-return value != null  DOUBLE_VALIDATOR.isValid( value )  NUMERIC_PATTERN.matcher( value ).matches();
+return value != null  DOUBLE_VALIDATOR.isValid( value, DHIS_STANDARD_LOCALE )  NUMERIC_PATTERN.matcher( value ).matches();
 }
 
 /**
@@ -329,7 +331,7 @@
  */
 public static boolean isNumericLenient( String value )
 {
-return value != null  DOUBLE_VALIDATOR.isValid( value )  NUMERIC_LENIENT_PATTERN.matcher( value ).matches();
+return value != null  DOUBLE_VALIDATOR.isValid( value, DHIS_STANDARD_LOCALE )  NUMERIC_LENIENT_PATTERN.matcher( value ).matches();
 }
 
 /**

___
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] Eivind Eriksen joins as developer

2014-11-12 Thread Lars Helge Øverland

Hi all,

I have the pleasure to announce that Eivind Eriksen has joined the team as
software developer. Eivind will work 40% this year, then full time from
January.

Eivind has 6 years of experience as Java software developer at Eniro,
Visma, 3Media and has been working on search, monitoring and web portals.
Eivind is 29 and originally from the northern city of Tromsø, Norway.

We are excited to you get on the team. Welcome!

regards,

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] Eivind Eriksen joins as developer

2014-11-12 Thread Abyot Gizaw

Welcome Eivind !


---
Thank you,
Abyot.

On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland larshe...@gmail.com
wrote:

 Hi all,

 I have the pleasure to announce that Eivind Eriksen has joined the team as
 software developer. Eivind will work 40% this year, then full time from
 January.

 Eivind has 6 years of experience as Java software developer at Eniro,
 Visma, 3Media and has been working on search, monitoring and web portals.
 Eivind is 29 and originally from the northern city of Tromsø, Norway.

 We are excited to you get on the team. Welcome!

 regards,

 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


___
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] Eivind Eriksen joins as developer

2014-11-12 Thread Halvdan Grelland

Welcome to the team!

2014-11-12 12:51 GMT+01:00 Lars Helge Øverland larshe...@gmail.com:

 Hi all,

 I have the pleasure to announce that Eivind Eriksen has joined the team as
 software developer. Eivind will work 40% this year, then full time from
 January.

 Eivind has 6 years of experience as Java software developer at Eniro,
 Visma, 3Media and has been working on search, monitoring and web portals.
 Eivind is 29 and originally from the northern city of Tromsø, Norway.

 We are excited to you get on the team. Welcome!

 regards,

 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


___
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] Eivind Eriksen joins as developer

2014-11-12 Thread Jan Henrik Øverland

Welcome!

On Wed, Nov 12, 2014 at 12:58 PM, Abyot Gizaw aby...@gmail.com wrote:

 Welcome Eivind !


 ---
 Thank you,
 Abyot.

 On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland larshe...@gmail.com
  wrote:

 Hi all,

 I have the pleasure to announce that Eivind Eriksen has joined the team
 as software developer. Eivind will work 40% this year, then full time from
 January.

 Eivind has 6 years of experience as Java software developer at Eniro,
 Visma, 3Media and has been working on search, monitoring and web portals.
 Eivind is 29 and originally from the northern city of Tromsø, Norway.

 We are excited to you get on the team. Welcome!

 regards,

 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



 ___
 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] Eivind Eriksen joins as developer

2014-11-12 Thread Morten Olav Hansen

Welcome to the team!

--
Morten

On Wed, Nov 12, 2014 at 6:12 PM, Jan Henrik Øverland 
janhenrik.overl...@gmail.com wrote:

 Welcome!

 On Wed, Nov 12, 2014 at 12:58 PM, Abyot Gizaw aby...@gmail.com wrote:

 Welcome Eivind !


 ---
 Thank you,
 Abyot.

 On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland 
 larshe...@gmail.com wrote:

 Hi all,

 I have the pleasure to announce that Eivind Eriksen has joined the team
 as software developer. Eivind will work 40% this year, then full time from
 January.

 Eivind has 6 years of experience as Java software developer at Eniro,
 Visma, 3Media and has been working on search, monitoring and web portals.
 Eivind is 29 and originally from the northern city of Tromsø, Norway.

 We are excited to you get on the team. Welcome!

 regards,

 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



 ___
 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] [Dhis2-users] Eivind Eriksen joins as developer

2014-11-12 Thread Nicola Hobby

Welcome Eivind, from the PSI team!
--
Nicola Hobby
MIS Program Manager

Office: +1 (202) 469-6685tel:%2B1%20%28202%29%20469-6685
Skype: nicolahobby

Connect with PSI
Websitehttp://www.psi.org/  |  Bloghttp://blog.psiimpact.com/  |  
Twitterhttps://twitter.com/PSIimpact  |  
Facebookhttps://www.facebook.com/PSIHealthyLives  |  
YouTubehttp://www.youtube.com/user/healthybehaviors

[https://ci3.googleusercontent.com/proxy/qmRB0qP8tPgh7VdUYjP5SLdm2iDvKQrxTUK4XinBIL5X53IVcb_JkYf36Z7pSmdZI72UXPTG_at9ov2f3neWj0UHVYYoD8GlesoSm-gumfnqcbT2nVQ7i_pNzXn13b1ZyFajlmWkdq0-g-2uL8TM=s0-d-e1-ft#http://www.psi.org/sites/default/files/imagefield_thumbs/galleries/web%20icon%20small.png]http://www.psi.org/
   
[https://ci4.googleusercontent.com/proxy/WlZYkSAue-2d-ETvwJrctA5fvGOkHGAYPJriR4uB9TpVWDOKj93sldy_aEXQG-h8NUcg_gngjXWzxagC991i1p919OhCotoTgEn_I6HdU2K-OOErJHH7k3CPwvnW4m-_lZAIOwxZJNHAtrfFmTL1OQ=s0-d-e1-ft#http://www.psi.org/sites/default/files/imagefield_thumbs/galleries/blog%20icon%20small.png]
 http://blog.psiimpact.com/
[https://ci5.googleusercontent.com/proxy/iV2mFVLDSE3TYf5Q_vzNqXvMn2SLx9WgDiodTxC7s3EtebDIl57KAHf5nsF2ctnRhwHbH5cX7zzMzLCWKmmel8Pd03SxkMAgT57sXKsJ5oAzHIJw38fkiCnyg7TkYJbehR9gvYUO-sWnp5kyv8Wtq1v0Rg=s0-d-e1-ft#http://www.psi.org/sites/default/files/imagefield_thumbs/galleries/twitter%20icon%20small.png]
 https://twitter.com/PSIimpact
[https://ci6.googleusercontent.com/proxy/oFdOWFKydX8YtKQcLVlrj2g-ZfhieWyEjvP56x7Hb_o4Z4WxcslXGUyW3I339_17EfYkWixCjhIO6mkN2SfOa1FA2LpwgQxOQM99ATZuowcmQsxv2uqaZOD5fV4f6PFC_R_GuzoAlJiQIilUz3m9athN-Zg=s0-d-e1-ft#http://www.psi.org/sites/default/files/imagefield_thumbs/galleries/facebook%20icon%20small.png]
 https://www.facebook.com/PSIHealthyLives
[https://ci3.googleusercontent.com/proxy/0kcyX1I0ppaYgxcg-Vl7T4R8yP55usK3s6uk-9rfmUQfFQO_uRijn0H45kFsdaJG9C2wJ8ActUmWKLzdGqUWIx2mOhpGehIGh74r3OLJKmub3vmVeTUbKADjm6kfz7MLdemdyMC7bqe-v8kjWqoM-CJWNw=s0-d-e1-ft#http://www.psi.org/sites/default/files/imagefield_thumbs/galleries/youtube%20icon%20small.png]
 http://www.youtube.com/user/healthybehaviors

Donate to PSI
www.psi.orghttp://www.psi.org/. 94.5 cents of every dollar raised directly 
supports PSI programs.


From: Morten Olav Hansen morte...@gmail.commailto:morte...@gmail.com
Date: Wednesday, November 12, 2014 at 8:40 AM
To: Jan Henrik Øverland 
janhenrik.overl...@gmail.commailto:janhenrik.overl...@gmail.com
Cc: dhis2-users 
dhis2-us...@lists.launchpad.netmailto:dhis2-us...@lists.launchpad.net, DHIS 
list dhis2-devs@lists.launchpad.netmailto:dhis2-devs@lists.launchpad.net
Subject: Re: [Dhis2-users] [Dhis2-devs] Eivind Eriksen joins as developer

Welcome to the team!

--
Morten

On Wed, Nov 12, 2014 at 6:12 PM, Jan Henrik Øverland 
janhenrik.overl...@gmail.commailto:janhenrik.overl...@gmail.com wrote:
Welcome!

On Wed, Nov 12, 2014 at 12:58 PM, Abyot Gizaw 
aby...@gmail.commailto:aby...@gmail.com wrote:
Welcome Eivind !


---
Thank you,
Abyot.

On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland 
larshe...@gmail.commailto:larshe...@gmail.com wrote:
Hi all,

I have the pleasure to announce that Eivind Eriksen has joined the team as 
software developer. Eivind will work 40% this year, then full time from January.

Eivind has 6 years of experience as Java software developer at Eniro, Visma, 
3Media and has been working on search, monitoring and web portals. Eivind is 29 
and originally from the northern city of Tromsø, Norway.

We are excited to you get on the team. Welcome!

regards,

Lars



___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : 
dhis2-devs@lists.launchpad.netmailto: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.netmailto: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.netmailto: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 17451: Improved add and edit for user groups in dashboard. Now uses partial load for user selector.

2014-11-12 Thread noreply

Merge authors:
  Halvdan Hoem Grelland (halvdanhg)

revno: 17451 [merge]
committer: Halvdan Hoem Grelland halvda...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 16:12:24 +0100
message:
  Improved add and edit for user groups in dashboard. Now uses partial load for 
user selector.
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
  
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupAction.java
  
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/UpdateUserGroupAction.java
  
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm
  
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2014-10-15 04:17:05 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2014-11-12 14:50:59 +
@@ -67,7 +67,7 @@
 rangelength : [ 2, 210 ],
 alphanumericwithbasicpuncspaces : true
 },
-groupMembersList : {
+usersSelected : {
 required : true
 }
 },

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupAction.java	2014-10-16 06:17:19 +
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupAction.java	2014-11-12 14:50:59 +
@@ -30,6 +30,7 @@
 
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_ONLY_MANAGE_WITHIN_USER_GROUPS;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.hisp.dhis.attribute.AttributeService;
@@ -82,11 +83,11 @@
 // Parameters
 // -
 
-private ListInteger groupMembersList;
+private ListString usersSelected;
 
-public void setGroupMembersList( ListInteger groupMembersList )
+public void setUsersSelected( ListString usersSelected )
 {
-this.groupMembersList = groupMembersList;
+this.usersSelected = usersSelected;
 }
 
 private String name;
@@ -111,13 +112,24 @@
 public String execute()
 throws Exception
 {
+if ( usersSelected == null )
+{
+usersSelected = new ArrayList();
+}
+
 boolean writeGroupRequired = (Boolean) systemSettingManager.getSystemSetting( KEY_ONLY_MANAGE_WITHIN_USER_GROUPS, false );
 
 UserGroup userGroup = new UserGroup( name );
-
-for ( Integer groupMember : groupMembersList )
+
+for ( String userUid : usersSelected )
 {
-User user = userService.getUser( groupMember );
+User user = userService.getUser( userUid );
+
+if( user == null )
+{
+continue;
+}
+
 userGroup.addUser( user );
 
 if ( writeGroupRequired  !userGroup.getMembers().contains( user)  !userService.canUpdate( user.getUserCredentials() ) )
@@ -128,8 +140,7 @@
 
 if ( jsonAttributeValues != null )
 {
-AttributeUtils.updateAttributeValuesFromJson( userGroup.getAttributeValues(), jsonAttributeValues,
-attributeService );
+AttributeUtils.updateAttributeValuesFromJson( userGroup.getAttributeValues(), jsonAttributeValues, attributeService );
 }
 
 userGroupService.addUserGroup( userGroup );

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/UpdateUserGroupAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/UpdateUserGroupAction.java	2014-11-08 17:30:22 +
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/UpdateUserGroupAction.java	2014-11-12 14:50:59 +
@@ -39,6 +39,7 @@
 import org.hisp.dhis.user.UserGroupService;
 import org.hisp.dhis.user.UserService;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

2014-11-12 Thread Jim Grace

Welcome Eivind!

Cheers,
Jim


On Wed, Nov 12, 2014 at 7:46 AM, Nicola Hobby nho...@psi.org wrote:

  Welcome Eivind, from the PSI team!
  --
   Nicola Hobby
 MIS Program Manager

 Office: +1 (202) 469-6685
 Skype: nicolahobby

 *Connect with PSI*
 Website http://www.psi.org/  |  Blog http://blog.psiimpact.com/  |
 Twitter https://twitter.com/PSIimpact  |  Facebook
 https://www.facebook.com/PSIHealthyLives  |  YouTube
 http://www.youtube.com/user/healthybehaviors

  http://www.psi.org/http://blog.psiimpact.com/
 https://twitter.com/PSIimpact
 https://www.facebook.com/PSIHealthyLives
 http://www.youtube.com/user/healthybehaviors

  Donate to PSI
 www.psi.org. 94.5 cents of every dollar raised directly supports PSI
 programs.


   From: Morten Olav Hansen morte...@gmail.com
 Date: Wednesday, November 12, 2014 at 8:40 AM
 To: Jan Henrik Øverland janhenrik.overl...@gmail.com
 Cc: dhis2-users dhis2-us...@lists.launchpad.net, DHIS list 
 dhis2-devs@lists.launchpad.net
 Subject: Re: [Dhis2-users] [Dhis2-devs] Eivind Eriksen joins as developer

   Welcome to the team!

  --
 Morten

 On Wed, Nov 12, 2014 at 6:12 PM, Jan Henrik Øverland 
 janhenrik.overl...@gmail.com wrote:

 Welcome!

 On Wed, Nov 12, 2014 at 12:58 PM, Abyot Gizaw aby...@gmail.com wrote:

 Welcome Eivind !


  ---
 Thank you,
  Abyot.

  On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland 
 larshe...@gmail.com wrote:

  Hi all,

  I have the pleasure to announce that Eivind Eriksen has joined the
 team as software developer. Eivind will work 40% this year, then full time
 from January.

  Eivind has 6 years of experience as Java software developer at Eniro,
 Visma, 3Media and has been working on search, monitoring and web portals.
 Eivind is 29 and originally from the northern city of Tromsø, Norway.

  We are excited to you get on the team. Welcome!

  regards,

 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



 ___
 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-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 17452: minor: indentation consistency

2014-11-12 Thread noreply


revno: 17452
committer: Halvdan Hoem Grelland halvda...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 16:24:44 +0100
message:
  minor: indentation consistency
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2014-11-12 14:50:59 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2014-11-12 15:24:44 +
@@ -46,15 +46,15 @@
 required : true
 }
 },
-	profile : {
-		email : {
+profile : {
+email : {
 email : true,
 rangelength : [ 0, 160 ]
 },
-		phoneNumber : {
+phoneNumber : {
 rangelength : [ 0, 80 ]
 }
-	},
+},
 role : {
 name : {
 required : true,
@@ -89,14 +89,14 @@
 required : true
 },
 longitude : {
-	number : true,
-	min: -180,
-	max: 180
+number : true,
+min: -180,
+max: 180
 },
 latitude : {
-	number : true,
-	min: -90,
-	max: 90
+number : true,
+min: -90,
+max: 90
 },
 url : {
 url : true,
@@ -441,225 +441,225 @@
 alphanumericwithbasicpuncspaces : true
 }
 },
-	dataMart : {
-		name : {
-			required: true
-		}
-	},
-	trackedEntityAttribute : {
-		name : {
-			required : true,
-			rangelength : [ 2,160 ]
-		},
-		shortName : {
-			required : true,
-			rangelength : [ 2, 50 ]
-		},
-		description : {
-			required : true,
-			minlength : 2
-		}
-	},
-	trackedEntityAttributeGroup : {
-		name : {
-			required : true,
-			rangelength : [ 2,160 ]
-		},
-		description : {
-			required : true,
-			rangelength : [ 2, 255 ]
-		},
-		attributeList : {
-			required : true
-		}
-	},
-	relationshipType : {
-		aIsToB : {
-			required : true,
-			rangelength : [ 2,160 ]
-		},
-		bIsToA : {
-			required : true,
-			rangelength : [ 2, 160 ]
-		},
-		name : {
-			required : true,
-			rangelength : [ 2, 160 ]
-		}
-	},
-	trackedEntity : {
-		name : {
-			required : true,
-			rangelength : [ 2,160 ]
-		},
-		description : {
-			required : true,
-			minlength : 2
-		}
-	},
-	program : {
-		name : {
-			required : true,
-			rangelength : [ 2,160 ]
-		},
-		description : {
-			required : true,
-			minlength : 2
-		},
-		trackedEntityId : {
-			required : true
-		},
-		dateOfIncidentDescription : {
-			required : true,
-			rangelength : [ 2,160 ]
-		},
-		dateOfEnrollmentDescription : {
-			required : true,
-			rangelength : [ 2,160 ]
-		},
-		compulsaryIdentifier : {
-			required : true
-		},
-		version : {
-			required : true,
-			integer:true
-		}
-	},
-	programStage : {
-		name : {
-			required : true,
-			rangelength : [2,160]
-		},
-		description : {
-			required : true,
-			rangelength : [2,254]
-		},
-		reportDateDescription : {
-			required : true,
-			rangelength : [2,160]
-		},
-		minDaysFromStart : {
-			number : true,
-			min : 0
-		},
-		reportDateToUse : {
-			required : true
-		},
-		standardInterval : {
-			number : true
-		}
-	},
-	trackedEntityInstanceReminder : {
-		name : {
-			required : true,
-			rangelength : [2,160]
-		},
-		days : {
-			required: true,
-			number : true
-		},
-		sendTo : {
-			required: true
-		},
-		messageType : {
-			required: true,
-			number : true
-		},
-		templateMessage : {
-			required: true
-		}
-	},
-	programIndicator : {
-		name : {
-			required : true,
-			rangelength : [2,160]
-		},
-		shortName : {
-			required : true,
-			rangelength : [2,50]
-		},
-		code : {
-			rangelength : [2,160]
-		},
-		rootDate : {
-			required : true
-		},
-		expression : {
-			required : true,
-			maxlength : 254
-		},
-		valueType : {
-			required : true
-		}
-	},
-	caseAggregation : {
-		name : {
-			required : true,
-			rangelength : [2,160]
-		},
-		aggregationDataElementId : {
-			required : true
-		},
-		deSumId : {
-			required : true
-		},
-		aggregationCondition : {
-			required : true,
-			rangelength : [2,1000]
-		}
-	},
-	programStageSection : {
-		name : {
-			required : true,
-			rangelength : [2,160]
-		},
-		dataElementList : {
-			required : true
-		}
-	},
-	programValidation : {
-		name : {
-			required : true,
-			rangelength : [2,160]
-		},
-		operator : {
-			required : true
-		},
-		description : {
-			required : true
-		},
-		expression : {
-			required

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17453: disabled google map; fix to indexeddb issue when refreshing

2014-11-12 Thread noreply


revno: 17453
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 17:49:17 +0100
message:
  disabled google map; fix to indexeddb issue when refreshing
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/directives.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache	2014-11-03 13:12:05 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache	2014-11-12 16:49:17 +
@@ -20,6 +20,7 @@
 
 ../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css
 ../dhis-web-commons/javascripts/jQuery/calendars/css/ui-redmond.calendars.picker.css
+../dhis-web-commons/javascripts/jQuery/calendars/css/ui.calendars.picker.css 
 
 ../dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot
 ../dhis-web-commons/fonts/LiberationSans-Regular-webfont.woff

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2014-11-03 10:34:14 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2014-11-12 16:49:17 +
@@ -66,14 +66,14 @@
 script type=text/javascript src=../dhis-web-commons/javascripts/dhis2/dhis2.storage.js/script
 script type=text/javascript src=../dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js/script
 script type=text/javascript src=../dhis-web-commons/javascripts/dhis2/dhis2.appcache.js/script
-!--script type=text/javascript src=../dhis-web-commons/ouwt/ouwt.js/script--
+script type=text/javascript src=../dhis-web-commons/ouwt/ouwt.js/script
 
 script type=text/javascript src=../dhis-web-commons/javascripts/angular/plugins/angularLocalStorage.js/script
 script type=text/javascript src=../dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js/script
 script type=text/javascript src=../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-static-files.min.js/script
 script type=text/javascript src=../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-url.min.js/script
 
-!--script type=text/javascript src=scripts/event-capture.js/script--
+script type=text/javascript src=scripts/event-capture.js/script
 script type=text/javascript src=scripts/app.js/script
 script type=text/javascript src=scripts/services.js/script
 script type=text/javascript src=scripts/directives.js/script
@@ -83,7 +83,7 @@
 script type=text/javascript src=scripts/map-controller.js/script
 script type=text/javascript src=scripts/notes-controller.js/script
 script type=text/javascript src=scripts/filters.js/script
-script type=text/javascript src=scripts/orgunitTreeSearch.js/script
+!--script type=text/javascript src=scripts/orgunitTreeSearch.js/script--
 
 !-- Menu scripts --
 script type=text/javascript src=../dhis-web-commons/javascripts/dhis2/dhis2.translate.js/script

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/directives.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/directives.js	2014-11-03 11:11:25 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/directives.js	2014-11-12 16:49:17 +
@@ -17,14 +17,14 @@
 };   
 })
 
-.directive('selectedOrgUnit', function() {
+.directive('selectedOrgUnit', function($timeout, storage) {
 
 return {
 restrict: 'A',
-link: function(scope, element, attrs){   
+link: function(scope, element, attrs){
 
 //when tree has loaded, get selected orgunit - if there is any - and inform angular   
-$(function() { 
+/*$(function() { 
 
 var adapters = [];
 var partial_adapters = [];
@@ -73,6 +73,39 @@
 function

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17454: Data approval, log level

2014-11-12 Thread noreply


revno: 17454
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 18:27:29 +0100
message:
  Data approval, log level
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java
  
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.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/dataapproval/hibernate/HibernateDataApprovalStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java	2014-11-11 15:20:56 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java	2014-11-12 17:27:29 +
@@ -256,7 +256,7 @@
 
 if ( categoryComboIds.isEmpty() )
 {
-log.debug( No dataset categorycombos to check for approval, user  + ( user == null ? (null) : user.getUsername() ) +  datasetIds  + dataSetIds );
+log.warn( No dataset categorycombos to check for approval, user  + ( user == null ? (null) : user.getUsername() ) +  datasetIds  + dataSetIds );
 
 return new ArrayList();
 }

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2014-11-11 12:58:17 +
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2014-11-12 17:27:29 +
@@ -1560,7 +1560,7 @@
 items[0] = keyword;
 }
 
-for ( String item : items )
+for ( int i = 0; i  items.length; i++ )
 {
 String[] split = keyword.split( : );
 if ( split == null || (split.length != 3  split.length != 2) )

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17455: Approval, simplified code for getting periods

2014-11-12 Thread noreply


revno: 17455
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-11-12 18:42:04 +0100
message:
  Approval, simplified code for getting periods
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.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/dataapproval/hibernate/HibernateDataApprovalStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java	2014-11-12 17:27:29 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java	2014-11-12 17:42:04 +
@@ -34,12 +34,11 @@
 import static org.hisp.dhis.dataapproval.DataApprovalState.UNAPPROVED_READY;
 import static org.hisp.dhis.dataapproval.DataApprovalState.UNAPPROVED_WAITING;
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_ACCEPTANCE_REQUIRED_FOR_APPROVAL;
-import static org.hisp.dhis.system.util.CollectionUtils.asSet;
+import static org.hisp.dhis.system.util.CollectionUtils.asList;
 import static org.hisp.dhis.system.util.ConversionUtils.getIdentifiers;
 import static org.hisp.dhis.system.util.TextUtils.getCommaDelimitedString;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -48,10 +47,12 @@
 import java.util.concurrent.ExecutionException;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
+import org.hisp.dhis.common.IdentifiableObjectUtils;
 import org.hisp.dhis.dataapproval.DataApproval;
 import org.hisp.dhis.dataapproval.DataApprovalLevel;
 import org.hisp.dhis.dataapproval.DataApprovalLevelService;
@@ -204,18 +205,16 @@
 
 PeriodType dataSetPeriodType = dataSets.iterator().next().getPeriodType();
 
-CollectionPeriod periods;
+ListPeriod periods;
 
 if ( period.getPeriodType().equals( dataSetPeriodType ) )
 {
-periods = asSet( period );
+periods = asList( period );
 }
 else if ( period.getPeriodType().getFrequencyOrder()  dataSetPeriodType.getFrequencyOrder() )
 {
-periods = periodService.getPeriodsBetweenDates(
-dataSetPeriodType,
-period.getStartDate(),
-period.getEndDate() );
+periods = new ArrayList( periodService.getPeriodsBetweenDates( dataSetPeriodType,
+period.getStartDate(), period.getEndDate() ) );
 }
 else
 {
@@ -229,13 +228,6 @@
 final String minDate = DateUtils.getMediumDateString( period.getStartDate() );
 final String maxDate = DateUtils.getMediumDateString( period.getEndDate() );
 
-String periodIds = ;
-
-for ( Period p : periods )
-{
-periodIds += ( periodIds.isEmpty() ?  : ,  ) + periodService.reloadPeriod( p ).getId();
-}
-
 boolean maySeeDefaultCategoryCombo = user == null || user.getUserCredentials() == null ||
 ( CollectionUtils.isEmpty( user.getUserCredentials().getCogsDimensionConstraints() )
  CollectionUtils.isEmpty( user.getUserCredentials().getCatDimensionConstraints() ) );
@@ -281,6 +273,10 @@
 orgUnitJoinOn = o.level =  + orgUnitLevel;
 }
 
+periods = periodService.reloadPeriods( periods );
+
+String periodIds = StringUtils.join( IdentifiableObjectUtils.getIdentifiers( periods ), , );
+
 boolean isSuperUser = currentUserService.currentUserIsSuper();
 
 DataApprovalLevel lowestApprovalLevelForOrgUnit = 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

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

2014-11-12 Thread Wilfred Senyoni

Welcome to the team Eivind.

Wilfred
On 12 Nov 2014 18:41, Jim Grace jimgr...@gmail.com wrote:

 Welcome Eivind!

 Cheers,
 Jim


 On Wed, Nov 12, 2014 at 7:46 AM, Nicola Hobby nho...@psi.org wrote:

  Welcome Eivind, from the PSI team!
  --
   Nicola Hobby
 MIS Program Manager

 Office: +1 (202) 469-6685
 Skype: nicolahobby

 *Connect with PSI*
 Website http://www.psi.org/  |  Blog http://blog.psiimpact.com/  |
 Twitter https://twitter.com/PSIimpact  |  Facebook
 https://www.facebook.com/PSIHealthyLives  |  YouTube
 http://www.youtube.com/user/healthybehaviors

  http://www.psi.org/http://blog.psiimpact.com/
 https://twitter.com/PSIimpact
 https://www.facebook.com/PSIHealthyLives
 http://www.youtube.com/user/healthybehaviors

  Donate to PSI
 www.psi.org. 94.5 cents of every dollar raised directly supports PSI
 programs.


   From: Morten Olav Hansen morte...@gmail.com
 Date: Wednesday, November 12, 2014 at 8:40 AM
 To: Jan Henrik Øverland janhenrik.overl...@gmail.com
 Cc: dhis2-users dhis2-us...@lists.launchpad.net, DHIS list 
 dhis2-devs@lists.launchpad.net
 Subject: Re: [Dhis2-users] [Dhis2-devs] Eivind Eriksen joins as developer

   Welcome to the team!

  --
 Morten

 On Wed, Nov 12, 2014 at 6:12 PM, Jan Henrik Øverland 
 janhenrik.overl...@gmail.com wrote:

 Welcome!

 On Wed, Nov 12, 2014 at 12:58 PM, Abyot Gizaw aby...@gmail.com wrote:

 Welcome Eivind !


  ---
 Thank you,
  Abyot.

  On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland 
 larshe...@gmail.com wrote:

  Hi all,

  I have the pleasure to announce that Eivind Eriksen has joined the
 team as software developer. Eivind will work 40% this year, then full time
 from January.

  Eivind has 6 years of experience as Java software developer at
 Eniro, Visma, 3Media and has been working on search, monitoring and web
 portals. Eivind is 29 and originally from the northern city of Tromsø,
 Norway.

  We are excited to you get on the team. Welcome!

  regards,

 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



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

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

2014-11-12 Thread Greg Rowles

Welcome Eivind! If you're attending our South Africa conference next year -
I hope to meet you there!

On Wed, Nov 12, 2014 at 10:47 PM, Wilfred Senyoni seny...@gmail.com wrote:

 Welcome to the team Eivind.

 Wilfred
 On 12 Nov 2014 18:41, Jim Grace jimgr...@gmail.com wrote:

 Welcome Eivind!

 Cheers,
 Jim


 On Wed, Nov 12, 2014 at 7:46 AM, Nicola Hobby nho...@psi.org wrote:

  Welcome Eivind, from the PSI team!
  --
   Nicola Hobby
 MIS Program Manager

 Office: +1 (202) 469-6685
 Skype: nicolahobby

 *Connect with PSI*
 Website http://www.psi.org/  |  Blog http://blog.psiimpact.com/  |
 Twitter https://twitter.com/PSIimpact  |  Facebook
 https://www.facebook.com/PSIHealthyLives  |  YouTube
 http://www.youtube.com/user/healthybehaviors

  http://www.psi.org/http://blog.psiimpact.com/
 https://twitter.com/PSIimpact
 https://www.facebook.com/PSIHealthyLives
 http://www.youtube.com/user/healthybehaviors

  Donate to PSI
 www.psi.org. 94.5 cents of every dollar raised directly supports PSI
 programs.


   From: Morten Olav Hansen morte...@gmail.com
 Date: Wednesday, November 12, 2014 at 8:40 AM
 To: Jan Henrik Øverland janhenrik.overl...@gmail.com
 Cc: dhis2-users dhis2-us...@lists.launchpad.net, DHIS list 
 dhis2-devs@lists.launchpad.net
 Subject: Re: [Dhis2-users] [Dhis2-devs] Eivind Eriksen joins as
 developer

   Welcome to the team!

  --
 Morten

 On Wed, Nov 12, 2014 at 6:12 PM, Jan Henrik Øverland 
 janhenrik.overl...@gmail.com wrote:

 Welcome!

 On Wed, Nov 12, 2014 at 12:58 PM, Abyot Gizaw aby...@gmail.com wrote:

 Welcome Eivind !


  ---
 Thank you,
  Abyot.

  On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland 
 larshe...@gmail.com wrote:

  Hi all,

  I have the pleasure to announce that Eivind Eriksen has joined the
 team as software developer. Eivind will work 40% this year, then full 
 time
 from January.

  Eivind has 6 years of experience as Java software developer at
 Eniro, Visma, 3Media and has been working on search, monitoring and web
 portals. Eivind is 29 and originally from the northern city of Tromsø,
 Norway.

  We are excited to you get on the team. Welcome!

  regards,

 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



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




-- 

Business Intelligence Planner
*Health Information Systems Programme*
*- - - - - - - **- - - - - - - **- - - - - - - **- - - - - - - **- - - - - *
Mobile  :073 246 2992
Landline:   021 554 3130
Fax:  086 733 8432
Skype:  gregory_rowles
___
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] Eivind Eriksen joins as developer

2014-11-12 Thread Dapo Adejumo

Welcome!

 

………

Regards,

Dapo Adejumo

+2348033683677

Skype : dapojorge

 

From: Dhis2-devs 
[mailto:dhis2-devs-bounces+dapo_adejumo=yahoo@lists.launchpad.net] On 
Behalf Of Greg Rowles
Sent: 12 November, 2014 10:59 PM
To: Wilfred Senyoni
Cc: Nicola Hobby; DHIS 2 Users list; DHIS developers
Subject: Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

 

Welcome Eivind! If you're attending our South Africa conference next year - I 
hope to meet you there!

 

On Wed, Nov 12, 2014 at 10:47 PM, Wilfred Senyoni seny...@gmail.com 
mailto:seny...@gmail.com  wrote:

Welcome to the team Eivind.

Wilfred

On 12 Nov 2014 18:41, Jim Grace jimgr...@gmail.com 
mailto:jimgr...@gmail.com  wrote:

Welcome Eivind!

 

Cheers,

Jim

 

 

On Wed, Nov 12, 2014 at 7:46 AM, Nicola Hobby nho...@psi.org 
mailto:nho...@psi.org  wrote:

Welcome Eivind, from the PSI team! 

-- 

Nicola Hobby
MIS Program Manager

Office:  tel:%2B1%20%28202%29%20469-6685 +1 (202) 469-6685
Skype: nicolahobby

Connect with PSI

 http://www.psi.org/ Website  |   http://blog.psiimpact.com/ Blog  |   
https://twitter.com/PSIimpact Twitter  |   
https://www.facebook.com/PSIHealthyLives Facebook  |   
http://www.youtube.com/user/healthybehaviors YouTube

 

 http://www.psi.org/ http://blog.psiimpact.com/ 
https://twitter.com/PSIimpact https://www.facebook.com/PSIHealthyLives  
   http://www.youtube.com/user/healthybehaviors  

 

Donate to PSI

 http://www.psi.org/ www.psi.org. 94.5 cents of every dollar raised directly 
supports PSI programs.

 

 

From: Morten Olav Hansen morte...@gmail.com mailto:morte...@gmail.com 
Date: Wednesday, November 12, 2014 at 8:40 AM
To: Jan Henrik Øverland janhenrik.overl...@gmail.com 
mailto:janhenrik.overl...@gmail.com 
Cc: dhis2-users dhis2-us...@lists.launchpad.net 
mailto:dhis2-us...@lists.launchpad.net , DHIS list 
dhis2-devs@lists.launchpad.net mailto:dhis2-devs@lists.launchpad.net 
Subject: Re: [Dhis2-users] [Dhis2-devs] Eivind Eriksen joins as developer

 

Welcome to the team!




--
Morten

 

On Wed, Nov 12, 2014 at 6:12 PM, Jan Henrik Øverland 
janhenrik.overl...@gmail.com mailto:janhenrik.overl...@gmail.com  wrote:

Welcome!

 

On Wed, Nov 12, 2014 at 12:58 PM, Abyot Gizaw aby...@gmail.com 
mailto:aby...@gmail.com  wrote:

Welcome Eivind !




 

---

Thank you,

Abyot.

 

On Wed, Nov 12, 2014 at 12:51 PM, Lars Helge Øverland larshe...@gmail.com 
mailto:larshe...@gmail.com  wrote:

Hi all, 

 

I have the pleasure to announce that Eivind Eriksen has joined the team as 
software developer. Eivind will work 40% this year, then full time from January.

 

Eivind has 6 years of experience as Java software developer at Eniro, Visma, 
3Media and has been working on search, monitoring and web portals. Eivind is 29 
and originally from the northern city of Tromsø, Norway. 

 

We are excited to you get on the team. Welcome!

 

regards,


Lars

 

 

 

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





 

-- 

  http://hispsa.org/timesheets/images/HISP-logo.png 

Business Intelligence Planner

Health Information Systems Programme

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 

Mobile  :073 246 2992
Landline:   021 554 3130

Fax:  086 733 8432 

Skype:  gregory_rowles

Re: [Dhis2-devs] /multiple api for acceptance

2014-11-12 Thread Shantala Raman

Hi Jim,

Just wanted to check on the status of approval and acceptance related
changes being implemented. By when do you think these will be completed?
Also, what is the release date for 2.17?

Thanks,
Shantala


On Tue, Oct 28, 2014 at 2:57 PM, Mahendra Kariya 
mahendra.kar...@thoughtworks.com wrote:

 It would also be great if you can point us to any APIs that have changed
 while you were refactoring.

 On Tue, Oct 28, 2014 at 10:49 AM, Mahendra Kariya 
 mahendra.kar...@thoughtworks.com wrote:

 Hi Jim,

 I saw a lot of commits regarding approval over the weekend. I am not sure
 if /acceptance/multiple was one of them. So I was just wondering if it is
 there in the trunk. If you are too busy and need some help with it, please
 let us know.

 On Mon, Oct 20, 2014 at 4:16 PM, Jim Grace jimgr...@gmail.com wrote:

 Hi Mansi,

 My time has been hijacked by some critical work supporting a deployment,
 but I'm now back to work on this. I need to get it done within the next
 couple of days. Sorry about the further delay.

 Cheers,
 Jim


 On Mon, Oct 20, 2014 at 1:31 AM, Mahendra Kariya 
 mahendra.kar...@thoughtworks.com wrote:

 Hi Jim,

 Just wondering if you got time to work on this api.

 On Fri, Oct 10, 2014 at 3:37 PM, Jim Grace jimgr...@gmail.com wrote:

 Sorry, not yet. The work on this was a bit disrupted this week by
 other things. But I'm trying for the end of the weekend.


 On Fri, Oct 10, 2014 at 1:58 AM, Mahendra Kariya 
 mahendra.kar...@thoughtworks.com wrote:

 Hi Jim,

 We were wondering these changes have been checked in to trunk.

 On Mon, Oct 6, 2014 at 5:42 PM, Mansi Singhal 
 msing...@thoughtworks.com wrote:

 Thanks.

 On Mon, Oct 6, 2014 at 5:35 PM, Jim Grace jimgr...@gmail.com
 wrote:

 Should be some time this week.


 On Mon, Oct 6, 2014 at 7:51 AM, Mansi Singhal 
 msing...@thoughtworks.com wrote:

 Hey Jim,

 Can you please tell us, By when these changes are expected to be
 there in trunk ?

 On Mon, Oct 6, 2014 at 4:52 PM, Jim Grace jimgr...@gmail.com
 wrote:

 Hi Mansi,

 We are refactoring some of the approvals service layer for 2.17,
 and will have the ability there already for multiple acceptances. I 
 will
 add support for this in the API controller as well.

 Cheers,
 Jim


 On Mon, Oct 6, 2014 at 4:56 AM, Mansi Singhal 
 msing...@thoughtworks.com wrote:

 Hi,

 There is an API (/dataApprovals/multiple) for approving multiple
 datasets for a given period and org unit. But we don't have 
 /multiple api
 for accepting data (/acceptances).

 We have a scenario where we need to accept data for multiple
 datasets for a given period and org unit. Would it make sense to the
 broader DHIS2 community to have this API? Are you planning to write 
 api for
 the same or should we submit a patch?

 --
 Regards,
 Mansi Singhal


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





 --
 Regards,
 Mansi Singhal





 --
 Regards,
 Mansi Singhal








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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17456: GIS event layer start date tmp fix. Work in progress.

2014-11-12 Thread noreply

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

revno: 17456 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-11-13 08:18:54 +0100
message:
  GIS event layer start date tmp fix. Work in progress.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-11-10 16:03:39 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-11-13 07:17:37 +
@@ -4619,12 +4619,13 @@
 			labelSeparator: '',
 columnWidth: 0.5,
 height: 41,
-value: function() {
-var greg = $.calendars.instance('gregorian'),
-date = greg.parseDate('-mm-dd', (new Date( (new Date()).setMonth( (new Date()).getMonth() - 3))).toJSON().slice(0,10));
+//value: function() {
+var greg = $.calendars.instance('gregorian'),
+//var date = gis.init.calendar.parseDate('-mm-dd', (new Date( (new Date()).setMonth( (new Date()).getMonth() - 3))).toJSON().slice(0,10));
 
-return gis.init.calendar.formatDate(gis.init.systemInfo.dateFormat, date);
-}(),
+//return gis.init.calendar.formatDate(gis.init.systemInfo.dateFormat, date);
+//}(),
+value: gis.init.calendar.formatDate(gis.init.systemInfo.dateFormat, gis.init.calendar.today()),
 listeners: {
 render: function(c) {
 onDateFieldRender(c);

___
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 17457: reverted back to jackson 2.3.4, 2.4.x have issues with @JsonIgnore, which makes get/set password ...

2014-11-12 Thread noreply


revno: 17457
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-11-13 13:28:09 +0545
message:
  reverted back to jackson 2.3.4, 2.4.x have issues with @JsonIgnore, which 
makes get/set password not working
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	2014-10-16 06:17:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2014-11-13 07:43:09 +
@@ -347,6 +347,7 @@
  * Tests whether the credentials contain all needed parameters to
  * perform an account restore.
  * If a parameter is missing a descriptive error string is returned.
+ *
  * @return null on success, a descriptive error string on failure.
  */
 public String isRestorable()

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2014-11-10 19:40:12 +
+++ dhis-2/pom.xml	2014-11-13 07:43:09 +
@@ -986,7 +986,7 @@
 struts.version2.3.16.3/struts.version
 hibernate.version4.2.0.Final/hibernate.version
 hibernate-validator.version4.3.1.Final/hibernate-validator.version
-jackson.version2.4.1/jackson.version
+jackson.version2.3.4/jackson.version
 camel.version2.10.2/camel.version
 slf4j.version1.6.6/slf4j.version
 geotools.version9.3/geotools.version

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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17458: local/in add missing files

2014-11-12 Thread noreply


revno: 17458
committer: Mithilesh Kumar Thakur mithilesh.h...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-11-13 07:47:22 +
message:
  local/in add missing files
added:
  local/in/dhis-web-birtreports/
  local/in/dhis-web-birtreports/pom.xml
  local/in/dhis-web-birtreports/src/
  local/in/dhis-web-birtreports/src/main/
  local/in/dhis-web-birtreports/src/main/java/
  local/in/dhis-web-birtreports/src/main/java/org/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/
  local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/
  
local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportOptionsStack.java
  
local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportTypeObject.java
  
local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/ReportsHomePageAction.java
  local/in/dhis-web-birtreports/src/main/resources/
  local/in/dhis-web-birtreports/src/main/resources/META-INF/
  local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/
  local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-birtreports/src/main/resources/arial.ttf
  local/in/dhis-web-birtreports/src/main/resources/org/
  local/in/dhis-web-birtreports/src/main/resources/org/hisp/
  local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/
  local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/
  
local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/i18n_module.properties
  local/in/dhis-web-birtreports/src/main/resources/struts.xml
  local/in/dhis-web-birtreports/src/main/webapp/
  local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/
  local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/web.xml
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/StylesForTags.css
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/document.js
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/report.js
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportConfiguration.js
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportParams.js
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/style.css
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/stylesForReports.css
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images/
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/images/goback.png
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/javascript/
  local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menu.vm
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menuWithTree.vm
  
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/selectReport.vm


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added directory 'local/in/dhis-web-birtreports'
=== added file 'local/in/dhis-web-birtreports/pom.xml'
--- local/in/dhis-web-birtreports/pom.xml	1970-01-01 00:00:00 +
+++ local/in/dhis-web-birtreports/pom.xml	2014-11-13 07:47:22 +
@@ -0,0 +1,71 @@
+project xmlns=http://maven.apache.org/POM/4.0.0;
+	xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+	xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;
+	modelVersion4.0.0/modelVersion
+	
+	parent
+		groupIdorg.hisp.dhis/groupId
+		artifactIddhis-web/artifactId
+		version2.17-SNAPSHOT/version
+	/parent
+	
+	artifactIddhis-web-birtreports/artifactId
+	packagingwar/packaging
+	nameDHIS Birt Reports/name
+	
+	build
+		finalNamedhis-web-birtreports/finalName
+	/build
+	
+	dependencies
+		
+dependency
+  groupIdjavax.servlet/groupId
+  artifactIdservlet-api/artifactId
+	/dependency
+
+		!-- DHIS --
+		dependency
+			groupIdorg.hisp.dhis/groupId
+			artifactIddhis-api/artifactId
+		/dependency
+		dependency
+			groupIdorg.hisp.dhis/groupId
+			artifactIddhis-in-api/artifactId
+			version${project.version}/version
+		/dependency
+		dependency
+			groupIdorg.hisp.dhis/groupId
+			artifactIddhis-service-core/artifactId
+		/dependency
+		dependency
+			groupIdorg.hisp.dhis/groupId
+			artifactIddhis-in-service-configuration/artifactId
+			version${project.version}/version
+		/dependency
+dependency
+groupIdorg.hisp.dhis/groupId
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17448: Data entry, fixed bug, must check if data set is accessible to current user when fetching org uni...

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17449: local/in add validated role in maintancance rbf

[Dhis2-devs] Pull Visit Data of a Tracked Entity Instance - Web API

[Dhis2-devs] category combination still show, even not use

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17450: MathUtils, specified locale for double validation

[Dhis2-devs] Eivind Eriksen joins as developer

Re: [Dhis2-devs] Eivind Eriksen joins as developer

Re: [Dhis2-devs] Eivind Eriksen joins as developer

Re: [Dhis2-devs] Eivind Eriksen joins as developer

Re: [Dhis2-devs] Eivind Eriksen joins as developer

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17451: Improved add and edit for user groups in dashboard. Now uses partial load for user selector.

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17452: minor: indentation consistency

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17453: disabled google map; fix to indexeddb issue when refreshing

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17454: Data approval, log level

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17455: Approval, simplified code for getting periods

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

Re: [Dhis2-devs] [Dhis2-users] Eivind Eriksen joins as developer

Re: [Dhis2-devs] /multiple api for acceptance

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17456: GIS event layer start date tmp fix. Work in progress.

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17457: reverted back to jackson 2.3.4, 2.4.x have issues with @JsonIgnore, which makes get/set password ...

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 17458: local/in add missing files

24 matches

Site Navigation

Mail list logo

Footer information