Menu
▾
▴
advance-project-commit
|
From: <aka...@us...> - 2013-08-26 12:23:18
|
Revision: 304
http://sourceforge.net/p/advance-project/code/304
Author: akarnokd
Date: 2013-08-26 12:23:14 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Initial import of the open-source ADVANCE Live Reporter
Added Paths:
-----------
advance-live-reporter-os/.classpath
advance-live-reporter-os/.project
advance-live-reporter-os/.settings/
advance-live-reporter-os/.settings/.jsdtscope
advance-live-reporter-os/.settings/org.eclipse.jdt.core.prefs
advance-live-reporter-os/.settings/org.eclipse.wst.common.component
advance-live-reporter-os/.settings/org.eclipse.wst.common.project.facet.core.xml
advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.container
advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.name
advance-live-reporter-os/WebContent/
advance-live-reporter-os/WebContent/META-INF/
advance-live-reporter-os/WebContent/META-INF/MANIFEST.MF
advance-live-reporter-os/WebContent/WEB-INF/
advance-live-reporter-os/WebContent/WEB-INF/lib/
advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/annotations.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/commons-codec-1.6.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/commons-lang-2.6.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/commons-math3-3.2.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/guava-14.0.1.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/j2ssh-0.2.9.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/javamail.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/jaxws-rt.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/joda-time-2.2.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/log4j-1.2.17.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/mysql-connector-java-5.1.25-bin.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/reactive4java-0.97.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/slf4j-log4j-jcl-jul-1.6.1.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/trove-3.0.3.jar
advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml
advance-live-reporter-os/WebContent/WEB-INF/web.xml
advance-live-reporter-os/src/
Added: advance-live-reporter-os/.classpath
===================================================================
--- advance-live-reporter-os/.classpath (rev 0)
+++ advance-live-reporter-os/.classpath 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: advance-live-reporter-os/.project
===================================================================
--- advance-live-reporter-os/.project (rev 0)
+++ advance-live-reporter-os/.project 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>advance-live-reporter-os</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Added: advance-live-reporter-os/.settings/.jsdtscope
===================================================================
--- advance-live-reporter-os/.settings/.jsdtscope (rev 0)
+++ advance-live-reporter-os/.settings/.jsdtscope 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: advance-live-reporter-os/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- advance-live-reporter-os/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ advance-live-reporter-os/.settings/org.eclipse.jdt.core.prefs 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
Added: advance-live-reporter-os/.settings/org.eclipse.wst.common.component
===================================================================
--- advance-live-reporter-os/.settings/org.eclipse.wst.common.component (rev 0)
+++ advance-live-reporter-os/.settings/org.eclipse.wst.common.component 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="advance-live-reporter-os">
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="advance-live-reporter-os"/>
+ <property name="java-output-path" value="/advance-live-reporter-os/build/classes"/>
+ </wb-module>
+</project-modules>
Added: advance-live-reporter-os/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- advance-live-reporter-os/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ advance-live-reporter-os/.settings/org.eclipse.wst.common.project.facet.core.xml 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="Apache Tomcat v7.0"/>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.7"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.container 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ advance-live-reporter-os/.settings/org.eclipse.wst.jsdt.ui.superType.name 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: advance-live-reporter-os/WebContent/META-INF/MANIFEST.MF
===================================================================
--- advance-live-reporter-os/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ advance-live-reporter-os/WebContent/META-INF/MANIFEST.MF 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/annotations.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/annotations.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/annotations.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/annotations.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/annotations.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-codec-1.6.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-codec-1.6.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/commons-codec-1.6.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/commons-codec-1.6.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-codec-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-lang-2.6.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-lang-2.6.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/commons-lang-2.6.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/commons-lang-2.6.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-lang-2.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-math3-3.2.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-math3-3.2.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/commons-math3-3.2.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/commons-math3-3.2.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/commons-math3-3.2.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/guava-14.0.1.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/guava-14.0.1.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/guava-14.0.1.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/guava-14.0.1.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/guava-14.0.1.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/j2ssh-0.2.9.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/j2ssh-0.2.9.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/j2ssh-0.2.9.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/j2ssh-0.2.9.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/j2ssh-0.2.9.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/javamail.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/javamail.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/javamail.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/javamail.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/javamail.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/jaxws-rt.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/jaxws-rt.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/jaxws-rt.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/jaxws-rt.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/jaxws-rt.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/joda-time-2.2.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/joda-time-2.2.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/joda-time-2.2.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/joda-time-2.2.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/joda-time-2.2.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/log4j-1.2.17.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/log4j-1.2.17.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/log4j-1.2.17.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/log4j-1.2.17.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/log4j-1.2.17.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/mysql-connector-java-5.1.25-bin.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/mysql-connector-java-5.1.25-bin.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/mysql-connector-java-5.1.25-bin.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/mysql-connector-java-5.1.25-bin.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/mysql-connector-java-5.1.25-bin.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/reactive4java-0.97.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/reactive4java-0.97.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/reactive4java-0.97.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/reactive4java-0.97.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/reactive4java-0.97.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/slf4j-log4j-jcl-jul-1.6.1.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/slf4j-log4j-jcl-jul-1.6.1.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/slf4j-log4j-jcl-jul-1.6.1.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/slf4j-log4j-jcl-jul-1.6.1.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/slf4j-log4j-jcl-jul-1.6.1.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/trove-3.0.3.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/trove-3.0.3.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/trove-3.0.3.jar 2013-08-26 12:15:09 UTC (rev 303)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/trove-3.0.3.jar 2013-08-26 12:23:14 UTC (rev 304)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/trove-3.0.3.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml (rev 0)
+++ advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<endpoints
+ xmlns="http://java.sun.com/xml/ns/jax-ws/ri/runtime"
+ version="2.0">
+ <endpoint
+ name="importdata"
+ implementation="eu.advance.logistics.live.reporter.importdata.ImportSEI"
+ url-pattern="/importdata"/>
+</endpoints>
\ No newline at end of file
Added: advance-live-reporter-os/WebContent/WEB-INF/web.xml
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/web.xml (rev 0)
+++ advance-live-reporter-os/WebContent/WEB-INF/web.xml 2013-08-26 12:23:14 UTC (rev 304)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ id="WebApp_ID" version="3.0">
+ <display-name>advance-live-reporter</display-name>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+ <filter>
+ <filter-name>ResponseHeaderFilter</filter-name>
+ <filter-class>eu.advance.logistics.live.reporter.server.ResponseHeaderFilter</filter-class>
+ <init-param>
+ <param-name>Cache-Control</param-name>
+ <param-value>max-age=86400</param-value>
+ </init-param>
+ </filter>
+ <!-- Watch out for file extension upper/lowercase -->
+ <filter-mapping>
+ <filter-name>ResponseHeaderFilter</filter-name>
+ <url-pattern>*.png</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResponseHeaderFilter</filter-name>
+ <url-pattern>*.gif</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResponseHeaderFilter</filter-name>
+ <url-pattern>*.css</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResponseHeaderFilter</filter-name>
+ <url-pattern>*.js</url-pattern>
+ </filter-mapping>
+
+ <listener>
+ <listener-class>
+ com.sun.xml.ws.transport.http.servlet.WSServletContextListener
+ </listener-class>
+ </listener>
+
+
+ <!-- <servlet> <servlet-name>AlertWatcher</servlet-name> <servlet-class>eu.advance.logistics.live.reporter.server.AlertWatcher</servlet-class>
+ <load-on-startup>1</load-on-startup> </servlet> -->
+ <servlet>
+ <servlet-name>AdvanceFlowEngine</servlet-name>
+ <servlet-class>eu.advance.logistics.live.reporter.server.AdvanceFlowEngineServlet</servlet-class>
+ <!-- Workdir override <init-param> <param-name>WorkDir</param-name> <param-value>C:\work\workspace\advance-live-reporting-tool\WebContent\WEB-INF\advance-flow-engine</param-value>
+ </init-param> -->
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>importdata</servlet-name>
+ <servlet-class>
+ com.sun.xml.ws.transport.http.servlet.WSServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Crontab</servlet-name>
+ <servlet-class>eu.advance.logistics.live.reporter.server...
[truncated message content] |
|
From: <aka...@us...> - 2013-09-26 13:38:14
|
Revision: 321
http://sourceforge.net/p/advance-project/code/321
Author: akarnokd
Date: 2013-09-26 13:38:06 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Working hub-views, no engine or ML integration yet.
Modified Paths:
--------------
advance-live-reporter-os/.project
advance-live-reporter-os/.settings/.jsdtscope
advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml
advance-live-reporter-os/WebContent/WEB-INF/web.xml
Added Paths:
-----------
advance-live-reporter-os/.checkstyle
advance-live-reporter-os/.settings/org.eclipse.jdt.ui.prefs
advance-live-reporter-os/WebContent/api-baus.jsp
advance-live-reporter-os/WebContent/api-daybyday.jsp
advance-live-reporter-os/WebContent/api-duringday.jsp
advance-live-reporter-os/WebContent/api-layout.jsp
advance-live-reporter-os/WebContent/api-summary.jsp
advance-live-reporter-os/WebContent/api-users.jsp
advance-live-reporter-os/WebContent/api-warehouse-l1.jsp
advance-live-reporter-os/WebContent/api-warehouse-l2.jsp
advance-live-reporter-os/WebContent/api-warehouse-l3.jsp
advance-live-reporter-os/WebContent/css/
advance-live-reporter-os/WebContent/css/charts/
advance-live-reporter-os/WebContent/css/charts/common.css
advance-live-reporter-os/WebContent/css/charts/dayby-chart.css
advance-live-reporter-os/WebContent/css/charts/duringday-chart.css
advance-live-reporter-os/WebContent/css/charts/sum-chart.css
advance-live-reporter-os/WebContent/css/charts/warehouse-l1-chart.css
advance-live-reporter-os/WebContent/css/charts/warehouse-l2-chart.css
advance-live-reporter-os/WebContent/css/charts/warehouse-l3-chart.css
advance-live-reporter-os/WebContent/css/datetime/
advance-live-reporter-os/WebContent/css/datetime/images/
advance-live-reporter-os/WebContent/css/datetime/images/animated-overlay.gif
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_flat_0_aaaaaa_40x100.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_flat_75_ffffff_40x100.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_glass_55_fbf9ee_1x400.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_glass_65_ffffff_1x400.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_glass_75_dadada_1x400.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_glass_75_e6e6e6_1x400.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_glass_95_fef1ec_1x400.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-bg_highlight-soft_75_cccccc_1x100.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-icons_222222_256x240.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-icons_2e83ff_256x240.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-icons_454545_256x240.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-icons_888888_256x240.png
advance-live-reporter-os/WebContent/css/datetime/images/ui-icons_cd0a0a_256x240.png
advance-live-reporter-os/WebContent/css/datetime/jquery-ui-timepicker-addon.css
advance-live-reporter-os/WebContent/css/datetime/jquery-ui.css
advance-live-reporter-os/WebContent/css/dialog/
advance-live-reporter-os/WebContent/css/dialog/sle.css
advance-live-reporter-os/WebContent/css/dialog/um.css
advance-live-reporter-os/WebContent/css/hubdepot-header.css
advance-live-reporter-os/WebContent/css/jqtransform/
advance-live-reporter-os/WebContent/css/jqtransform/jqtransform.css
advance-live-reporter-os/WebContent/css/tipsy/
advance-live-reporter-os/WebContent/css/tipsy/main.css
advance-live-reporter-os/WebContent/css/tipsy/tipsy.css
advance-live-reporter-os/WebContent/css/warehouse-header.css
advance-live-reporter-os/WebContent/daybyday.jsp
advance-live-reporter-os/WebContent/duringday.jsp
advance-live-reporter-os/WebContent/header.jspf
advance-live-reporter-os/WebContent/images/
advance-live-reporter-os/WebContent/images/favicon.ico
advance-live-reporter-os/WebContent/images/hubdepot/
advance-live-reporter-os/WebContent/images/hubdepot/alr_headbg.png
advance-live-reporter-os/WebContent/images/hubdepot/alr_header_alpha.png
advance-live-reporter-os/WebContent/images/hubdepot/current_btm.png
advance-live-reporter-os/WebContent/images/hubdepot/current_top.png
advance-live-reporter-os/WebContent/images/hubdepot/dialog_checked.png
advance-live-reporter-os/WebContent/images/hubdepot/dialog_delete.png
advance-live-reporter-os/WebContent/images/hubdepot/dialog_to_down.png
advance-live-reporter-os/WebContent/images/hubdepot/dialog_to_up.png
advance-live-reporter-os/WebContent/images/hubdepot/dialog_unchecked.png
advance-live-reporter-os/WebContent/images/hubdepot/exit.png
advance-live-reporter-os/WebContent/images/hubdepot/highlighter_bar.png
advance-live-reporter-os/WebContent/images/hubdepot/highlighter_btm.png
advance-live-reporter-os/WebContent/images/hubdepot/highlighter_top.png
advance-live-reporter-os/WebContent/images/hubdepot/login_submit.png
advance-live-reporter-os/WebContent/images/hubdepot/login_textonly.png
advance-live-reporter-os/WebContent/images/hubdepot/selector-arrow.png
advance-live-reporter-os/WebContent/images/hubdepot/settings_active.png
advance-live-reporter-os/WebContent/images/hubdepot/settings_inactive.png
advance-live-reporter-os/WebContent/images/hubdepot/vis_off.png
advance-live-reporter-os/WebContent/images/hubdepot/vis_on.png
advance-live-reporter-os/WebContent/images/loading.gif
advance-live-reporter-os/WebContent/images/warehouse/
advance-live-reporter-os/WebContent/images/warehouse/warehouse-down.png
advance-live-reporter-os/WebContent/images/warehouse/warehouse-logo.png
advance-live-reporter-os/WebContent/images/warehouse/warehouse-up.png
advance-live-reporter-os/WebContent/index.jsp
advance-live-reporter-os/WebContent/js/
advance-live-reporter-os/WebContent/js/charts/
advance-live-reporter-os/WebContent/js/charts/dayby-chart.js
advance-live-reporter-os/WebContent/js/charts/duringday-chart.js
advance-live-reporter-os/WebContent/js/charts/sum-chart.js
advance-live-reporter-os/WebContent/js/charts/warehouse-l1-chart.js
advance-live-reporter-os/WebContent/js/charts/warehouse-l2-chart.js
advance-live-reporter-os/WebContent/js/charts/warehouse-l3-chart.js
advance-live-reporter-os/WebContent/js/datetime/
advance-live-reporter-os/WebContent/js/datetime/jquery-ui-sliderAccess.js
advance-live-reporter-os/WebContent/js/datetime/jquery-ui-timepicker-addon.js
advance-live-reporter-os/WebContent/js/dialog/
advance-live-reporter-os/WebContent/js/dialog/baus.js
advance-live-reporter-os/WebContent/js/dialog/sle.js
advance-live-reporter-os/WebContent/js/dialog/um.js
advance-live-reporter-os/WebContent/js/lib/
advance-live-reporter-os/WebContent/js/lib/jquery-1.8.1.js
advance-live-reporter-os/WebContent/js/lib/jquery-ui-1.10.3.js
advance-live-reporter-os/WebContent/js/lib/jquery.jqtransform.js
advance-live-reporter-os/WebContent/js/lib/moment.js
advance-live-reporter-os/WebContent/js/pages/
advance-live-reporter-os/WebContent/js/pages/dayby-page.js
advance-live-reporter-os/WebContent/js/pages/duringday-page.js
advance-live-reporter-os/WebContent/js/pages/sum-page.js
advance-live-reporter-os/WebContent/js/pages/warehouse-l1-page.js
advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js
advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js
advance-live-reporter-os/WebContent/js/tipsy/
advance-live-reporter-os/WebContent/js/tipsy/jquery.tipsy.js
advance-live-reporter-os/WebContent/js/tipsy/project.js
advance-live-reporter-os/WebContent/login.jsp
advance-live-reporter-os/WebContent/logout.jsp
advance-live-reporter-os/WebContent/summary.jsp
advance-live-reporter-os/WebContent/warehouse-header.jspf
advance-live-reporter-os/WebContent/warehouse-l1.jsp
advance-live-reporter-os/WebContent/warehouse-l2.jsp
advance-live-reporter-os/WebContent/warehouse-l3.jsp
advance-live-reporter-os/checkstyle.xml
advance-live-reporter-os/src/crontab.xml
advance-live-reporter-os/src/db.xml
advance-live-reporter-os/src/duringday.xml
advance-live-reporter-os/src/duringday.xsd
advance-live-reporter-os/src/eu/
advance-live-reporter-os/src/eu/advance/
advance-live-reporter-os/src/eu/advance/logistics/
advance-live-reporter-os/src/eu/advance/logistics/live/
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/Aggregates.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/BarCoordinate.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/BarData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/ChartProcess.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DayByChart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DayByData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DepotCoord.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DuringDayChart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DuringDayData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DuringDaySummary.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/ErrorType.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/GraphDecimal.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/HubCoord.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/HubDepotDataCache.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/HubDepotSummary.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/HubDepotSwitch.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1AtHubData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1WarehouseInfo.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2DisplaySide.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2StorageChartData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2StorageRawData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2TimeState.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageCoord.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseInfo.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/OrientStatus.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/StorageAreaInfo.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/StorageAreaOrder.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/SumChart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/SumData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/TypeStatus.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseOption.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseServiceLevel.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSide.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseType.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/package-info.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/ConsignmentDB.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/Demo.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MLDB.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/PredictionDB.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/UserDB.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/package-info.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ArxPrediction.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ArxPredictionKey.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ChartView.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Consignment.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ConsignmentSummary.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/CrontabTask.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/CrontabTaskSettings.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/CrontabTime.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/DeclaredProgress.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Depot.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/DepotDiagramScale.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/DepotTerritory.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/DuringAmountStatus.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/DuringDayDetailsInfo.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/GasDayDepotVehicle.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/GasDayItemTotal.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/GasDuringDayPrediction.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Hub.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/HubDepotInfo.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/HubDiagramScale.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Item.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ItemEvent.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ItemEventType.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ItemStatus.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ItemSummary.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/LorryPosition.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/MlModel.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/MlPrediction.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Postcode.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/QueryTimeRange.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Scan.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ScanType.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/ServiceLevel.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/StorageArea.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/StorageSide.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/UOM.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/User.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/UserView.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Vehicle.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/VehicleDeclared.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/VehicleJob.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/VehicleScan.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/VehicleSession.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/VehicleSlotTime.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/Warehouse.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/model/package-info.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/package-info.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/CrontabServlet.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/DataPack.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportConsignment.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportEvent.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportItem.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportSEI.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportSEIService.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportSEInterface.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportTerritory.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportVehicleDeclared.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportVehicleHeader.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportVehicleItem.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ImportVehicleScan.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ObjectFactory.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/ResponseHeaderFilter.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/ws/package-info.java
advance-live-reporter-os/src/log4j.dtd
advance-live-reporter-os/src/log4j.xml
Added: advance-live-reporter-os/.checkstyle
===================================================================
--- advance-live-reporter-os/.checkstyle (rev 0)
+++ advance-live-reporter-os/.checkstyle 2013-09-26 13:38:06 UTC (rev 321)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <local-check-config name="local" location="checkstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="local" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
Modified: advance-live-reporter-os/.project
===================================================================
--- advance-live-reporter-os/.project 2013-09-26 12:03:01 UTC (rev 320)
+++ advance-live-reporter-os/.project 2013-09-26 13:38:06 UTC (rev 321)
@@ -25,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -32,5 +37,6 @@
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
Modified: advance-live-reporter-os/.settings/.jsdtscope
===================================================================
--- advance-live-reporter-os/.settings/.jsdtscope 2013-09-26 12:03:01 UTC (rev 320)
+++ advance-live-reporter-os/.settings/.jsdtscope 2013-09-26 13:38:06 UTC (rev 321)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="WebContent"/>
+ <classpathentry excluding="**/*.js" kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
Added: advance-live-reporter-os/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- advance-live-reporter-os/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ advance-live-reporter-os/.settings/org.eclipse.jdt.ui.prefs 2013-09-26 13:38:06 UTC (rev 321)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright 2010-2013 The Advance EU 7th Framework project consortium\r\n *\r\n * This file is part of Advance.\r\n *\r\n * Advance is free software\: you can redistribute it and/or modify\r\n * it under the terms of the GNU Lesser General Public License as\r\n * published by the Free Software Foundation, either version 3 of\r\n * the License, or (at your option) any later version.\r\n *\r\n * Advance is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n * GNU Lesser General Public License for more details.\r\n *\r\n * You should have received a copy of the GNU Lesser General Public\r\n * License along with Advance. If not, see\r\n * <http\://www.gnu.org/licenses/>.\r\n *\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}, ${date}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
Modified: advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
===================================================================
(Binary files differ)
Modified: advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml 2013-09-26 12:03:01 UTC (rev 320)
+++ advance-live-reporter-os/WebContent/WEB-INF/sun-jaxws.xml 2013-09-26 13:38:06 UTC (rev 321)
@@ -4,6 +4,6 @@
version="2.0">
<endpoint
name="importdata"
- implementation="eu.advance.logistics.live.reporter.importdata.ImportSEI"
+ implementation="eu.advance.logistics.live.reporter.ws.ImportSEI"
url-pattern="/importdata"/>
</endpoints>
\ No newline at end of file
Modified: advance-live-reporter-os/WebContent/WEB-INF/web.xml
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/web.xml 2013-09-26 12:03:01 UTC (rev 320)
+++ advance-live-reporter-os/WebContent/WEB-INF/web.xml 2013-09-26 13:38:06 UTC (rev 321)
@@ -8,15 +8,18 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
+ <!--
<filter>
<filter-name>ResponseHeaderFilter</filter-name>
- <filter-class>eu.advance.logistics.live.reporter.server.ResponseHeaderFilter</filter-class>
+ <filter-class>eu.advance.logistics.live.reporter.ws.ResponseHeaderFilter</filter-class>
<init-param>
<param-name>Cache-Control</param-name>
<param-value>max-age=86400</param-value>
</init-param>
</filter>
+ -->
<!-- Watch out for file extension upper/lowercase -->
+ <!--
<filter-mapping>
<filter-name>ResponseHeaderFilter</filter-name>
<url-pattern>*.png</url-pattern>
@@ -33,24 +36,21 @@
<filter-name>ResponseHeaderFilter</filter-name>
<url-pattern>*.js</url-pattern>
</filter-mapping>
-
+ -->
<listener>
<listener-class>
com.sun.xml.ws.transport.http.servlet.WSServletContextListener
</listener-class>
</listener>
-
- <!-- <servlet> <servlet-name>AlertWatcher</servlet-name> <servlet-class>eu....
[truncated message content] |
|
From: <cs...@us...> - 2013-11-06 19:53:49
|
Revision: 328
http://sourceforge.net/p/advance-project/code/328
Author: csirobi
Date: 2013-11-06 19:53:45 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
Shed layout: bug fixing to start out
Modified Paths:
--------------
advance-live-reporter-os/WebContent/api-warehouse-l1.jsp
advance-live-reporter-os/WebContent/api-warehouse-l2.jsp
advance-live-reporter-os/WebContent/api-warehouse-l3.jsp
advance-live-reporter-os/WebContent/css/warehouse-header.css
advance-live-reporter-os/WebContent/js/pages/warehouse-l1-page.js
advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js
advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js
advance-live-reporter-os/WebContent/warehouse-header.jspf
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java
Added Paths:
-----------
advance-live-reporter-os/src/l2params.xml
advance-live-reporter-os/src/l2params.xsd
Modified: advance-live-reporter-os/WebContent/api-warehouse-l1.jsp
===================================================================
--- advance-live-reporter-os/WebContent/api-warehouse-l1.jsp 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/api-warehouse-l1.jsp 2013-11-06 19:53:45 UTC (rev 328)
@@ -27,7 +27,8 @@
HubDepotSwitch hubDepotSwitch = new HubDepotSwitch(user.hub, user.name);
hubDepotSwitch.setDateTime(new Date());
- WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, request.getParameter("warehouse_name"), user.name);
+ WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, user.name);
+ warehouseSwitch.setWarehouse(request.getParameter("warehouse_name"));
L1OverallData overallData = new L1OverallData(warehouseSwitch);
L1AtHubData atHubData = new L1AtHubData(warehouseSwitch);
Modified: advance-live-reporter-os/WebContent/api-warehouse-l2.jsp
===================================================================
--- advance-live-reporter-os/WebContent/api-warehouse-l2.jsp 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/api-warehouse-l2.jsp 2013-11-06 19:53:45 UTC (rev 328)
@@ -30,7 +30,8 @@
HubDepotSwitch hubDepotSwitch = new HubDepotSwitch(user.hub, user.name);
hubDepotSwitch.setDateTime(new Date());
- WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, request.getParameter("warehouse_name"), user.name);
+ WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, user.name);
+ warehouseSwitch.setWarehouse(request.getParameter("warehouse_name"));
warehouseSwitch.setL2WarehouseOption(request.getParameter("warehouse_option"));
warehouseSwitch.setStorageAreaOrder(request.getParameter("storage_order"));
Modified: advance-live-reporter-os/WebContent/api-warehouse-l3.jsp
===================================================================
--- advance-live-reporter-os/WebContent/api-warehouse-l3.jsp 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/api-warehouse-l3.jsp 2013-11-06 19:53:45 UTC (rev 328)
@@ -29,7 +29,8 @@
HubDepotSwitch hubDepotSwitch = new HubDepotSwitch(user.hub, user.name);
hubDepotSwitch.setDateTime(new Date());
- WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, request.getParameter("warehouse_name"), user.name);
+ WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, user.name);
+ warehouseSwitch.setWarehouse(request.getParameter("warehouse_name"));
warehouseSwitch.setL3WarehouseOption(request.getParameter("warehouse_l3_option"));
warehouseSwitch.setStorageAreaOrder(request.getParameter("storage_order"));
Modified: advance-live-reporter-os/WebContent/css/warehouse-header.css
===================================================================
--- advance-live-reporter-os/WebContent/css/warehouse-header.css 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/css/warehouse-header.css 2013-11-06 19:53:45 UTC (rev 328)
@@ -121,7 +121,7 @@
div.warehouse-menu .warehouse-width td,
div.warehouse-menu .option-width td {
border: 1px solid #388C00;
- font-size: 52px;
+ font-size: 20px;
font-weight: bold;
padding: 0px;
margin: 0px;
Modified: advance-live-reporter-os/WebContent/js/pages/warehouse-l1-page.js
===================================================================
--- advance-live-reporter-os/WebContent/js/pages/warehouse-l1-page.js 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/js/pages/warehouse-l1-page.js 2013-11-06 19:53:45 UTC (rev 328)
@@ -78,13 +78,13 @@
callChart : function()
{
var mySelf = this;
- var s = mySelf.active.warehouse.split("_");
+ var s = mySelf.active.warehouse;
$("div#k2").warehousel1chart("clearBar");
$("div#k2").warehousel1chart("warehouseL1Bar", {
url : "api-warehouse-l1.jsp",
data : {
- warehouse_name : s[1]
+ warehouse_name : s
}
});
}
Modified: advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js
===================================================================
--- advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js 2013-11-06 19:53:45 UTC (rev 328)
@@ -86,12 +86,12 @@
$("#hand_silent_rect").on("click.silent", function(event)
{
- var s = mySelf.active.warehouse.split("_");
+ var s = mySelf.active.warehouse;
var o = mySelf.active.option.split("_");
var r = mySelf.active.order.split("_");
var l3o = event.storage_info.split("_");
- $('#l2_l3_form input[name="warehouse_name"]').val(s[1]);
+ $('#l2_l3_form input[name="warehouse_name"]').val(s);
$('#l2_l3_form input[name="warehouse_option"]').val(o[1]);
$('#l2_l3_form input[name="storage_order"]').val(r[1]);
$('#l2_l3_form input[name="warehouse_l3_option"]').val(l3o[2]);
@@ -105,7 +105,7 @@
callChart : function()
{
var mySelf = this;
- var s = mySelf.active.warehouse.split("_");
+ var s = mySelf.active.warehouse;
var o = mySelf.active.option.split("_");
var r = mySelf.active.order.split("_");
@@ -113,7 +113,7 @@
$("div#k2").warehousel2chart("warehouseL2Bar", {
url : "api-warehouse-l2.jsp",
data : {
- warehouse_name : s[1],
+ warehouse_name : s,
warehouse_option : o[1],
storage_order : r[1]
},
Modified: advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js
===================================================================
--- advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js 2013-11-06 19:53:45 UTC (rev 328)
@@ -81,7 +81,7 @@
callChart : function(modeType)
{
var mySelf = this;
- var s = mySelf.active.warehouse.split("_");
+ var s = mySelf.active.warehouse;
var o = mySelf.active.option.split("_");
var r = mySelf.active.order.split("_");
var storageId = 0;
@@ -101,10 +101,10 @@
url : "api-warehouse-l3.jsp",
data : {
mode : modeType,
- warehouse_name : s[1],
+ warehouse_name : s,
warehouse_l3_option : o[1],
storage_order : r[1],
- warehouse_l3_storage_id : storageId
+ warehouse_l3_storage_id : storageId
}
});
}
Modified: advance-live-reporter-os/WebContent/warehouse-header.jspf
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-11-06 19:53:45 UTC (rev 328)
@@ -1,3 +1,4 @@
+<%@page import="hu.akarnokd.utils.lang.*"%>
<%@page import="java.util.Date"%>
<%@page import="eu.advance.logistics.live.reporter.charts.*"%>
<%@page import="eu.advance.logistics.live.reporter.model.*"%>
@@ -3,5 +4,4 @@
<%
User user = null;
-HubDepotSwitch hubDepotSwitch = null;
WarehouseSwitch warehouseSwitch = null;
@@ -23,17 +23,35 @@
else
{
warehouseSwitch = (WarehouseSwitch)request.getAttribute("WAREHOUSE_SWITCH");
- if (warehouseSwitch == null ) {
- try {
- if (request.getParameter("warehouse_name") != null) {
- warehouseSwitch = new WarehouseSwitch(user.hub, request.getParameter("warehouse_name"), user.name);
- warehouseSwitch.setL2WarehouseOption(request.getParameter("warehouse_option"));
- warehouseSwitch.setStorageAreaOrder(request.getParameter("storage_order"));
- warehouseSwitch.setL3WarehouseOption(request.getParameter("warehouse_l3_option"));
- if (request.getParameter("warehouse_l3_storage_id") != null) {
- warehouseSwitch.setL3SelectedStorageId(Long.parseLong(request.getParameter("warehouse_l3_storage_id")));
- }
- }
+ if (warehouseSwitch == null )
+ {
+ try
+ {
+ warehouseSwitch = new WarehouseSwitch(user.hub, user.name);
+
+ String whName = ObjectUtils.nvl(request.getParameter("warehouse_name"), warehouseSwitch.getFirstWarehousePairTop());
+ String whOption = ObjectUtils.nvl(request.getParameter("warehouse_option"), "A");
+ String stOrder = ObjectUtils.nvl(request.getParameter("storage_order"), "PHYSICAL");
+ String whL3Option = ObjectUtils.nvl(request.getParameter("warehouse_l3_option"), "LEFT");
+
+ String whL3StId = ObjectUtils.nvl(request.getParameter("warehouse_l3_storage_id"), "0");
+
+ warehouseSwitch.setWarehouse(whName);
+ warehouseSwitch.setL2WarehouseOption(whOption);
+ warehouseSwitch.setStorageAreaOrder(stOrder);
+ warehouseSwitch.setL3WarehouseOption(whL3Option);
+ warehouseSwitch.setL3SelectedStorageId(Long.parseLong(whL3StId));
+
+
+ /*
+ warehouseSwitch.setL2WarehouseOption(request.getParameter("warehouse_option"));
+ warehouseSwitch.setStorageAreaOrder(request.getParameter("storage_order"));
+ warehouseSwitch.setL3WarehouseOption(request.getParameter("warehouse_l3_option"));
+ if (request.getParameter("warehouse_l3_storage_id") != null) {
+ warehouseSwitch.setL3SelectedStorageId(Long.parseLong(request.getParameter("warehouse_l3_storage_id")));
+ }
+ */
+
}
catch(IllegalArgumentException e)
{
@@ -61,10 +79,10 @@
<div id="warehouse-up-down" class="warehouse-up-down"></div>
<form id="warehouse_form" method="post" action="" accept-charset="UTF-8">
- <input type="hidden" name="warehouse_name" value=""> <input
- type="hidden" name="warehouse_option" value=""> <input
- type="hidden" name="storage_order" value=""> <input
- type="hidden" name="warehouse_l3_option" value="">
+ <input type="hidden" name="warehouse_name" value="">
+ <input type="hidden" name="warehouse_option" value="">
+ <input type="hidden" name="storage_order" value="">
+ <input type="hidden" name="warehouse_l3_option" value="">
</form>
</div>
<div class="option-container">
@@ -75,10 +93,10 @@
<div id="selector_warehouse" class="option-inner warehouse-width">
<table>
<tr>
- <td id="warehouse_1" class="inactive">1</td>
+ <td id="warehouse_top" class="inactive"><%= warehouseSwitch.getWarehousePairTop()%></td>
</tr>
<tr>
- <td id="warehouse_2" class="inactive">2</td>
+ <td id="warehouse_bottom" class="inactive"><%= warehouseSwitch.getWarehousePairBottom()%></td>
</tr>
</table>
</div>
@@ -148,7 +166,7 @@
var mySelf = this;
mySelf.atPage = param;
- mySelf.active.warehouse = "warehouse_<%= warehouseSwitch.getWarehouse().toLowerCase()%>";
+ mySelf.active.warehouse = "<%= warehouseSwitch.getWarehouse()%>";
mySelf.active.option = "option_<%= warehouseSwitch.getL2WarehouseOption().name().toLowerCase()%>";
mySelf.active.order = "order_<%= warehouseSwitch.getStorageOrder().name().toLowerCase()%>";
mySelf.active.l3option = "option_<%= warehouseSwitch.getL3WarehouseOption().name().toLowerCase()%>";
@@ -157,8 +175,9 @@
{
mySelf.setUpDown("warehouse-down", "warehouse-l2.jsp");
- mySelf.setInitMenu("warehouse");
- mySelf.buttonGroupHandler("warehouse");
+ mySelf.setWarehouseMenu();
+ mySelf.buttonWarehouseHandler();
+
$("#selector_option").hide();
$("#selector_order").hide();
}
@@ -166,7 +185,7 @@
{
mySelf.setUpDown("warehouse-up", "warehouse-l1.jsp");
- mySelf.setInitMenu("warehouse");
+ mySelf.setWarehouseMenu();
mySelf.setInitMenu("option");
mySelf.buttonGroupHandler("option");
@@ -177,7 +196,7 @@
{
mySelf.setUpDown("warehouse-up", "warehouse-l2.jsp");
- mySelf.setInitMenu("warehouse");
+ mySelf.setWarehouseMenu();
mySelf.setInitMenu("option", "l3");
mySelf.buttonGroupHandler("option");
@@ -235,7 +254,7 @@
var active = mySelf.getAllEnumMenu();
$("#warehouse_form").attr("action", actionURL);
- $('#warehouse_form input[name="warehouse_name"]').val(active.warehouse);
+ $('#warehouse_form input[name="warehouse_name"]').val(active.warehouse);
$('#warehouse_form input[name="warehouse_option"]').val(active.option);
$('#warehouse_form input[name="storage_order"]').val(active.order);
$('#warehouse_form input[name="warehouse_l3_option"]').val(active.l3option);
@@ -244,6 +263,58 @@
});
},
+ // Set the warehouse menu based on mySelf.active
+ setWarehouseMenu : function()
+ {
+ var mySelf = this;
+ var active = mySelf.active;
+ var ss = 'td[id^="warehouse_"]';
+
+ $(ss).toggleClass(mySelf.actClass, false);
+ if($('td[id="warehouse_top"]').text() == active.warehouse)
+ {
+ $('td[id="warehouse_top"]').toggleClass(mySelf.actClass);
+ }
+ else if($('td[id="warehouse_bottom"]').text() == active.warehouse)
+ {
+ $('td[id="warehouse_bottom"]').toggleClass(mySelf.actClass);
+ }
+ },
+
+ // Warehouse button group handler
+ buttonWarehouseHandler : function()
+ {
+ var mySelf = this;
+ var ss = 'td[id^="warehouse_"]';
+
+ $(ss).on("click", function(event)
+ {
+ var isChanged = true;
+
+ if ($("#" + event.target.id).hasClass(mySelf.actClass) == false)
+ {
+ $(ss).toggleClass(mySelf.actClass, false);
+ $("#" + event.target.id).toggleClass(mySelf.actClass);
+ } else
+ {
+ isChanged = false;
+ }
+
+ if (isChanged)
+ {
+ var t = "click.warehouse";
+ var actValue = $('td[id="' + event.target.id + '"]').text();
+
+ $("#hand_warehouse").triggerHandler({
+ type : t,
+ active : actValue,
+ });
+ }
+
+ });
+
+ },
+
// Set the switchboard menu based on the mySelf.active and the level
setInitMenu : function(group, level)
{
@@ -297,7 +368,7 @@
{
var active = {};
- active.warehouse = $('td[id^="warehouse_"].active').attr("id");
+ active.warehouse = $('td[id^="warehouse_"].active').text();
active.option = $('td[id^="option_"].active').attr("id");
active.order = $('td[id^="order_"].active').attr("id");
@@ -312,8 +383,7 @@
if(mySelf.atPage == "l1")
{
- var s = $('td[id^="warehouse_"].active').attr("id").split("_");
- active.warehouse = s[1];
+ active.warehouse = $('td[id^="warehouse_"].active').text();
var o = mySelf.active.option.split("_");
active.option = o[1];
@@ -326,8 +396,7 @@
}
else if(mySelf.atPage == "l2")
{
- var s = $('td[id^="warehouse_"].active').attr("id").split("_");
- active.warehouse = s[1];
+ active.warehouse = $('td[id^="warehouse_"].active').text();
var o = $('td[id^="option_"].active').attr("id").split("_");
active.option = o[1];
@@ -340,8 +409,7 @@
}
else if(mySelf.atPage == "l3")
{
- var s = $('td[id^="warehouse_"].active').attr("id").split("_");
- active.warehouse = s[1];
+ active.warehouse = $('td[id^="warehouse_"].active').text();
var o = mySelf.active.option.split("_");
active.option = o[1];
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java 2013-11-06 19:53:45 UTC (rev 328)
@@ -69,11 +69,13 @@
JSONObject result = new JSONObject();
JSONArray inner = new JSONArray();
+ int ordinal = 0;
for (ItemStatus keyItem : L1OverallData.getDisplayItems()) {
JSONObject statusRecord = new JSONObject();
statusRecord.put("info", keyItem.getInfo());
statusRecord.put("message", keyItem.getMessage());
- inner.add(keyItem.ordinal(), statusRecord);
+ inner.add(ordinal, statusRecord);
+ ordinal++;
}
result.put("overall", inner);
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java 2013-11-06 19:53:45 UTC (rev 328)
@@ -84,7 +84,7 @@
public void checkBaus() {
GraphDecimal value = new GraphDecimal(0);
- for (ItemStatus pKey : ItemStatus.values()) {
+ for (ItemStatus pKey : L1OverallData.getDisplayItems()) {
value = value.add(new GraphDecimal(this.items.get(WarehouseServiceLevel.ALL).get(pKey).value));
}
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java 2013-11-06 19:53:45 UTC (rev 328)
@@ -168,7 +168,9 @@
double d = 0;
for (WarehouseSide sKey : WarehouseSide.values()) {
- d += warehouseCapacityMap.get(warehouse).get(sKey);
+ // FIXME somehow!
+ d += warehouseCapacityMap.get(warehouse + WarehouseType.A).get(sKey);
+ d += warehouseCapacityMap.get(warehouse + WarehouseType.B).get(sKey);
}
return d;
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-11-06 19:53:45 UTC (rev 328)
@@ -52,26 +52,95 @@
private WarehouseOption l3warehouseOption;
/** Level 3 selected storage area ID. */
private long l3SelectedStorageId;
+
/** The hub id. */
private final long hubId;
/** The user. */
private final String user;
+ /** The map of warehouse pairs. */
+ private final Map<String, String> warehousePairMap;
+
/**
* Constructor.
* @param hubId the hub
* @param warehouse the starting warehouse
* @param user the user name
*/
- public WarehouseSwitch(long hubId, String warehouse, String user) {
+ public WarehouseSwitch(long hubId, String user) {
this.hubId = hubId;
- this.warehouse = warehouse;
- this.user = user;
- this.l2warehouseOption = WarehouseOption.A;
+ this.user = user;
+ this.warehousePairMap = this.getWarehousePairMap();
+ this.warehouse = this.getFirstWarehousePairTop();
+
+ this.l2warehouseOption = WarehouseOption.A;
this.storageOrder = StorageAreaOrder.PHYSICAL;
this.l3warehouseOption = WarehouseOption.LEFT;
this.l3SelectedStorageId = 0;
}
+
+ private Map<String, String> getWarehousePairMap()
+ {
+ Map<String, String> wPair = new LinkedHashMap<>();
+ List<Warehouse> list = MasterDB.warehouses(1);
+
+ if(list.isEmpty() == false)
+ {
+ for(Warehouse item: list)
+ {
+ if( (wPair.containsKey(item.warehouse) == false) && (wPair.containsValue(item.warehouse) == false))
+ {
+ wPair.put(item.warehouse, item.pair);
+ }
+ }
+ }
+
+ return wPair;
+ }
+
+ public String getFirstWarehousePairTop()
+ {
+ return this.warehousePairMap.keySet().iterator().next();
+ }
+
+ public String getWarehousePairTop()
+ {
+ String res = "";
+
+ if(warehousePairMap.containsKey(this.warehouse))
+ {
+ res = this.warehouse;
+ }
+ else if(warehousePairMap.containsValue(this.warehouse))
+ {
+ for(String keyItem : warehousePairMap.keySet())
+ {
+ if(warehousePairMap.get(keyItem).equals(this.warehouse))
+ {
+ res = keyItem;
+ }
+ }
+ }
+
+ return res;
+ }
+
+ public String getWarehousePairBottom()
+ {
+ String res = "";
+
+ if(this.warehousePairMap.containsKey(this.warehouse))
+ {
+ res = this.warehousePairMap.get(this.warehouse);
+ }
+ else if(this.warehousePairMap.containsValue(this.warehouse))
+ {
+ res = this.warehouse;
+ }
+
+ return res;
+ }
+
/**
* Returns the hub of this warehouse.
* @return the hub id
@@ -79,6 +148,12 @@
public long hubId() {
return hubId;
}
+
+ public void setWarehouse(String warehouse)
+ {
+ this.warehouse = warehouse;
+ }
+
/**
* Set the level 2 warehouse option.
* @param option the option
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java 2013-10-07 11:57:44 UTC (rev 327)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java 2013-11-06 19:53:45 UTC (rev 328)
@@ -398,6 +398,7 @@
map.put(sd, new ArrayList<StorageAreaInfo>());
}
}
+
TLongObjectMap<StorageSide> depotSide = new TLongObjectHashMap<>();
for (Warehouse wh : warehouses) {
String sn = wh.warehouse;
@@ -446,6 +447,7 @@
Collections.sort(l);
}
}
+
return result;
}
/**
@@ -484,6 +486,10 @@
for (WarehouseType stype : WarehouseType.values()) {
Map<WarehouseSide, Double> sd = new LinkedHashMap<>();
String key = snKey.toString() + stype.toString();
+
+ // FIXME somehow!
+ System.out.println("X3 " + key);
+
result.put(key, sd);
for (WarehouseSide ssKey : WarehouseSide.values()) {
double count = 0;
@@ -494,6 +500,7 @@
}
}
}
+
return result;
}
}
Added: advance-live-reporter-os/src/l2params.xml
===================================================================
--- advance-live-reporter-os/src/l2params.xml (rev 0)
+++ advance-live-reporter-os/src/l2params.xml 2013-11-06 19:53:45 UTC (rev 328)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paramWeight xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="l2params.xsd">
+ <timeState id="now_at_hub">
+ <tau>0.85</tau>
+ <lambda>0.85</lambda>
+ <delta>1.2</delta>
+ </timeState>
+ <timeState id="coming_up">
+ <tau>0.85</tau>
+ <lambda>0.85</lambda>
+ <delta>1.2</delta>
+ <wm>0.6</wm>
+ <ws>0.3</ws>
+ <we>0.1</we>
+ </timeState>
+ <timeState id="overall">
+ <lambda>0.85</lambda>
+ <delta>1.2</delta>
+ <wn>0.75</wn>
+ <wp>0.25</wp>
+ </timeState>
+</paramWeight>
Added: advance-live-reporter-os/src/l2params.xsd
===================================================================
--- advance-live-reporter-os/src/l2params.xsd (rev 0)
+++ advance-live-reporter-os/src/l2params.xsd 2013-11-06 19:53:45 UTC (rev 328)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="paramWeight">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="timeState" maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:float" name="tau" minOccurs="0"/>
+ <xs:element type="xs:float" name="lambda"/>
+ <xs:element type="xs:float" name="delta"/>
+ <xs:element type="xs:float" name="wm" minOccurs="0"/>
+ <xs:element type="xs:float" name="ws" minOccurs="0"/>
+ <xs:element type="xs:float" name="we" minOccurs="0"/>
+ <xs:element type="xs:float" name="wn" minOccurs="0"/>
+ <xs:element type="xs:float" name="wp" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="id" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2013-11-08 17:37:07
|
Revision: 332
http://sourceforge.net/p/advance-project/code/332
Author: csirobi
Date: 2013-11-08 17:37:04 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
SL1: warehouse up-down selector
SL1, SL3: order of item statuses
Modified Paths:
--------------
advance-live-reporter-os/WebContent/css/warehouse-header.css
advance-live-reporter-os/WebContent/warehouse-header.jspf
advance-live-reporter-os/WebContent/warehouse-l1.jsp
advance-live-reporter-os/WebContent/warehouse-l2.jsp
advance-live-reporter-os/WebContent/warehouse-l3.jsp
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java
Added Paths:
-----------
advance-live-reporter-os/WebContent/api-updown-wh.jsp
advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-down.png
advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-up.png
Added: advance-live-reporter-os/WebContent/api-updown-wh.jsp
===================================================================
--- advance-live-reporter-os/WebContent/api-updown-wh.jsp (rev 0)
+++ advance-live-reporter-os/WebContent/api-updown-wh.jsp 2013-11-08 17:37:04 UTC (rev 332)
@@ -0,0 +1,69 @@
+<%@page import="net.sf.json.JSONArray"%>
+<%@page import="hu.akarnokd.utils.lang.*"%>
+<%@page import="java.util.Date"%>
+<%@page import="eu.advance.logistics.live.reporter.charts.WarehouseSwitch"%>
+<%@page import="eu.advance.logistics.live.reporter.charts.HubDepotSwitch"%>
+<%@page import="eu.advance.logistics.live.reporter.charts.ErrorType"%>
+<%@page import="eu.advance.logistics.live.reporter.model.User"%>
+<%@page import="net.sf.json.JSONObject"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<%
+ response.setContentType("application/json");
+ JSONObject result = new JSONObject();
+
+ User user = null;
+ synchronized(session)
+ {
+ user = (User) session.getAttribute("USER");
+ }
+ if(user == null)
+ {
+ JSONObject errType = new JSONObject();
+ errType.put(ErrorType.TIME_OUT.name().toLowerCase(), ErrorType.TIME_OUT.getMessage());
+ result.put("error", errType);
+ } else
+ {
+ try
+ {
+ HubDepotSwitch hubDepotSwitch = new HubDepotSwitch(user.hub, user.name);
+ hubDepotSwitch.setDateTime(new Date());
+
+ WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, user.name);
+ String whName = ObjectUtils.nvl(request.getParameter("warehouse_name"), warehouseSwitch.getFirstWarehousePairTop());
+ warehouseSwitch.setWarehouse(whName);
+
+ int i = 0, pos = 0;
+ String whTop = warehouseSwitch.getWarehousePairTop();
+ JSONArray dataArr = new JSONArray();
+ JSONObject o;
+ for(String keyItem : warehouseSwitch.getWarehousePairMap().keySet())
+ {
+ if(keyItem.equals(whTop))
+ {
+ pos = i;
+ }
+ i++;
+
+ o = new JSONObject();
+ o.put("top", keyItem);
+ o.put("bottom", warehouseSwitch.getWarehousePairMap().get(keyItem));
+ dataArr.add(o);
+ }
+
+ result.put("size", warehouseSwitch.getWarehousePairMap().size());
+ result.put("position", pos);
+ result.put("dataList", dataArr);
+
+
+ } catch (IllegalArgumentException e)
+ {
+ JSONObject errType = new JSONObject();
+ errType.put(ErrorType.ENUM_CODE_ILLEGAL_FORMAT.name().toLowerCase(), ErrorType.ENUM_CODE_ILLEGAL_FORMAT.getMessage());
+ result.put("error", errType);
+ }
+
+ }
+
+ out.print(result.toString());
+%>
\ No newline at end of file
Modified: advance-live-reporter-os/WebContent/css/warehouse-header.css
===================================================================
--- advance-live-reporter-os/WebContent/css/warehouse-header.css 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/WebContent/css/warehouse-header.css 2013-11-08 17:37:04 UTC (rev 332)
@@ -68,7 +68,7 @@
right: 0px;
margin: 0px 12px 0px 0px;
height: 145px;
- width: 481px;
+ width: 540px;
}
div.warehouse-menu div.option-inner {
@@ -79,21 +79,35 @@
height: 100%;
}
+div.warehouse-menu td.updown-up{
+ background: url("../images/warehouse/warehouse-sel-up.png") no-repeat center center;
+}
+
+div.warehouse-menu td.updown-down{
+ background: url("../images/warehouse/warehouse-sel-down.png") no-repeat center center;
+}
+
+div.warehouse-menu .updown-width {
+ margin: 0px auto;
+ width: 40px;
+}
+
div.warehouse-menu .warehouse-width {
- margin: 0px auto;
+ margin: 0px 0px 0px 7px;
width: 160px;
}
div.warehouse-menu .option-width {
- margin: 0px 0px 0px 10px;
+ margin: 0px 0px 0px 7px;
width: 200px;
}
div.warehouse-menu .order-width {
- margin: 0px 0px 0px 10px;
+ margin: 0px 0px 0px 7px;
width: 100px;
}
+div.warehouse-menu .updown-width table,
div.warehouse-menu .warehouse-width table,
div.warehouse-menu .option-width table,
div.warehouse-menu .order-width table {
@@ -103,6 +117,7 @@
height: 100%;
}
+div.warehouse-menu .updown-width tr,
div.warehouse-menu .warehouse-width tr,
div.warehouse-menu .option-width tr {
color: #000000;
@@ -118,8 +133,10 @@
height: 33%%;
}
+div.warehouse-menu .updown-width td,
div.warehouse-menu .warehouse-width td,
-div.warehouse-menu .option-width td {
+div.warehouse-menu .option-width td,
+div.warehouse-menu .order-width td {
border: 1px solid #388C00;
font-size: 20px;
font-weight: bold;
@@ -129,16 +146,6 @@
vertical-align: middle;
}
-div.warehouse-menu .order-width td {
- border: 1px solid #388C00;
- font-size: 32px;
- font-weight: bold;
- padding: 0px;
- margin: 0px;
- text-align:center;
- vertical-align: middle;
-}
-
div.warehouse-menu td.inactive {
background-color: #FFFFFF;
color : #388C00;
Added: advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-down.png
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-down.png
===================================================================
--- advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-down.png 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-down.png 2013-11-08 17:37:04 UTC (rev 332)
Property changes on: advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-down.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-up.png
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-up.png
===================================================================
--- advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-up.png 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-up.png 2013-11-08 17:37:04 UTC (rev 332)
Property changes on: advance-live-reporter-os/WebContent/images/warehouse/warehouse-sel-up.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: advance-live-reporter-os/WebContent/warehouse-header.jspf
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-11-08 17:37:04 UTC (rev 332)
@@ -33,7 +33,6 @@
String whOption = ObjectUtils.nvl(request.getParameter("warehouse_option"), "A");
String stOrder = ObjectUtils.nvl(request.getParameter("storage_order"), "PHYSICAL");
String whL3Option = ObjectUtils.nvl(request.getParameter("warehouse_l3_option"), "LEFT");
-
String whL3StId = ObjectUtils.nvl(request.getParameter("warehouse_l3_storage_id"), "0");
warehouseSwitch.setWarehouse(whName);
@@ -41,17 +40,6 @@
warehouseSwitch.setStorageAreaOrder(stOrder);
warehouseSwitch.setL3WarehouseOption(whL3Option);
warehouseSwitch.setL3SelectedStorageId(Long.parseLong(whL3StId));
-
-
- /*
- warehouseSwitch.setL2WarehouseOption(request.getParameter("warehouse_option"));
- warehouseSwitch.setStorageAreaOrder(request.getParameter("storage_order"));
- warehouseSwitch.setL3WarehouseOption(request.getParameter("warehouse_l3_option"));
- if (request.getParameter("warehouse_l3_storage_id") != null) {
- warehouseSwitch.setL3SelectedStorageId(Long.parseLong(request.getParameter("warehouse_l3_storage_id")));
- }
- */
-
}
catch(IllegalArgumentException e)
{
@@ -90,6 +78,16 @@
<div id="hand_option"></div>
<div id="hand_order"></div>
+ <div id="updown_warehouse" class="option-inner updown-width">
+ <table>
+ <tr>
+ <td id="updown_up" class="inactive updown-up"></td>
+ </tr>
+ <tr>
+ <td id="updown_down" class="inactive updown-down"></td>
+ </tr>
+ </table>
+ </div>
<div id="selector_warehouse" class="option-inner warehouse-width">
<table>
<tr>
@@ -176,6 +174,7 @@
mySelf.setUpDown("warehouse-down", "warehouse-l2.jsp");
mySelf.setWarehouseMenu();
+ mySelf.upDownWarehouseHandler();
mySelf.buttonWarehouseHandler();
$("#selector_option").hide();
@@ -268,9 +267,8 @@
{
var mySelf = this;
var active = mySelf.active;
- var ss = 'td[id^="warehouse_"]';
- $(ss).toggleClass(mySelf.actClass, false);
+ $('td[id^="warehouse_"]').toggleClass(mySelf.actClass, false);
if($('td[id="warehouse_top"]').text() == active.warehouse)
{
$('td[id="warehouse_top"]').toggleClass(mySelf.actClass);
@@ -281,6 +279,74 @@
}
},
+ // Get the warehouse pair and set the click handler
+ upDownWarehouseHandler : function()
+ {
+ var mySelf = this;
+ var pos = 0;
+
+ $.ajax({
+ url : "api-updown-wh.jsp",
+ type : "POST",
+ data : {
+ warehouse_name : mySelf.active.warehouse
+ },
+ dataType : "json",
+ success : function(result)
+ {
+ if ((result.size !== undefined) &&
+ (result.position !== undefined) &&
+ (result.dataList !== undefined))
+ {
+ pos = result.position * 1.0;
+
+ $("td#updown_up").on("click", function(event)
+ {
+ pos = ( pos == 0) ? result.size - 1 : pos - 1;
+ mySelf.upDownSetWarehouse(pos, result);
+ });
+
+ $("td#updown_down").on("click", function(event)
+ {
+ pos = ( pos == result.size - 1) ? 0 : pos + 1;
+ mySelf.upDownSetWarehouse(pos, result);
+ });
+
+ } else if (result.error !== undefined)
+ {
+ var v = "";
+ $.each(result.error, function(key, value){ v = value; });
+ $("div.error-msgbox p#error_msg").html(v);
+ $("body").addClass("show-error");
+ }
+ }
+ });
+
+ },
+
+ // Set the active warehouse based on up-down button
+ upDownSetWarehouse : function(pos, result)
+ {
+ var mySelf = this;
+
+ $("td#warehouse_top").text(result.dataList[pos].top);
+ $("td#warehouse_bottom").text(result.dataList[pos].bottom);
+
+ if( $('td[id^="warehouse_"].active').text() === "")
+ {
+ $('td[id^="warehouse_"]').toggleClass(mySelf.actClass, false);
+ $("td#warehouse_top").toggleClass(mySelf.actClass);
+ }
+
+ var actValue = $('td[id^="warehouse_"].active').text();
+ $("#hand_warehouse").triggerHandler(
+ {
+ type : "click.warehouse",
+ active : actValue,
+ });
+
+ },
+
// Warehouse button group handler
buttonWarehouseHandler : function()
{
@@ -291,7 +357,8 @@
{
var isChanged = true;
- if ($("#" + event.target.id).hasClass(mySelf.actClass) == false)
+ if (($("#" + event.target.id).hasClass(mySelf.actClass) == false) &&
+ ($("#" + event.target.id).text() !== ""))
{
$(ss).toggleClass(mySelf.actClass, false);
$("#" + event.target.id).toggleClass(mySelf.actClass);
@@ -302,11 +369,10 @@
if (isChanged)
{
- var t = "click.warehouse";
var actValue = $('td[id="' + event.target.id + '"]').text();
$("#hand_warehouse").triggerHandler({
- type : t,
+ type : "click.warehouse",
active : actValue,
});
}
@@ -422,46 +488,6 @@
}
return active;
- },
-
- // Error message dialog box
- showErrorMessage : function(param)
- {
- var defaultMsg = "There seems to be a problem with the server.<br/>Please try again later.";
- $("div.warehouse-menu div#dialog_general").dialog(
- {
- autoOpen: true,
- modal: true,
- width: 300,
- height: 200,
- resizable: false,
-
- open : function(event, ui)
- {
- if(param !== undefined)
- {
- $("div#dialog_general p#general_message").html("");
- $("div#dialog_general p#general_message").html(param);
- }
- else
- {
- $("div#dialog_general p#general_message").html("");
- $("div#dialog_general p#general_message").html(defaultMsg);
- }
- },
- buttons:
- {
- Ok: function()
- {
- $( this ).dialog( "close" );
- }
- },
- close : function()
- {
- $(location).attr("href", "logout.jsp");
- }
- });
-
}
};
Modified: advance-live-reporter-os/WebContent/warehouse-l1.jsp
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-l1.jsp 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/WebContent/warehouse-l1.jsp 2013-11-08 17:37:04 UTC (rev 332)
@@ -14,7 +14,6 @@
<script src="js/lib/jquery-1.8.1.js" type="text/javascript"></script>
-<script src="js/lib/jquery-ui-1.10.3.js" type="text/javascript"></script>
<script src="js/charts/warehouse-l1-chart.js" type="text/javascript"></script>
<script src="js/pages/warehouse-l1-page.js" type="text/javascript"></script>
Modified: advance-live-reporter-os/WebContent/warehouse-l2.jsp
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-l2.jsp 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/WebContent/warehouse-l2.jsp 2013-11-08 17:37:04 UTC (rev 332)
@@ -14,7 +14,6 @@
<script src="js/lib/jquery-1.8.1.js" type="text/javascript"></script>
-<script src="js/lib/jquery-ui-1.10.3.js" type="text/javascript"></script>
<script src="js/charts/warehouse-l2-chart.js" type="text/javascript"></script>
<script src="js/pages/warehouse-l2-page.js" type="text/javascript"></script>
Modified: advance-live-reporter-os/WebContent/warehouse-l3.jsp
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-l3.jsp 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/WebContent/warehouse-l3.jsp 2013-11-08 17:37:04 UTC (rev 332)
@@ -14,7 +14,6 @@
<script src="js/lib/jquery-1.8.1.js" type="text/javascript"></script>
-<script src="js/lib/jquery-ui-1.10.3.js" type="text/javascript"></script>
<script src="js/charts/warehouse-l3-chart.js" type="text/javascript"></script>
<script src="js/pages/warehouse-l3-page.js" type="text/javascript"></script>
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1Chart.java 2013-11-08 17:37:04 UTC (rev 332)
@@ -69,13 +69,11 @@
JSONObject result = new JSONObject();
JSONArray inner = new JSONArray();
- int ordinal = 0;
- for (ItemStatus keyItem : L1OverallData.getDisplayItems()) {
- JSONObject statusRecord = new JSONObject();
+ for (ItemStatus keyItem : L1OverallData.DISPLAY_ITEMS) {
+ JSONObject statusRecord = new JSONObject();
statusRecord.put("info", keyItem.getInfo());
statusRecord.put("message", keyItem.getMessage());
- inner.add(ordinal, statusRecord);
- ordinal++;
+ inner.add(statusRecord);
}
result.put("overall", inner);
@@ -84,7 +82,7 @@
JSONObject statusRecord = new JSONObject();
statusRecord.put("info", keyItem.name().toLowerCase());
statusRecord.put("message", keyItem.getMessage());
- inner.add(keyItem.ordinal(), statusRecord);
+ inner.add(statusRecord);
}
result.put("athub", inner);
@@ -138,7 +136,7 @@
// Generate for Overall
innerArr = new JSONArray();
- for (ItemStatus pKey: L1OverallData.getDisplayItems()) {
+ for (ItemStatus pKey: L1OverallData.DISPLAY_ITEMS) {
itemRec = new JSONObject();
itemRec.put("info", pKey.getInfo());
itemRec.put("value", overData.items.get(sKey).get(pKey).value.toPlainString());
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L1OverallData.java 2013-11-08 17:37:04 UTC (rev 332)
@@ -20,7 +20,6 @@
*/
package eu.advance.logistics.live.reporter.charts;
-import java.util.EnumSet;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -37,6 +36,16 @@
public int busAsUsSc;
/** HashMap for items. */
public final Map<WarehouseServiceLevel, Map<ItemStatus, BarData>> items;
+ /**item statuses which are displayed in the UI.*/
+ public static final ItemStatus[] DISPLAY_ITEMS = {
+ ItemStatus.LEFT_HUB_TODAY,
+ ItemStatus.AT_HUB,
+ ItemStatus.DECLARED,
+ ItemStatus.SCANNED,
+ ItemStatus.CREATED
+ };
+
+
/**
* Constructor, initializes the fields.
* @param warehouseSwitch the warehouse switch
@@ -48,20 +57,6 @@
}
/**
- * Get that item statuses which are displayed in the UI.
- * @return EnumSet of the used item statuses
- */
- public static EnumSet<ItemStatus> getDisplayItems() {
- EnumSet<ItemStatus> result = EnumSet.of(ItemStatus.LEFT_HUB_TODAY,
- ItemStatus.AT_HUB,
- ItemStatus.DECLARED,
- ItemStatus.SCANNED,
- ItemStatus.CREATED);
-
- return result;
- }
-
- /**
* Normalize value of items based on total coordinate.
* @param coord the coordinates
*/
@@ -84,7 +79,7 @@
public void checkBaus() {
GraphDecimal value = new GraphDecimal(0);
- for (ItemStatus pKey : L1OverallData.getDisplayItems()) {
+ for (ItemStatus pKey : L1OverallData.DISPLAY_ITEMS) {
value = value.add(new GraphDecimal(this.items.get(WarehouseServiceLevel.ALL).get(pKey).value));
}
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java 2013-11-08 17:37:04 UTC (rev 332)
@@ -115,7 +115,7 @@
result.put("jumpStorageId", ws.getL3SelectedStorageId());
JSONArray inner = new JSONArray();
- for (ItemStatus keyItem : L3DepotStorageData.displayedPStatus()) {
+ for (ItemStatus keyItem : L3DepotStorageData.DISPLAY_FUTURE_STATUS) {
JSONObject statusRecord = new JSONObject();
statusRecord.put("info", keyItem.getInfo());
statusRecord.put("message", keyItem.getMessage());
@@ -179,7 +179,7 @@
// Generate for Future
innerArr = new JSONArray();
- for (ItemStatus pKey: L3DepotStorageData.displayedPStatus()) {
+ for (ItemStatus pKey: L3DepotStorageData.DISPLAY_FUTURE_STATUS) {
itemRec = new JSONObject();
itemRec.put("info", pKey.getInfo());
itemRec.put("value", data.futureItems.get(sKey).get(pKey).value.toPlainString());
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java 2013-11-08 17:37:04 UTC (rev 332)
@@ -54,6 +54,14 @@
public final Map<WarehouseServiceLevel, Map<ItemStatus, BarData>> futureItems;
/** HashMap for at hub items separate to A and B warehouse. */
public final Map<WarehouseServiceLevel, Map<WarehouseType, BarData>> atHubItems;
+
+ /**Future item statuses which are displayed.*/
+ public static final ItemStatus[] DISPLAY_FUTURE_STATUS = {
+ ItemStatus.DECLARED,
+ ItemStatus.SCANNED,
+ ItemStatus.CREATED
+ };
+
/**
* Constructor.
* @param warehouseSwitch the warehouse switch
@@ -69,31 +77,6 @@
}
/**
- * Get that future item statuses which are used in this class.
- * @return EnumSet of the used item statuses
- */
- public static EnumSet<ItemStatus> getFuturePStatus() {
- EnumSet<ItemStatus> result = EnumSet.of(ItemStatus.DECLARED,
- ItemStatus.SCANNED,
- ItemStatus.CREATED,
- ItemStatus.PREDICTED);
-
- return result;
- }
-
- /**
- * Get that future item statuses which are displayed by change request.
- * @return EnumSet of the used item statuses
- */
- public static EnumSet<ItemStatus> displayedPStatus() {
- EnumSet<ItemStatus> result = EnumSet.of(ItemStatus.DECLARED,
- ItemStatus.SCANNED,
- ItemStatus.CREATED);
-
- return result;
- }
-
- /**
* Returns the combined capacity of storage (A + B).
* @return the capacity value
*/
@@ -128,7 +111,7 @@
for (WarehouseServiceLevel sKey : WarehouseServiceLevel.values()) {
// For future items: count the warehouse type + warehouse service level specific capacity.
capacity = new GraphDecimal(this.getStorageCapacity(EnumSet.of(WarehouseType.A, WarehouseType.B), sKey));
- for (ItemStatus pKey : L3DepotStorageData.displayedPStatus()) {
+ for (ItemStatus pKey : L3DepotStorageData.DISPLAY_FUTURE_STATUS) {
this.futureItems.get(sKey).get(pKey).normalizeWarehouseL3(capacity, coord.normalScale);
}
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-11-08 17:37:04 UTC (rev 332)
@@ -28,6 +28,8 @@
import java.util.List;
import java.util.Map;
+import com.google.common.base.Strings;
+
import eu.advance.logistics.live.reporter.db.MasterDB;
import eu.advance.logistics.live.reporter.model.HubDepotInfo;
import eu.advance.logistics.live.reporter.model.UOM;
@@ -69,7 +71,7 @@
public WarehouseSwitch(long hubId, String user) {
this.hubId = hubId;
this.user = user;
- this.warehousePairMap = this.getWarehousePairMap();
+ this.warehousePairMap = this.createWarehousePairMap();
this.warehouse = this.getFirstWarehousePairTop();
this.l2warehouseOption = WarehouseOption.A;
@@ -79,7 +81,11 @@
this.l3SelectedStorageId = 0;
}
- private Map<String, String> getWarehousePairMap()
+ /**
+ * Creates map for the warehouse pairs.
+ * @return map of the warehouse pairs
+ */
+ private Map<String, String> createWarehousePairMap()
{
Map<String, String> wPair = new LinkedHashMap<>();
List<Warehouse> list = MasterDB.warehouses(1);
@@ -90,7 +96,8 @@
{
if( (wPair.containsKey(item.warehouse) == false) && (wPair.containsValue(item.warehouse) == false))
{
- wPair.put(item.warehouse, item.pair);
+ String pair = Strings.isNullOrEmpty(item.pair) ? "" : item.pair;
+ wPair.put(item.warehouse, pair);
}
}
}
@@ -98,11 +105,28 @@
return wPair;
}
+ /**
+ * Returns the map of the warehouse pairs.
+ * @return the map of the warehouse pairs
+ */
+ public Map<String, String> getWarehousePairMap()
+ {
+ return this.warehousePairMap;
+ }
+
+ /**
+ * Returns the top member of the first warehouse pair.
+ * @return the top member of the first warehouse pair
+ */
public String getFirstWarehousePairTop()
{
return this.warehousePairMap.keySet().iterator().next();
}
+ /**
+ * Returns the top member of the actual warehouse pair.
+ * @return the top member of the actual warehouse pair
+ */
public String getWarehousePairTop()
{
String res = "";
@@ -125,6 +149,10 @@
return res;
}
+ /**
+ * Returns the bottom member of the actual warehouse pair.
+ * @return the bottom member of the actual warehouse pair
+ */
public String getWarehousePairBottom()
{
String res = "";
@@ -149,6 +177,10 @@
return hubId;
}
+ /**
+ * Sets the actual warehosue.
+ * @param warehouse the actual warehosue
+ */
public void setWarehouse(String warehouse)
{
this.warehouse = warehouse;
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java 2013-11-07 20:00:42 UTC (rev 331)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/db/MasterDB.java 2013-11-08 17:37:04 UTC (rev 332)
@@ -486,10 +486,6 @@
for (WarehouseType stype : WarehouseType.values()) {
Map<WarehouseSide, Double> sd = new LinkedHashMap<>();
String key = snKey.toString() + stype.toString();
-
- // FIXME somehow!
- System.out.println("X3 " + key);
-
result.put(key, sd);
for (WarehouseSide ssKey : WarehouseSide.values()) {
double count = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2013-11-11 17:35:18
|
Revision: 334
http://sourceforge.net/p/advance-project/code/334
Author: csirobi
Date: 2013-11-11 17:35:15 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
SL2 and SL3: modified based on the BL
Modified Paths:
--------------
advance-live-reporter-os/WebContent/api-warehouse-l3.jsp
advance-live-reporter-os/WebContent/js/charts/warehouse-l2-chart.js
advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js
advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js
advance-live-reporter-os/WebContent/warehouse-header.jspf
advance-live-reporter-os/WebContent/warehouse-l2.jsp
advance-live-reporter-os/WebContent/warehouse-l3.jsp
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
Modified: advance-live-reporter-os/WebContent/api-warehouse-l3.jsp
===================================================================
--- advance-live-reporter-os/WebContent/api-warehouse-l3.jsp 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/WebContent/api-warehouse-l3.jsp 2013-11-11 17:35:15 UTC (rev 334)
@@ -31,8 +31,9 @@
WarehouseSwitch warehouseSwitch = new WarehouseSwitch(user.hub, user.name);
warehouseSwitch.setWarehouse(request.getParameter("warehouse_name"));
+ warehouseSwitch.setStorageAreaOrder(request.getParameter("storage_order"));
warehouseSwitch.setL3WarehouseOption(request.getParameter("warehouse_l3_option"));
- warehouseSwitch.setStorageAreaOrder(request.getParameter("storage_order"));
+ warehouseSwitch.setL3Warehouse(request.getParameter("warehouse_l3_name"));
switch(L3WarehouseMode.valueOf(request.getParameter("mode").toUpperCase()))
{
@@ -43,7 +44,7 @@
warehouseSwitch.setL3SelectedStorageId(Integer.parseInt(request.getParameter("warehouse_l3_storage_id")));
break;
}
- case OPTION:
+ case L3OPTION:
{
int atStorageId = Integer.parseInt(request.getParameter("warehouse_l3_storage_id"));
Modified: advance-live-reporter-os/WebContent/js/charts/warehouse-l2-chart.js
===================================================================
--- advance-live-reporter-os/WebContent/js/charts/warehouse-l2-chart.js 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/WebContent/js/charts/warehouse-l2-chart.js 2013-11-11 17:35:15 UTC (rev 334)
@@ -151,6 +151,7 @@
var rect = $(event.target);
$("#" + settings.handSilentRect).triggerHandler({
type : "click.silent",
+ displayed_wh : rect.attr("displayed_wh"),
storage_id : rect.attr("storage_id"),
storage_info: rect.attr("storage_info")
});
@@ -301,6 +302,7 @@
myRect.setAttributeNS(null, "y", zeroY);
myRect.setAttributeNS(null, "width", columnInfo.width.circle + columnInfo.width.text);
myRect.setAttributeNS(null, "height", columnInfo.height);
+ myRect.setAttribute("displayed_wh", storageData.displayedWarehouse);
myRect.setAttribute("storage_info", storageData.warehouseLayout);
myRect.setAttribute("storage_id", storageData.id);
document.getElementById(appendId).appendChild(myRect);
Modified: advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js
===================================================================
--- advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/WebContent/js/pages/warehouse-l2-page.js 2013-11-11 17:35:15 UTC (rev 334)
@@ -94,8 +94,9 @@
$('#l2_l3_form input[name="warehouse_name"]').val(s);
$('#l2_l3_form input[name="warehouse_option"]').val(o[1]);
$('#l2_l3_form input[name="storage_order"]').val(r[1]);
- $('#l2_l3_form input[name="warehouse_l3_option"]').val(l3o[2]);
+ $('#l2_l3_form input[name="warehouse_l3_option"]').val(l3o[1]);
$('#l2_l3_form input[name="warehouse_l3_storage_id"]').val(event.storage_id);
+ $('#l2_l3_form input[name="warehouse_l3_name"]').val(event.displayed_wh);
$("#l2_l3_form").submit();
});
Modified: advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js
===================================================================
--- advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js 2013-11-11 17:35:15 UTC (rev 334)
@@ -37,8 +37,8 @@
$.warehousemenu("init", "l3");
mySelf.active = $.warehousemenu("getActiveMenu");
- mySelf.handlerFor("option");
- mySelf.handlerFor("order");
+ mySelf.handlerForL3Option();
+ mySelf.handlerForOrder();
mySelf.refreshPage();
$(window).on("orientationchange", function()
@@ -58,18 +58,30 @@
},
- handlerFor : function(group)
+ handlerForL3Option : function()
{
var mySelf = this;
- var cl = "click." + group;
+ var cl = "click.option";
- $("#hand_" + group).on(cl, function(event)
+ $("#hand_option").on(cl, function(event)
{
- mySelf.active[group] = event.active;
- mySelf.callChart(group);
+ mySelf.active.option = event.active;
+ mySelf.callChart("l3option");
});
},
+ handlerForOrder : function()
+ {
+ var mySelf = this;
+ var cl = "click.order";
+
+ $("#hand_order").on(cl, function(event)
+ {
+ mySelf.active.order = event.active;
+ mySelf.callChart("order");
+ });
+ },
+
refreshPage : function()
{
var mySelf = this;
@@ -82,9 +94,10 @@
{
var mySelf = this;
var s = mySelf.active.warehouse;
- var o = mySelf.active.option.split("_");
var r = mySelf.active.order.split("_");
+ var l3o = mySelf.active.option.split("_");
var storageId = 0;
+ var l3Warehouse = $('input[id="warehouse_l3_name"]').val();
if(modeType == "init")
{
@@ -102,9 +115,10 @@
data : {
mode : modeType,
warehouse_name : s,
- warehouse_l3_option : o[1],
storage_order : r[1],
- warehouse_l3_storage_id : storageId
+ warehouse_l3_option : l3o[1],
+ warehouse_l3_storage_id : storageId,
+ warehouse_l3_name : l3Warehouse
}
});
}
Modified: advance-live-reporter-os/WebContent/warehouse-header.jspf
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-11-11 17:35:15 UTC (rev 334)
@@ -34,12 +34,14 @@
String stOrder = ObjectUtils.nvl(request.getParameter("storage_order"), "PHYSICAL");
String whL3Option = ObjectUtils.nvl(request.getParameter("warehouse_l3_option"), "LEFT");
String whL3StId = ObjectUtils.nvl(request.getParameter("warehouse_l3_storage_id"), "0");
+ String whL3Name = ObjectUtils.nvl(request.getParameter("warehouse_l3_name"), warehouseSwitch.getFirstWarehousePairTop());
warehouseSwitch.setWarehouse(whName);
warehouseSwitch.setL2WarehouseOption(whOption);
warehouseSwitch.setStorageAreaOrder(stOrder);
warehouseSwitch.setL3WarehouseOption(whL3Option);
warehouseSwitch.setL3SelectedStorageId(Long.parseLong(whL3StId));
+ warehouseSwitch.setL3Warehouse(whL3Name);
}
catch(IllegalArgumentException e)
{
@@ -433,7 +435,6 @@
getActiveMenu : function()
{
var active = {};
-
active.warehouse = $('td[id^="warehouse_"].active').text();
active.option = $('td[id^="option_"].active').attr("id");
active.order = $('td[id^="order_"].active').attr("id");
@@ -499,8 +500,6 @@
if (method === "init")
op[method](param);
else if (method === "getActiveMenu")
- return op[method]();
- else if (method === "showErrorMessage")
return op[method](param);
};
Modified: advance-live-reporter-os/WebContent/warehouse-l2.jsp
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-l2.jsp 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/WebContent/warehouse-l2.jsp 2013-11-11 17:35:15 UTC (rev 334)
@@ -34,6 +34,7 @@
<input type="hidden" name="storage_order" value="">
<input type="hidden" name="warehouse_l3_option" value="">
<input type="hidden" name="warehouse_l3_storage_id" value="">
+ <input type="hidden" name="warehouse_l3_name" value="">
</form>
</center>
</body>
Modified: advance-live-reporter-os/WebContent/warehouse-l3.jsp
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-l3.jsp 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/WebContent/warehouse-l3.jsp 2013-11-11 17:35:15 UTC (rev 334)
@@ -27,6 +27,7 @@
<div id="k2"></div>
<input id="warehouse_l3_storage_id" type="hidden" name="warehouse_l3_storage_id" value="<%= warehouseSwitch.getL3SelectedStorageId()%>">
+ <input id="warehouse_l3_name" type="hidden" name="warehouse_l3_name" value="<%= warehouseSwitch.getL3Warehouse()%>">
</center>
</body>
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java 2013-11-11 17:35:15 UTC (rev 334)
@@ -113,7 +113,7 @@
JSONObject result = new JSONObject();
result.put("direction", L2Chart.createDirectionJSON(ws));
for (L2DisplaySide dsKey : L2DisplaySide.values()) {
- result.put(dsKey.getInfo(), L2Chart.createDisplaySideJSON(storageRawMap.get(dsKey), storageChartMap.get(dsKey)));
+ result.put(dsKey.getInfo(), L2Chart.createDisplaySideJSON(L2Chart.getDisplayedWarehouse(dsKey, ws), storageRawMap.get(dsKey), storageChartMap.get(dsKey)));
}
return result;
@@ -195,18 +195,35 @@
JSONObject dsRecord = new JSONObject();
switch (ws.getL2WarehouseOption()) {
case A:
+ {
+ dsRecord.put("align", WarehouseSide.values()[dsKey.ordinal()].name().toLowerCase());
+ dsRecord.put("warehouseName", ws.getWarehouse());
+ dsRecord.put("warehouseInfo", ws.getWarehouseType().name());
+ break;
+ }
case B:
- dsRecord.put("align", WarehouseSide.values()[dsKey.ordinal()].name().toLowerCase());
- dsRecord.put("warehouseInfo", ws.getWarehouse() + ws.getWarehouseType().name());
- break;
+ {
+ dsRecord.put("align", WarehouseSide.values()[dsKey.ordinal()].name().toLowerCase());
+ dsRecord.put("warehouseName", ws.getPair());
+ dsRecord.put("warehouseInfo", ws.getWarehouseType().name());
+ break;
+ }
case LEFT:
- dsRecord.put("align", WarehouseSide.LEFT.toString().toLowerCase());
- dsRecord.put("warehouseInfo", ws.getWarehouse() + WarehouseType.values()[dsKey.ordinal()].name());
- break;
+ {
+ dsRecord.put("align", WarehouseSide.LEFT.toString().toLowerCase());
+ String wh = (dsKey == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
+ dsRecord.put("warehouseName", wh);
+ dsRecord.put("warehouseInfo", WarehouseType.values()[dsKey.ordinal()].name());
+ break;
+ }
case RIGHT:
- dsRecord.put("align", WarehouseSide.RIGHT.toString().toLowerCase());
- dsRecord.put("warehouseInfo", ws.getWarehouse() + WarehouseType.values()[dsKey.ordinal()].name());
- break;
+ {
+ dsRecord.put("align", WarehouseSide.RIGHT.toString().toLowerCase());
+ String wh = (dsKey == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
+ dsRecord.put("warehouseName", wh);
+ dsRecord.put("warehouseInfo", WarehouseType.values()[dsKey.ordinal()].name());
+ break;
+ }
default:
}
dsRecord.put("at_hub", L2TimeState.NOW_AT_HUB.getMessage());
@@ -219,14 +236,46 @@
}
/**
+ * Returns the displayed warehouse based on the display side and the warehouse switch.
+ * @param ds the dislay side
+ * @param ws the warehouse switch
+ * @return the displayed warehouse
+ */
+ private static String getDisplayedWarehouse(L2DisplaySide ds, WarehouseSwitch ws)
+ {
+ String res = "";
+
+ switch(ws.getL2WarehouseOption())
+ {
+ case A:
+ {
+ res = ws.getWarehouse();
+ break;
+ }
+ case B:
+ {
+ res = ws.getPair();
+ break;
+ }
+ case LEFT:
+ case RIGHT:
+ {
+ res = (ds == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
+ break;
+ }
+ }
+
+ return res;
+ }
+
+ /**
* Create a display side JSON array.
* @param storageRawList the raw list
* @param storageChartList the storage chart
* @return the JSON array
*/
- private static JSONArray createDisplaySideJSON(
- List<L2StorageRawData> storageRawList,
- List<L2StorageChartData> storageChartList) {
+ private static JSONArray createDisplaySideJSON(String displayedWarehouse, List<L2StorageRawData> storageRawList, List<L2StorageChartData> storageChartList)
+ {
JSONArray result = new JSONArray();
int i = 0;
@@ -234,7 +283,8 @@
JSONObject storageRecord = new JSONObject();
L2StorageRawData storageRaw = storageRawList.get(i);
- String ss = storageRaw.warehouse + "_" + storageRaw.type + "_" + storageRaw.side.name();
+ storageRecord.put("displayedWarehouse", displayedWarehouse);
+ String ss = storageRaw.type + "_" + storageRaw.side.name();
storageRecord.put("warehouseLayout", ss.toLowerCase());
storageRecord.put("id", storageChart.id);
storageRecord.put("overColor", storageChart.bgColor.get(L2TimeState.OVERALL).getColor());
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3Chart.java 2013-11-11 17:35:15 UTC (rev 334)
@@ -112,6 +112,7 @@
private static JSONObject createStatusJSON(WarehouseSwitch ws) {
JSONObject result = new JSONObject();
+ result.put("displayedWarehouse", ws.getL3Warehouse());
result.put("jumpStorageId", ws.getL3SelectedStorageId());
JSONArray inner = new JSONArray();
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3DepotStorageData.java 2013-11-11 17:35:15 UTC (rev 334)
@@ -33,7 +33,7 @@
*/
public class L3DepotStorageData {
- /** Name of the warehouse. */
+ /** Name of the layer 3 warehouse. */
public String warehouse;
/** Side of the warehouse. */
public WarehouseSide side;
@@ -67,7 +67,7 @@
* @param warehouseSwitch the warehouse switch
*/
public L3DepotStorageData(WarehouseSwitch warehouseSwitch) {
- this.warehouse = warehouseSwitch.getWarehouse();
+ this.warehouse = warehouseSwitch.getL3Warehouse();
this.side = warehouseSwitch.getL3WarehouseSide();
this.storageCapacityMap = new HashMap<>();
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java 2013-11-11 17:35:15 UTC (rev 334)
@@ -30,8 +30,8 @@
INIT,
/** Orientation. */
ORIENT,
- /** Option. */
- OPTION,
+ /** Layer 3 option. */
+ L3OPTION,
/** Order. */
ORDER;
}
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-11-08 17:43:48 UTC (rev 333)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-11-11 17:35:15 UTC (rev 334)
@@ -50,10 +50,13 @@
private WarehouseOption l2warehouseOption;
/** The storage area order. */
private StorageAreaOrder storageOrder;
+
/** Level 3 warehouse display mode option. */
private WarehouseOption l3warehouseOption;
/** Level 3 selected storage area ID. */
private long l3SelectedStorageId;
+ /** Level 3 warehouse name. */
+ private String l3warehouse;
/** The hub id. */
private final long hubId;
@@ -79,6 +82,7 @@
this.l3warehouseOption = WarehouseOption.LEFT;
this.l3SelectedStorageId = 0;
+ this.l3warehouse = this.warehouse;
}
/**
@@ -88,7 +92,7 @@
private Map<String, String> createWarehousePairMap()
{
Map<String, String> wPair = new LinkedHashMap<>();
- List<Warehouse> list = MasterDB.warehouses(1);
+ List<Warehouse> list = MasterDB.warehouses(this.hubId);
if(list.isEmpty() == false)
{
@@ -115,6 +119,32 @@
}
/**
+ * Returns the pair of the warehouse.
+ * @return the pair of the warehouse
+ */
+ public String getPair()
+ {
+ String res = "";
+
+ if(warehousePairMap.containsKey(this.warehouse))
+ {
+ res = warehousePairMap.get(this.warehouse);
+ }
+ else if(warehousePairMap.containsValue(this.warehouse))
+ {
+ for(String keyItem : warehousePairMap.keySet())
+ {
+ if(warehousePairMap.get(keyItem).equals(this.warehouse))
+ {
+ res = keyItem;
+ }
+ }
+ }
+
+ return res;
+ }
+
+ /**
* Returns the top member of the first warehouse pair.
* @return the top member of the first warehouse pair
*/
@@ -215,7 +245,17 @@
public void setL3SelectedStorageId(long storageId) {
this.l3SelectedStorageId = storageId;
}
+
/**
+ * Sets the level 3 warehouse.
+ * @param warehouse the level 3 warehouse
+ */
+ public void setL3Warehouse(String warehouse)
+ {
+ this.l3warehouse = warehouse;
+ }
+
+ /**
* @return the warehouse
*/
public String getWarehouse() {
@@ -316,7 +356,17 @@
public long getL3SelectedStorageId() {
return this.l3SelectedStorageId;
}
+
/**
+ * Returns the Level 3 warehouse.
+ * @return the Level 3 warehouse
+ */
+ public String getL3Warehouse()
+ {
+ return this.l3warehouse;
+ }
+
+ /**
* Returns the default floorspace scale.
* @return the default floorspace scale
*/
@@ -358,22 +408,33 @@
for (StorageAreaInfo storageInfoItem : storageInfoList) {
L2StorageRawData storageRaw = new L2StorageRawData();
- storageRaw.warehouse = warehouse;
switch(sOption) {
case A:
+ {
+ storageRaw.warehouse = warehouse;
+ storageRaw.type = getWarehouseType();
+ storageRaw.side = WarehouseSide.values()[displaySide.ordinal()];
+ break;
+ }
case B:
- storageRaw.type = getWarehouseType();
- storageRaw.side = WarehouseSide.values()[displaySide.ordinal()];
- break;
+ {
+ storageRaw.warehouse = wh.pair;
+ storageRaw.type = getWarehouseType();
+ storageRaw.side = WarehouseSide.values()[displaySide.ordinal()];
+ break;
+ }
case LEFT:
- case RIGHT:
- storageRaw.type = WarehouseType.values()[displaySide.ordinal()];
- storageRaw.side = getL2WarehouseSide();
- break;
+ case RIGHT:
+ {
+ storageRaw.warehouse = (displaySide == L2DisplaySide.LEFT) ? warehouse : wh.pair;
+ storageRaw.type = WarehouseType.values()[displaySide.ordinal()];
+ storageRaw.side = getL2WarehouseSide();
+ break;
+ }
default:
}
-
+
storageRaw.id = storageInfoItem.id;
for (WarehouseType st : WarehouseType.values()) {
@@ -402,7 +463,7 @@
Map<String, Map<WarehouseSide, List<StorageAreaInfo>>> warehouseLayoutMap = MasterDB.getWarehouseLayoutMap(hubId);
- List<StorageAreaInfo> storageInfoList = warehouseLayoutMap.get(warehouse).get(getL3WarehouseSide());
+ List<StorageAreaInfo> storageInfoList = warehouseLayoutMap.get(l3warehouse).get(getL3WarehouseSide());
for (StorageAreaInfo storageInfoItem : storageInfoList) {
HubDepotInfo depotInfo = MasterDB.getDepotSummaryValueMaxes(hubId, storageInfoItem.id, user);
if (depotInfo != null) {
@@ -439,10 +500,10 @@
long result = 0;
Map<String, Map<WarehouseSide, List<StorageAreaInfo>>> warehouseLayoutMap = MasterDB.getWarehouseLayoutMap(hubId);
-
+
// If the storageId from the request is real..
if (storageId != 0) {
- List<StorageAreaInfo> prevStorageInfoList = warehouseLayoutMap.get(warehouse).get(prevWarehouseSide);
+ List<StorageAreaInfo> prevStorageInfoList = warehouseLayoutMap.get(l3warehouse).get(prevWarehouseSide);
int ordinal = -1;
// Find the ordinal of this storageId
@@ -454,7 +515,7 @@
// If the storageId is found, get the opposite storageId from the actual side
if (ordinal > -1) {
- List<StorageAreaInfo> actualStorageInfoList = warehouseLayoutMap.get(warehouse).get(getL3WarehouseSide());
+ List<StorageAreaInfo> actualStorageInfoList = warehouseLayoutMap.get(l3warehouse).get(getL3WarehouseSide());
// If the size of this actual side is less than the previous one..
if (actualStorageInfoList.size() < ordinal) {
result = actualStorageInfoList.get(actualStorageInfoList.size() - 1).id;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2013-11-11 17:52:04
|
Revision: 335
http://sourceforge.net/p/advance-project/code/335
Author: csirobi
Date: 2013-11-11 17:52:02 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
Warehouse minor changes
Modified Paths:
--------------
advance-live-reporter-os/WebContent/api-warehouse-l3.jsp
advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java
Modified: advance-live-reporter-os/WebContent/api-warehouse-l3.jsp
===================================================================
--- advance-live-reporter-os/WebContent/api-warehouse-l3.jsp 2013-11-11 17:35:15 UTC (rev 334)
+++ advance-live-reporter-os/WebContent/api-warehouse-l3.jsp 2013-11-11 17:52:02 UTC (rev 335)
@@ -44,7 +44,7 @@
warehouseSwitch.setL3SelectedStorageId(Integer.parseInt(request.getParameter("warehouse_l3_storage_id")));
break;
}
- case L3OPTION:
+ case OPTION:
{
int atStorageId = Integer.parseInt(request.getParameter("warehouse_l3_storage_id"));
Modified: advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js
===================================================================
--- advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js 2013-11-11 17:35:15 UTC (rev 334)
+++ advance-live-reporter-os/WebContent/js/pages/warehouse-l3-page.js 2013-11-11 17:52:02 UTC (rev 335)
@@ -37,8 +37,8 @@
$.warehousemenu("init", "l3");
mySelf.active = $.warehousemenu("getActiveMenu");
- mySelf.handlerForL3Option();
- mySelf.handlerForOrder();
+ mySelf.handlerFor("option");
+ mySelf.handlerFor("order");
mySelf.refreshPage();
$(window).on("orientationchange", function()
@@ -58,30 +58,18 @@
},
- handlerForL3Option : function()
+ handlerFor : function(group)
{
var mySelf = this;
- var cl = "click.option";
+ var cl = "click." + group;
- $("#hand_option").on(cl, function(event)
+ $("#hand_" + group).on(cl, function(event)
{
- mySelf.active.option = event.active;
- mySelf.callChart("l3option");
+ mySelf.active[group] = event.active;
+ mySelf.callChart(group);
});
},
- handlerForOrder : function()
- {
- var mySelf = this;
- var cl = "click.order";
-
- $("#hand_order").on(cl, function(event)
- {
- mySelf.active.order = event.active;
- mySelf.callChart("order");
- });
- },
-
refreshPage : function()
{
var mySelf = this;
@@ -94,10 +82,11 @@
{
var mySelf = this;
var s = mySelf.active.warehouse;
+ var l3o = mySelf.active.option.split("_");
var r = mySelf.active.order.split("_");
- var l3o = mySelf.active.option.split("_");
var storageId = 0;
var l3Warehouse = $('input[id="warehouse_l3_name"]').val();
+
if(modeType == "init")
{
@@ -115,8 +104,8 @@
data : {
mode : modeType,
warehouse_name : s,
+ warehouse_l3_option : l3o[1],
storage_order : r[1],
- warehouse_l3_option : l3o[1],
warehouse_l3_storage_id : storageId,
warehouse_l3_name : l3Warehouse
}
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java 2013-11-11 17:35:15 UTC (rev 334)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L3WarehouseMode.java 2013-11-11 17:52:02 UTC (rev 335)
@@ -30,8 +30,8 @@
INIT,
/** Orientation. */
ORIENT,
- /** Layer 3 option. */
- L3OPTION,
+ /** Option. */
+ OPTION,
/** Order. */
ORDER;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2013-11-13 13:36:05
|
Revision: 337
http://sourceforge.net/p/advance-project/code/337
Author: csirobi
Date: 2013-11-13 13:36:02 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
L2: "direction" tag of json minor changes
Modified Paths:
--------------
advance-live-reporter-os/WebContent/warehouse-header.jspf
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java
Modified: advance-live-reporter-os/WebContent/warehouse-header.jspf
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-11-11 18:37:11 UTC (rev 336)
+++ advance-live-reporter-os/WebContent/warehouse-header.jspf 2013-11-13 13:36:02 UTC (rev 337)
@@ -32,6 +32,7 @@
String whName = ObjectUtils.nvl(request.getParameter("warehouse_name"), warehouseSwitch.getFirstWarehousePairTop());
String whOption = ObjectUtils.nvl(request.getParameter("warehouse_option"), "A");
String stOrder = ObjectUtils.nvl(request.getParameter("storage_order"), "PHYSICAL");
+ //Real values are set by l2_l3 form at the l2 jsp page.
String whL3Option = ObjectUtils.nvl(request.getParameter("warehouse_l3_option"), "LEFT");
String whL3StId = ObjectUtils.nvl(request.getParameter("warehouse_l3_storage_id"), "0");
String whL3Name = ObjectUtils.nvl(request.getParameter("warehouse_l3_name"), warehouseSwitch.getFirstWarehousePairTop());
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java 2013-11-11 18:37:11 UTC (rev 336)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java 2013-11-13 13:36:02 UTC (rev 337)
@@ -194,36 +194,19 @@
for (L2DisplaySide dsKey : L2DisplaySide.values()) {
JSONObject dsRecord = new JSONObject();
switch (ws.getL2WarehouseOption()) {
- case A:
- {
- dsRecord.put("align", WarehouseSide.values()[dsKey.ordinal()].name().toLowerCase());
- dsRecord.put("warehouseName", ws.getWarehouse());
- dsRecord.put("warehouseInfo", ws.getWarehouseType().name());
- break;
- }
+ case A:
case B:
- {
dsRecord.put("align", WarehouseSide.values()[dsKey.ordinal()].name().toLowerCase());
- dsRecord.put("warehouseName", ws.getPair());
dsRecord.put("warehouseInfo", ws.getWarehouseType().name());
break;
- }
case LEFT:
- {
dsRecord.put("align", WarehouseSide.LEFT.toString().toLowerCase());
- String wh = (dsKey == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
- dsRecord.put("warehouseName", wh);
dsRecord.put("warehouseInfo", WarehouseType.values()[dsKey.ordinal()].name());
break;
- }
case RIGHT:
- {
dsRecord.put("align", WarehouseSide.RIGHT.toString().toLowerCase());
- String wh = (dsKey == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
- dsRecord.put("warehouseName", wh);
dsRecord.put("warehouseInfo", WarehouseType.values()[dsKey.ordinal()].name());
break;
- }
default:
}
dsRecord.put("at_hub", L2TimeState.NOW_AT_HUB.getMessage());
@@ -245,24 +228,18 @@
{
String res = "";
- switch(ws.getL2WarehouseOption())
- {
+ switch(ws.getL2WarehouseOption()) {
case A:
- {
res = ws.getWarehouse();
break;
- }
case B:
- {
res = ws.getPair();
break;
- }
case LEFT:
case RIGHT:
- {
res = (ds == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
break;
- }
+ default:
}
return res;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aka...@us...> - 2013-11-15 12:00:46
|
Revision: 341
http://sourceforge.net/p/advance-project/code/341
Author: akarnokd
Date: 2013-11-15 12:00:43 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
Updated libraries
Modified Paths:
--------------
advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/ChartProcess.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DuringDayData.java
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
Added Paths:
-----------
advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-1.0.jar
advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-api-1.0.jar
Removed Paths:
-------------
advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-1.0.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-1.0.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-1.0.jar 2013-11-15 11:50:36 UTC (rev 340)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-1.0.jar 2013-11-15 12:00:43 UTC (rev 341)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-1.0.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-api-1.0.jar
===================================================================
(Binary files differ)
Index: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-api-1.0.jar
===================================================================
--- advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-api-1.0.jar 2013-11-15 11:50:36 UTC (rev 340)
+++ advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-api-1.0.jar 2013-11-15 12:00:43 UTC (rev 341)
Property changes on: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine-api-1.0.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: advance-live-reporter-os/WebContent/WEB-INF/lib/advance-flow-engine.jar
===================================================================
(Binary files differ)
Modified: advance-live-reporter-os/WebContent/WEB-INF/lib/akarnokd_tools.jar
===================================================================
(Binary files differ)
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/ChartProcess.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/ChartProcess.java 2013-11-15 11:50:36 UTC (rev 340)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/ChartProcess.java 2013-11-15 12:00:43 UTC (rev 341)
@@ -20,6 +20,8 @@
*/
package eu.advance.logistics.live.reporter.charts;
+import hu.akarnokd.utils.xml.XElement;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.EnumSet;
@@ -30,7 +32,6 @@
import javax.xml.stream.XMLStreamException;
-import eu.advance.logistics.flow.engine.xml.XElement;
import eu.advance.logistics.live.reporter.model.ItemStatus;
/**
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DuringDayData.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DuringDayData.java 2013-11-15 11:50:36 UTC (rev 340)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/DuringDayData.java 2013-11-15 12:00:43 UTC (rev 341)
@@ -25,6 +25,7 @@
import hu.akarnokd.utils.collection.AggregatorHashMap4;
import hu.akarnokd.utils.collection.AggregatorMap1;
import hu.akarnokd.utils.collection.AggregatorMap4;
+import hu.akarnokd.utils.xml.XElement;
import java.io.IOException;
import java.util.ArrayList;
@@ -39,7 +40,6 @@
import com.google.common.collect.Iterables;
-import eu.advance.logistics.flow.engine.xml.XElement;
import eu.advance.logistics.live.reporter.model.ChartView;
import eu.advance.logistics.live.reporter.model.DuringAmountStatus;
import eu.advance.logistics.live.reporter.model.ServiceLevel;
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-11-15 11:50:36 UTC (rev 340)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSwitch.java 2013-11-15 12:00:43 UTC (rev 341)
@@ -50,21 +50,21 @@
private WarehouseOption l2warehouseOption;
/** The storage area order. */
private StorageAreaOrder storageOrder;
-
+
/** Level 3 warehouse display mode option. */
private WarehouseOption l3warehouseOption;
/** Level 3 selected storage area ID. */
private long l3SelectedStorageId;
- /** Level 3 warehouse name. */
- private String l3warehouse;
-
+ /** Level 3 warehouse name. */
+ private String l3warehouse;
+
/** The hub id. */
private final long hubId;
/** The user. */
private final String user;
- /** The map of warehouse pairs. */
- private final Map<String, String> warehousePairMap;
-
+ /** The map of warehouse pairs. */
+ private final Map<String, String> warehousePairMap;
+
/**
* Constructor.
* @param hubId the hub
@@ -73,138 +73,131 @@
*/
public WarehouseSwitch(long hubId, String user) {
this.hubId = hubId;
- this.user = user;
- this.warehousePairMap = this.createWarehousePairMap();
- this.warehouse = this.getFirstWarehousePairTop();
-
- this.l2warehouseOption = WarehouseOption.A;
+ this.user = user;
+ this.warehousePairMap = this.createWarehousePairMap();
+ this.warehouse = this.getFirstWarehousePairTop();
+
+ this.l2warehouseOption = WarehouseOption.A;
this.storageOrder = StorageAreaOrder.PHYSICAL;
this.l3warehouseOption = WarehouseOption.LEFT;
this.l3SelectedStorageId = 0;
this.l3warehouse = this.warehouse;
}
-
+
/**
* Creates map for the warehouse pairs.
* @return map of the warehouse pairs
*/
- private Map<String, String> createWarehousePairMap()
- {
- Map<String, String> wPair = new LinkedHashMap<>();
- List<Warehouse> list = MasterDB.warehouses(this.hubId);
-
- if(list.isEmpty() == false)
- {
- for(Warehouse item: list)
- {
- if( (wPair.containsKey(item.warehouse) == false) && (wPair.containsValue(item.warehouse) == false))
- {
- String pair = Strings.isNullOrEmpty(item.pair) ? "" : item.pair;
- wPair.put(item.warehouse, pair);
- }
- }
- }
-
- return wPair;
+ private Map<String, String> createWarehousePairMap() {
+ Map<String, String> wPair = new LinkedHashMap<>();
+ List<Warehouse> list = MasterDB.warehouses(this.hubId);
+
+ if (list.isEmpty() == false) {
+ for (Warehouse item: list) {
+ if ((wPair.containsKey(item.warehouse) == false) && (wPair.containsValue(item.warehouse) == false)) {
+ String pair = Strings.isNullOrEmpty(item.pair) ? "" : item.pair;
+ wPair.put(item.warehouse, pair);
+ }
+ }
+ }
+
+ return wPair;
}
-
+
/**
* Returns the map of the warehouse pairs.
* @return the map of the warehouse pairs
*/
- public Map<String, String> getWarehousePairMap()
- {
- return this.warehousePairMap;
+ public Map<String, String> getWarehousePairMap() {
+ return this.warehousePairMap;
}
-
+
/**
* Returns the pair of the warehouse.
* @return the pair of the warehouse
*/
- public String getPair()
- {
- String res = "";
-
- if(warehousePairMap.containsKey(this.warehouse))
- {
- res = warehousePairMap.get(this.warehouse);
- }
- else if(warehousePairMap.containsValue(this.warehouse))
- {
- for(String keyItem : warehousePairMap.keySet())
- {
- if(warehousePairMap.get(keyItem).equals(this.warehouse))
- {
- res = keyItem;
- }
- }
- }
-
- return res;
+ public String getPair() {
+ String res = "";
+
+ if (warehousePairMap.containsKey(this.warehouse)) {
+ res = warehousePairMap.get(this.warehouse);
+ }
+ else if(warehousePairMap.containsValue(this.warehouse))
+ {
+ for(String keyItem : warehousePairMap.keySet())
+ {
+ if(warehousePairMap.get(keyItem).equals(this.warehouse))
+ {
+ res = keyItem;
+ }
+ }
+ }
+
+ return res;
}
-
+
/**
* Returns the top member of the first warehouse pair to initialize the warehouse.
* @return the top member of the first warehouse pair
*/
public String getFirstWarehousePairTop()
{
- String res = "";
- if(this.warehousePairMap.isEmpty() == false)
- {
- res = this.warehousePairMap.keySet().iterator().next();
- }
-
- return res;
+ String res = "";
+ if(this.warehousePairMap.isEmpty() == false)
+ {
+ res = this.warehousePairMap.keySet().iterator().next();
+ }
+
+ return res;
}
-
+
/**
* Returns the top member of the actual warehouse pair.
* @return the top member of the actual warehouse pair
*/
public String getWarehousePairTop()
{
- String res = "";
-
- if(warehousePairMap.containsKey(this.warehouse))
- {
- res = this.warehouse;
- }
- else if(warehousePairMap.containsValue(this.warehouse))
- {
- for(String keyItem : warehousePairMap.keySet())
- {
- if(warehousePairMap.get(keyItem).equals(this.warehouse))
- {
- res = keyItem;
- }
- }
- }
-
- return res;
+ String res = "";
+
+ if(warehousePairMap.containsKey(this.warehouse))
+ {
+ res = this.warehouse;
+ }
+ else if(warehousePairMap.containsValue(this.warehouse))
+ {
+ for(String keyItem : warehousePairMap.keySet())
+ {
+ if(warehousePairMap.get(keyItem).equals(this.warehouse))
+ {
+ res = keyItem;
+ }
+ }
+ }
+
+ return res;
}
-
- /**
- * Returns the bottom member of the actual warehouse pair.
- * @return the bottom member of the actual warehouse pair
- */
+
+ /**
+ * Returns the bottom member of the actual warehouse pair.
+ * @return the bottom member of the actual warehouse pair
+ */
public String getWarehousePairBottom()
{
- String res = "";
-
- if(this.warehousePairMap.containsKey(this.warehouse))
- {
- res = this.warehousePairMap.get(this.warehouse);
- }
- else if(this.warehousePairMap.containsValue(this.warehouse))
- {
- res = this.warehouse;
- }
-
- return res;
+ String res = "";
+
+ if(this.warehousePairMap.containsKey(this.warehouse))
+ {
+ res = this.warehousePairMap.get(this.warehouse);
+ }
+ else if(this.warehousePairMap.containsValue(this.warehouse))
+ {
+ res = this.warehouse;
+ }
+
+ return res;
}
-
+
/**
* Returns the hub of this warehouse.
* @return the hub id
@@ -212,16 +205,16 @@
public long hubId() {
return hubId;
}
-
+
/**
* Sets the actual warehosue.
* @param warehouse the actual warehosue
*/
public void setWarehouse(String warehouse)
{
- this.warehouse = warehouse;
+ this.warehouse = warehouse;
}
-
+
/**
* Set the level 2 warehouse option.
* @param option the option
@@ -251,16 +244,16 @@
public void setL3SelectedStorageId(long storageId) {
this.l3SelectedStorageId = storageId;
}
-
+
/**
* Sets the level 3 warehouse.
* @param warehouse the level 3 warehouse
*/
public void setL3Warehouse(String warehouse)
{
- this.l3warehouse = warehouse;
+ this.l3warehouse = warehouse;
}
-
+
/**
* @return the warehouse
*/
@@ -362,16 +355,16 @@
public long getL3SelectedStorageId() {
return this.l3SelectedStorageId;
}
-
+
/**
* Returns the Level 3 warehouse.
* @return the Level 3 warehouse
*/
public String getL3Warehouse()
{
- return this.l3warehouse;
+ return this.l3warehouse;
}
-
+
/**
* Returns the default floorspace scale.
* @return the default floorspace scale
@@ -387,9 +380,9 @@
Map<L2DisplaySide, List<L2StorageRawData>> result = new LinkedHashMap<L2DisplaySide, List<L2StorageRawData>>();
Map<String, Map<WarehouseSide, List<StorageAreaInfo>>> warehouseLayoutMap = MasterDB.getWarehouseLayoutMap(hubId);
-
+
Warehouse wh = MasterDB.warehouse(hubId, warehouse);
-
+
for (L2DisplaySide displaySide : L2DisplaySide.values()) {
List<StorageAreaInfo> storageInfoList;
@@ -418,29 +411,29 @@
switch(sOption) {
case A:
{
- storageRaw.warehouse = warehouse;
- storageRaw.type = getWarehouseType();
- storageRaw.side = WarehouseSide.values()[displaySide.ordinal()];
- break;
+ storageRaw.warehouse = warehouse;
+ storageRaw.type = getWarehouseType();
+ storageRaw.side = WarehouseSide.values()[displaySide.ordinal()];
+ break;
}
case B:
{
- storageRaw.warehouse = wh.pair;
- storageRaw.type = getWarehouseType();
- storageRaw.side = WarehouseSide.values()[displaySide.ordinal()];
- break;
+ storageRaw.warehouse = wh.pair;
+ storageRaw.type = getWarehouseType();
+ storageRaw.side = WarehouseSide.values()[displaySide.ordinal()];
+ break;
}
case LEFT:
case RIGHT:
{
- storageRaw.warehouse = (displaySide == L2DisplaySide.LEFT) ? warehouse : wh.pair;
- storageRaw.type = WarehouseType.values()[displaySide.ordinal()];
- storageRaw.side = getL2WarehouseSide();
- break;
+ storageRaw.warehouse = (displaySide == L2DisplaySide.LEFT) ? warehouse : wh.pair;
+ storageRaw.type = WarehouseType.values()[displaySide.ordinal()];
+ storageRaw.side = getL2WarehouseSide();
+ break;
}
default:
}
-
+
storageRaw.id = storageInfoItem.id;
for (WarehouseType st : WarehouseType.values()) {
@@ -468,7 +461,7 @@
List<L3DepotStorageData> result = new ArrayList<L3DepotStorageData>();
Map<String, Map<WarehouseSide, List<StorageAreaInfo>>> warehouseLayoutMap = MasterDB.getWarehouseLayoutMap(hubId);
-
+
List<StorageAreaInfo> storageInfoList = warehouseLayoutMap.get(l3warehouse).get(getL3WarehouseSide());
for (StorageAreaInfo storageInfoItem : storageInfoList) {
HubDepotInfo depotInfo = MasterDB.getDepotSummaryValueMaxes(hubId, storageInfoItem.id, user);
@@ -506,7 +499,7 @@
long result = 0;
Map<String, Map<WarehouseSide, List<StorageAreaInfo>>> warehouseLayoutMap = MasterDB.getWarehouseLayoutMap(hubId);
-
+
// If the storageId from the request is real..
if (storageId != 0) {
List<StorageAreaInfo> prevStorageInfoList = warehouseLayoutMap.get(l3warehouse).get(prevWarehouseSide);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2013-11-20 12:07:25
|
Revision: 346
http://sourceforge.net/p/advance-project/code/346
Author: csirobi
Date: 2013-11-20 12:07:21 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
L2: null-check for the warehouse pair
Modified Paths:
--------------
advance-live-reporter-os/WebContent/css/warehouse-header.css
advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java
Modified: advance-live-reporter-os/WebContent/css/warehouse-header.css
===================================================================
--- advance-live-reporter-os/WebContent/css/warehouse-header.css 2013-11-19 20:44:33 UTC (rev 345)
+++ advance-live-reporter-os/WebContent/css/warehouse-header.css 2013-11-20 12:07:21 UTC (rev 346)
@@ -116,8 +116,6 @@
width: 100%;
height: 100%;
table-layout : fixed;
- overflow : hidden;
- white-space : nowrap;
}
div.warehouse-menu .updown-width tr,
Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java 2013-11-19 20:44:33 UTC (rev 345)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/WarehouseSummary.java 2013-11-20 12:07:21 UTC (rev 346)
@@ -58,6 +58,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Strings;
+
/**
* Data provider for the warehouse summary and detail views.
* @author karnokd, 2013.04.29.
@@ -385,6 +387,7 @@
serviceToSnip.get(ServiceLevel.PRIORITY).addAll(Arrays.asList(WarehouseServiceLevel.PRIORITY_SPECIAL));
serviceToSnip.get(ServiceLevel.SPECIAL).addAll(Arrays.asList(WarehouseServiceLevel.PRIORITY_SPECIAL));
+ Warehouse wh = MasterDB.warehouse(hubId, warehouse);
for (ConsignmentSummary cs : consignmentStatus.valueCollection()) {
double cscreated = 0;
@@ -400,14 +403,16 @@
cscreated = cs.floorspace(ItemStatus.CREATED);
EnumMap<WarehouseServiceLevel, Aggregates> perLevel = out.get(cs.deliveryDepot);
-
- for (WarehouseServiceLevel s : serviceToSnip.get(cs.level)) {
- perLevel.get(s).created += cscreated;
- perLevel.get(s).scanned += csscanned;
- perLevel.get(s).declared += csdeclared;
- perLevel.get(s).athub += csathub;
- perLevel.get(s).lefthub += cslefthub;
- }
+
+ if(Strings.isNullOrEmpty(wh.pair) == false) {
+ for (WarehouseServiceLevel s : serviceToSnip.get(cs.level)) {
+ perLevel.get(s).created += cscreated;
+ perLevel.get(s).scanned += csscanned;
+ perLevel.get(s).declared += csdeclared;
+ perLevel.get(s).athub += csathub;
+ perLevel.get(s).lefthub += cslefthub;
+ }
+ }
}
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X