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

[noreply]

revno: 15822
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 10:23:44 +0200
message:
  Minor
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java	2014-06-23 21:31:31 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java	2014-06-24 08:23:44 +
@@ -326,6 +326,7 @@
 registration.setDataSet( dataSet );
 registration.setPeriod( period );
 registration.setSource( organisationUnit );
+registration.setAttributeOptionCombo( attributeOptionCombo );
 registration.setDate( new Date() );
 registration.setStoredBy( storedBy );
 

___
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 15823: Data set report, only showing advanced options link if there are any

[noreply]

revno: 15823
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 10:33:02 +0200
message:
  Data set report, only showing advanced options link if there are any
modified:
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.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-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-06-17 13:09:03 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-06-24 08:33:02 +
@@ -146,8 +146,10 @@
 
 #end 
 
+#if( $organisationUnitGroupSets.size() > 0 )
 $i18n.getString( "show_more_options" )
 $i18n.getString( "show_fewer_options" )
+#end
 
 
 
@@ -159,10 +161,3 @@
 #parse( "dhis-web-commons/loader/loader.vm" )
 
 
-
-
-
-
-
-
-

___
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 15824: Analytics, replaced use of Arrays.asList with ListUtils.getList

[noreply]

revno: 15824
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 10:47:50 +0200
message:
  Analytics, replaced use of Arrays.asList with ListUtils.getList
modified:
  
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2014-04-16 14:01:54 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2014-06-24 08:47:50 +
@@ -34,10 +34,10 @@
 import static org.hisp.dhis.analytics.AnalyticsTableManager.ORGUNIT_TARGET_TABLE_NAME;
 import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_CATEGORYOPTIONCOMBO;
 import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_DATA_X;
+import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_LATITUDE;
+import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_LONGITUDE;
 import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_ORGUNIT;
 import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_PERIOD;
-import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_LONGITUDE;
-import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_LATITUDE;
 import static org.hisp.dhis.analytics.DataQueryParams.FIXED_DIMS;
 import static org.hisp.dhis.common.DimensionalObject.CATEGORYOPTIONCOMBO_DIM_ID;
 import static org.hisp.dhis.common.DimensionalObject.DATAELEMENT_DIM_ID;
@@ -45,10 +45,10 @@
 import static org.hisp.dhis.common.DimensionalObject.DATA_X_DIM_ID;
 import static org.hisp.dhis.common.DimensionalObject.DIMENSION_SEP;
 import static org.hisp.dhis.common.DimensionalObject.INDICATOR_DIM_ID;
+import static org.hisp.dhis.common.DimensionalObject.LATITUDE_DIM_ID;
+import static org.hisp.dhis.common.DimensionalObject.LONGITUDE_DIM_ID;
 import static org.hisp.dhis.common.DimensionalObject.ORGUNIT_DIM_ID;
 import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID;
-import static org.hisp.dhis.common.DimensionalObject.LONGITUDE_DIM_ID;
-import static org.hisp.dhis.common.DimensionalObject.LATITUDE_DIM_ID;
 import static org.hisp.dhis.common.DimensionalObjectUtils.toDimension;
 import static org.hisp.dhis.common.IdentifiableObjectUtils.getUids;
 import static org.hisp.dhis.common.NameableObjectUtils.asList;
@@ -66,7 +66,6 @@
 import static org.hisp.dhis.system.util.DateUtils.daysBetween;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -372,7 +371,7 @@
 
 for ( Map.Entry entry : aggregatedDataMap.entrySet() )
 {
-List dataRow = new ArrayList( Arrays.asList( entry.getKey().split( DIMENSION_SEP ) ) );
+List dataRow = ListUtils.getList( entry.getKey().split( DIMENSION_SEP ) );
 
 List targetRow = ListUtils.getAtIndexes( dataRow, completenessDimIndexes );
 String targetKey = StringUtils.join( targetRow, DIMENSION_SEP );
@@ -856,7 +855,7 @@
 {
 DimensionalObject object = new BaseDimensionalObject( dimension, DimensionType.CATEGORY_OPTION_COMBO, null, DISPLAY_NAME_CATEGORYOPTIONCOMBO, new ArrayList() );
 
-return Arrays.asList( object );
+return ListUtils.getList( object );
 }
 
 if ( PERIOD_DIM_ID.equals( dimension ) )
@@ -896,7 +895,7 @@
 
 DimensionalObject object = new BaseDimensionalObject( dimension, DimensionType.PERIOD, null, DISPLAY_NAME_PERIOD, asList( periodList ) );
 
-return Arrays.asList( object );
+return ListUtils.getList( object );
 }
 
 if ( ORGUNIT_DIM_ID.equals( dimension ) )
@@ -977,21 +976,21 @@
 
 DimensionalObject object = new BaseDimensionalObject( dimension, DimensionType.ORGANISATIONUNIT, null, DISPLAY_NAME_ORGUNIT, orgUnits );
 
