date:20160223

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22034: include usernames=>uc map in preheater

2016-02-23 Thread noreply


revno: 22034
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2016-02-24 13:10:49 +0700
message:
  include usernames=>uc map in preheater
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.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/preheat/Preheat.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-02-19 02:27:16 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-02-24 06:10:49 +
@@ -32,6 +32,7 @@
 import org.hisp.dhis.dataelement.DataElementCategory;
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryOption;
+import org.hisp.dhis.user.UserCredentials;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -48,6 +49,8 @@
 
 private Map defaults = new HashMap<>();
 
+private Map usernames = new HashMap<>();
+
 public Preheat()
 {
 }
@@ -222,6 +225,16 @@
 this.defaults = defaults;
 }
 
+public Map getUsernames()
+{
+return usernames;
+}
+
+public void setUsernames( Map usernames )
+{
+this.usernames = usernames;
+}
+
 public static boolean isDefaultClass( IdentifiableObject object )
 {
 return (DataElementCategory.class.isInstance( object ) || DataElementCategoryOption.class.isInstance( object )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-23 10:58:58 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-24 06:10:49 +
@@ -75,6 +75,7 @@
 {
 Preheat preheat = new Preheat();
 preheat.setDefaults( manager.getDefaults() );
+preheat.setUsernames( getUsernames() );
 
 if ( PreheatMode.ALL == params.getPreheatMode() )
 {
@@ -392,4 +393,19 @@
 }
 } );
 }
+
+@SuppressWarnings( "unchecked" )
+private Map getUsernames()
+{
+Map userCredentialsMap = new HashMap<>();
+Query query = Query.from( schemaService.getDynamicSchema( UserCredentials.class ) );
+List userCredentials = (List) queryService.query( query );
+
+for ( UserCredentials uc : userCredentials )
+{
+userCredentialsMap.put( uc.getUsername(), uc );
+}
+
+return userCredentialsMap;
+}
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java	2016-02-23 10:32:50 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java	2016-02-24 06:10:49 +
@@ -29,13 +29,26 @@
  */
 
 import org.hisp.dhis.common.IdentifiableObject;
+import org.hisp.dhis.common.IdentifiableObjectManager;
 import org.hisp.dhis.dxf2.metadata2.objectbundle.ObjectBundle;
