[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20373: Spanish GIS translations.

[noreply]

revno: 20373
committer: Jason P. Pickering 
branch nick: dhis2
timestamp: Sat 2015-09-26 06:26:47 +0200
message:
  Spanish GIS translations.
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.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-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties	2014-11-06 14:00:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties	2015-09-26 04:26:47 +
@@ -211,7 +211,7 @@
 facility_layer=Capa de establecimiento
 open_which_layer=\u00bfQu\u00e9 capa quiere abrir?
 organisationunit_search=Buscar unidad organizativa
-no_features_rendered=Sin caracter\u00edsticas prestados
+no_features_rendered=Sin caracter\u00edsticas prestadas
 wms_overlays=Superposiciones WMS
 file_overlays=Archivo de superposiciones
 centroid_layer=Capa de s\u00edmbolos
@@ -260,7 +260,7 @@
 share_interpretation=Compartir interpretaci\u00f3n
 organisation_unit_level_parent=Nivel de unidad organizativa / padre
 value_type=Tipo de valor
-equal_counts=Intervalos iguales
+equal_counts=Cuentas iguales
 classes_method=Clases / m\u00e9todo
 legendset=Set de leyendas
 low_color_size=Color / tama\u00f1o m\u00ednimo

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

Re: [Dhis2-devs] [Bug 1370486] Re: orgunit-merge-problem-report-tables

[jason.p.pickering]

Yes,we will also have a script for this, to really delete a site, but only
available through the backend system to a  DB administrator, but it is a
related problem.

Thanks for reporting this as well though. There are a few bugs related to
this, and has to do with the DeletionHandler not getting rid of everything
which needs to be deleted.

On Fri, Sep 25, 2015 at 4:14 PM, Juan Manuel Alcantara <
jmalcant...@apunto.com.mx> wrote:

> A similar problem happens when the org unit that will be deleted is
> linked to program/tracker data.
>
> --
> You received this bug notification because you are subscribed to the bug
> report.
> https://bugs.launchpad.net/bugs/1370486
>
> Title:
>   orgunit-merge-problem-report-tables
>
> Status in DHIS:
>   Fix Committed
>
> Bug description:
>   Version:
>   2.15
>   Build revision:
>   15196
>
>   When orgunits which are part of a report table are attempted to be
>   merged with another orgunit, the following error results.
>
>   DELETE FROM reporttable_organisationunits where organisationunitid =
>   76018;
>
>   followed by clearing the cache is a workaround.
>
>   * INFO  2014-09-17 08:15:05,583 DELETE FROM datavalue_audit WHERE
> sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>   * INFO  2014-09-17 08:15:05,584 DELETE FROM datavalue WHERE
> sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>   * INFO  2014-09-17 08:15:05,815 DELETE FROM completedatasetregistration
> WHERE sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>   * ERROR 2014-09-17 08:15:05,848 Error while executing action
> (ExceptionInterceptor.java [http-bio-8080-exec-81])
>   org.hisp.dhis.common.DeleteNotAllowedException: ReportTable
>   at
> org.hisp.dhis.system.deletion.DefaultDeletionManager.execute(DefaultDeletionManager.java:102)
>   at
> org.hisp.dhis.system.deletion.DeletionInterceptor.intercept(DeletionInterceptor.java:54)
>   at sun.reflect.GeneratedMethodAccessor2549.invoke(Unknown Source)
>   at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:606)
>   at
> org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:621)
>   at
> org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:603)
>   at
> org.springframework.aop.aspectj.AspectJMethodBeforeAdvice.before(AspectJMethodBeforeAdvice.java:39)
>   at
> org.springframework.aop.framework.adapter.MethodBeforeAdviceInterceptor.invoke(MethodBeforeAdviceInterceptor.java:50)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
>   at
> org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:91)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
>   at
> org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
>   at com.sun.proxy.$Proxy54.deleteOrganisationUnit(Unknown Source)
>   at
> org.hisp.dhis.datamerge.DefaultDataMergeService.mergeOrganisationUnits(DefaultDataMergeService.java:129)
>   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)
>   at
> org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:317)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:183)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:150)
>   at
> org.springframework.transaction.interceptor.TransactionInterceptor$1.proceedWithInvocation(TransactionInterceptor.java:96)
>   at
> org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:260)
>   at
> org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:94)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
>   at
> org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
>   at com.sun.proxy.$Proxy118.mergeOrganisationUnits(Unknown Source)
>   at
> org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction.execute(MergeOrganisationUnitsAction.java:95)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>  

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20371: event-capture: better detection of unsaved form

[noreply]

revno: 20371
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Fri 2015-09-25 16:43:20 +0200
message:
  event-capture: better detection of unsaved form
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2015-09-25 13:33:59 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2015-09-25 14:43:20 +
@@ -1,6 +1,5 @@
 
-
-
+
 
 Event Capture
 
@@ -63,7 +62,7 @@
 
 
 