-return Arrays.asList( object );
+return ListUtils.getList( object );
 }
 
 if ( LONGITUDE_DIM_ID.contains( dimension ) )
 {
 DimensionalObject object = new BaseDimensionalObject( dimension, DimensionType.STATIC, null, DISPLAY_NAME_LONGITUDE, new ArrayList() );
 
-return Arrays.asList( object );
+return ListUtils.getList( object );
 }
 
 if ( LATITU

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15825: ER EV integration fix.

[noreply]

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

revno: 15825 [merge]
committer: Jan Henrik Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 11:15:37 +0200
message:
  ER EV integration fix.
modified:
  
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-06-23 11:47:18 +
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-06-24 09:13:49 +
@@ -5846,7 +5846,7 @@
 	if (NS.isSessionStorage) {
 		//web.events.setValueMouseHandlers(layout, response || xResponse, ns.app.uuidDimUuidsMap, ns.app.uuidObjectMap);
 		web.events.setColumnHeaderMouseHandlers(layout, response, xResponse);
-		web.storage.session.set(layout, 'table');
+		web.storage.session.set(layout, 'eventtable');
 	}
 
 	ns.app.widget.setGui(layout, xLayout, response, isUpdateGui, table);

___
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 15826: Fixed bug - Exception thrown when to click DataEntry icon to open Update single-event with regist...

[noreply]

revno: 15826
committer: Tran Chau 
branch nick: dhis2
timestamp: Tue 2014-06-24 18:12:20 +0800
message:
  Fixed bug - Exception thrown when to click DataEntry icon to open Update 
single-event with registration form.
removed:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm
renamed:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstancesAction.java
 => 
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstanceAction.java
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstanceAction.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
=== renamed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstancesAction.java' => 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstanceAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstancesAction.java	2014-06-22 13:38:08 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstanceAction.java	2014-06-24 10:12:20 +
@@ -29,29 +29,38 @@
  */
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.oust.manager.SelectionTreeManager;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramInstance;
 import org.hisp.dhis.program.ProgramInstanceService;
 import org.hisp.dhis.program.ProgramService;
 import org.hisp.dhis.program.ProgramStageInstance;
+import org.hisp.dhis.trackedentity.TrackedEntityInstance;
 import org.hisp.dhis.trackedentity.TrackedEntityInstanceService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
 
 /**
  * @author Chau Thu Tran
  */
-public class LoadProgramStageInstancesAction
+public class LoadProgramStageInstanceAction
 implements Action
 {
 // -
 // Dependencies
 // -
 
+@Autowired
+private SelectionTreeManager selectionTreeManager;
+
 private TrackedEntityInstanceService entityInstanceService;
 
 public void setEntityInstanceService( TrackedEntityInstanceService entityInstanceService )
@@ -98,18 +107,11 @@
 return statusMap;
 }
 
-private ProgramInstance programInstance;
-
-public ProgramInstance getProgramInstance()
-{
-return programInstance;
-}
-
-private List programStageInstances = new ArrayList();
-
-public List getProgramStageInstances()
-{
-return programStageInstances;
+private ProgramStageInstance programStageInstance;
+
+public ProgramStageInstance getProgramStageInstance()
+{
+return programStageInstance;
 }
 
 private Program program;
@@ -126,26 +128,28 @@
 public String execute()
 throws Exception
 {
-//TrackedEntityInstance entityInstance = entityInstanceService.getTrackedEntityInstance( entityInstanceId );
+TrackedEntityInstance entityInstance = entityInstanceService.getTrackedEntityInstance( entityInstanceId );
 
 program = programService.getProgram( programId );
-//
-//List programInstances = new ArrayList();
-//
-//if ( program.getType() == Program.MULTIPLE_EVENTS_WITH_REGISTRATION )
-//{
-//programInstances = new ArrayList( programInstanceService.getProgramInstances( entityInstance,
-//program, ProgramInstance.STATUS_ACTIVE ) );
-//}
-//else if ( program.getType() == Program.SINGLE_EVENT_WITH_REGISTRATION )
-//{
-//programInstances = new ArrayList( programInstanceService.getProgramInstances( entityInstance,
-//program ) );
-//}
-//else
-//{
-//programInstances = new ArrayList( programInstanceService.getProgramInstances( program ) );
-//}
+
+List programInstances = new ArrayList();
+
+programInstances = new ArrayList( programInst

[Dhis2-devs] Programme validation rule exception with decimals

[Jason Pickering]

Not sure if this has already been reported, but thought just in case not.
We have defined a programme validation rule which states that the height of
a client (in meters) should be less than 2.5. However ,we get this exception


* ERROR 2014-06-24 07:02:24,750 Error while executing action
(ExceptionInterceptor.java [http-apr-8080-exec-5])
java.lang.NumberFormatException: For input string: "2.6"at
java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
  at java.lang.Integer.parseInt(Integer.java:492)at
java.lang.Integer.parseInt(Integer.java:527)at
org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:176)
  at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
  at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  at java.lang.reflect.Method.invoke(Method.java:606)

Version:2.15Build revision:15170
Regards,Jason
___
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] Programme validation rule exception with decimals

[Jason Pickering]

Seems from this (https://bugs.launchpad.net/dhis2/+bug/1251718) it may have
been fixed in 15169 but

int leftSide = Integer.parseInt( leftSideValue );
int rightSide = Integer.parseInt( rightSideValue );

would seem to indicate the problem with decimal values.




On Tue, Jun 24, 2014 at 1:08 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> Not sure if this has already been reported, but thought just in case not.
> We have defined a programme validation rule which states that the height
> of a client (in meters) should be less than 2.5. However ,we get this
> exception
>
>
> * ERROR 2014-06-24 07:02:24,750 Error while executing action
> (ExceptionInterceptor.java [http-apr-8080-exec-5])
> java.lang.NumberFormatException: For input string: "2.6" at
> java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
>   at java.lang.Integer.parseInt(Integer.java:492)at
> java.lang.Integer.parseInt(Integer.java:527) at
> org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:176)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
>   at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:606)
>
> Version:2.15Build revision:15170
> Regards, Jason
>
___
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 15827: Centralized method for converting dimension query parameters

[noreply]

revno: 15827
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 13:30:23 +0200
message:
  Centralized method for converting dimension query parameters
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js
  
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java	2014-06-16 19:51:38 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java	2014-06-24 11:30:23 +
@@ -37,12 +37,16 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
+import org.hisp.dhis.common.DimensionalObjectUtils;
 import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.system.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -275,6 +279,36 @@
 
 return new ArrayList( Arrays.asList( values ) );
 }
+
+/**
+ * Returns a mapping of dimension identifiers and dimension option identifiers
+ * based on the given set of dimension strings. Splits the strings using : as
+ * separator. Returns null of dimensions are null or empty.
+ * 
+ * @param dimensions the set of strings on format dimension:dimension-option.
+ * @return a map of dimensions and dimension options.
+ */
+public static Map getDimensionsAndOptions( Set dimensions )
+{
+if ( dimensions == null || dimensions.isEmpty() )
+{
+return null;
+}
+
+Map map = new HashMap();
+
+for ( String dim : dimensions )
+{
+String[] dims = dim.split( DimensionalObjectUtils.DIMENSION_NAME_SEP );
+
+if ( dims.length == 2 && dims[0] != null && dims[1] != null )
+{
+map.put( dims[0], dims[1] );
+}
+}
+
+return map;
+}
 
 /**
  * Adds basic authentication by adding an Authorization header to the

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js	2013-11-06 10:41:43 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js	2014-06-24 11:30:23 +
@@ -10,17 +10,10 @@
 {
 	selectedOrganisationUnitList__.empty();
 
-if( ids && ids.length > 0 ) {
+if ( ids && ids.length > 0 )  {
 selectedOrganisationUnitList__.append('' + ids[0] + '');
 }
 
-/*
-	jQuery.each(ids, function( i, item )
-	{
-		selectedOrganisationUnitList__.append('' + item	+ '');
-	});
-	*/
-
 	byId('treeSelectedId').selectedIndex = 0;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java	2014-06-23 21:31:31 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java	2014-06-24 11:30:23 +
@@ -32,7 +32,6 @@
 import static org.hisp.dhis.dataset.DataSet.TYPE_SECTION;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -40,10 +39,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.struts2.ServletActionContext;
