Re: [Dhis2-devs] snapshot version dhis2 deploy error
Hi, my guess is that you are building from source and need to do mvn clean first. You have the 217 jar files still in target folder. Lars On Feb 2, 2015 1:36 PM, Morten Olav Hansen morte...@gmail.com wrote: Just guessing here... but it could be that you have two versions of dhis in your webapps folder? try and clean it out and make sure you only have one dhis war file in the webapps directory -- Morten On Mon, Feb 2, 2015 at 9:36 PM, easy lin...@126.com wrote: hi,all, I have updated to the newest version,and build successful,deploy to tomcat-8.0.14, got error: Deploying web application archive D:\tool\apache-tomcat-8.0.14-windows-x64\apache-tomcat-8.0.14\webap ps\dhis.war * ERROR 2015-02-02 22:33:16,833 Context initialization failed (ContextLoader.java [localhost-startStop -1]) org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: Only one AsyncAnnotationBeanPostProcessor may exist within the context. Offending resource: URL [jar:file:/D:/tool/apache-tomcat-8.0.14-windows-x64/apache-tomcat-8.0.14/webap ps/dhis/WEB-INF/lib/dhis-support-external-2.19-SNAPSHOT.jar!/META-INF/dhis/beans.xml] at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemRepo rter.java:70) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:85) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:72) at org.springframework.scheduling.config.AnnotationDrivenBeanDefinitionParser.parse(Annotation DrivenBeanDefinitionParser.java:91) at org.springframework.beans.factory.xml.NamespaceHandlerSupport.parse(NamespaceHandlerSupport .java:74) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanD efinitionParserDelegate.java:1424) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanD efinitionParserDelegate.java:1414) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.parseBeanDefiniti ons(DefaultBeanDefinitionDocumentReader.java:187) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.doRegisterBeanDef initions(DefaultBeanDefinitionDocumentReader.java:141) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.registerBeanDefin itions(DefaultBeanDefinitionDocumentReader.java:110) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.registerBeanDefinitions(XmlBe anDefinitionReader.java:508) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.doLoadBeanDefinitions(XmlBean DefinitionReader.java:391) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDe finitionReader.java:335) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDe finitionReader.java:303) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:180) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:216) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:187) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWeb ApplicationContext.java:125) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWeb ApplicationContext.java:94) at org.springframework.context.support.AbstractRefreshableApplicationContext.refreshBeanFactor y(AbstractRefreshableApplicationContext.java:129) at org.springframework.context.support.AbstractApplicationContext.obtainFreshBeanFactory(Abstr actApplicationContext.java:540) at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationC ontext.java:454) at org.springframework.web.context.ContextLoader.configureAndRefreshWebApplicationContext(Cont extLoader.java:403) at org.springframework.web.context.ContextLoader.initWebApplicationContext(ContextLoader.java: 306) at org.springframework.web.context.ContextLoaderListener.contextInitialized(ContextLoaderListe ner.java:106) at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4797) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5221) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:724) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:700) at
[Dhis2-devs] [Bug 1417254] [NEW] Bad 'disaggregation' DimensionType on import
Public bug reported: Importing a metaData export from 2.14 into 2.18 and I come across the following error in catalina.out (below). It seens that 'disaggregation' was an allowed type in 2.14 but not 2.18? Meta data can be found here: https://github.com/dhis2/deansdashboard-demodata/tree/master/data Cheers, -carl * ERROR 2015-02-02 15:02:53,691 com.fasterxml.jackson.databind.exc.InvalidFormatException: Can not construct instance of org.hisp.dhis.common.DimensionType from String value 'disaggregation': value not one of declared Enum instance names: [INDICATOR, DATAELEMENT, DATASET, DATAELEMENT_OPERAND, DATA_X, CATEGORY_OPTION_COMBO, PERIOD, ORGANISATIONUNIT, CATEGORYOPTION_GROUPSET, DATAELEMENT_GROUPSET, ORGANISATIONUNIT_GROUPSET, CATEGORY, TRACKED_ENTITY_ATTRIBUTE, TRACKED_ENTITY_DATAELEMENT, STATIC] at [Source: java.io.BufferedInputStream@6bdcc875; line: 50, column: 36] (through reference chain: org.hisp.dhis.dxf2.metadata.MetaData[categories]-java.util.ArrayList[0]-org.hisp.dhis.dataelement.DataElementCategory[dimensionType]) at com.fasterxml.jackson.databind.exc.InvalidFormatException.from(InvalidFormatException.java:55) at com.fasterxml.jackson.databind.DeserializationContext.weirdStringException(DeserializationContext.java:810) at com.fasterxml.jackson.databind.deser.std.EnumDeserializer._deserializeAltString(EnumDeserializer.java:127) at com.fasterxml.jackson.databind.deser.std.EnumDeserializer.deserialize(EnumDeserializer.java:81) at com.fasterxml.jackson.databind.deser.std.EnumDeserializer.deserialize(EnumDeserializer.java:17) at com.fasterxml.jackson.databind.deser.SettableBeanProperty.deserialize(SettableBeanProperty.java:538) at com.fasterxml.jackson.databind.deser.impl.MethodProperty.deserializeAndSet(MethodProperty.java:99) at com.fasterxml.jackson.databind.deser.BeanDeserializer.deserializeFromObject(BeanDeserializer.java:306) at com.fasterxml.jackson.databind.deser.BeanDeserializer.deserialize(BeanDeserializer.java:124) at com.fasterxml.jackson.databind.deser.std.CollectionDeserializer.deserialize(CollectionDeserializer.java:232) at com.fasterxml.jackson.databind.deser.std.CollectionDeserializer.deserialize(CollectionDeserializer.java:206) at com.fasterxml.jackson.databind.deser.std.CollectionDeserializer.deserialize(CollectionDeserializer.java:25) at com.fasterxml.jackson.databind.deser.SettableBeanProperty.deserialize(SettableBeanProperty.java:538) at com.fasterxml.jackson.databind.deser.impl.MethodProperty.deserializeAndSet(MethodProperty.java:99) at com.fasterxml.jackson.databind.deser.BeanDeserializer.vanillaDeserialize(BeanDeserializer.java:238) at com.fasterxml.jackson.databind.deser.BeanDeserializer.deserialize(BeanDeserializer.java:118) at com.fasterxml.jackson.databind.ObjectMapper._readMapAndClose(ObjectMapper.java:3066) at com.fasterxml.jackson.databind.ObjectMapper.readValue(ObjectMapper.java:2207) at org.hisp.dhis.dxf2.utils.JacksonUtils.fromXml(JacksonUtils.java:214) at org.hisp.dhis.importexport.action.util.ImportMetaDataTask.run(ImportMetaDataTask.java:87) at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:178) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:292) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) (ImportMetaDataTask.java [taskScheduler-1]) * ERROR 2015-02-02 15:02:53,691 Unexpected error occurred in scheduled task. (TaskUtils.java [taskScheduler-1]) java.lang.RuntimeException: Failed to parse meta data input stream at org.hisp.dhis.importexport.action.util.ImportMetaDataTask.run(ImportMetaDataTask.java:94) at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:178) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:292) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at
[Dhis2-devs] how to translate the new version of DHIS2?
hi,all The new app all in dhis-web-apps,but the translating tool can't translate it ? how or when will update the tool? -- 此致 easy 莫愁前路无知己，天下谁人不识君。___ 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 18152: Not allow to add/update 'program validation' if the formula is invalid.
revno: 18152
committer: Tran Chautran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Mon 2015-02-02 20:58:48 +0700
message:
Not allow to add/update 'program validation' if the formula is invalid.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramExpressionDescriptionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java 2015-01-17 07:41:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java 2015-02-02 13:58:48 +
@@ -53,6 +53,8 @@
{
String ID = ProgramExpressionService.class.getName();
+public static final String INVALID_CONDITION = Expression is not well-formed;
+
/**
* Adds an {@link ProgramExpression}
*
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java 2015-01-27 13:45:40 +
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java 2015-02-02 13:58:48 +
@@ -29,6 +29,9 @@
*/
import static org.hisp.dhis.program.ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT;
+import static org.hisp.dhis.program.ProgramExpression.OBJECT_PROGRAM_STAGE;
+import static org.hisp.dhis.program.ProgramExpression.REPORT_DATE;
+import static org.hisp.dhis.program.ProgramExpression.DUE_DATE;
import static org.hisp.dhis.program.ProgramExpression.SEPARATOR_ID;
import static org.hisp.dhis.program.ProgramExpression.SEPARATOR_OBJECT;
@@ -53,10 +56,9 @@
public class DefaultProgramExpressionService
implements ProgramExpressionService
{
-private static final String regExp = \\[ + OBJECT_PROGRAM_STAGE_DATAELEMENT + SEPARATOR_OBJECT
-+ ([a-zA-Z0-9\\- ]+[ + SEPARATOR_ID + [a-zA-Z0-9\\- ]+]*) + \\];
-
-private static final String INVALID_CONDITION = Invalid condition;
+private static final String regExp = \\[( + OBJECT_PROGRAM_STAGE_DATAELEMENT + | + OBJECT_PROGRAM_STAGE + )
++ SEPARATOR_OBJECT + ([a-zA-Z0-9\\- ]+[ + SEPARATOR_ID + ([a-zA-Z0-9\\- ]| + DUE_DATE + | + REPORT_DATE
++ )+]*)\\];
// -
// Dependencies
@@ -134,9 +136,7 @@
{
String key = matcher.group().replaceAll( [\\[\\]], ).split( SEPARATOR_OBJECT )[1];
-System.err.println(\n\n\n key : + key );
String dataValue = dataValueMap.get( key );
-System.err.println(\n\n\n dataValue : + dataValue );
if ( dataValue == null )
{
return null;
@@ -160,28 +160,51 @@
Pattern pattern = Pattern.compile( regExp );
Matcher matcher = pattern.matcher( programExpression );
+int countFormula = 0;
while ( matcher.find() )
{
+countFormula++;
+
String match = matcher.group();
+String key = matcher.group(1);
match = match.replaceAll( [\\[\\]], );
String[] info = match.split( SEPARATOR_OBJECT );
String[] ids = info[1].split( SEPARATOR_ID );
ProgramStage programStage = programStageService.getProgramStage( ids[0] );
-DataElement dataElement = dataElementService.getDataElement( ids[1] );
-
-if ( programStage == null || dataElement == null )
+String name = ids[1];
+
+if ( programStage == null )
{
return INVALID_CONDITION;
}
+else if ( !name.equals( DUE_DATE ) !name.equals( REPORT_DATE ) )
+{
+DataElement dataElement = dataElementService.getDataElement( name );
+if( dataElement == null )
+{
+return INVALID_CONDITION;
+}
+else
+{
+
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18150: Implemented missing TODO : associating catoptcombos to catopts
revno: 18150
committer: Bob Jolliffe bobjolli...@gmail.com
branch nick: dhis2
timestamp: Mon 2015-02-02 13:06:15 +
message:
Implemented missing TODO : associating catoptcombos to catopts
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.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/dataelement/DataElementCategoryCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2015-01-17 07:41:26 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2015-02-02 13:06:15 +
@@ -147,7 +147,7 @@
return arrays;
}
-
+
public ListDataElementCategoryOptionCombo generateOptionCombosList()
{
ListDataElementCategoryOptionCombo list = new ArrayList();
@@ -215,10 +215,16 @@
return name.toString();
}
-//TODO update category option - category option combo association
public void generateOptionCombos()
{
this.optionCombos = new HashSet( generateOptionCombosList() );
+for (DataElementCategoryOptionCombo optionCombo : optionCombos)
+{
+for (DataElementCategoryOption categoryOption : optionCombo.getCategoryOptions())
+{
+categoryOption.addCategoryOptionCombo(optionCombo);
+}
+}
}
public boolean hasOptionCombos()
___
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] how to translate the new version of DHIS2?
Hi Easy, Yes, the i18n tool will not work for this. If you want, I can setup the system to translate to Chinese here (translate.dhis2.org), which we manage centrally to coordinate the translation process. Otherwise, you can look for the i18n folder in each app, and translate the corresponding properties files there, with something like Eclipse or another IDE, to i18n_app_zh.properties. There may be some other things which need to be done, but the JavaScript/app developers may need to comment there. Best regards, Jason On Mon, Feb 2, 2015 at 2:44 PM, easy lin...@126.com wrote: hi,all The new app all in dhis-web-apps,but the translating tool can't translate it ? how or when will update the tool? -- 此致 easy 莫愁前路无知己，天下谁人不识君。 ___ 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 18149: support field filtering for dimensionController, also adds generic support for field filtering on...
revno: 18149
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2015-02-02 16:26:11 +0700
message:
support field filtering for dimensionController, also adds generic support
for field filtering on all property endpoints
/api/type/id/propertyName?fields=XXX
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.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/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2015-01-23 14:17:20 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2015-02-02 09:26:11 +
@@ -29,6 +29,7 @@
*/
import com.google.common.base.Enums;
+import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import org.hisp.dhis.acl.AclService;
@@ -275,7 +276,16 @@
@PathVariable( uid ) String pvUid, @PathVariable( property ) String pvProperty, @RequestParam MapString, String rpParameters,
HttpServletRequest request, HttpServletResponse response ) throws Exception
{
-return getObjectInternal( pvUid, rpParameters, Lists.StringnewArrayList(), Lists.newArrayList( pvProperty + [:all] ) );
+ListString fields = Lists.newArrayList( contextService.getParameterValues( fields ) );
+
+if ( fields.isEmpty() )
+{
+fields.add( :all );
+}
+
+String fieldFilter = [ + Joiner.on( ',' ).join( fields ) + ];
+
+return getObjectInternal( pvUid, rpParameters, Lists.StringnewArrayList(), Lists.newArrayList( pvProperty + fieldFilter ) );
}
@RequestMapping( value = /{uid}/{property}, method = { RequestMethod.PUT, RequestMethod.PATCH } )
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java 2015-01-28 13:37:43 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java 2015-02-02 09:26:11 +
@@ -28,40 +28,40 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.google.common.collect.Lists;
import org.hisp.dhis.common.DimensionService;
import org.hisp.dhis.common.DimensionalObject;
+import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.common.NameableObject;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.node.AbstractNode;
+import org.hisp.dhis.node.Node;
+import org.hisp.dhis.node.types.CollectionNode;
+import org.hisp.dhis.node.types.RootNode;
import org.hisp.dhis.webapi.utils.ContextUtils;
import org.hisp.dhis.webapi.webdomain.WebMetaData;
import org.hisp.dhis.webapi.webdomain.WebOptions;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
-import com.google.common.collect.Lists;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
@Controller
@RequestMapping( value = DimensionController.RESOURCE_PATH )
-public class DimensionController
+public class DimensionController
extends AbstractCrudControllerDimensionalObject
{
public static final String RESOURCE_PATH = /dimensions;
@@ -93,92 +93,35 @@
}
@RequestMapping( value = /{uid}/items, method = RequestMethod.GET )
-public String getItems( @PathVariable String uid, @RequestParam MapString, String
Re: [Dhis2-devs] SMS not Receiving
Thank u sir, let me show you my configuration : Gateway Configuration Management Gateway TypeType : Modem Gateway Gateway Configuration---Gateway Name: HuaweiPort *: COM25BaudRate *: 460800 Polling interval in seconds: *: 10Manufacturer: HuaweiModel: E173PIN: Inbound: Yes Outbound: Yes = EKANI Guy Le Lundi 2 février 2015 10h26, Long Ngo Thanh long.hispviet...@gmail.com a écrit : Hi Guy, This issue should be fixed long time ago but let me check it from the code. Long On Mon Feb 02 2015 at 4:21:36 PM Guy Ekani constyek...@yahoo.fr wrote: Hello Everyone, I use a Modem Gateway, I'm able to send SMS in DHIS, but DHIS don't receive the SMS I sent. I have the following error when i click on view received SMS: Version: - 2.18 - Build revision: - 18100 - Build date: - 2015-01-22 04:08 HTTP ERROR 404 Problemaccessing /dhis-web-maintenance-mobile/show_receive_sms_form.action. Reason: There is no Action mapped for namespace [/dhis-web-maintenance-mobile] and action name [show_receive_sms_form] associated with context path [].Powered by Jetty://* INFO 11:20:33,944 [Level: INFO, category: SENDING_SMS,time: Sun Feb 01 11:20:33 WAT 2015, message: Sending SMS](InMemoryNotifier.java [taskScheduler-1])* INFO 11:20:33,959 Sending message OutboundSMS[recipients=237699**, message=admin: tata](DefaultOutboundSmsTransportService.java [taskScheduler-1])* WARN 11:20:33,960 Message not sent(DefaultOutboundSmsTransportService.java [taskScheduler-1])* INFO 11:20:33,991 [Level: INFO, category:SENDING_SMS, time: Sun Feb 01 11:20:33 WAT 2015, message: All Message Sent](InMemoryNotifier.java [taskScheduler-1]) * WARN 10:37:33,928 Unable to load gateway Huawei(DefaultOutboundSmsTransportService.java [22821551@qtp-14938154-32])org.smslib.GatewayException:Cannot add gateways while Service is running! = EKANI Guy ___ 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] Query Regarding Spring scheduler for set dynamic cron expression
Dear Dev, I have a Query Regarding Spring scheduler for set dynamic cron expression I use the Spring scheduler in which i add task:scheduled-tasks scheduler=schedulerName task:scheduled ref=action-Name method=method-Name cron=0 0 23 * * ?/ /task:scheduled-tasks i want how to dynamic replace the cron expression means i want to set the cron expression from form(GUI) -- Thanks and Regards Mithilesh Kumar Thakur ___ 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] Query Regarding Spring scheduler for set dynamic cron expression
Did you have a look at the documentation? you can probably save the timing itself using a system or user setting, which means http://docs.spring.io/spring/docs/current/spring-framework-reference/html/scheduling.html -- Morten On Tue, Feb 3, 2015 at 12:31 PM, Mithilesh Kumar Thakur mithilesh.h...@gmail.com wrote: Dear Dev, I have a Query Regarding Spring scheduler for set dynamic cron expression I use the Spring scheduler in which i add task:scheduled-tasks scheduler=schedulerName task:scheduled ref=action-Name method=method-Name cron=0 0 23 * * ?/ /task:scheduled-tasks i want how to dynamic replace the cron expression means i want to set the cron expression from form(GUI) -- Thanks and Regards Mithilesh Kumar Thakur ___ 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 18157: minor fix, make sure that autoFields are set also when using the object bridge
revno: 18157
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-02-03 13:04:09 +0700
message:
minor fix, make sure that autoFields are set also when using the object bridge
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2015-01-23 16:35:50 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2015-02-03 06:04:09 +
@@ -34,6 +34,7 @@
import org.apache.commons.logging.LogFactory;
import org.hibernate.SessionFactory;
import org.hisp.dhis.common.AuditLogUtil;
+import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.IdentifiableObject;
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.common.IdentifiableProperty;
@@ -318,6 +319,12 @@
if ( writeEnabled )
{
AuditLogUtil.infoWrapper( log, currentUserService.getCurrentUsername(), object, AuditLogUtil.ACTION_UPDATE );
+
+if ( IdentifiableObject.class.isInstance( object ) )
+{
+((BaseIdentifiableObject) object).setAutoFields();
+}
+
sessionFactory.getCurrentSession().update( object );
}
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] snapshot version dhis2 deploy error
hi,all, I have updated to the newest version,and build successful,deploy to tomcat-8.0.14, got error: Deploying web application archive D:\tool\apache-tomcat-8.0.14-windows-x64\apache-tomcat-8.0.14\webap ps\dhis.war * ERROR 2015-02-02 22:33:16,833 Context initialization failed (ContextLoader.java [localhost-startStop -1]) org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: Only one AsyncAnnotationBeanPostProcessor may exist within the context. Offending resource: URL [jar:file:/D:/tool/apache-tomcat-8.0.14-windows-x64/apache-tomcat-8.0.14/webap ps/dhis/WEB-INF/lib/dhis-support-external-2.19-SNAPSHOT.jar!/META-INF/dhis/beans.xml] at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemRepo rter.java:70) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:85) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:72) at org.springframework.scheduling.config.AnnotationDrivenBeanDefinitionParser.parse(Annotation DrivenBeanDefinitionParser.java:91) at org.springframework.beans.factory.xml.NamespaceHandlerSupport.parse(NamespaceHandlerSupport .java:74) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanD efinitionParserDelegate.java:1424) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanD efinitionParserDelegate.java:1414) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.parseBeanDefiniti ons(DefaultBeanDefinitionDocumentReader.java:187) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.doRegisterBeanDef initions(DefaultBeanDefinitionDocumentReader.java:141) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.registerBeanDefin itions(DefaultBeanDefinitionDocumentReader.java:110) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.registerBeanDefinitions(XmlBe anDefinitionReader.java:508) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.doLoadBeanDefinitions(XmlBean DefinitionReader.java:391) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDe finitionReader.java:335) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDe finitionReader.java:303) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:180) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:216) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:187) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWeb ApplicationContext.java:125) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWeb ApplicationContext.java:94) at org.springframework.context.support.AbstractRefreshableApplicationContext.refreshBeanFactor y(AbstractRefreshableApplicationContext.java:129) at org.springframework.context.support.AbstractApplicationContext.obtainFreshBeanFactory(Abstr actApplicationContext.java:540) at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationC ontext.java:454) at org.springframework.web.context.ContextLoader.configureAndRefreshWebApplicationContext(Cont extLoader.java:403) at org.springframework.web.context.ContextLoader.initWebApplicationContext(ContextLoader.java: 306) at org.springframework.web.context.ContextLoaderListener.contextInitialized(ContextLoaderListe ner.java:106) at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4797) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5221) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:724) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:700) at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:714) at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:919) at org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1703) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at
Re: [Dhis2-devs] SMS not Receiving
Hi Guy, The bug has been fixed. You can download the latest 2.18 from: https://apps.dhis2.org/ci/job/dhis-2.18/lastSuccessfulBuild/artifact/dhis-2/dhis-web/dhis-web-portal/target/dhis.war Long On Mon Feb 02 2015 at 4:36:23 PM Guy Ekani constyek...@yahoo.fr wrote: Thank u sir, let me show you my configuration : *Gateway Configuration Management* Gateway Type Type : Modem Gateway Gateway Configuration --- Gateway Name: Huawei Port *: COM25 BaudRate *: 460800 Polling interval in seconds: *: 10 Manufacturer: Huawei Model: E173 PIN: Inbound: Yes Outbound: Yes = EKANI Guy Le Lundi 2 février 2015 10h26, Long Ngo Thanh long.hispviet...@gmail.com a écrit : Hi Guy, This issue should be fixed long time ago but let me check it from the code. Long On Mon Feb 02 2015 at 4:21:36 PM Guy Ekani constyek...@yahoo.fr wrote: Hello Everyone, I use a Modem Gateway, I'm able to send SMS in DHIS, but DHIS don't receive the SMS I sent. I have the following error when i click on view received SMS: Version: 2.18Build revision:18100Build date:2015-01-22 04:08 HTTP ERROR 404 Problem accessing /dhis-web-maintenance-mobile/show_receive_sms_form.action. Reason: There is no Action mapped for namespace [/dhis-web-maintenance-mobile] and action name [show_receive_sms_form] associated with context path []. -- *Powered by Jetty://* * INFO 11:20:33,944 [Level: INFO, category: SENDING_SMS, time: Sun Feb 01 11:20:33 WAT 2015, message: Sending SMS] (InMemoryNotifier.java [taskScheduler-1]) * INFO 11:20:33,959 Sending message OutboundSMS [recipients=237699**, message=admin: tata] (DefaultOutboundSmsTransportService.java [taskScheduler-1]) * WARN 11:20:33,960 Message not sent (DefaultOutboundSmsTransportService.java [taskScheduler-1]) * INFO 11:20:33,991 [Level: INFO, category: SENDING_SMS, time: Sun Feb 01 11:20:33 WAT 2015, message: All Message Sent] (InMemoryNotifier.java [taskScheduler-1]) * WARN 10:37:33,928 Unable to load gateway Huawei (DefaultOutboundSmsTransportService.java [22821551@qtp-14938154-32]) org.smslib.GatewayException: Cannot add gateways while Service is running! = EKANI Guy ___ 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] Urgent feedback required
Hi Calle I voted for Jason's suggestion. In Vietnam, in many cases we use this approach. Hacking dhis2 by using days as categories will be problematic in the long run although such problems may not be visible now. Once time in the past someone told us to use departments of hospitals as categories (instead of orgunit). We followed this and this went bankcrupt shortly. Thanh On Fri, Jan 30, 2015 at 9:52 PM, Jason Pickering jason.p.picker...@gmail.com wrote: Why not just make the dataset daily and transform all monthly data such that it occurs on the last day of the month? On Fri, Jan 30, 2015 at 2:11 PM, Calle Hedberg calle.hedb...@gmail.com wrote: Hi, I need some urgent feedback on one very specific issue: 1. We have a lot of monthly data that have been captured on a daily basis (up to now in 1.4). The data is in reality monthly aggregated data because it is the monthly totals that are used for indicators, analysis, reports etc - but the data is captured daily into DHIS to enable consistency/completeness tracking and to cut down on the erroneous manual data compilation from paper forms at the end of every month. 2. Initially, the HISP team converted these daily captured values in 1.4 into datavalues in DHIS2 with dataperiodtype = daily. This approach has various shortcomings, in particular when the use of daily capturing is slowly being rolled out - meaning that while let us say 30% of all facilities captured data on a daily basis themselves, the remaining 70% are still submitting monthly summary forms to the sub-district office for capturing as monthly total data. 3. I believe a more logical approach is to store the daily data (Day01, Day02, , Day31) as categories - as mentioned, we are in general NOT using those daily values for anything beyond the initial data quality and completeness process. QUESTION: 1. Are there any major drawbacks to storing these daily values as categories? 2. Are there any major limitations with regard to the design of data entry forms that will make it difficult to have a matrix type data entry form where (a) the user select OrgUnit, DataSet, and the DATE (as in 2015-01-30) (b) the year/month part of that date determines the dataperiodid (c) the day portion of the date determines which category will be the right-most column in the data entry matrix (d) we can display let us say 7 preceding days in the matrix to assist the data capturer with eyeballing data during capture (dynamic selection display of categories). So the entry form would show up as DataElement Day23 Day24 Day25 Day26 Day27 Day28 Day29 Day30 data element1 17 14 15 22 18 19 20 entry data element2 13 11 19 8 15 12 10 entry Any quick feedback would be appreciated Regards Calle *** Calle Hedberg 46D Alma Road, 7700 Rosebank, SOUTH AFRICA Tel/fax (home): +27-21-685-6472 Cell: +27-82-853-5352 Iridium SatPhone: +8816-315-19274 Email: calle.hedb...@gmail.com Skype: calle_hedberg *** ___ 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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18153: Also bootstrap menu when helpurl request fails
revno: 18153
committer: Mark Polak mar...@ifi.uio.no
branch nick: dhis2
timestamp: Mon 2015-02-02 17:30:47 +0100
message:
Also bootstrap menu when helpurl request fails
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2015-01-28 19:03:29 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2015-02-02 16:30:47 +
@@ -951,16 +951,20 @@
try {
jQuery.ajax({
type : GET,
-url : ../dhis-web-commons/menu/getHelpPageLinkModule.action,
+url : dhis2.settings.getBaseUrl() + /dhis-web-commons/menu/getHelpPageLinkModule.action,
dataType : json,
success : function(json) {
helpPageLink = json;
bootstrapMenu();
+},
+failure: function () {
+bootstrapMenu();
}
});
} catch (e) {
-if (console console.error)
+if (console console.error) {
console.error(e.message, e.stack);
+}
}
};
___
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 18154: DV minor bug fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 18154 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Mon 2015-02-02 17:41:21 +0100
message:
DV minor bug fixed.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.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-visualizer/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html 2015-01-26 15:12:42 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html 2015-02-02 16:39:05 +
@@ -22,52 +22,38 @@
DHIS.getChart({
url: url,
el: 'chart1',
-uid: 'LW0O27b7TdD',
-crossDomain: false,
-rows: [{dimension: 'ou', items: [{id: 'LEVEL-4'}, {id: 'ENHOJz3UH5L'}]}],
-baseLineValue: 10,
-domainAxisStyle: {
-labelColor: 'blue',
-labelFont: '10px arial',
-labelRotation: 70,
-
-titleFont: 'bold 12px arial',
-titleColor: 'blue'
-},
-rangeAxisStyle: {
-labelFont: '10px arial',
-titleFont: 'bold 12px arial'
-}
+uid: 'IXF2whoSbRn',
+crossDomain: false
});
- DHIS.getChart({
-url: url,
-el: 'chart2',
-//type: 'pie',
-columns: [{dimension: 'in', items: [{id: 'Uvn6LCg7dVU'}, {id: 'OdiHJayrsKo'}, {id: 'sB79w2hiLp8'}, {id: 'AUqdhY4mpvp'}]}],
-rows: [{dimension: 'pe', items: [{id: 'LAST_6_MONTHS'}]}],
-filters: [{dimension: 'ou', items: [{id: 'USER_ORGUNIT'}]}],
-domainAxisTitle: 'PERIODS',
-rangeAxisTitle: 'PERCENT',
-domainAxisStyle: {
-labelFont: '10px sans-serif',
-labelRotation: 0,
-titleFont: 'bold 10px sans-serif'
-},
-rangeAxisStyle: {
-labelFont: '10px arial',
-titleFont: 'bold 10px sans-serif'
-},
-legendStyle: {
-labelMaxLength: 9,
-labelFontSize: 10,
-titleFont: '18px sans-serif'
-},
-seriesStyle: {
-labelFont: '10px sans-serif',
-labelColor: 'black'
-}
- });
+ //DHIS.getChart({
+//url: url,
+//el: 'chart2',
+type: 'pie',
+//columns: [{dimension: 'in', items: [{id: 'Uvn6LCg7dVU'}, {id: 'OdiHJayrsKo'}, {id: 'sB79w2hiLp8'}, {id: 'AUqdhY4mpvp'}]}],
+//rows: [{dimension: 'pe', items: [{id: 'LAST_6_MONTHS'}]}],
+//filters: [{dimension: 'ou', items: [{id: 'USER_ORGUNIT'}]}],
+//domainAxisTitle: 'PERIODS',
+//rangeAxisTitle: 'PERCENT',
+//domainAxisStyle: {
+//labelFont: '10px sans-serif',
+//labelRotation: 0,
+//titleFont: 'bold 10px sans-serif'
+//},
+//rangeAxisStyle: {
+//labelFont: '10px arial',
+//titleFont: 'bold 10px sans-serif'
+//},
+//legendStyle: {
+//labelMaxLength: 9,
+//labelFontSize: 10,
+//titleFont: '18px sans-serif'
+//},
+//seriesStyle: {
+//labelFont: '10px sans-serif',
+//labelColor: 'black'
+//}
+ //});
});
/script
/head
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-01-26 15:12:42 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-02-02 16:39:05 +
@@ -2997,7 +2997,8 @@
position = 'top',
padding = 0,
positions = ['top', 'right', 'bottom', 'left'],
-series = chartConfig.series;
+series =
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18156: Minor
revno: 18156
committer: Mark Polak mar...@ifi.uio.no
branch nick: dhis2
timestamp: Mon 2015-02-02 19:22:00 +0100
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2015-02-02 17:28:12 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2015-02-02 18:22:00 +
@@ -957,7 +957,7 @@
helpPageLink = json;
bootstrapMenu();
},
-failure: function () {
+error: function () {
bootstrapMenu();
}
});
___
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] snapshot version dhis2 deploy error
Just guessing here... but it could be that you have two versions of dhis in your webapps folder? try and clean it out and make sure you only have one dhis war file in the webapps directory -- Morten On Mon, Feb 2, 2015 at 9:36 PM, easy lin...@126.com wrote: hi,all, I have updated to the newest version,and build successful,deploy to tomcat-8.0.14, got error: Deploying web application archive D:\tool\apache-tomcat-8.0.14-windows-x64\apache-tomcat-8.0.14\webap ps\dhis.war * ERROR 2015-02-02 22:33:16,833 Context initialization failed (ContextLoader.java [localhost-startStop -1]) org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: Only one AsyncAnnotationBeanPostProcessor may exist within the context. Offending resource: URL [jar:file:/D:/tool/apache-tomcat-8.0.14-windows-x64/apache-tomcat-8.0.14/webap ps/dhis/WEB-INF/lib/dhis-support-external-2.19-SNAPSHOT.jar!/META-INF/dhis/beans.xml] at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemRepo rter.java:70) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:85) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:72) at org.springframework.scheduling.config.AnnotationDrivenBeanDefinitionParser.parse(Annotation DrivenBeanDefinitionParser.java:91) at org.springframework.beans.factory.xml.NamespaceHandlerSupport.parse(NamespaceHandlerSupport .java:74) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanD efinitionParserDelegate.java:1424) at org.springframework.beans.factory.xml.BeanDefinitionParserDelegate.parseCustomElement(BeanD efinitionParserDelegate.java:1414) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.parseBeanDefiniti ons(DefaultBeanDefinitionDocumentReader.java:187) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.doRegisterBeanDef initions(DefaultBeanDefinitionDocumentReader.java:141) at org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader.registerBeanDefin itions(DefaultBeanDefinitionDocumentReader.java:110) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.registerBeanDefinitions(XmlBe anDefinitionReader.java:508) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.doLoadBeanDefinitions(XmlBean DefinitionReader.java:391) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDe finitionReader.java:335) at org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(XmlBeanDe finitionReader.java:303) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:180) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:216) at org.springframework.beans.factory.support.AbstractBeanDefinitionReader.loadBeanDefinitions( AbstractBeanDefinitionReader.java:187) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWeb ApplicationContext.java:125) at org.springframework.web.context.support.XmlWebApplicationContext.loadBeanDefinitions(XmlWeb ApplicationContext.java:94) at org.springframework.context.support.AbstractRefreshableApplicationContext.refreshBeanFactor y(AbstractRefreshableApplicationContext.java:129) at org.springframework.context.support.AbstractApplicationContext.obtainFreshBeanFactory(Abstr actApplicationContext.java:540) at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationC ontext.java:454) at org.springframework.web.context.ContextLoader.configureAndRefreshWebApplicationContext(Cont extLoader.java:403) at org.springframework.web.context.ContextLoader.initWebApplicationContext(ContextLoader.java: 306) at org.springframework.web.context.ContextLoaderListener.contextInitialized(ContextLoaderListe ner.java:106) at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4797) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5221) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:724) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:700) at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:714) at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:919) at
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18155: Fix regression bug in menu manager and code style
revno: 18155
committer: Mark Polak mar...@ifi.uio.no
branch nick: dhis2
timestamp: Mon 2015-02-02 18:28:12 +0100
message:
Fix regression bug in menu manager and code style
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.manager.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js 2014-10-16 19:00:41 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js 2015-02-02 17:28:12 +
@@ -255,14 +255,14 @@
that.getMenuItems = function () {
return menuItems;
-}
+};
/**
* Get the max number of favorites
*/
that.getMaxFavorites = function () {
return MAX_FAVORITES;
-}
+};
/**
* Order the menuItems by a given list
@@ -307,7 +307,7 @@
executeCallBacks();
return that;
-}
+};
/**
* Adds the menu items given to the menu
@@ -363,7 +363,7 @@
that.notify = function () {
executeCallBacks();
-}
+};
/**
* Get the favorite apps
@@ -390,7 +390,7 @@
that.sortNonFavAppsByName = function (inverse) {
return sortAppsByName(that.getNonFavoriteApps(), inverse);
-}
+};
/**
* Gets the applist based on the current display order
@@ -409,7 +409,7 @@
break;
}
return favApps.concat(nonFavApps);;
-}
+};
that.updateOrder = function (reorderedApps) {
switch (that.displayOrder) {
@@ -423,7 +423,7 @@
that.orderMenuItemsByList(reorderedApps);
break;
}
-}
+};
that.save = function (saveMethod) {
if ( ! du.isFunction(saveMethod)) {
@@ -431,7 +431,7 @@
}
return saveMethod(that.getMenuItems().getOrder());
-}
+};
that.search = function (searchFor) {
//Get all the apps
@@ -459,7 +459,7 @@
});
return searchMatches;
-}
+};
if (typeof preLoadedData === 'object') {
that.addMenuItems(preLoadedData);
@@ -490,7 +490,7 @@
return true;
}
return false;
-}
+};
/**
* Returns the name keys for the current menus.
@@ -508,7 +508,7 @@
}
}
return nameKeys;
-}
+};
//Expose the fixUrl method so we can use externally
dhis2.menu.fixUrlIfNeeded = fixUrlIfNeeded;
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.manager.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.manager.js 2014-06-11 20:02:19 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.manager.js 2015-02-02 17:28:12 +
@@ -37,7 +37,8 @@
* @see jQuery (http://jquery.com)
* @see jQuery Template Plugin (http://github.com/jquery/jquery-tmpl)
*/
-(function ($, menu, undefined) {
+(function ($, undefined) {
+var menu;
var markup = '',
selector = 'appsMenu';
@@ -137,7 +138,11 @@
$('.app-menu ul').sortable(options).disableSelection();
}
-menu.subscribe(renderMenu);
+$.when(dhis2.menu.ui.loadingStatus)
+.then(function () {
+menu = dhis2.menu.mainAppMenu.menuItems;
+menu.subscribe(renderMenu);
+});
/**
* jQuery events that communicate with the web api
@@ -188,4 +193,4 @@
});
});
-})(jQuery, dhis2.menu.mainAppMenu.menuItems);
+})(jQuery);
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2015-02-02 16:30:47 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2015-02-02 17:28:12
[Dhis2-devs] SMS not Receiving
Hello Everyone, I use a Modem Gateway, I'm able to send SMS in DHIS, but DHIS don't receive the SMS I sent. I have the following error when i click on view received SMS: Version: - 2.18 - Build revision: - 18100 - Build date: - 2015-01-22 04:08 HTTP ERROR 404 Problemaccessing /dhis-web-maintenance-mobile/show_receive_sms_form.action. Reason: There is no Action mapped for namespace [/dhis-web-maintenance-mobile] and action name [show_receive_sms_form] associated with context path []. Powered by Jetty:// * INFO 11:20:33,944 [Level: INFO, category: SENDING_SMS,time: Sun Feb 01 11:20:33 WAT 2015, message: Sending SMS](InMemoryNotifier.java [taskScheduler-1]) * INFO 11:20:33,959 Sending message OutboundSMS[recipients=237699**, message=admin: tata](DefaultOutboundSmsTransportService.java [taskScheduler-1]) * WARN 11:20:33,960 Message not sent(DefaultOutboundSmsTransportService.java [taskScheduler-1]) * INFO 11:20:33,991 [Level: INFO, category:SENDING_SMS, time: Sun Feb 01 11:20:33 WAT 2015, message: All Message Sent](InMemoryNotifier.java [taskScheduler-1]) * WARN 10:37:33,928 Unable to load gateway Huawei(DefaultOutboundSmsTransportService.java [22821551@qtp-14938154-32]) org.smslib.GatewayException:Cannot add gateways while Service is running! = EKANI Guy ___ 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] SMS not Receiving
Hi Guy, This issue should be fixed long time ago but let me check it from the code. Long On Mon Feb 02 2015 at 4:21:36 PM Guy Ekani constyek...@yahoo.fr wrote: Hello Everyone, I use a Modem Gateway, I'm able to send SMS in DHIS, but DHIS don't receive the SMS I sent. I have the following error when i click on view received SMS: Version: 2.18Build revision:18100Build date:2015-01-22 04:08 HTTP ERROR 404 Problem accessing /dhis-web-maintenance-mobile/show_receive_sms_form.action. Reason: There is no Action mapped for namespace [/dhis-web-maintenance-mobile] and action name [show_receive_sms_form] associated with context path []. -- *Powered by Jetty://* * INFO 11:20:33,944 [Level: INFO, category: SENDING_SMS, time: Sun Feb 01 11:20:33 WAT 2015, message: Sending SMS] (InMemoryNotifier.java [taskScheduler-1]) * INFO 11:20:33,959 Sending message OutboundSMS [recipients=237699**, message=admin: tata] (DefaultOutboundSmsTransportService.java [taskScheduler-1]) * WARN 11:20:33,960 Message not sent (DefaultOutboundSmsTransportService.java [taskScheduler-1]) * INFO 11:20:33,991 [Level: INFO, category: SENDING_SMS, time: Sun Feb 01 11:20:33 WAT 2015, message: All Message Sent] (InMemoryNotifier.java [taskScheduler-1]) * WARN 10:37:33,928 Unable to load gateway Huawei (DefaultOutboundSmsTransportService.java [22821551@qtp-14938154-32]) org.smslib.GatewayException: Cannot add gateways while Service is running! = EKANI Guy ___ 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
