You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/12/10 23:46:15 UTC
svn commit: r1549992 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccAbstractHandler.java DuccHandlerClassic.java DuccHandlerJsonFormat.java
Author: degenaro
Date: Tue Dec 10 22:46:15 2013
New Revision: 1549992
URL: http://svn.apache.org/r1549992
Log:
UIMA-3494 DUCC better hovers for Duration column on Job page
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1549992&r1=1549991&r2=1549992&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java Tue Dec 10 22:46:15 2013
@@ -846,7 +846,19 @@ public abstract class DuccAbstractHandle
if(projectedTime > 0) {
long millis = Math.round(projectedTime);
if(millis > 1000) {
- retVal = FormatHelper.duration(millis);
+ String projection = FormatHelper.duration(millis);
+ String health = "class=\"health_yellow\"";
+ String title = "title=\"Time (ddd:hh:mm:ss) to projected completion, based on average processing time per work item\"";
+ retVal = "+"+"<span "+health+" "+title+"><i>"+projection+"</i></span>";
+ }
+ }
+ else {
+ long millis = Math.round(0-projectedTime);
+ if(millis > 1000) {
+ String projection = FormatHelper.duration(millis);
+ String health = "class=\"health_purple\"";
+ String title = "title=\"Time (ddd:hh:mm:ss) past projected completion, based on average processing time per work item\"";
+ retVal = "-"+"<span "+health+" "+title+"><i>"+projection+"</i></span>";
}
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1549992&r1=1549991&r2=1549992&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Tue Dec 10 22:46:15 2013
@@ -138,11 +138,7 @@ public class DuccHandlerClassic extends
sb.append(decoratedDuration);
sb.append("</span>");
String projection = getProjection(request,job);
- if(projection.length() > 0) {
- String health = "class=\"health_yellow\"";
- String title = "title=\"Time (ddd:hh:mm:ss) to completion, based on average processing time per work item\"";
- sb.append("+"+"<span "+health+" "+title+"><i>"+projection+"</i></span>");
- }
+ sb.append(projection);
}
sb.append("</td>");
// User
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1549992&r1=1549991&r2=1549992&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Tue Dec 10 22:46:15 2013
@@ -159,11 +159,7 @@ public class DuccHandlerJsonFormat exten
sb.append(decoratedDuration);
sb.append("</span>");
String projection = getProjection(request,job);
- if(projection.length() > 0) {
- String health = "class=\"health_yellow\"";
- String title = "title=\"Time (ddd:hh:mm:ss) to completion, based on average processing time per work item\"";
- sb.append("+"+"<span "+health+" "+title+"><i>"+projection+"</i></span>");
- }
+ sb.append(projection);
}
row.add(new JsonPrimitive(sb.toString()));
// User