-import org.hisp.dhis.webapi.utils.ContextUtils;
-import org.hisp.dhis.webapi.utils.InputUtils;
-import org.hisp.dhis.webapi.utils.ContextUtils.CacheStrategy;
-import org.hisp.dhis.common.DimensionalObjectUtils;
 import org.hisp.dhis.common.Grid;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataset.CompleteDataSetRegistration;
@@ -58,6 +53,9 @@
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.webapi.utils.ContextUtils;
+import

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15828: some validation on lat and long capturing, also minor style fix in custom forms

[noreply]

revno: 15828
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Tue 2014-06-24 14:23:55 +0200
message:
  some validation on lat and long capturing, also minor style fix in custom 
forms
modified:
  
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js
  
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css
  
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/customForm.html
  
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.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-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js	2014-06-22 07:04:04 +
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js	2014-06-24 12:23:55 +
@@ -231,7 +231,7 @@
 newInputField = '';
+'typeahead-open-on-focus ng-required="programStageDataElements.'+deId+'.compulsory" name="foo">';
 }
 if(programStageDataElements[deId].dataElement.type == "bool"){
 newInputField = '
 
-{{'number_required'| translate}}
+{{'number_required'| translate}} [-90 ... 90]
 
 
 
@@ -36,9 +38,11 @@
 
-{{'number_required'| translate}}
+{{'number_required'| translate}}[-180 ... 180]
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2014-06-22 07:04:04 +
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2014-06-24 12:23:55 +
@@ -33,10 +33,12 @@
 
 
-{{'number_required'| translate}}
+{{'number_required'| translate}} [-90 ... 90]
 
 
 
@@ -47,9 +49,11 @@
 
-{{'number_required'| translate}}
+{{'number_required'| translate}}[-180 ... 180]
 
 
 

___
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 15829: Fixed bug - Programme validation rule exception with decimals.

[noreply]

revno: 15829
committer: Tran Chau 
branch nick: dhis2
timestamp: Tue 2014-06-24 20:33:37 +0800
message:
  Fixed bug -  Programme validation rule exception with decimals.
modified:
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java	2014-06-23 13:01:57 +
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java	2014-06-24 12:33:37 +
@@ -158,8 +158,8 @@
 String expression = validate.getLeftSide().getExpression() + " " + validate.getRightSide().getExpression();
 if ( isNumberDataExpression( expression ) )
 {
-int leftSide = Integer.parseInt( leftSideValue );
-int rightSide = Integer.parseInt( rightSideValue );
+double leftSide = Double.parseDouble( leftSideValue );
+double rightSide = Double.parseDouble( rightSideValue );
 if ( !((operator.equals( "==" ) && leftSide == rightSide)
 || (operator.equals( "<" ) && leftSide < rightSide)
 || (operator.equals( "<=" ) && leftSide <= rightSide)

___
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 15830: Fixed bug - Exception thrown when to save coordinates of an event in case entry form.

[noreply]

revno: 15830
committer: Tran Chau 
branch nick: dhis2
timestamp: Tue 2014-06-24 20:38:54 +0800
message:
  Fixed bug - Exception thrown when to save coordinates of an event in case 
entry form.
modified:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.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-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-06-19 13:44:22 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2014-06-24 12:38:54 +
@@ -1921,4 +1921,3 @@
 	$('#completedTB [id=tr1_' + programInstanceId + ']').remove();
 	$('#completedTB [id=tr2_' + programInstanceId + ']').remove();
 }
-

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2014-06-19 09:24:54 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2014-06-24 12:38:54 +
@@ -1254,3 +1254,9 @@
 $( '#sec_' + value ).show();
 }
 }
+
+function isNumber( value )
+{
+	var regex = /^(-?0|-?[1-9]\d*)(\.\d+)?(E\d+)?$/;
+	return regex.test( value );
+}

___
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] Programme validation rule exception with decimals

[Tran Chau]

Thank you for reporting this bug. It is fixed in revision 15171.

Best regards,

Châu Thu Trân
HISP Viet Nam
Email: tran.hispviet...@gmail.com


On Tue, Jun 24, 2014 at 7:13 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> Seems from this (https://bugs.launchpad.net/dhis2/+bug/1251718) it may
> have been fixed in 15169 but
>
> int leftSide = Integer.parseInt( leftSideValue );
> int rightSide = Integer.parseInt( rightSideValue );
>
> would seem to indicate the problem with decimal values.
>
>
>
>
> On Tue, Jun 24, 2014 at 1:08 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Not sure if this has already been reported, but thought just in case not.
>> We have defined a programme validation rule which states that the height
>> of a client (in meters) should be less than 2.5. However ,we get this
>> exception
>>
>>
>> * ERROR 2014-06-24 07:02:24,750 Error while executing action
>> (ExceptionInterceptor.java [http-apr-8080-exec-5])
>> java.lang.NumberFormatException: For input string: "2.6" at
>> java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
>>   at java.lang.Integer.parseInt(Integer.java:492)at
>> java.lang.Integer.parseInt(Integer.java:527) at
>> org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:176)
>>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>> at
>> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
>>   at
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>   at java.lang.reflect.Method.invoke(Method.java:606)
>>
>> Version:2.15Build revision:15170
>> Regards, Jason
>>
>
>
> ___
> 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] Programme validation rule exception with decimals

[Jason Pickering]

Hi Tran,
Thanks for this, but I think it is only a partial fix. Now the problem is
that we have some data elements which needed to be added together and
compared to other ones, similar to the aggregate validation rules, but this
is event data. The error we get now is..

* ERROR 2014-06-24 09:34:47,979 Error while executing action
(ExceptionInterceptor.java [http-apr-8080-exec-7])
java.lang.NumberFormatException: For input string: "0+3+6+6+0+0"
at
java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
at java.lang.Integer.parseInt(Integer.java:492)
at java.lang.Integer.parseInt(Integer.java:527)
at
org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:177)
at sun.reflect.GeneratedMethodAccessor1771.invoke(Unknown Source)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)

Looks like the formula is not being parsed?

Best regards,
Jason


On Tue, Jun 24, 2014 at 3:16 PM, Tran Chau 
wrote:

