From 2e844559438fb731158ae104a750eea3a3d10b1f Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Mon, 2 Dec 2013 14:49:49 +0000 Subject: [PATCH 1/1] Clean up JSP code --- webapp/view/ReportAboutRemove.jsp | 4 +-- webapp/view/home.jsp | 3 -- webapp/view/queryIP.jsp | 6 ++-- webapp/view/queryIPStatistics.jsp | 41 +++++++++++++----------- webapp/view/queryJobLog.jsp | 2 -- webapp/view/queryJobStatistics.jsp | 1 - webapp/view/queryProteinSequence.jsp | 1 - webapp/view/queryProteinSequenceCounter.jsp | 21 ++++++------- webapp/view/queryRemoveJobs.jsp | 6 ++-- webapp/view/queryTimeExecution.jsp | 5 ++- webapp/view/reportIP.jsp | 4 --- webapp/view/reportIPstatistics.jsp | 2 -- webapp/view/reportJobLog.jsp | 27 +++++++--------- webapp/view/reportJobStatistics.jsp | 14 +++------ webapp/view/reportJobStatisticsOneDay.jsp | 42 +++++++++++++++---------- webapp/view/reportProteinSequences.jsp | 6 +--- webapp/view/reportProteinSequencesCounter.jsp | 3 +- webapp/view/reportTimeExecution.jsp | 5 +-- 18 files changed, 85 insertions(+), 108 deletions(-) diff --git a/webapp/view/ReportAboutRemove.jsp b/webapp/view/ReportAboutRemove.jsp index 6789b06..67e120d 100644 --- a/webapp/view/ReportAboutRemove.jsp +++ b/webapp/view/ReportAboutRemove.jsp @@ -1,10 +1,8 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -Proteocache removed +Jobs have been removed from ProteoCache

ProteoCache removed : ${result} jobs

diff --git a/webapp/view/home.jsp b/webapp/view/home.jsp index e960b0f..db9857c 100644 --- a/webapp/view/home.jsp +++ b/webapp/view/home.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> @@ -29,8 +28,6 @@ - - diff --git a/webapp/view/queryIP.jsp b/webapp/view/queryIP.jsp index 5c88761..95ca909 100644 --- a/webapp/view/queryIP.jsp +++ b/webapp/view/queryIP.jsp @@ -1,5 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="java.util.Calendar"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> @@ -12,14 +10,14 @@
+
Enter IP
- -
+

diff --git a/webapp/view/queryIPStatistics.jsp b/webapp/view/queryIPStatistics.jsp index a5dd4d3..9181754 100644 --- a/webapp/view/queryIPStatistics.jsp +++ b/webapp/view/queryIPStatistics.jsp @@ -1,8 +1,7 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> @@ -12,30 +11,34 @@
+
IPs with multipled executed jobs
- -
-
- -
-
- - - - -

${error}

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

${error}

+
+ + + +
+
- - -
- -
diff --git a/webapp/view/queryJobLog.jsp b/webapp/view/queryJobLog.jsp index f08aa52..7c5db0a 100644 --- a/webapp/view/queryJobLog.jsp +++ b/webapp/view/queryJobLog.jsp @@ -1,5 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="java.util.Calendar"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> diff --git a/webapp/view/queryJobStatistics.jsp b/webapp/view/queryJobStatistics.jsp index dec5320..35d813d 100644 --- a/webapp/view/queryJobStatistics.jsp +++ b/webapp/view/queryJobStatistics.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> diff --git a/webapp/view/queryProteinSequence.jsp b/webapp/view/queryProteinSequence.jsp index aedf713..a0bde5a 100644 --- a/webapp/view/queryProteinSequence.jsp +++ b/webapp/view/queryProteinSequence.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> diff --git a/webapp/view/queryProteinSequenceCounter.jsp b/webapp/view/queryProteinSequenceCounter.jsp index 00bb5d7..c7d7ab6 100644 --- a/webapp/view/queryProteinSequenceCounter.jsp +++ b/webapp/view/queryProteinSequenceCounter.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> @@ -12,30 +11,30 @@
+
Proteins with multiple executed jobs
- -
+
-
+
+ + +
-
- - +
- -

${error}

- +

${error}

- + +
diff --git a/webapp/view/queryRemoveJobs.jsp b/webapp/view/queryRemoveJobs.jsp index 41e0177..53f0d4d 100644 --- a/webapp/view/queryRemoveJobs.jsp +++ b/webapp/view/queryRemoveJobs.jsp @@ -1,5 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="java.util.Calendar"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> @@ -23,7 +21,7 @@