+import org.hisp.dhis.preheat.PreheatService;
+import org.hisp.dhis.schema.validation.SchemaValidator;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Morten Olav Hansen 
  */
 public class AbstractObjectBundleHook implements ObjectBundleHook
 {
+@Autowired
+protected IdentifiableObjectManager manager;
+
+@Autowired
+protected PreheatService preheatService;
+
+@Autowired
+protected SchemaValidator validator;
+
 @Override
 public void preCreate( IdentifiableObject identifiableObject, ObjectBundle objectBundle )
 {

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.java	2016-02-23 10:32:50 +

[Dhis2-devs] DHIS2 Date Format queries

2016-02-23 Thread Archana Chillala

Hi,

I have a couple of queries regarding date format in DHIS as per the current
functionality.


   - Does the date format in DHIS change based on the browser locale
   settings?
   - Also, does changing language or locale change date settings?




Thanks

Archana Chillala
Application Developer
Email archa...@thoughtworks.com
Telephone +91 9100960533 <+91+9100960533>
[image: ThoughtWorks]

___
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 22033: minor, replace test metadata in dxf2 object bundle test

2016-02-23 Thread noreply


revno: 22033
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2016-02-24 11:40:54 +0700
message:
  minor, replace test metadata in dxf2 object bundle test
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json


--
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/fieldfilter/DefaultFieldFilterService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java	2016-02-24 04:32:46 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java	2016-02-24 04:40:54 +
@@ -433,14 +433,6 @@
 private FieldMap getFullFieldMap( Schema schema )
 {
 FieldMap fieldMap = new FieldMap();
-
-/*
-for ( String mapKey : schema.getPropertyMap().keySet() )
-{
-fieldMap.put( mapKey, new FieldMap() );
-}
-*/
-
 fieldMap.put( ":owner", new FieldMap() );
 
 return fieldMap;

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json	2016-02-23 06:02:53 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json	2016-02-24 04:40:54 +
@@ -1,231 +1,148 @@
 {
+  "organisationUnitLevels": [
+{
+  "name": "Country",
+  "created": "2016-02-17T06:17:12.379+",
+  "lastUpdated": "2016-02-17T06:19:09.255+",
+  "level": 1,
+  "id": "e1DcQuAONBm"
+}
+  ],
+  "categoryCombos": [
+{
+  "lastUpdated": "2016-02-17T06:13:29.135+",
+  "name": "default",
+  "skipTotal": false,
+  "categories": [
+{
+  "id": "XSypGD15atv"
+}
+  ],
+  "id": "zU1OZFVxnw7",
+  "created": "2016-02-17T06:13:29.133+",
+  "dataDimensionType": "DISAGGREGATION",
+  "publicAccess": "",
+  "userGroupAccesses": []
+}
+  ],
   "users": [
 {
+  "firstName": "admin",
+  "created": "2016-02-17T06:14:12.250+",
   "organisationUnits": [
 {
   "id": "PdWlltZnVZe"
 }
   ],
   "surname": "admin",
-  "created": "2016-02-17T06:14:12.250+",
   "userCredentials": {
-"disabled": false,
-"cogsDimensionConstraints": [],
 "lastLogin": "2016-02-17T06:14:12.274+",
-"username": "admin",
-"externalAccess": false,
-"userInfo": {
-  "id": "ueKaFVdR8Fz"
-},
-"catDimensionConstraints": [],
-"externalAuth": false,
-"name": "admin",
-"invitation": false,
-"displayName": "admin",
-"selfRegistered": false,
-"passwordLastUpdated": "2016-02-17T06:14:12.274+",
-"attributeValues": [],
 "created": "2016-02-17T06:14:12.362+",
-"code": "admin",
-"userGroupAccesses": [],
 "userRoles": [
   {
 "id": "rKLtmQLRMU8"
   }
-]
+],
+"invitation": false,
+"disabled": false,
+"externalAuth": false,
+"cogsDimensionConstraints": [],
+"userInfo": {
+  "id": "ueKaFVdR8Fz"
+},
+"passwordLastUpdated": "2016-02-17T06:14:12.274+",
+"catDimensionConstraints": [],
+"username": "admin",
+"selfRegistered": false
   },
+  "attributeValues": [],
   "dataViewOrganisationUnits": [],
-  "id": "ueKaFVdR8Fz",
-  "firstName": "admin",
-  "attributeValues": [],
-  "lastUpdated": "2016-02-17T06:14:12.250+"
-}
-  ],
-  "organisationUnitLevels": [
-{
-  "id": "e1DcQuAONBm",
-  "name": "Country",
-  "level": 1,
-  "created": "2016-02-17T06:17:12.379+",
-  "lastUpdated": "2016-02-17T06:19:09.255+"
-}
-  ],
-  "dataElements": [
-{
-  "domainType": "AGGREGATE",
-  "code": "DataElementCodeA",
-  "created": "2016-02-17T06:15:06.079+",
-  "userGroupAccesses": [],
-  "shortName": "DataElementShortA",
-  "name": "DataElementA",
-  "id": "SG4HuKlNEFH",
-  "publicAccess": "rw--",
-  "attributeValues": [],
-  "user": {
-"id": "ueKaFVdR8Fz"
-  },
-  "valueType": "TEXT",
-  "zeroIsSignificant": false,
-  "categoryCombo": {
-"id": "zU1OZFVxnw7"
-  },
-  "lastUpdated": "2016-02-17T06:15:59.378+",
-  "aggregationType":

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22032: minor, default to :owner for non-id objects

2016-02-23 Thread noreply


revno: 22032
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2016-02-24 11:32:46 +0700
message:
  minor, default to :owner for non-id objects
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.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/fieldfilter/DefaultFieldFilterService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java	2016-02-23 04:33:11 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java	2016-02-24 04:32:46 +
@@ -434,10 +434,14 @@
 {
 FieldMap fieldMap = new FieldMap();
 
+/*
 for ( String mapKey : schema.getPropertyMap().keySet() )
 {
 fieldMap.put( mapKey, new FieldMap() );
 }
+*/
+
+fieldMap.put( ":owner", new FieldMap() );
 
 return fieldMap;
 }

___
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 22031: removed remains of caseagg

2016-02-23 Thread noreply


revno: 22031
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2016-02-24 11:25:21 +0700
message:
  removed remains of caseagg
removed:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQueries.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQuery.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregateSchedule.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationCondition.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCaseAggregation.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregationForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addCaseAggregationForm.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateCaseAggregationForm.js
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/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
=== removed directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQueries.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQueries.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQueries.java	1970-01-01 00:00:00 +
@@ -1,36 +0,0 @@
-package org.hisp.dhis.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.HashSet;
-
-public class AggregationQueries
-extends HashSet
-{
-}

=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQuery.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQuery.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQuery.java	1970-01-01 00:00:00 +
@@ -1,139 +0,0 @@
-package org.hisp.dhis.caseaggregation;
-
-/*
- * Copyright (c) 2004-2016, University

[Dhis2-devs] [Bug 1548998] [NEW] Missing tracker entity form in programs/attribute

2016-02-23 Thread Ibrahim Bayoh

Public bug reported:

In pervious version(2.18-2.19) within the programs/attribute app, there
a tracker entity form, which shows all the form for your different
programs. The tracker entity form allow you to generate forms in the
tracker capture App. But this is missing i the earlier versions.

** Affects: dhis2
 Importance: Undecided
 Status: New

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

Title:
  Missing tracker entity form in programs/attribute

Status in DHIS:
  New

Bug description:
  In pervious version(2.18-2.19) within the programs/attribute app,
  there a tracker entity form, which shows all the form for your
  different programs. The tracker entity form allow you to generate
  forms in the tracker capture App. But this is missing i the earlier
  versions.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1548998/+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 22030: Add new orgunit group symbols to dialog box.

2016-02-23 Thread noreply


revno: 22030
committer: Jason P. Pickering 
branch nick: dhis2
timestamp: Tue 2016-02-23 12:45:34 +0100
message:
  Add new orgunit group symbols to dialog box.
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.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-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm	2012-11-13 13:20:22 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm	2016-02-23 11:45:34 +
@@ -9,7 +9,7 @@
 .symbolTable img:hover
 {
   background-color: #ececec;
-}
+}
 
 
 
@@ -52,6 +52,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
\ No newline at end of file

___
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 22029: Add new set of orgunit group icons.

2016-02-23 Thread noreply


revno: 22029
committer: Jason P. Pickering 
branch nick: dhis2
timestamp: Tue 2016-02-23 12:39:36 +0100
message:
  Add new set of orgunit group icons.
added:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/26.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/27.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/28.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/29.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/30.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/31.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/32.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/33.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/34.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/35.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
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/26.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/26.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/26.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/27.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/27.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/27.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/28.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/28.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/28.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/29.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/29.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/29.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/30.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/30.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/30.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/31.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/31.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/31.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/32.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/32.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/32.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/33.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/33.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/33.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/34.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/34.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/34.png	2016-02-23 11:39:36 + differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/35.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/35.png	1970-01-01 00:00:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/35.png	2016-02-23 11:39:36 + differ
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22028: Minor fix

2016-02-23 Thread noreply


revno: 22028
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-02-23 18:32:53 +0700
message:
  Minor fix
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml	2015-12-01 04:59:42 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml	2016-02-23 11:32:53 +
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 

___
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] Issue installing apps

2016-02-23 Thread Olav Poppe

Hi, yes, I know the custom location setting is gone, and the $DHIS_HOME/apps 
folder exists and has correct permissions as far as I can see. But when trying 
to install apps, it complains about a missing file or folder. Looking in the 
java code, it seems to fail around 

File tempFile = File.createTempFile( "IMPORT_", "_ZIP" );
file.transferTo( tempFile );

so my assumption was that when installing, it will unzip to a temporary 
location before moving it to /apps - but I don't know where, or why it fails.

Olav


> 23. feb. 2016 kl. 11.42 skrev Morten Olav Hansen :
> 
> Hi
> 
> On 2.22, the only supported location is $DHIS2_HOME/apps
> 
>> On Tue, Feb 23, 2016 at 5:38 PM, Olav Poppe  wrote:
>> Hi, I’m having issues installing apps on a local 2.22 installation - when 
>> uploading the app, I get the below error. It looks like it fails to create a 
>> temporary file/folder during the installation process, but I don’t know 
>> what/where it is trying to create this file or folder.
>> 
>> Any advice?
>> 
>> Regards
>> Olav
>> 
>> 
>> 
>> java.io.IOException: No such file or directory
>> java.io.UnixFileSystem.createFileExclusively(Native Method)
>> java.io.File.createTempFile(File.java:2024)
>> java.io.File.createTempFile(File.java:2070)
>> 
>> org.hisp.dhis.webapi.controller.AppController.installApp(AppController.java:127)
>> 
>> org.hisp.dhis.webapi.controller.AppController$$FastClassBySpringCGLIB$$45556959.invoke()
>> 
>> org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:204)
>> 
>> org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:718)
>> 
>> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:157)
>> 
>> org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:64)
>> 
>> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:179)
>> 
>> org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:653)
>> 
>> org.hisp.dhis.webapi.controller.AppController$$EnhancerBySpringCGLIB$$6e1fce54.installApp()
>> sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> 
>> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
>> 
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>> java.lang.reflect.Method.invoke(Method.java:483)
>> 
>> org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:222)
>> 
>> org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:137)
>> 
>> org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:110)
>> 
>> org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:775)
>> 
>> org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:705)
>> 
>> org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:85)
>> 
>> org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:959)
>> 
>> org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:893)
>> 
>> org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:965)
>> 
>> org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:867)
>> javax.servlet.http.HttpServlet.service(HttpServlet.java:647)
>> 
>> org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:841)
>> javax.servlet.http.HttpServlet.service(HttpServlet.java:728)
>> 
>> org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330)
>> 
>> org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118)
>> 
>> org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84)
>> 
>> org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
>> 
>> org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113)
>> 
>> org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
>> 
>>

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22027: minor, clone object list in PreheatService.collectReferences, and add UserCredentials directly

2016-02-23 Thread noreply


revno: 22027
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-02-23 17:58:58 +0700
message:
  minor, clone object list in PreheatService.collectReferences, and add 
UserCredentials directly
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.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/preheat/DefaultPreheatService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-23 10:38:41 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-23 10:58:58 +
@@ -31,7 +31,6 @@
 import com.google.common.collect.Lists;
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.common.IdentifiableObjectManager;
-import org.hisp.dhis.dataelement.DataElementOperand;
 import org.hisp.dhis.query.Query;
 import org.hisp.dhis.query.QueryService;
 import org.hisp.dhis.query.Restrictions;
@@ -41,6 +40,7 @@
 import org.hisp.dhis.schema.SchemaService;
 import org.hisp.dhis.system.util.ReflectionUtils;
 import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserCredentials;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -199,31 +199,35 @@
 return map;
 }
 
-for ( Class objectClass : objects.keySet() )
+Map scanObjects = new HashMap<>();
+scanObjects.putAll( objects ); // clone objects list, we don't want to modify it
+
+if ( scanObjects.containsKey( User.class ) )
+{
+List users = scanObjects.get( User.class );
+List userCredentials = new ArrayList<>();
+
+for ( IdentifiableObject identifiableObject : users )
+{
+User user = (User) identifiableObject;
+
+if ( user.getUserCredentials() != null )
+{
+userCredentials.add( user.getUserCredentials() );
+}
+}
+
+scanObjects.put( UserCredentials.class, userCredentials );
+}
+
+for ( Class objectClass : scanObjects.keySet() )
 {
 Schema schema = schemaService.getDynamicSchema( objectClass );
 List properties = schema.getProperties().stream()
 .filter( p -> p.isPersisted() && p.isOwner() && (PropertyType.REFERENCE == p.getPropertyType() || PropertyType.REFERENCE == p.getItemPropertyType()) )
 .collect( Collectors.toList() );
 
-List identifiableObjects = objects.get( objectClass );
-
-if ( User.class.isAssignableFrom( objectClass ) )
-{
-List userCredentials = new ArrayList<>();
-
-for ( IdentifiableObject identifiableObject : identifiableObjects )
-{
-User user = (User) identifiableObject;
-
-if ( user.getUserCredentials() != null )
-{
-userCredentials.add( user.getUserCredentials() );
-}
-}
-
-// identifiableObjects.addAll( userCredentials );
-}
+List identifiableObjects = scanObjects.get( objectClass );
 
 if ( !uidMap.containsKey( objectClass ) ) uidMap.put( objectClass, new HashSet<>() );
 if ( !codeMap.containsKey( objectClass ) ) codeMap.put( objectClass, new HashSet<>() );

___
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 22025: Add User.UserCredentials references for preheat scans

2016-02-23 Thread noreply


revno: 22025
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-02-23 17:32:50 +0700
message:
  Add User.UserCredentials references for preheat scans
added:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/ObjectBundleHook.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.java
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.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/preheat/DefaultPreheatService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-18 13:44:33 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-23 10:32:50 +
@@ -31,6 +31,7 @@
 import com.google.common.collect.Lists;
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.common.IdentifiableObjectManager;
+import org.hisp.dhis.dataelement.DataElementOperand;
 import org.hisp.dhis.query.Query;
 import org.hisp.dhis.query.QueryService;
 import org.hisp.dhis.query.Restrictions;
@@ -39,6 +40,7 @@
 import org.hisp.dhis.schema.Schema;
 import org.hisp.dhis.schema.SchemaService;
 import org.hisp.dhis.system.util.ReflectionUtils;
+import org.hisp.dhis.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -206,6 +208,23 @@
 
 List identifiableObjects = objects.get( objectClass );
 
+if ( User.class.isAssignableFrom( objectClass ) )
+{
+List userCredentials = new ArrayList<>();
+
+for ( IdentifiableObject identifiableObject : identifiableObjects )
+{
+User user = (User) identifiableObject;
+
+if ( user.getUserCredentials() != null )
+{
+userCredentials.add( user.getUserCredentials() );
+}
+}
+
+identifiableObjects.addAll( userCredentials );
+}
+
 if ( !uidMap.containsKey( objectClass ) ) uidMap.put( objectClass, new HashSet<>() );
 if ( !codeMap.containsKey( objectClass ) ) codeMap.put( objectClass, new HashSet<>() );
 

=== added directory 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks'
=== added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java	2016-02-23 10:32:50 +
@@ -0,0 +1,68 @@
+package org.hisp.dhis.dxf2.metadata2.objectbundle.hooks;
+
+/*
+ * Copyright (c) 2004-2016, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22024: minor

2016-02-23 Thread noreply


revno: 22024
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Tue 2016-02-23 09:57:08 +0100
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-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-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2016-02-15 09:46:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2016-02-23 08:57:08 +
@@ -146,18 +146,12 @@
 
 
 
-
-{{showHideLabel}}
-
+
 
 
 
 
-
-
-
+
 
 
 

___
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 22023: remove references to dhis-service-eventreporting

2016-02-23 Thread noreply


revno: 22023
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Tue 2016-02-23 15:29:23 +0700
message:
  remove references to dhis-service-eventreporting
modified:
  dhis-2/dhis-web/dhis-web-api/pom.xml
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/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-web/dhis-web-api/pom.xml'
--- dhis-2/dhis-web/dhis-web-api/pom.xml	2016-01-15 00:52:40 +
+++ dhis-2/dhis-web/dhis-web-api/pom.xml	2016-02-23 08:29:23 +
@@ -42,10 +42,6 @@
   dhis-service-analytics
 
 
-  org.hisp.dhis
-  dhis-service-eventreporting
-
-
   javax.servlet
   javax.servlet-api
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java	2016-01-04 02:27:49 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java	2016-02-23 08:29:23 +
@@ -59,7 +59,6 @@
 
 public static final String RESOURCE_PATH = "/aggregationQueries";
 
-@Autowired
 private CaseAggregationConditionService aggregationConditionService;
 
 @Autowired

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml	2016-01-15 00:52:40 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml	2016-02-23 08:29:23 +
@@ -2,30 +2,30 @@
   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;>
   4.0.0
-  
+
   
 dhis-web-maintenance
 org.hisp.dhis
 2.23-SNAPSHOT
   
-  
+
   dhis-web-maintenance-program
   war
   DHIS Program and Attribute Management
-  
+
   
 dhis-web-maintenance-program
   
-  
+
   
-
+
 
   javax.servlet
   javax.servlet-api
-	
-	
+
+
 
-
+
 
   org.hisp.dhis
   dhis-api
@@ -49,27 +49,22 @@
   org.hisp.dhis
   dhis-service-core
 
-
+
+
+
 
-  org.hisp.dhis
-  dhis-service-eventreporting
+  org.apache.poi
+  poi
 
-
-	
-	
-	
-		org.apache.poi
-		poi
-	
-	
- 
- 
+
+
+
 
   net.sf.json-lib
   json-lib
   jdk15
 
-
+
   
   
 ../../../

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2016-02-15 08:24:00 +
+++ dhis-2/pom.xml	2016-02-23 08:29:23 +
@@ -329,11 +329,6 @@
   
   
 org.hisp.dhis
-dhis-service-eventreporting
-${project.version}
-  
-  
-org.hisp.dhis
 dhis-service-mobile
 ${project.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

Re: [Dhis2-devs] (no subject)

2016-02-23 Thread Knut Staring

Hi Moses,

Is this a test database or production? In any case, please always make sure
to take a backup of your database before doing any kind of SQL.

If you want to convert ALL the dataelements in your database to Tracker,
then this should suffice:

update dataelement set domaintype='TRACKER'

Please be aware that it will convert everything. If you first want to take
a look at which ones you want to convert, then do something like this:

select dataelementid, name, domaintype from dataelement

Knut

On Tue, Feb 23, 2016 at 9:19 AM, moses mwale  wrote:

> hello
>
> someone have an idea on how to convert data Elements which are created as
> aggregates to tracker using sql at once.. please need your help
>
>
> --
> developer_lusaka_systems
>
> ___
> 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
Norway: +4791880522
Skype: knutstar
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] (no subject)

2016-02-23 Thread moses mwale

hello

someone have an idea on how to convert data Elements which are created as
aggregates to tracker using sql at once.. please need your help


-- 
developer_lusaka_systems
___
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 22034: include usernames=>uc map in preheater

[Dhis2-devs] DHIS2 Date Format queries

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22033: minor, replace test metadata in dxf2 object bundle test

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22032: minor, default to :owner for non-id objects

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22031: removed remains of caseagg

[Dhis2-devs] [Bug 1548998] [NEW] Missing tracker entity form in programs/attribute

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22030: Add new orgunit group symbols to dialog box.

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22029: Add new set of orgunit group icons.

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22028: Minor fix

Re: [Dhis2-devs] Issue installing apps

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22027: minor, clone object list in PreheatService.collectReferences, and add UserCredentials directly

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22025: Add User.UserCredentials references for preheat scans

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22024: minor

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 22023: remove references to dhis-service-eventreporting

Re: [Dhis2-devs] (no subject)

[Dhis2-devs] (no subject)

16 matches

Site Navigation

Mail list logo

Footer information