> Thank you for reporting this bug. It is fixed in revision 15171.
>
> Best regards,
> 
> Châu Thu Trân
> HISP Viet Nam
> Email: tran.hispviet...@gmail.com
>
>
> On Tue, Jun 24, 2014 at 7:13 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Seems from this (https://bugs.launchpad.net/dhis2/+bug/1251718) it may
>> have been fixed in 15169 but
>>
>> int leftSide = Integer.parseInt( leftSideValue );
>> int rightSide = Integer.parseInt( rightSideValue );
>>
>> would seem to indicate the problem with decimal values.
>>
>>
>>
>>
>> On Tue, Jun 24, 2014 at 1:08 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> Not sure if this has already been reported, but thought just in case
>>> not.
>>> We have defined a programme validation rule which states that the height
>>> of a client (in meters) should be less than 2.5. However ,we get this
>>> exception
>>>
>>>
>>> * ERROR 2014-06-24 07:02:24,750 Error while executing action
>>> (ExceptionInterceptor.java [http-apr-8080-exec-5])
>>> java.lang.NumberFormatException: For input string: "2.6" at
>>> java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
>>>   at java.lang.Integer.parseInt(Integer.java:492)at
>>> java.lang.Integer.parseInt(Integer.java:527) at
>>> org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:176)
>>>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>>>   at
>>> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
>>>   at
>>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>>   at java.lang.reflect.Method.invoke(Method.java:606)
>>>
>>> Version:2.15Build revision:15170
>>> Regards, Jason
>>>
>>
>>
>> ___
>> 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] Programme validation rule exception with decimals

[Tran Chau]

Hi Jason,

We haven't support the program validation rule with multi data elements or
something like 0+3+6+6+0+0 yet. Just supported with one data element for
one side ( one data element for left side/right side ).


Best regards,

Châu Thu Trân
HISP Viet Nam
Email: tran.hispviet...@gmail.com


On Tue, Jun 24, 2014 at 9:45 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> Hi Tran,
> Thanks for this, but I think it is only a partial fix. Now the problem is
> that we have some data elements which needed to be added together and
> compared to other ones, similar to the aggregate validation rules, but this
> is event data. The error we get now is..
>
> * ERROR 2014-06-24 09:34:47,979 Error while executing action
> (ExceptionInterceptor.java [http-apr-8080-exec-7])
> java.lang.NumberFormatException: For input string: "0+3+6+6+0+0"
>  at
> java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
> at java.lang.Integer.parseInt(Integer.java:492)
> at java.lang.Integer.parseInt(Integer.java:527)
> at
> org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:177)
> at sun.reflect.GeneratedMethodAccessor1771.invoke(Unknown Source)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> at java.lang.reflect.Method.invoke(Method.java:606)
>
> Looks like the formula is not being parsed?
>
> Best regards,
> Jason
>
>
> On Tue, Jun 24, 2014 at 3:16 PM, Tran Chau 
> wrote:
>
>> Thank you for reporting this bug. It is fixed in revision 15171.
>>
>> Best regards,
>> 
>> Châu Thu Trân
>> HISP Viet Nam
>> Email: tran.hispviet...@gmail.com
>>
>>
>> On Tue, Jun 24, 2014 at 7:13 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> Seems from this (https://bugs.launchpad.net/dhis2/+bug/1251718) it may
>>> have been fixed in 15169 but
>>>
>>> int leftSide = Integer.parseInt( leftSideValue );
>>> int rightSide = Integer.parseInt( rightSideValue );
>>>
>>> would seem to indicate the problem with decimal values.
>>>
>>>
>>>
>>>
>>> On Tue, Jun 24, 2014 at 1:08 PM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 Not sure if this has already been reported, but thought just in case
 not.
 We have defined a programme validation rule which states that the
 height of a client (in meters) should be less than 2.5. However ,we get
 this exception


 * ERROR 2014-06-24 07:02:24,750 Error while executing action
 (ExceptionInterceptor.java [http-apr-8080-exec-5])
 java.lang.NumberFormatException: For input string: "2.6" at
 java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
   at java.lang.Integer.parseInt(Integer.java:492)at
 java.lang.Integer.parseInt(Integer.java:527) at
 org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:176)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   at
 sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
   at
 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
   at java.lang.reflect.Method.invoke(Method.java:606)

 Version:2.15Build revision:15170
 Regards, Jason

>>>
>>>
>>> ___
>>> 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] Programme validation rule exception with decimals

[Jason Pickering]

Hi Tran,

OK. well, in that case, I think you need to prevent people from being able
to create these types of validation rules or better yet, properly handle
the exception so that if one validation rule throws an exception for some
reason, then the others will be able to continue to execute.

Hope this will be supported soon.

Best regards,
Jason




On Tue, Jun 24, 2014 at 3:54 PM, Tran Chau 
wrote:

> Hi Jason,
>
> We haven't support the program validation rule with multi data elements or
> something like 0+3+6+6+0+0 yet. Just supported with one data element for
> one side ( one data element for left side/right side ).
>
>
> Best regards,
> 
> Châu Thu Trân
> HISP Viet Nam
> Email: tran.hispviet...@gmail.com
>
>
> On Tue, Jun 24, 2014 at 9:45 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Hi Tran,
>> Thanks for this, but I think it is only a partial fix. Now the problem is
>> that we have some data elements which needed to be added together and
>> compared to other ones, similar to the aggregate validation rules, but this
>> is event data. The error we get now is..
>>
>> * ERROR 2014-06-24 09:34:47,979 Error while executing action
>> (ExceptionInterceptor.java [http-apr-8080-exec-7])
>> java.lang.NumberFormatException: For input string: "0+3+6+6+0+0"
>>  at
>> java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
>> at java.lang.Integer.parseInt(Integer.java:492)
>> at java.lang.Integer.parseInt(Integer.java:527)
>> at
>> org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:177)
>> at sun.reflect.GeneratedMethodAccessor1771.invoke(Unknown Source)
>> at
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>> at java.lang.reflect.Method.invoke(Method.java:606)
>>
>> Looks like the formula is not being parsed?
>>
>> Best regards,
>> Jason
>>
>>
>> On Tue, Jun 24, 2014 at 3:16 PM, Tran Chau 
>> wrote:
>>
>>> Thank you for reporting this bug. It is fixed in revision 15171.
>>>
>>> Best regards,
>>> 
>>> Châu Thu Trân
>>> HISP Viet Nam
>>> Email: tran.hispviet...@gmail.com
>>>
>>>
>>> On Tue, Jun 24, 2014 at 7:13 PM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 Seems from this (https://bugs.launchpad.net/dhis2/+bug/1251718) it may
 have been fixed in 15169 but

 int leftSide = Integer.parseInt( leftSideValue );
 int rightSide = Integer.parseInt( rightSideValue );

 would seem to indicate the problem with decimal values.




 On Tue, Jun 24, 2014 at 1:08 PM, Jason Pickering <
 jason.p.picker...@gmail.com> wrote:

> Not sure if this has already been reported, but thought just in case
> not.
> We have defined a programme validation rule which states that the
> height of a client (in meters) should be less than 2.5. However ,we get
> this exception
>
>
> * ERROR 2014-06-24 07:02:24,750 Error while executing action
> (ExceptionInterceptor.java [http-apr-8080-exec-5])
> java.lang.NumberFormatException: For input string: "2.6" at
> java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
>   at java.lang.Integer.parseInt(Integer.java:492)at
> java.lang.Integer.parseInt(Integer.java:527) at
> org.hisp.dhis.program.DefaultProgramValidationService.validate(DefaultProgramValidationService.java:176)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
>   at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:606)
>
> Version:2.15Build revision:15170
> Regards, Jason
>


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


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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15831: Data set report, minor fix

