From 7418234f16f46bc59873db6623dbe33f605f0691 Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Sat, 2 Nov 2013 10:35:05 +0000 Subject: [PATCH] Improve JSP pages Conflicts: website/ReportLength.jsp --- website/ReportLength.jsp | 92 ++++++++++++++++++++++++++---------------- website/ReportNew.jsp | 99 ++++++++++++++++++++++++++-------------------- website/Sequence.jsp | 7 ++-- 3 files changed, 116 insertions(+), 82 deletions(-) diff --git a/website/ReportLength.jsp b/website/ReportLength.jsp index ed85c88..e68dc64 100644 --- a/website/ReportLength.jsp +++ b/website/ReportLength.jsp @@ -1,46 +1,68 @@ <%@page import="java.util.ArrayList"%> -<%@ page trimDirectiveWhitespaces="true" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://displaytag.sf.net" prefix="dt" %> +<%@ page trimDirectiveWhitespaces="true"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> +<%@ taglib uri="http://displaytag.sf.net" prefix="dt"%> - -

Time execution for the whole period

- - -

Time execution for the interval: ${data1} - ${data2}

- + +

Time execution for the whole period

+ + +

Time execution for the interval: ${data1} - ${data2}

+

Time execution: ${timeExecution} ms

- - - - - - - - - - - + + - - - - - - - - - - + - + - + - + +

Total number of jobs: ${sum}

+ +
Dateless then 30 s30 s - 60 s1 min - 2 minmore then 2min
${res.date}${time}
Total:${total}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Dateless then 30 s30 s - 60 s1 min - 2 min2 min - 10 minmore then 10 min
Total:${total}
${res.date}${time}
diff --git a/website/ReportNew.jsp b/website/ReportNew.jsp index 5abae4d..969cad7 100644 --- a/website/ReportNew.jsp +++ b/website/ReportNew.jsp @@ -1,50 +1,63 @@ <%@page import="java.util.ArrayList"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://displaytag.sf.net" prefix="dt" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> +<%@ taglib uri="http://displaytag.sf.net" prefix="dt"%> - -

Jobs statistics for the whole period

- - -

Jobs statistics for the Period: - to

- + +

Jobs statistics for the whole period

+ + +

+ Jobs statistics for the Period: + + to + +

+

Time execution: ${timeExecution} ms

- - - - - - - - - - - - - - - + + - - - - - - - - - + + - - - - - - - - + + +
DateNumber of Proteins
TotalFailedCancelledAbandoned
${res.date}000
Total:${sum}000
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateNumber of Proteins
TotalFailedCancelledAbandoned
Total:${sum}000
${res.date}000
\ No newline at end of file diff --git a/website/Sequence.jsp b/website/Sequence.jsp index 9e28601..1cccbb2 100644 --- a/website/Sequence.jsp +++ b/website/Sequence.jsp @@ -11,11 +11,10 @@

Enter protein sequence

-

- search by the whole sequence - search by a part of sequence
+

+ search


-

Enter minimum counter of job/protein

+

Enter minimum number of jobs per protein




-- 1.7.10.2