-
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-09-25 13:33:59 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-09-25 14:43:20 +
@@ -874,8 +874,10 @@
 var isChanged = false;
 for(var i=0; i<$scope.selectedProgramStage.programStageDataElements.length && !isChanged; i++){
 var deId = $scope.selectedProgramStage.programStageDataElements[i].dataElement.id;
-if($scope.currentEventOriginialValue[deId] !== $scope.currentEvent[deId]){
-isChanged = true;
+if($scope.currentEventOriginialValue[deId] !== $scope.currentEvent[deId] && 
+!$scope.currentEvent[deId] && 
+$scope.currentEventOriginialValue[deId] !== ""){   
+isChanged = true;
 }
 }
 if(!isChanged){

___
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] JS Errors in data entry

[Mark Polak]

"optionSets": {
"Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} *,
,*"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}
 },

"indicatorFormulas": {

Between those (red) commas there should be another object. As it currently
is that is not a valid JSON structure.

On Fri, Sep 25, 2015 at 12:44 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> From the file, it looks like this
>
> "optionSets": {
> "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} ,
> ,"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}  },
>
> "indicatorFormulas": {
>
>
> Any ideas what might be causing that?
>
>
>
> On Fri, Sep 25, 2015 at 12:01 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> I got this
>>
>> [Error: Parse error on line 11:
>> ...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
>> ---^
>> Expecting 'STRING', got ',']
>>
>> On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen 
>> wrote:
>>
>>> Try to manually run the getMedaData.action in data-entry, and then take
>>> that output to jsonlint.com
>>>
>>> Unexpected token u, means something was undefined..
>>>
>>> --
>>> Morten
>>>
>>> On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 We are seeing an error in data entry, which is preventing all data
 entry,so it is pretty critical.

 Uncaught SyntaxError: Unexpected token u

 Unknown revision of 2.18. I suspect it is a meta-data problem, but not
 really sure how to pinpoint it?

 Any ideas?

 Regards,
 Jason

 ​

 --
 Jason P. Pickering
 email: jason.p.picker...@gmail.com
 tel:+46764147049

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


>>>
>>
>>
>> --
>> Jason P. Pickering
>> email: jason.p.picker...@gmail.com
>> tel:+46764147049
>>
>
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] JS Errors in data entry

[Jason Pickering]

Yeah, i see it but not sure what that object should be. Is this related to
option sets?

On Fri, Sep 25, 2015 at 12:57 PM, Mark Polak  wrote:

> "optionSets": {
> "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} *, 
> ,*"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}
>  },
>
> "indicatorFormulas": {
>
> Between those (red) commas there should be another object. As it currently
> is that is not a valid JSON structure.
>
> On Fri, Sep 25, 2015 at 12:44 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> From the file, it looks like this
>>
>> "optionSets": {
>> "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} ,
>> ,"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}  },
>>
>> "indicatorFormulas": {
>>
>>
>> Any ideas what might be causing that?
>>
>>
>>
>> On Fri, Sep 25, 2015 at 12:01 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> I got this
>>>
>>> [Error: Parse error on line 11:
>>> ...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
>>> ---^
>>> Expecting 'STRING', got ',']
>>>
>>> On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen >> > wrote:
>>>
 Try to manually run the getMedaData.action in data-entry, and then take
 that output to jsonlint.com

 Unexpected token u, means something was undefined..

 --
 Morten

 On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
 jason.p.picker...@gmail.com> wrote:

> We are seeing an error in data entry, which is preventing all data
> entry,so it is pretty critical.
>
> Uncaught SyntaxError: Unexpected token u
>
> Unknown revision of 2.18. I suspect it is a meta-data problem, but not
> really sure how to pinpoint it?
>
> Any ideas?
>
> Regards,
> Jason
>
> ​
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>

>>>
>>>
>>> --
>>> Jason P. Pickering
>>> email: jason.p.picker...@gmail.com
>>> tel:+46764147049
>>>
>>
>>
>>
>> --
>> Jason P. Pickering
>> email: jason.p.picker...@gmail.com
>> tel:+46764147049
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>


-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+46764147049
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] JS Errors in data entry

[Mark Polak]

Yes it should be an option set just like the others, something like the
others "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1}"

However, perhaps there shouldn't be anything there and there is just a
comma too much, because the object in between is actually "null" or w/e.
But i'm not really sure what you should receive so i can't say much about
that. Perhaps you can check the optionSets that you expect to get with the
ones you actually get?

On Fri, Sep 25, 2015 at 1:10 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> Yeah, i see it but not sure what that object should be. Is this related to
> option sets?
>
> On Fri, Sep 25, 2015 at 12:57 PM, Mark Polak  wrote:
>
>> "optionSets": {
>> "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} *, 
>> ,*"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}
>>  },
>>
>> "indicatorFormulas": {
>>
>> Between those (red) commas there should be another object. As it
>> currently is that is not a valid JSON structure.
>>
>> On Fri, Sep 25, 2015 at 12:44 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> From the file, it looks like this
>>>
>>> "optionSets": {
>>> "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} ,
>>> ,"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}  },
>>>
>>> "indicatorFormulas": {
>>>
>>>
>>> Any ideas what might be causing that?
>>>
>>>
>>>
>>> On Fri, Sep 25, 2015 at 12:01 PM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 I got this

 [Error: Parse error on line 11:
 ...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
 ---^
 Expecting 'STRING', got ',']

 On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen <
 morte...@gmail.com> wrote:

> Try to manually run the getMedaData.action in data-entry, and then
> take that output to jsonlint.com
>
> Unexpected token u, means something was undefined..
>
> --
> Morten
>
> On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> We are seeing an error in data entry, which is preventing all data
>> entry,so it is pretty critical.
>>
>> Uncaught SyntaxError: Unexpected token u
>>
>> Unknown revision of 2.18. I suspect it is a meta-data problem, but
>> not really sure how to pinpoint it?
>>
>> Any ideas?
>>
>> Regards,
>> Jason
>>
>> ​
>>
>> --
>> Jason P. Pickering
>> email: jason.p.picker...@gmail.com
>> tel:+46764147049
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>


 --
 Jason P. Pickering
 email: jason.p.picker...@gmail.com
 tel:+46764147049

>>>
>>>
>>>
>>> --
>>> Jason P. Pickering
>>> email: jason.p.picker...@gmail.com
>>> tel:+46764147049
>>>
>>> ___
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to : dhis2-devs@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>>
>>
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] JS Errors in data entry

[Halvdan Grelland]

Agree with Mark. Check wether you're supposed to get two or three
optionSets.

2015-09-25 13:20 GMT+02:00 Mark Polak :

> Yes it should be an option set just like the others, something like the
> others "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1}"
>
> However, perhaps there shouldn't be anything there and there is just a
> comma too much, because the object in between is actually "null" or w/e.
> But i'm not really sure what you should receive so i can't say much about
> that. Perhaps you can check the optionSets that you expect to get with the
> ones you actually get?
>
> On Fri, Sep 25, 2015 at 1:10 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Yeah, i see it but not sure what that object should be. Is this related
>> to option sets?
>>
>> On Fri, Sep 25, 2015 at 12:57 PM, Mark Polak 
>> wrote:
>>
>>> "optionSets": {
>>> "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} *, 
>>> ,*"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}
>>>  },
>>>
>>> "indicatorFormulas": {
>>>
>>> Between those (red) commas there should be another object. As it
>>> currently is that is not a valid JSON structure.
>>>
>>> On Fri, Sep 25, 2015 at 12:44 PM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 From the file, it looks like this

 "optionSets": {
 "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} ,
 ,"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}  },

 "indicatorFormulas": {


 Any ideas what might be causing that?



 On Fri, Sep 25, 2015 at 12:01 PM, Jason Pickering <
 jason.p.picker...@gmail.com> wrote:

> I got this
>
> [Error: Parse error on line 11:
> ...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
> ---^
> Expecting 'STRING', got ',']
>
> On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen <
> morte...@gmail.com> wrote:
>
>> Try to manually run the getMedaData.action in data-entry, and then
>> take that output to jsonlint.com
>>
>> Unexpected token u, means something was undefined..
>>
>> --
>> Morten
>>
>> On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> We are seeing an error in data entry, which is preventing all data
>>> entry,so it is pretty critical.
>>>
>>> Uncaught SyntaxError: Unexpected token u
>>>
>>> Unknown revision of 2.18. I suspect it is a meta-data problem, but
>>> not really sure how to pinpoint it?
>>>
>>> Any ideas?
>>>
>>> Regards,
>>> Jason
>>>
>>> ​
>>>
>>> --
>>> Jason P. Pickering
>>> email: jason.p.picker...@gmail.com
>>> tel:+46764147049
>>>
>>> ___
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to : dhis2-devs@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>>
>>
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>



 --
 Jason P. Pickering
 email: jason.p.picker...@gmail.com
 tel:+46764147049

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


>>>
>>
>>
>> --
>> Jason P. Pickering
>> email: jason.p.picker...@gmail.com
>> tel:+46764147049
>>
>
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] JS Errors in data entry

[Jason Pickering]

I fixed it,but will detail the problem when I get back, as I still do not
understand what it was, but it was related to an option set assigned to a
data element.


On Fri, Sep 25, 2015 at 1:34 PM, Halvdan Grelland 
wrote:

> Agree with Mark. Check wether you're supposed to get two or three
> optionSets.
>
> 2015-09-25 13:20 GMT+02:00 Mark Polak :
>
>> Yes it should be an option set just like the others, something like the
>> others "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1}"
>>
>> However, perhaps there shouldn't be anything there and there is just a
>> comma too much, because the object in between is actually "null" or w/e.
>> But i'm not really sure what you should receive so i can't say much about
>> that. Perhaps you can check the optionSets that you expect to get with the
>> ones you actually get?
>>
>> On Fri, Sep 25, 2015 at 1:10 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> Yeah, i see it but not sure what that object should be. Is this related
>>> to option sets?
>>>
>>> On Fri, Sep 25, 2015 at 12:57 PM, Mark Polak 
>>> wrote:
>>>
 "optionSets": {
 "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} *, 
 ,*"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}
  },

 "indicatorFormulas": {

 Between those (red) commas there should be another object. As it
 currently is that is not a valid JSON structure.

 On Fri, Sep 25, 2015 at 12:44 PM, Jason Pickering <
 jason.p.picker...@gmail.com> wrote:

> From the file, it looks like this
>
> "optionSets": {
> "Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} ,
> ,"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}  },
>
> "indicatorFormulas": {
>
>
> Any ideas what might be causing that?
>
>
>
> On Fri, Sep 25, 2015 at 12:01 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> I got this
>>
>> [Error: Parse error on line 11:
>> ...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
>> ---^
>> Expecting 'STRING', got ',']
>>
>> On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen <
>> morte...@gmail.com> wrote:
>>
>>> Try to manually run the getMedaData.action in data-entry, and then
>>> take that output to jsonlint.com
>>>
>>> Unexpected token u, means something was undefined..
>>>
>>> --
>>> Morten
>>>
>>> On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 We are seeing an error in data entry, which is preventing all data
 entry,so it is pretty critical.

 Uncaught SyntaxError: Unexpected token u

 Unknown revision of 2.18. I suspect it is a meta-data problem, but
 not really sure how to pinpoint it?

 Any ideas?

 Regards,
 Jason

 ​

 --
 Jason P. Pickering
 email: jason.p.picker...@gmail.com
 tel:+46764147049

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


>>>
>>
>>
>> --
>> Jason P. Pickering
>> email: jason.p.picker...@gmail.com
>> tel:+46764147049
>>
>
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>

>>>
>>>
>>> --
>>> Jason P. Pickering
>>> email: jason.p.picker...@gmail.com
>>> tel:+46764147049
>>>
>>
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>


-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+46764147049
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] Coordinate capture does not seem to work in Tracker Capture

[Ese Egerega]

Hi,

It looks like the coordinate capture feature is not working in the Tracker
Capture app as it does in Event Capture.

When you click on the blue coordinate capture icon during data entry, it
just loads a blank page without the map (see snapshot
http://awesomescreenshot.com/02959r9f73).

Thanks,
Ese
___
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 20372: Program indicator, added property missingValueReplacement

[noreply]

revno: 20372
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 19:51:47 +0200
message:
  Program indicator, added property missingValueReplacement
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java
  
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/webapp/dhis-web-maintenance-program/addProgramIndicator.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java	2015-09-24 19:18:20 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java	2015-09-25 17:51:47 +
@@ -102,6 +102,12 @@
  */
 private Integer decimals;
 
+/**
+ * Value to use in expression when data element and attribute values are not
+ * present.
+ */
+private Integer missingValueReplacement;
+
 private Boolean displayInForm;
 
 // -
@@ -218,6 +224,19 @@
 @JsonProperty
 @JsonView( { DetailedView.class, ExportView.class } )
 @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+public Integer getMissingValueReplacement()
+{
+return missingValueReplacement;
+}
+
+public void setMissingValueReplacement( Integer missingValueReplacement )
+{
+this.missingValueReplacement = missingValueReplacement;
+}
+
+@JsonProperty
+@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
 public Boolean getDisplayInForm()
 {
 return displayInForm;
@@ -243,6 +262,7 @@
 expression = programIndicator.getExpression();
 filter = programIndicator.getFilter();
 decimals = programIndicator.getDecimals();
+missingValueReplacement = programIndicator.getMissingValueReplacement();
 displayInForm = programIndicator.getDisplayInForm();
 }
 else if ( strategy.isMerge() )
@@ -251,6 +271,7 @@
 expression = programIndicator.getExpression() == null ? expression : programIndicator.getExpression();
 filter = programIndicator.getFilter() == null ? filter : programIndicator.getFilter();
 decimals = programIndicator.getDecimals() == null ? decimals : programIndicator.getDecimals();
+missingValueReplacement = programIndicator.getMissingValueReplacement() == null ? missingValueReplacement : programIndicator.getMissingValueReplacement();
 displayInForm = programIndicator.getDisplayInForm() == null ? displayInForm : programIndicator.getDisplayInForm();
 }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml	2015-09-18 10:16:02 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml	2015-09-25 17:51:47 +
@@ -36,6 +36,8 @@
 
 
 
+
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java	2015-09-18 10:16:02 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java	2015-09-25 17:51:47 +
@@ -140,6 +140,13 @@
 {
 this.displayInForm = displayInForm;
   

[Dhis2-devs] [Bug 1498898] Re: api/events.json - page totals are not displayed

[Abyot Asalefew Gizaw]

Hi,

Use totalPages=true in the query string.

** Changed in: dhis2
   Status: New => Invalid

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

Title:
  api/events.json - page totals are not displayed

Status in DHIS:
  Invalid

Bug description:
  When accessing api/events (.json) the page totals are not displayed in
  the pager.

  version 2.20 rev 19876

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1498898/+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 20358: event-capture: bug fix in radio buttons

[noreply]

revno: 20358
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Fri 2015-09-25 09:58:42 +0200
message:
  event-capture: bug fix in radio buttons
modified:
  
dhis-2/dhis-web/dhis-web-apps/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-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2015-09-24 14:38:58 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2015-09-25 07:58:42 +
@@ -338,7 +338,7 @@
 
 
 
-
+
 
 
 
-
+
 
 {{'no_value' | translate}}
-
-
- {{option.name}}
-
+
+
+
+ {{option.name}}
+
+
 
 
 

___
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] Data statistics for Tracker?

[Rodolfo Melia]

Hi knut. We have done this on PSI's data dict. We submitted to the app
store, but in never made it. We will resubmit.

On Thursday, 24 September 2015, Knut Staring  wrote:

> In the nice-to-have department:
>
> I imagine it would not be a huge task to extend the Data Statistics
> feature to include some basic numbers on Tracker?
>
> E.g. we should break up data elements by domain, and list the number of
> attributes and TEI in the db.
>
> Blueprint?
>
> --
> Knut Staring
> Dept. of Informatics, University of Oslo
> Norway: +4791880522
> Skype: knutstar
> http://dhis2.org
>


-- 
*Rodolfo Meliá*
*Principal  |  *rme...@knowming.com
Skype: rod.melia  |  +44 777 576 4090  |  +1 708 872 7636
www.knowming.com
___
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 20362: Test

[noreply]

revno: 20362
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 14:38:13 +0200
message:
  Test
modified:
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java	2015-09-25 12:29:08 +
+++ dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java	2015-09-25 12:38:13 +
@@ -81,10 +81,24 @@
 assertEquals( 4d, ExpressionUtils.evaluateToDouble( "d2:zing(v1) + d2:zing(v2)", vars ), DELTA );
 }
 
-//@Test
+@Test
 public void testEvaluateToDoubleZeroPositiveValueCount()
 {
-String expression = "d2:zing(3";
+String expression = "d2:zpvc(2,3,-1,0)";
+
+assertEquals( 3d, ExpressionUtils.evaluateToDouble( expression, null ), DELTA );
+
+expression  = "(d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1)";
+
+assertEquals( 2d, ExpressionUtils.evaluateToDouble( expression, null ), DELTA );
+
+expression  = 
+"((d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1) * 0.25) + " +
+"((d2:zing(8) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1) * 0.75)";
+
+assertEquals( 3.5, ExpressionUtils.evaluateToDouble( expression, null ), DELTA );
+
+
 }
 
 @Test

___
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 20365: Removed empty test folders

[noreply]

revno: 20365
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 15:01:12 +0200
message:
  Removed empty test folders
removed:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/test/java/
  dhis-2/dhis-web/dhis-web-mobile/src/test/java/
  dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/
  dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp/
  dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp/dhis/web/
  dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp/dhis/web/mobile/
  dhis-2/dhis-web/dhis-web-sms/src/test/java/
  dhis-2/dhis-web/dhis-web-uaa/src/test/java/
modified:
  dhis-2/dhis-web/dhis-web-api/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	2015-08-04 21:35:00 +
+++ dhis-2/dhis-web/dhis-web-api/pom.xml	2015-09-25 13:01:12 +
@@ -89,6 +89,14 @@
   batik-codec
 
 
+
+
+
+  junit
+  junit
+  test
+
+
   
 
   

=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/test/java'
=== removed directory 'dhis-2/dhis-web/dhis-web-mobile/src/test/java'
=== removed directory 'dhis-2/dhis-web/dhis-web-mobile/src/test/java/org'
=== removed directory 'dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp'
=== removed directory 'dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp/dhis'
=== removed directory 'dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp/dhis/web'
=== removed directory 'dhis-2/dhis-web/dhis-web-mobile/src/test/java/org/hisp/dhis/web/mobile'
=== removed directory 'dhis-2/dhis-web/dhis-web-sms/src/test/java'
=== removed directory 'dhis-2/dhis-web/dhis-web-uaa/src/test/java'
___
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 20361: Moved some tests from support-system to support-commons. Set test scope on junit dependencies.

[noreply]

revno: 20361
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 14:29:08 +0200
message:
  Moved some tests from support-system to support-commons. Set test scope on 
junit dependencies.
removed:
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DebugUtilsTest.java
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ExpressionUtilsTest.java
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ListUtilsTest.java
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PageRangeTest.java
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PaginatedListTest.java
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/TextUtilsTest.java
added:
  dhis-2/dhis-support/dhis-support-commons/src/test/
  dhis-2/dhis-support/dhis-support-commons/src/test/java/
  dhis-2/dhis-support/dhis-support-commons/src/test/java/org/
  dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/
  dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/IntegrationTest.java
  dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/DebugUtilsTest.java
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ListUtilsTest.java
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/PageRangeTest.java
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/PaginatedListTest.java
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/TextUtilsTest.java
modified:
  dhis-2/dhis-api/pom.xml
  dhis-2/dhis-support/dhis-support-commons/pom.xml
  dhis-2/dhis-support/dhis-support-hibernate/pom.xml
  dhis-2/dhis-support/dhis-support-jdbc/pom.xml
  dhis-2/dhis-support/dhis-support-system/pom.xml
  
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java
  dhis-2/dhis-web/dhis-web-api-mobile/pom.xml


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/pom.xml'
--- dhis-2/dhis-api/pom.xml	2015-09-04 09:00:49 +
+++ dhis-2/dhis-api/pom.xml	2015-09-25 12:29:08 +
@@ -16,10 +16,6 @@
 
   
 
-  junit
-  junit
-
-
 org.apache.commons
 commons-lang3
 
@@ -91,6 +87,14 @@
   org.javassist
   javassist
 
+
+
+
+
+  junit
+  junit
+  test
+
 
   
 

=== modified file 'dhis-2/dhis-support/dhis-support-commons/pom.xml'
--- dhis-2/dhis-support/dhis-support-commons/pom.xml	2015-09-16 18:32:40 +
+++ dhis-2/dhis-support/dhis-support-commons/pom.xml	2015-09-25 12:29:08 +
@@ -35,6 +35,15 @@
   org.apache.commons
   commons-jexl
 
+
+
+
+
+  junit
+  junit
+  test
+
+
   
 
   

=== added directory 'dhis-2/dhis-support/dhis-support-commons/src/test'
=== added directory 'dhis-2/dhis-support/dhis-support-commons/src/test/java'
=== added directory 'dhis-2/dhis-support/dhis-support-commons/src/test/java/org'
=== added directory 'dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp'
=== added directory 'dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis'
=== added file 'dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/IntegrationTest.java'
--- dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/IntegrationTest.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/IntegrationTest.java	2015-09-25 12:29:08 +
@@ -0,0 +1,36 @@
+package org.hisp.dhis;
+
+/*
+ * Copyright (c) 2004-2015, 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 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20366: Removed empty test folders

[noreply]

revno: 20366
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 15:02:35 +0200
message:
  Removed empty test folders
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/test/
  dhis-2/dhis-web/dhis-web-mobile/src/test/
  dhis-2/dhis-web/dhis-web-sms/src/test/
  dhis-2/dhis-web/dhis-web-uaa/src/test/
  dhis-2/dhis-web/dhis-web-uaa/src/test/resources/


--
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-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/test'
=== removed directory 'dhis-2/dhis-web/dhis-web-mobile/src/test'
=== removed directory 'dhis-2/dhis-web/dhis-web-sms/src/test'
=== removed directory 'dhis-2/dhis-web/dhis-web-uaa/src/test'
=== removed directory 'dhis-2/dhis-web/dhis-web-uaa/src/test/resources'
___
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 20363: Minor

[noreply]

revno: 20363
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 14:41:17 +0200
message:
  Minor
modified:
  
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/CollectionUtils.java
  
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java
  
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/SystemTimer.java
  
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/DebugUtils.java
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java


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

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/CollectionUtils.java'
--- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/CollectionUtils.java	2015-09-22 10:47:41 +
+++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/CollectionUtils.java	2015-09-25 12:41:17 +
@@ -49,8 +49,8 @@
  */
 public class CollectionUtils
 {
-public static String[] STRING_ARR = new String[0];
-public static String[][] STRING_2D_ARR = new String[0][];
+public static final String[] STRING_ARR = new String[0];
+public static final String[][] STRING_2D_ARR = new String[0][];
 
 /**
  * Applies the given Function1 on each member of the Collection.

=== modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java'
--- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java	2015-06-16 17:57:23 +
+++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java	2015-09-25 12:41:17 +
@@ -125,11 +125,11 @@
  */
 public int pageCount()
 {
-int c = size();
-int r = c / pageSize;
-int m = c % pageSize;
+int count = size();
+int pages = count / pageSize;
+int mod = count % pageSize;
 
-return m == 0 ? r : ( r + 1 );
+return mod == 0 ? pages : ( pages + 1 );
 }
 
 /**

=== modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/SystemTimer.java'
--- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/SystemTimer.java	2015-06-16 17:57:23 +
+++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/SystemTimer.java	2015-09-25 12:41:17 +
@@ -38,28 +38,28 @@
 public class SystemTimer 
 implements Timer
 {
-private long _start = 0;
+private long internalStart = 0;
 
-private long _end = 0;
+private long internalEnd = 0;
 
 @Override
 public Timer start()
 {
-_start = System.nanoTime();
+internalStart = System.nanoTime();
 return this;
 }
 
 @Override
 public Timer stop()
 {
-_end = System.nanoTime();
+internalEnd = System.nanoTime();
 return this;
 }
 
 @Override
 public Long duration()
 {
-return _end - _start;
+return internalEnd - internalStart;
 }
 
 @Override

=== modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/DebugUtils.java'
--- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/DebugUtils.java	2015-07-03 20:43:24 +
+++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/DebugUtils.java	2015-09-25 12:41:17 +
@@ -49,7 +49,7 @@
 
 public static final String SEPARATOR = "-";
 
-private static ThreadLocal> duplicateMapPeg = new ThreadLocal<>();
+private static ThreadLocal> DUPLICATE_MAP_PEG = new ThreadLocal<>();
 
 public static String logDuplicates( String key, Integer... values )
 {
@@ -85,7 +85,7 @@
 
 private static String log( String key, String value )
 {   
-Map duplicateMap = duplicateMapPeg.get();
+Map duplicateMap = DUPLICATE_MAP_PEG.get();
 
 if ( duplicateMap == null )
 {
@@ -112,20 +112,20 @@
 
 duplicateMap.put( key, list );
 
-duplicateMapPeg.set( duplicateMap );
+DUPLICATE_MAP_PEG.set( duplicateMap );
 
 return duplicate;
 }
 
 public static boolean resetDuplicates( String key )
 {
-Map duplicateMap = duplicateMapPeg.get();
+ 

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

[noreply]

revno: 20364
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 14:58:13 +0200
message:
  Minor
modified:
  
dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java
  dhis-2/dhis-web/dhis-web-ohie/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-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java	2015-09-25 12:41:17 +
+++ dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/ExpressionUtilsTest.java	2015-09-25 12:58:13 +
@@ -88,11 +88,11 @@
 
 assertEquals( 3d, ExpressionUtils.evaluateToDouble( expression, null ), DELTA );
 
-expression  = "(d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1)";
+expression = "(d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1)";
 
 assertEquals( 2d, ExpressionUtils.evaluateToDouble( expression, null ), DELTA );
 
-expression  = 
+expression = 
 "((d2:zing(4) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1) * 0.25) + " +
 "((d2:zing(8) + d2:zing(0) + d2:zing(-1)) / d2:zpvc(2,0,-1) * 0.75)";
 

=== modified file 'dhis-2/dhis-web/dhis-web-ohie/pom.xml'
--- dhis-2/dhis-web/dhis-web-ohie/pom.xml	2015-07-20 02:01:37 +
+++ dhis-2/dhis-web/dhis-web-ohie/pom.xml	2015-09-25 12:58:13 +
@@ -98,6 +98,15 @@
   org.hamcrest
   hamcrest-library
 
+
+
+
+
+  junit
+  junit
+  test
+
+
   
 
   

___
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 20367: Added dependency

[noreply]

revno: 20367
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 15:04:32 +0200
message:
  Added dependency
modified:
  dhis-2/dhis-web/dhis-web-uaa/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-uaa/pom.xml'
--- dhis-2/dhis-web/dhis-web-uaa/pom.xml	2015-07-20 02:01:37 +
+++ dhis-2/dhis-web/dhis-web-uaa/pom.xml	2015-09-25 13:04:32 +
@@ -49,11 +49,19 @@
   org.springframework
   spring-context-support
 
-
 
   javax.servlet
   servlet-api
 
+
+
+
+
+  junit
+  junit
+  test
+
+
   
 
   

___
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 20360: Program, removed i18n of count method which caused crash

[noreply]

revno: 20360
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 12:35:37 +0200
message:
  Program, removed i18n of count method which caused crash
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramService.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/program/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramService.java	2015-09-13 15:47:21 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramService.java	2015-09-25 10:35:37 +
@@ -240,7 +240,7 @@
 @Override
 public Integer getProgramCountByName( String name )
 {
-return i18n( i18nService, programStore.getCountLikeName( name ) );
+return programStore.getCountLikeName( name );
 }
 
 @Override

___
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] JS Errors in data entry

[Jason Pickering]

>From the file, it looks like this

"optionSets": {
"Thfz8125uPk-USfPOPAeN16":{"uid":"eUZ79clX7y1","v":1} ,
,"f1R88WLGXvs-USfPOPAeN16":{"uid":"M2dZRqmn8A7","v":1}  },

"indicatorFormulas": {


Any ideas what might be causing that?



On Fri, Sep 25, 2015 at 12:01 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> I got this
>
> [Error: Parse error on line 11:
> ...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
> ---^
> Expecting 'STRING', got ',']
>
> On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen 
> wrote:
>
>> Try to manually run the getMedaData.action in data-entry, and then take
>> that output to jsonlint.com
>>
>> Unexpected token u, means something was undefined..
>>
>> --
>> Morten
>>
>> On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> We are seeing an error in data entry, which is preventing all data
>>> entry,so it is pretty critical.
>>>
>>> Uncaught SyntaxError: Unexpected token u
>>>
>>> Unknown revision of 2.18. I suspect it is a meta-data problem, but not
>>> really sure how to pinpoint it?
>>>
>>> Any ideas?
>>>
>>> Regards,
>>> Jason
>>>
>>> ​
>>>
>>> --
>>> Jason P. Pickering
>>> email: jason.p.picker...@gmail.com
>>> tel:+46764147049
>>>
>>> ___
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to : dhis2-devs@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>>
>>
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>



-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+46764147049
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20368: Moved FredSpringWebTest from main to test

[noreply]

revno: 20368
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 15:10:34 +0200
message:
  Moved FredSpringWebTest from main to test
removed:
  
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/FredSpringWebTest.java
added:
  
dhis-2/dhis-web/dhis-web-ohie/src/test/java/org/hisp/dhis/web/ohie/fred/FredSpringWebTest.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
=== removed file 'dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/FredSpringWebTest.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/FredSpringWebTest.java	2015-09-16 18:31:45 +
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/FredSpringWebTest.java	1970-01-01 00:00:00 +
@@ -1,175 +0,0 @@
-package org.hisp.dhis.web.ohie.fred;
-
-/*
- * Copyright (c) 2004-2015, 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 com.fasterxml.jackson.databind.ObjectMapper;
-import org.hisp.dhis.web.ohie.fred.webapi.v1.utils.ObjectMapperFactoryBean;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockHttpSession;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.web.FilterChainProxy;
-import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.filter.CharacterEncodingFilter;
-import org.springframework.web.filter.ShallowEtagHeaderFilter;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author Morten Olav Hansen 
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {
-"classpath*:/META-INF/dhis/beans.xml",
-"classpath*:/META-INF/dhis/webapi-ohie.xml" }
-)
-@WebAppConfiguration
-@Transactional
-public abstract class FredSpringWebTest
-{
-@Autowired
-protected FilterChainProxy filterChainProxy;
-
-@Autowired
-protected WebApplicationContext wac;
-
-protected MockMvc mvc;
-
-protected ObjectMapper objectMapper;
-
-public MockHttpSession getSession( String... authorities )
-{
-SecurityContextHolder.getContext().setAuthentication( getPrincipal( authorities ) );
-MockHttpSession session 

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20369: event-capture: update eventdate both in grid and full editing

[noreply]

revno: 20369
committer: Abyot Asalefew Gizaw 
branch nick: dhis2
timestamp: Fri 2015-09-25 15:33:59 +0200
message:
  event-capture: update eventdate both in grid and full editing
modified:
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html
  
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.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-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2015-09-21 15:01:55 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2015-09-25 13:33:59 +
@@ -1,5 +1,6 @@
 
-
+
+
 
 Event Capture
 
@@ -62,7 +63,7 @@
 
 
 
-
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-09-24 15:28:23 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-09-25 13:33:59 +
@@ -174,9 +174,9 @@
 $scope.eventGridColumns.push({name: 'form_id', id: 'uid', valueType: 'TEXT', compulsory: false, filterWithRange: false, showFilter: false, show: false});
 $scope.filterTypes['uid'] = 'TEXT';
 
-$scope.eventGridColumns.push({name: $scope.selectedProgramStage.reportDateDescription ? $scope.selectedProgramStage.reportDateDescription : 'incident_date', id: 'event_date', valueType: 'DATE', filterWithRange: true, compulsory: false, showFilter: false, show: true});
-$scope.filterTypes['event_date'] = 'DATE';
-$scope.filterText['event_date']= {};
+$scope.eventGridColumns.push({name: $scope.selectedProgramStage.reportDateDescription ? $scope.selectedProgramStage.reportDateDescription : 'incident_date', id: 'eventDate', valueType: 'DATE', filterWithRange: true, compulsory: false, showFilter: false, show: true});
+$scope.filterTypes['eventDate'] = 'DATE';
+$scope.filterText['eventDate']= {};
 
 angular.forEach($scope.selectedProgramStage.programStageDataElements, function(prStDe){
 $scope.prStDes[prStDe.dataElement.id] = prStDe;
@@ -319,7 +319,7 @@
 
 $scope.dhis2Events[i]['uid'] = $scope.dhis2Events[i].event;
 $scope.dhis2Events[i].eventDate = DateUtils.formatFromApiToUser($scope.dhis2Events[i].eventDate);
-$scope.dhis2Events[i]['event_date'] = $scope.dhis2Events[i].eventDate;
+$scope.dhis2Events[i]['eventDate'] = $scope.dhis2Events[i].eventDate;
 
 delete $scope.dhis2Events[i].dataValues;
 }
@@ -330,7 +330,7 @@
 }
 
 if(!$scope.sortHeader.id){
-$scope.sortEventGrid({name: $scope.selectedProgramStage.reportDateDescription ? $scope.selectedProgramStage.reportDateDescription : 'incident_date', id: 'event_date', type: 'DATE', compulsory: false, showFilter: false, show: true});
+$scope.sortEventGrid({name: $scope.selectedProgramStage.reportDateDescription ? $scope.selectedProgramStage.reportDateDescription : 'incident_date', id: 'eventDate', type: 'DATE', compulsory: false, showFilter: false, show: true});
 }
 }
 
@@ -609,7 +609,7 @@
 $scope.dhis2Events = [];   
 }
 newEvent['uid'] = newEvent.event;
-newEvent['event_date'] = newEvent.eventDate; 
+newEvent['eventDate'] = newEvent.eventDate; 
 $scope.dhis2Events.splice(0,0,newEvent);
 
 $scope.eventLength++;
@@ -696,7 +696,55 @@
 

[Dhis2-devs] JS Errors in data entry

[Jason Pickering]

We are seeing an error in data entry, which is preventing all data entry,so
it is pretty critical.

Uncaught SyntaxError: Unexpected token u

Unknown revision of 2.18. I suspect it is a meta-data problem, but not
really sure how to pinpoint it?

Any ideas?

Regards,
Jason

​

-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+46764147049
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

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

[noreply]

revno: 20359
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Fri 2015-09-25 11:54:36 +0200
message:
  Minor
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/StaticContentController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/statistics/GetStatisticsAction.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/StaticContentController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/StaticContentController.java	2015-09-24 15:09:40 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/StaticContentController.java	2015-09-25 09:54:36 +
@@ -159,7 +159,7 @@
 throw new WebMessageException( WebMessageUtils.badRequest( "Missing parameter \"file\"" ) );
 }
 
-// Only PNG is accepted at the current time
+// Only PNG accepted currently
 
 if ( !file.getContentType().equalsIgnoreCase( "image/png" ) )
 {
@@ -167,7 +167,7 @@
 new WebMessage(WebMessageStatus.WARNING, HttpStatus.UNSUPPORTED_MEDIA_TYPE ) );
 }
 
-// Only keys in the white list is accepted at the current time
+// Only keys in the white list accepted currently
 
 if ( !KEY_WHITELIST_MAP.containsKey( key ) )
 {

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java	2015-09-09 19:29:50 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java	2015-09-25 09:54:36 +
@@ -86,7 +86,7 @@
 }
 
 @RequestMapping( value = "/availability", method = RequestMethod.GET, produces = "application/json" )
-public @ResponseBody AvailabilityStatus isRemoteServerAvailable()
+public @ResponseBody AvailabilityStatus remoteServerAvailable()
 {
 return synchronizationManager.isRemoteServerAvailable();
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java	2015-09-14 17:57:00 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java	2015-09-25 09:54:36 +
@@ -118,7 +118,7 @@
 for ( String fldName : fldNames )
 {
 // If the value in the text field is not empty, proceed to add it.
-if ( !form.getField( fldName ).trim().equals( "" ) )
+if ( !form.getField( fldName ).trim().isEmpty() )
 {
 if ( fldName.startsWith( PdfDataEntryFormUtil.LABELCODE_DATADATETEXTFIELD ) )
 {
@@ -159,16 +159,14 @@
 
 programStageInstance = programStageInstanceService.getProgramStageInstance( programStageInstanceId );
 
-for ( Map.Entry dataElementsEntry : programStageInstanceStorage.getDataElementsValue()
-.entrySet() )
+for ( Map.Entry dataElementsEntry : programStageInstanceStorage.getDataElementsValue().entrySet() )
 {
 Integer dataElementId = dataElementsEntry.getKey();
 String value = dataElementsEntry.getValue();
 
 // Step 3. Insert Data
-insertValue_ProgramStageDataElement( programStageInstance, dataElementId, value );
+insertValueProgramStageDataElement( programStageInstance, dataElementId, value );
 }
-
 }
 
 reader.close();
@@ -199,8 +197,7 @@
 return programStageInstanceService.addProgramStageInstance( programStageInstance );
 }
 
-private void insertValue_ProgramStageDataElement( ProgramStageInstance programStageInstance, int dataElementId,
-String value )
+private void insertValueProgramStageDataElement( ProgramStageInstance programStageInstance, int dataElementId, String value )
 throws Exception
 {
 
@@ -303,7 +300,6 @@
 
 programStageInstanceData.put( rowNumber, programStageInstanceStorage );
 }
-
 }
 }
 

=== modified file 

[Dhis2-devs] [Bug 1498885] Re: EC - radio buttons not working when using sections

[Abyot Asalefew Gizaw]

Revno: 19901.

** Changed in: dhis2
   Status: New => Fix Committed

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

Title:
  EC - radio buttons not working when using sections

Status in DHIS:
  Fix Committed

Bug description:
  Event capture on 2.20 (reproduced on /demo).

  If using "radio buttons" for option sets, no input is displayed when
  using sections for the form. Radio buttons work then not using
  sections.

To manage notifications about this bug go to:
https://bugs.launchpad.net/dhis2/+bug/1498885/+subscriptions

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

Re: [Dhis2-devs] JS Errors in data entry

[Morten Olav Hansen]

Try to manually run the getMedaData.action in data-entry, and then take
that output to jsonlint.com

Unexpected token u, means something was undefined..

--
Morten

On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> We are seeing an error in data entry, which is preventing all data
> entry,so it is pretty critical.
>
> Uncaught SyntaxError: Unexpected token u
>
> Unknown revision of 2.18. I suspect it is a meta-data problem, but not
> really sure how to pinpoint it?
>
> Any ideas?
>
> Regards,
> Jason
>
> ​
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>
> ___
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to : dhis2-devs@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] JS Errors in data entry

[Jason Pickering]

I got this

[Error: Parse error on line 11:
...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
---^
Expecting 'STRING', got ',']

On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen 
wrote:

> Try to manually run the getMedaData.action in data-entry, and then take
> that output to jsonlint.com
>
> Unexpected token u, means something was undefined..
>
> --
> Morten
>
> On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> We are seeing an error in data entry, which is preventing all data
>> entry,so it is pretty critical.
>>
>> Uncaught SyntaxError: Unexpected token u
>>
>> Unknown revision of 2.18. I suspect it is a meta-data problem, but not
>> really sure how to pinpoint it?
>>
>> Any ideas?
>>
>> Regards,
>> Jason
>>
>> ​
>>
>> --
>> Jason P. Pickering
>> email: jason.p.picker...@gmail.com
>> tel:+46764147049
>>
>> ___
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to : dhis2-devs@lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>


-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+46764147049
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

Re: [Dhis2-devs] JS Errors in data entry

[Morten Olav Hansen]

Can you give a bit more?

--
Morten

On Fri, Sep 25, 2015 at 5:01 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> I got this
>
> [Error: Parse error on line 11:
> ...Z79clX7y1","v":1} , ,"f1R88WLGXvs-USfPOP
> ---^
> Expecting 'STRING', got ',']
>
> On Fri, Sep 25, 2015 at 11:53 AM, Morten Olav Hansen 
> wrote:
>
>> Try to manually run the getMedaData.action in data-entry, and then take
>> that output to jsonlint.com
>>
>> Unexpected token u, means something was undefined..
>>
>> --
>> Morten
>>
>> On Fri, Sep 25, 2015 at 4:49 PM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> We are seeing an error in data entry, which is preventing all data
>>> entry,so it is pretty critical.
>>>
>>> Uncaught SyntaxError: Unexpected token u
>>>
>>> Unknown revision of 2.18. I suspect it is a meta-data problem, but not
>>> really sure how to pinpoint it?
>>>
>>> Any ideas?
>>>
>>> Regards,
>>> Jason
>>>
>>> ​
>>>
>>> --
>>> Jason P. Pickering
>>> email: jason.p.picker...@gmail.com
>>> tel:+46764147049
>>>
>>> ___
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to : dhis2-devs@lists.launchpad.net
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>>
>>
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+46764147049
>
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 20370: Updated license file.

[noreply]

revno: 20370
committer: Jason P. Pickering 
branch nick: dhis2
timestamp: Fri 2015-09-25 16:01:43 +0200
message:
  Updated license file.
modified:
  dhis-2/LICENSE.txt


--
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/LICENSE.txt'
--- dhis-2/LICENSE.txt	2009-03-03 16:46:36 +
+++ dhis-2/LICENSE.txt	2015-09-25 14:01:43 +
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2007, University of Oslo
+Copyright (c) 2004-2015, University of Oslo
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

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

Re: [Dhis2-devs] [Bug 1370486] Re: orgunit-merge-problem-report-tables

[Rodolfo Melia]

Hi Jason - losing this functionality is a shame. Wouldn't be better trying
to get it fixed?

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

On Thu, Sep 24, 2015 at 5:47 PM, jason.p.pickering <
1370...@bugs.launchpad.net> wrote:

> OU merge functionality has been removed and will be replaced with
> administrative SQL scripts due to various implementation scenarios.
>
> ** Changed in: dhis2
>Status: New => Fix Committed
>
> --
> You received this bug notification because you are a member of DHIS 2
> developers, which is subscribed to DHIS.
> https://bugs.launchpad.net/bugs/1370486
>
> Title:
>   orgunit-merge-problem-report-tables
>
> Status in DHIS:
>   Fix Committed
>
> Bug description:
>   Version:
>   2.15
>   Build revision:
>   15196
>
>   When orgunits which are part of a report table are attempted to be
>   merged with another orgunit, the following error results.
>
>   DELETE FROM reporttable_organisationunits where organisationunitid =
>   76018;
>
>   followed by clearing the cache is a workaround.
>
>   * INFO  2014-09-17 08:15:05,583 DELETE FROM datavalue_audit WHERE
> sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>   * INFO  2014-09-17 08:15:05,584 DELETE FROM datavalue WHERE
> sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>   * INFO  2014-09-17 08:15:05,815 DELETE FROM completedatasetregistration
> WHERE sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>   * ERROR 2014-09-17 08:15:05,848 Error while executing action
> (ExceptionInterceptor.java [http-bio-8080-exec-81])
>   org.hisp.dhis.common.DeleteNotAllowedException: ReportTable
>   at
> org.hisp.dhis.system.deletion.DefaultDeletionManager.execute(DefaultDeletionManager.java:102)
>   at
> org.hisp.dhis.system.deletion.DeletionInterceptor.intercept(DeletionInterceptor.java:54)
>   at sun.reflect.GeneratedMethodAccessor2549.invoke(Unknown Source)
>   at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:606)
>   at
> org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:621)
>   at
> org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:603)
>   at
> org.springframework.aop.aspectj.AspectJMethodBeforeAdvice.before(AspectJMethodBeforeAdvice.java:39)
>   at
> org.springframework.aop.framework.adapter.MethodBeforeAdviceInterceptor.invoke(MethodBeforeAdviceInterceptor.java:50)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
>   at
> org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:91)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
>   at
> org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
>   at com.sun.proxy.$Proxy54.deleteOrganisationUnit(Unknown Source)
>   at
> org.hisp.dhis.datamerge.DefaultDataMergeService.mergeOrganisationUnits(DefaultDataMergeService.java:129)
>   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)
>   at
> org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:317)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:183)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:150)
>   at
> org.springframework.transaction.interceptor.TransactionInterceptor$1.proceedWithInvocation(TransactionInterceptor.java:96)
>   at
> org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:260)
>   at
> org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:94)
>   at
> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
>   at
> org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
>   at com.sun.proxy.$Proxy118.mergeOrganisationUnits(Unknown Source)
>   at
> org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction.execute(MergeOrganisationUnitsAction.java:95)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

[Dhis2-devs] [Bug 1370486] Re: orgunit-merge-problem-report-tables

[Juan Manuel Alcantara]

A similar problem happens when the org unit that will be deleted is
linked to program/tracker data.

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

Title:
  orgunit-merge-problem-report-tables

Status in DHIS:
  Fix Committed

Bug description:
  Version:
  2.15
  Build revision:
  15196

  When orgunits which are part of a report table are attempted to be
  merged with another orgunit, the following error results.

  DELETE FROM reporttable_organisationunits where organisationunitid =
  76018;

  followed by clearing the cache is a workaround.

  * INFO  2014-09-17 08:15:05,583 DELETE FROM datavalue_audit WHERE 
sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
  * INFO  2014-09-17 08:15:05,584 DELETE FROM datavalue WHERE sourceid=76018; 
(JdbcDataMergeStore.java [http-bio-8080-exec-81])
  * INFO  2014-09-17 08:15:05,815 DELETE FROM completedatasetregistration WHERE 
sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
  * ERROR 2014-09-17 08:15:05,848 Error while executing action 
(ExceptionInterceptor.java [http-bio-8080-exec-81])
  org.hisp.dhis.common.DeleteNotAllowedException: ReportTable
  at 
org.hisp.dhis.system.deletion.DefaultDeletionManager.execute(DefaultDeletionManager.java:102)
  at 
org.hisp.dhis.system.deletion.DeletionInterceptor.intercept(DeletionInterceptor.java:54)
  at sun.reflect.GeneratedMethodAccessor2549.invoke(Unknown Source)
  at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  at java.lang.reflect.Method.invoke(Method.java:606)
  at 
org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:621)
  at 
org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:603)
  at 
org.springframework.aop.aspectj.AspectJMethodBeforeAdvice.before(AspectJMethodBeforeAdvice.java:39)
  at 
org.springframework.aop.framework.adapter.MethodBeforeAdviceInterceptor.invoke(MethodBeforeAdviceInterceptor.java:50)
  at 
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
  at 
org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:91)
  at 
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
  at 
org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
  at com.sun.proxy.$Proxy54.deleteOrganisationUnit(Unknown Source)
  at 
org.hisp.dhis.datamerge.DefaultDataMergeService.mergeOrganisationUnits(DefaultDataMergeService.java:129)
  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)
  at 
org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:317)
  at 
org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:183)
  at 
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:150)
  at 
org.springframework.transaction.interceptor.TransactionInterceptor$1.proceedWithInvocation(TransactionInterceptor.java:96)
  at 
org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:260)
  at 
org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:94)
  at 
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
  at 
org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204)
  at com.sun.proxy.$Proxy118.mergeOrganisationUnits(Unknown Source)
  at 
org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction.execute(MergeOrganisationUnitsAction.java:95)
  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)
  at 
com.opensymphony.xwork2.DefaultActionInvocation.invokeAction(DefaultActionInvocation.java:450)
  at 
com.opensymphony.xwork2.DefaultActionInvocation.invokeActionOnly(DefaultActionInvocation.java:289)
  at 

Re: [Dhis2-devs] [Bug 1370486] Re: orgunit-merge-problem-report-tables

[Jason Pickering]

Hi Rodolfo,
Yes, it would be nice, but let me explain a bit our thinking.

There were numerous issues with the implementation, and after some
discussion among the dev team, it was decided it was safer to remove it
entirely for now, until a further review and possible re-implementation
could be done.

The code was quite old, and did not handle properly things like the
"attributeOptionCombo". If this was in use, the functionality could have
caused really major problems when data overlapped. Also, it did not handle
events, among other things. Additionally, the default logic was to "SUM"
numeric data when the data was overlapping, although this was not really
totally apparent unless you looked very carefully at the code, and may not
have really been intended. In the end, it was too risky to keep it in, and
I would strongly advise everyone not to use it.

As Lars says, we are in the process of developing some SQL scripts to
handle this operation, which is something which usually does not need to be
done frequently, and since it is destructive, needs to be done with great
care. The dev team is currently reviewing my initial scripts for this, and
we will release it very soon. Even these scripts will not handle all cases
for what to do when merging data, for instance, how to handle non-numeric
data, like text or options sets. It gets complicated when you want to try
and figure out how to merge this stuff, and may be very implementation
specific.

Its never nice to lose functionality, but this was deemed to be too risky
to keep in.

Maybe we can put it back in the future with some more code, but since it
again is something which can be handled by SQL, and which may need to be
reconfigured per implementation, it may be difficult to have a general
functionality which will handle every situation.

Regards,
Jason



On Fri, Sep 25, 2015 at 4:07 PM, Rodolfo Melia  wrote:

> Hi Jason - losing this functionality is a shame. Wouldn't be better trying
> to get it fixed?
>
> *Rodolfo Meliá*
> *Principal  |  *rme...@knowming.com
> Skype: rod.melia  |  +44 777 576 4090  |  +1 708 872 7636
> www.knowming.com
>
> On Thu, Sep 24, 2015 at 5:47 PM, jason.p.pickering <
> 1370...@bugs.launchpad.net> wrote:
>
>> OU merge functionality has been removed and will be replaced with
>> administrative SQL scripts due to various implementation scenarios.
>>
>> ** Changed in: dhis2
>>Status: New => Fix Committed
>>
>> --
>> You received this bug notification because you are a member of DHIS 2
>> developers, which is subscribed to DHIS.
>> https://bugs.launchpad.net/bugs/1370486
>>
>> Title:
>>   orgunit-merge-problem-report-tables
>>
>> Status in DHIS:
>>   Fix Committed
>>
>> Bug description:
>>   Version:
>>   2.15
>>   Build revision:
>>   15196
>>
>>   When orgunits which are part of a report table are attempted to be
>>   merged with another orgunit, the following error results.
>>
>>   DELETE FROM reporttable_organisationunits where organisationunitid =
>>   76018;
>>
>>   followed by clearing the cache is a workaround.
>>
>>   * INFO  2014-09-17 08:15:05,583 DELETE FROM datavalue_audit WHERE
>> sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>>   * INFO  2014-09-17 08:15:05,584 DELETE FROM datavalue WHERE
>> sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>>   * INFO  2014-09-17 08:15:05,815 DELETE FROM completedatasetregistration
>> WHERE sourceid=76018; (JdbcDataMergeStore.java [http-bio-8080-exec-81])
>>   * ERROR 2014-09-17 08:15:05,848 Error while executing action
>> (ExceptionInterceptor.java [http-bio-8080-exec-81])
>>   org.hisp.dhis.common.DeleteNotAllowedException: ReportTable
>>   at
>> org.hisp.dhis.system.deletion.DefaultDeletionManager.execute(DefaultDeletionManager.java:102)
>>   at
>> org.hisp.dhis.system.deletion.DeletionInterceptor.intercept(DeletionInterceptor.java:54)
>>   at sun.reflect.GeneratedMethodAccessor2549.invoke(Unknown
>> Source)
>>   at
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>   at java.lang.reflect.Method.invoke(Method.java:606)
>>   at
>> org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:621)
>>   at
>> org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:603)
>>   at
>> org.springframework.aop.aspectj.AspectJMethodBeforeAdvice.before(AspectJMethodBeforeAdvice.java:39)
>>   at
>> org.springframework.aop.framework.adapter.MethodBeforeAdviceInterceptor.invoke(MethodBeforeAdviceInterceptor.java:50)
>>   at
>> org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
>>   at
>> org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:91)
>>   at
>> 

Re: [Dhis2-devs] Data statistics for Tracker?

[Knut Staring]

Thanks, Rodolfo!

Knut

On Fri, Sep 25, 2015 at 12:25 PM, Rodolfo Melia  wrote:

> Hi knut. We have done this on PSI's data dict. We submitted to the app
> store, but in never made it. We will resubmit.
>
>
> On Thursday, 24 September 2015, Knut Staring  wrote:
>
>> In the nice-to-have department:
>>
>> I imagine it would not be a huge task to extend the Data Statistics
>> feature to include some basic numbers on Tracker?
>>
>> E.g. we should break up data elements by domain, and list the number of
>> attributes and TEI in the db.
>>
>> Blueprint?
>>
>> --
>> Knut Staring
>> Dept. of Informatics, University of Oslo
>> Norway: +4791880522
>> Skype: knutstar
>> http://dhis2.org
>>
>
>
> --
> *Rodolfo Meliá*
> *Principal  |  *rme...@knowming.com
> Skype: rod.melia  |  +44 777 576 4090  |  +1 708 872 7636
> www.knowming.com
>
>


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