[noreply]

revno: 15831
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 16:08:10 +0200
message:
  Data set report, minor fix
modified:
  
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java	2014-06-24 11:30:23 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java	2014-06-24 14:08:10 +
@@ -41,6 +41,7 @@
 import org.apache.struts2.ServletActionContext;
 import org.hisp.dhis.common.Grid;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.dataset.CompleteDataSetRegistration;
 import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
 import org.hisp.dhis.dataset.DataSet;
@@ -55,7 +56,6 @@
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.webapi.utils.ContextUtils;
 import org.hisp.dhis.webapi.utils.ContextUtils.CacheStrategy;
-import org.hisp.dhis.webapi.utils.InputUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
@@ -105,6 +105,13 @@
 {
 this.periodService = periodService;
 }
+
+private DataElementCategoryService categoryService;
+
+public void setCategoryService( DataElementCategoryService categoryService )
+{
+this.categoryService = categoryService;
+}
 
 private I18nFormat format;
 
@@ -123,9 +130,6 @@
 @Autowired
 private ContextUtils contextUtils;
 
-@Autowired
-private InputUtils inputUtils;
-
 // -
 // Input
 // -
@@ -150,21 +154,7 @@
 {
 this.ou = ou;
 }
-
-private String cc;
-
-public void setCc( String cc )
-{
-this.cc = cc;
-}
-
-private String cp;
-
-public void setCp( String cp )
-{
-this.cp = cp;
-}
-
+
 private Set dimension;
 
 public void setDimension( Set dimension )
@@ -271,7 +261,7 @@
 
 String dataSetType = selectedDataSet.getDataSetType();
 
-DataElementCategoryOptionCombo attributeOptionCombo = inputUtils.getAttributeOptionCombo( response, cc, cp );
+DataElementCategoryOptionCombo attributeOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
 
 registration = registrationService.getCompleteDataSetRegistration( selectedDataSet, selectedPeriod, selectedOrgunit, attributeOptionCombo );
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-04-03 13:57:45 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2014-06-24 14:08:10 +
@@ -108,6 +108,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] [Dhis2-users] dhis 2.16 update

[Marta Vila]

Sounds great, looking forward to try it out :)

thanks!!




On 22 June 2014 15:43, Lars Helge Øverland  wrote:

> Hi all,
>
> here comes a quick update and preview of version 2.16. We plan to release
> in the first weeks on July. The major features being included:
>
> - Event visualizer: New app for visualizations / charts of aggregated
> event data.
>
> Preview
> 
>
>
> - Tracker capture: New app for tracking, intended to replace the current
> individual records module in 2.17. For 2.16 it will support search for
> tracked entities and dashboard with widgets for enrollment, data capture,
> current selections, profile, relationships and notes (at least).
>
> Preview 
>
>
> - Web API: Improved meta-data support. The API will support meta-data
> field filtering, allowing the consumer to explicitly define which fields
> should be included on objects when retrieving meta-data. The tracker
> related objects like programs and events will be fully supported in the API
> including the possibility for creating and updating objects.
>
> Docs  | Docs
> 
>
>
> - Calendar: Support for an array of eight calendars including nepal,
> coptic, julian.
>
> Preview
> 
>
>
> - Data value one-way sync: Support for automatically sending data from a
> semi-offline DHIS instance to another central, online DHIS instance.
>
>
> - Event analytics: Support for data element aggregation operators in the
> event analytics api and event reports app, allowing for sum, average,
> count, etc aggregation of events.
>
>
> There is a range of smaller features planned for 2.16 which you can find
> on Launchpad here .
>
>
> regards,
>
> Lars
>
>
>
>
>
> ___
> 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 15832: Fixed bug - Exception thrown when to load event list in Visit schedule.

[noreply]

revno: 15832
committer: Tran Chau 
branch nick: dhis2
timestamp: Tue 2014-06-24 22:23:58 +0800
message:
  Fixed bug - Exception thrown when to load event list in Visit schedule.
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
  
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchTrackedEntityInstanceCriteria.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java	2014-06-20 14:17:48 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java	2014-06-24 14:23:58 +
@@ -265,23 +265,23 @@
 
 if ( status == EventStatus.VISITED )
 {
-sql = "and psi.status = " +  + EventStatus.ACTIVE.getValue() + " and psi.executiondate is not null ";
+sql = "and psi.status = '" + EventStatus.ACTIVE.name() + "' and psi.executiondate is not null ";
 }
 else if ( status == EventStatus.COMPLETED )
 {
-sql = "and psi.status = " + EventStatus.COMPLETED.getValue();
+sql = "and psi.status = '" + EventStatus.COMPLETED.name() + "' ";
 }
 else if ( status == EventStatus.SCHEDULE )
 {
-sql += "and psi.executiondate is null and date(now()) <= date(psi.duedate) and psi.status = 0 ";
+sql += "and psi.executiondate is null and date(now()) <= date(psi.duedate) and psi.status = '" + EventStatus.ACTIVE.name() + "' ";
 }
 else  if ( status == EventStatus.OVERDUE )
 {
-sql += "and psi.executiondate is null and date(now()) > date(psi.duedate) and psi.status = 0 ";
+sql += "and psi.executiondate is null and date(now()) > date(psi.duedate) and psi.status = '" + EventStatus.ACTIVE.name() + "' ";
 }
 else
 {
-sql += "and psi.status = " + status.getValue() + " ";
+sql += "and psi.status = '" + status.name() + "' ";
 }
 }
 

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2014-06-20 12:32:01 +
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2014-06-24 14:23:58 +
@@ -213,7 +213,7 @@
 + "and pg.programid = " + program.getId()
 + "group by ou.name, ps.name, psi.completeduser, psi.completeddate, psi.status "
 + "having psi.completeddate >= '" + startDate + "' AND psi.completeddate <= '" + endDate + "' "