Job with the job Id -

+

@@ -43,7 +41,7 @@

Jobs with the protein subsequence -

+

diff --git a/webapp/view/queryTimeExecution.jsp b/webapp/view/queryTimeExecution.jsp index 719073c..3f5d1c6 100644 --- a/webapp/view/queryTimeExecution.jsp +++ b/webapp/view/queryTimeExecution.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> @@ -11,14 +10,14 @@
+
Enter time period for execution statistics
- -
+

Query for all dates

-
diff --git a/webapp/view/reportIPstatistics.jsp b/webapp/view/reportIPstatistics.jsp index 87b73ce..dec24be 100644 --- a/webapp/view/reportIPstatistics.jsp +++ b/webapp/view/reportIPstatistics.jsp @@ -1,5 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> diff --git a/webapp/view/reportJobLog.jsp b/webapp/view/reportJobLog.jsp index 2c204df..b886aa9 100644 --- a/webapp/view/reportJobLog.jsp +++ b/webapp/view/reportJobLog.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> @@ -15,17 +14,16 @@ -
-
-

Information for the job ${IdJob}

-
-
- -

Start timestamp : ${result.logInfo.dateStart}

-

End timestamp : ${result.logInfo.dateEnd}

-

IP: ${result.logInfo.ip}

+
+
+

Information for the job ${IdJob}

+
+
+

Start timestamp : ${result.logInfo.dateStart}

+

End timestamp : ${result.logInfo.dateEnd}

+

IP: ${result.logInfo.ip}

- +
@@ -42,10 +40,9 @@ -
Sequence
- -
-
+ +
+
diff --git a/webapp/view/reportJobStatistics.jsp b/webapp/view/reportJobStatistics.jsp index da4bec2..5c707b7 100644 --- a/webapp/view/reportJobStatistics.jsp +++ b/webapp/view/reportJobStatistics.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> @@ -6,8 +5,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> -<%@page import="java.util.ArrayList"%> - @@ -16,11 +13,11 @@ - +
@@ -36,7 +33,6 @@
-
diff --git a/webapp/view/reportJobStatisticsOneDay.jsp b/webapp/view/reportJobStatisticsOneDay.jsp index 9bde4ca..719ace8 100644 --- a/webapp/view/reportJobStatisticsOneDay.jsp +++ b/webapp/view/reportJobStatisticsOneDay.jsp @@ -1,12 +1,9 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ 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"%> -<%@page import="java.util.ArrayList"%> @@ -14,17 +11,28 @@
+ -

Job statistics for ${date}

+ - - -

No jobs found...

- - -

${njobs} jobs found for the day:

-
- +
+
+

Job statistics for ${date}

+
+
+ + + +

No jobs found...

+ + +

${njobs} jobs found for the day:

+
+
@@ -47,12 +55,14 @@ -
Job ID
+ +
+ + +
- - - +
\ No newline at end of file diff --git a/webapp/view/reportProteinSequences.jsp b/webapp/view/reportProteinSequences.jsp index 8bc1213..19a7a79 100644 --- a/webapp/view/reportProteinSequences.jsp +++ b/webapp/view/reportProteinSequences.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page trimDirectiveWhitespaces="true"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> @@ -17,7 +16,6 @@
-

Jobs for the protein sequence: ${prot}

@@ -27,11 +25,9 @@ ${prot}

 - -
-
+

No jobs found

diff --git a/webapp/view/reportProteinSequencesCounter.jsp b/webapp/view/reportProteinSequencesCounter.jsp index 432af72..4f38666 100644 --- a/webapp/view/reportProteinSequencesCounter.jsp +++ b/webapp/view/reportProteinSequencesCounter.jsp @@ -16,7 +16,6 @@ -
Jobs Statistics
@@ -54,7 +53,7 @@
- +
\ No newline at end of file diff --git a/webapp/view/reportTimeExecution.jsp b/webapp/view/reportTimeExecution.jsp index d711c05..907a578 100644 --- a/webapp/view/reportTimeExecution.jsp +++ b/webapp/view/reportTimeExecution.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> @@ -6,8 +5,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> -<%@page import="java.util.ArrayList"%> - @@ -18,7 +15,7 @@ -- 1.7.10.2