-+ "and psi.status=" + EventStatus.COMPLETED.getValue()
++ "and psi.status='" + EventStatus.COMPLETED.name()  + "' "
 + "order by ou.name, ps.name, psi.completeduser";
 
 SqlRowSet rs = jdbcTemplate.queryForRowSet( sql );

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java	2014-06-20 12:32:01 +
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java	2014-06-24 14:23:58 +
@@ -365,13 +365,13 @@
 {
 sql = 
 "and psi.executiondate >= '" + start + "' and psi.executiondate <= '" + end + "' " +
-"and psi.status = " + EventStatus.COMPLETED.getValue() ;
+"and psi.status = '" + EventStatus.COMPLETED.name() + "' ";
 }
 else if ( params.isEventStatus( EventStatus.VISITED ) )
 {
 sql = 
 "and p

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15833: Data entry, better handling of data type validation failures

[noreply]

revno: 15833
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 16:58:45 +0200
message:
  Data entry, better handling of data type validation failures
modified:
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2014-06-23 08:05:34 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2014-06-24 14:58:45 +
@@ -255,10 +255,15 @@
  */
 function alertField( fieldId, alertMessage )
 {
-$( fieldId ).css( 'background-color', COLOR_YELLOW );
-$( fieldId ).select();
-$( fieldId ).focus();
+var $field = $( fieldId );
+$field.css( 'background-color', COLOR_YELLOW );
+
 window.alert( alertMessage );
+
+var val = dhis2.de.currentExistingValue || '';
+$field.val( val );
+
+$field.focus();
 
 return false;
 }

___
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] Problem Saving Event Coordinates- DHIS 2.15 build 15055

[Tran Chau]

Hi Adebusoye,

This bug is fixed in revision 15171, version 2.15.

Best regards,

Châu Thu Trân
HISP Viet Nam
Email: tran.hispviet...@gmail.com


On Mon, May 26, 2014 at 6:04 PM,  wrote:

>  Thanks Dayo. Devs, Please find console output attached for more
> information.
>
> Thanks.
>
>
>
>
>
>
>
>
> On 2014-05-26 09:23, Deemoyes wrote:
>
> You may not be missing something though it may be a bug.
>
> But I will like to ask whether you are still using the same browser even
> after you probably have cleared your cache. You may just try Chrome
> incognito to narrow down the challenge and if it persists, you can right
> click on the page and inspect the element of that page to check what error
> you may be having.
>
> The inspect page could be useful to help you and the developers move
> forward also.
>
> I will also try to run the demo on my computer once I get a hold of space
> here.
>
> Regards,
>
> Adedayo
>
> Sent from my BlackBerry 10 smartphone.
>*From: *Adebusoye Anifalaje
> *Sent: *Sunday, 25 May 2014 23:11
> *To: *Adebusoye Anifalaje
> *Cc: *DHIS 2 Users list; DHIS 2 developers
> *Subject: *Re: [Dhis2-users] Problem Saving Event Coordinates- DHIS 2.15
> build 15055
>
>
> I just tested this on the demo site and i am getting the same problem.
>
> To replicate:
>
> 1) select Capture Coordonates on Delivery program stage for MNCH Program
> 2) Find/add instance
> 3) choose ou and program etc
> 4) go to Delivery program stage and enter coordinates
> 5) Program Stage Instance does not save the number
>
> Did I miss something?
>
> Cheers
> Busoye
>
> On Sunday, May 25, 2014, Adebusoye Anifalaje  wrote:
>
>> Sorry, I forgot to include version and build details:
>>
>> Version:2.15Build revision:15055
>>
>>  On 25 May 2014, at 12:50, Adebusoye Anifalaje  wrote:
>>
>> Hi
>>
>> I am having trouble saving event GPS coordinates for my program stages.
>> When the fields are empty the save icon works but as soon as I enter a
>> number it will not save.
>>
>> Any ideas or help would be appreciate.
>>
>> Thanks.
>>
>> Busoye
>>
>>
>
> ___
> 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] dhis 2.16 update

[Juma Lungo]

These are excellent features of DHIS2



On Tuesday, June 24, 2014 5:22 PM, Marta Vila  wrote:
 


Sounds great, looking forward to try it out :) 

thanks!!






On 22 June 2014 15:43, Lars Helge Øverland  wrote:

Hi all,
>
>
>here comes a quick update and preview of version 2.16. We plan to release in 
>the first weeks on July. The major features being included:
>
>
>- Event visualizer: New app for visualizations / charts of aggregated event 
>data. 
>
>
>Preview
>
>
>
>
>- Tracker capture: New app for tracking, intended to replace the current 
>individual records module in 2.17. For 2.16 it will support search for tracked 
>entities and dashboard with widgets for enrollment, data capture, current 
>selections, profile, relationships and notes (at least).
>
>
>Preview
>
>
>
>
>- Web API: Improved meta-data support. The API will support meta-data field 
>filtering, allowing the consumer to explicitly define which fields should be 
>included on objects when retrieving meta-data. The tracker related objects 
>like programs and events will be fully supported in the API including the 
>possibility for creating and updating objects.
>
>
>Docs | Docs
>
>
>
>- Calendar: Support for an array of eight calendars including nepal, coptic, 
>julian.
>
>
>Preview
>
>
>
>
>- Data value one-way sync: Support for automatically sending data from a 
>semi-offline DHIS instance to another central, online DHIS instance.
>
>
>
>
>- Event analytics: Support for data element aggregation operators in the event 
>analytics api and event reports app, allowing for sum, average, count, etc 
>aggregation of events.
>
>
>
>
>There is a range of smaller features planned for 2.16 which you can find on 
>Launchpad here.
>
>
>
>
>regards,
>
>
>Lars
>
>
>
>
> 
>
>
>___
>Mailing list: https://launchpad.net/~dhis2-users
>Post to     : dhis2-us...@lists.launchpad.net
>Unsubscribe : https://launchpad.net/~dhis2-users
>More help   : https://help.launchpad.net/ListHelp
>
>


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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15834: Data set report, disabling data criteria button when not relevant

[noreply]

revno: 15834
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 18:36:24 +0200
message:
  Data set report, disabling data criteria button when not relevant
modified:
  
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.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-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2014-06-17 13:09:03 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2014-06-24 16:36:24 +
@@ -272,4 +272,5 @@
 approval_entity=Approval entity
 approval_status=Approval status
 please_make_selection=Please make a selection below
-id=Id
\ No newline at end of file
+id=Id
+data_criteria=Data criteria

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-06-10 20:46:05 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-06-24 16:36:24 +
@@ -65,7 +65,7 @@
 
 
 
-
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-06-24 08:33:02 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-06-24 16:36:24 +
@@ -78,7 +78,7 @@
 $i18n.getString( "dataset_report" ) #openHelp( "dataset_reports" )
 
 
-
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2014-06-10 20:46:05 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2014-06-24 16:36:24 +
@@ -143,7 +143,7 @@
 }
 
 hideHeaderMessage();
-	$( "#criteria" ).hide( "fast" );
+dhis2.appr.hideCriteria();
 	$( "#content" ).hide( "fast" );
 showLoader();
 
@@ -157,6 +157,12 @@
 } );
 }
 
+dhis2.appr.hideCriteria = function()
+{
+	$( "#criteria" ).hide( "fast" );
+	$( "#dataButton" ).removeAttr( "disabled" );
+}
+
 //--
 // Approval
 //--

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2014-06-17 13:09:03 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2014-06-24 16:36:24 +
@@ -311,11 +311,13 @@
 dhis2.dsr.showCriteria = function()
 {
 	$( "#criteria" ).show( "fast" );
+	$( "#dataButton" ).attr( "disabled", "disabled" );
 }
 
 dhis2.dsr.hideCriteria = function()
 {
 	$( "#criteria" ).hide( "fast" );
+	$( "#dataButton" ).removeAttr( "disabled" );
 }
 
 dhis2.dsr.showContent = function()

___
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-documenters/dhis2/dhis2-docbook-docs] Rev 1110: Web api, system settings update

[noreply]

revno: 1110
committer: Lars Helge Overland 
branch nick: dhis2-docbook-docs
timestamp: Tue 2014-06-24 21:25:41 +0200
message:
  Web api, system settings update
modified:
  src/docbkx/en/dhis2_user_man_web_api.xml


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch 
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription
=== modified file 'src/docbkx/en/dhis2_user_man_web_api.xml'
--- src/docbkx/en/dhis2_user_man_web_api.xml	2014-06-16 20:02:18 +
+++ src/docbkx/en/dhis2_user_man_web_api.xml	2014-06-24 19:25:41 +
@@ -4374,10 +4374,24 @@
 Alternatively, you can submit the setting value as the request body, where content type is
   set to "text/plain". As an example, you can use curl like this:
 curl "apps.dhis2.org/demo/api/systemSettings/my-key" -d "My long value" -H "Content-Type: text/plain" -u admin:district -v
+To set system settings in bulk you can send a JSON object with a property -value pair for
+  each system setting key-value pair using a POST request:
+{
+  "keyApplicationNotification": "Welcome",
+  "keyApplicationIntro": "DHIS 2",
+  "keyApplicationFooter": "Read more at dhis2.org"
+}  
 You should replace my-key with your real key and my-val with your real value. To retrieve
   the value for a given key in plain text you can make a GET
   request to the following URL:
 /api/systemSettings/my-key
+Alternatively, you can specify the key as a query parameter:
+/api/systemSettings?key=my-key
+You can retrieve specific system settings as JSON by repeating the key query
+  parameter:
+curl "apps.dhis2.org/demo/api/systemSettings?key=keyApplicationNotification&key=keyApplicationIntro" -H "Content-Type: application/json" -u admin:district -v
+You can retrieve all system settings with a GET request:
+/api/systemSettings
 To delete a system setting, you can make a DELETE
   request to the URL similar to the one used above for retrieval.
   

___
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 15835: Web api, systemSettings, support for retrieving multiple specified settings in one request

[noreply]

revno: 15835
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 21:25:03 +0200
message:
  Web api, systemSettings, support for retrieving multiple specified settings 
in one request
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.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/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2014-05-20 15:16:46 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2014-06-24 19:25:03 +
@@ -37,6 +37,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Stian Strandli
@@ -162,4 +163,6 @@
 Integer credentialsExpires();
 
 Map getSystemSettingsAsMap();
+
+Map getSystemSettings( Set names );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java	2014-05-20 15:16:46 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java	2014-06-24 19:25:03 +
@@ -37,6 +37,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Stian Strandli
@@ -209,4 +210,21 @@
 
 return settingsMap;
 }
+
+public Map getSystemSettings( Set names )
+{
+Map map = new HashMap<>();
+
+for ( String name : names )
+{
+Serializable setting = getSystemSetting( name );
+
+if ( setting != null )
+{
+map.put( name, setting );
+}
+}
+
+return map;
+}
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java	2014-06-11 20:02:58 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java	2014-06-24 19:25:03 +
@@ -28,6 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.io.Serializable;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletResponse;
+
 import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.webapi.utils.ContextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +46,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.Serializable;
-import java.util.Map;
-
 /**
  * @author Lars Helge Overland
  */
@@ -57,11 +59,12 @@
 @RequestMapping( value = "/{key}", method = RequestMethod.POST, consumes = { ContextUtils.CONTENT_TYPE_TEXT, ContextUtils.CONTENT_TYPE_HTML } )
 @PreAuthorize( "hasRole('ALL') or hasRole('F_SYSTEM_SETTING')" )
 public void setSystemSetting(
-@PathVariable String key,
+@PathVariable( value = "key" ) String key,
+@RequestParam( required = false, value = "key" ) String keyParam,
 @RequestParam( required = false ) String value,
 @RequestBody( required = false ) String valuePayload, HttpServletResponse response )
 {
-if ( key == null )
+if ( key == null && keyParam == null )
 {
 ContextUtils.conflictResponse( response, "Key must be specified" );
 return;
@@ -73,6 +76,8 @@
 }
 
 value = value != null ? value : valuePayload;
+
+key = key != null ? key : keyParam;
 
 systemSettingManager.saveSystemSetting( key, value );
 
@@ -92,17 +97,24 @@
 }
 
 @RequestMapping( value = "/{key}", method = RequestMethod.GET, produces = ContextUtils.CONTENT_TYPE_TEXT )
-public @ResponseBody String getSystemSetting( @PathVariable( "key" ) String key )
+public @ResponseBody String getSystemSettingAsText( @PathVariable( "key" ) String key )
 {
 Serializable setting = systemSettingManager.getSystemSetting( key );
 
 return setting != null ? String.valueOf( setting ) : null;
 }
-
+
 @RequestMapp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15836: Naming conventions

[noreply]

revno: 15836
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Tue 2014-06-24 23:22:44 +0200
message:
  Naming conventions
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/TranslateSystemSettingManager.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsStringAction.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/setting/TranslateSystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/TranslateSystemSettingManager.java	2014-03-18 08:10:10 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/TranslateSystemSettingManager.java	2014-06-24 21:22:44 +
@@ -33,10 +33,9 @@
 /**
  * @author James Chang
  */
-
 public interface TranslateSystemSettingManager
 {
-Map getTranslation_SystemAppearanceSetting( String localeStr );
+Map getTranslationSystemAppearanceSettings( String localeStr );
 
-Map getTranslationNoFallback_SystemAppearanceSetting( String localeStr );
+Map getTranslationNoFallbackSystemAppearanceSettings( String localeStr );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java	2014-03-18 08:10:10 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java	2014-06-24 21:22:44 +
@@ -40,11 +40,9 @@
 /**
  * @author James Chang
  */
-
 public class DefaultTranslateSystemSettingManager
 implements TranslateSystemSettingManager
 {
-
 // -
 // Dependencies
 // -
@@ -61,11 +59,10 @@
 // -
 
 @Override
-public Map getTranslation_SystemAppearanceSetting( String localeStr )
+public Map getTranslationSystemAppearanceSettings( String localeStr )
 {
 Map translations = new Hashtable();
 
- // Add the key application data (with localeCode name) into translations map object
 translations.put( KEY_APPLICATION_TITLE, getSystemSettingWithFallbacks( KEY_APPLICATION_TITLE, localeStr, DEFAULT_APPLICATION_TITLE ) );
 translations.put( KEY_APPLICATION_INTRO, getSystemSettingWithFallbacks( KEY_APPLICATION_INTRO, localeStr, "" ) );
 translations.put( KEY_APPLICATION_NOTIFICATION, getSystemSettingWithFallbacks( KEY_APPLICATION_NOTIFICATION, localeStr, "" ) );
@@ -75,11 +72,10 @@
 }
 
 @Override
-public Map getTranslationNoFallback_SystemAppearanceSetting( String localeStr )
+public Map getTranslationNoFallbackSystemAppearanceSettings( String localeStr )
 {
 Map translations = new Hashtable();
 
- // Add the key application data (with localeCode name) into translations map object
 translations.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE + localeStr, DEFAULT_APPLICATION_TITLE ).toString() );
 translations.put( KEY_APPLICATION_INTRO, systemSettingManager.getSystemSetting( KEY_APPLICATION_INTRO + localeStr, "" ).toString() );
 translations.put( KEY_APPLICATION_NOTIFICATION, systemSettingManager.getSystemSetting( KEY_APPLICATION_NOTIFICATION + localeStr, "" ).toString() );
@@ -91,15 +87,16 @@
 // -
 // Support Method implementation
 // -
+
 private String getSystemSettingWithFallbacks( String keyName, String localeStr, String defaultValue )
 {
 String settingValue = "";
 
-String keyWithLocale = systemSettingManager.getSystemSetting( keyName + localeStr, "" ).toString();
+String keyWithLocale = (String) systemSettingManager.getSystemSetting( keyName + localeStr, "" );
 
 if ( keyWithLocale.isEmpty() )
 {
-settingValue = systemSettingManager.getSystemSetting( keyName, defaultValue ).toString();
+settingValue = (String) systemSettingManager.getSystemSetting( keyName, defaultValue );  
 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15837: Minor fix in traslations

[noreply]

revno: 15837
committer: Tran Chau 
branch nick: dhis2
timestamp: Wed 2014-06-25 11:57:10 +0800
message:
  Minor fix in traslations
modified:
  
dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties


--
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-i18n/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties	2014-06-17 10:10:42 +
+++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties	2014-06-25 03:57:10 +
@@ -184,6 +184,7 @@
 password_hint=Minimum 8 characters, 1 upper-case and 1 digit
 optional=Optional
 object_not_deleted_associated_by_objects=Object was not deleted because it is used by other objects:
+id=ID
 
 #-- PeriodTypes #
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-06-22 11:01:05 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-06-25 03:57:10 +
@@ -346,5 +346,4 @@
 data_monitoring=Data monitoring
 data_monitoring_strategy=Data monitoring strategy
 last_hour=Last hour
-data_set=Data Set
-id=Id
\ No newline at end of file
+data_set=Data Set
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2014-01-23 11:54:46 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2014-06-25 03:57:10 +
@@ -20,7 +20,6 @@
 selected_indicators=Selected indicators
 available_indicators=Available indicators
 define_associations=Assign to organisation units
-id=Id
 number_of_data_elements=Number of data elements
 define_dataset_associations=Assign data set to organisation units
 assign=Assign

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2014-06-13 08:01:34 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2014-06-25 03:57:10 +
@@ -107,5 +107,4 @@
 identifier=Identifier
 short_name_in_use=The short name is already in use. Please choose a different short name
 show_all_sections = Show all sections
-org_unit_levels_not_yet_saved=Organisation unit level is not yet saved, please save
-id=Id
\ No newline at end of file
+org_unit_levels_not_yet_saved=Organisation unit level is not yet saved, please save
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-06-22 12:36:40 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-06-25 03:57:10 +
@@ -59,7 +59,6 @@
 search=Search
 select=Select
 organisation_unit=Organisation unit
-id=Id
 add=Add
 program_management=Program management
 everything_is_ok=Everything is OK

=== modified file 'dhis-2/dhis-web/dhis-we

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

[noreply]

revno: 15839
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-06-25 07:31:09 +0200
message:
  minor
modified:
  
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.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-event-capture/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html	2014-06-25 05:30:24 +
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html	2014-06-25 05:31:09 +
@@ -1,6 +1,5 @@
 
-
-
+
 
 Event Capture
 
@@ -46,7 +45,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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15838: bug fix in even capture custom form rendering

[noreply]

revno: 15838
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-06-25 07:30:24 +0200
message:
  bug fix in even capture custom form rendering
modified:
  
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html
  
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.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-event-capture/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html	2014-06-13 06:12:21 +
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html	2014-06-25 05:30:24 +
@@ -1,5 +1,6 @@
 
-
+
+
 
 Event Capture
 
@@ -45,7 +46,7 @@
 
 
 
-
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js	2014-06-24 12:23:55 +
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js	2014-06-25 05:30:24 +
@@ -202,52 +202,60 @@
 programStageDataElements[prStDe.dataElement.id] = prStDe;
 });
 
-var inputRegex = //g,
+var inputRegex = //g,
 styleRegex = /style="[^"]*"/,
 idRegex = /id="[^"]*"/,
 match,
-inputFields = [];
+inputFields = [];
 
 while (match = inputRegex.exec(htmlCode)) {
-inputFields.push(match[0]);
+inputFields.push(match[0]);
 }
 
 for(var i=0; i';
+newInputField = '';
 }
 if(programStageDataElements[deId].dataElement.type == "string"){
-newInputField = '';
+newInputField = '';
 }
 if(programStageDataElements[deId].dataElement.type == "bool"){
-newInputField = '' + 
+newInputField = '' + 
 'option value="">{{\'please_select\'| translate}}' +
 '{{\'no\'| translate}}' + 
 '{{\'yes\'| translate}}';
 }
 if(programStageDataElements[deId].dataElement.type == "date"){
-newInputField = '';
+newInputField = '';
 }
 if(programStageDataElements[deId].dataElement.type == "trueOnly"){
-newInputField = '';
+newInputField = '';
 }
 
 newInputField = //'' + 

___
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