From 3c9f404e951837c4b7313624c7fb7d89943f792e Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Mon, 20 Jan 2014 15:17:35 +0000 Subject: [PATCH] Improve web view of the project (real pages for removal of DB records) --- webapp/view/query/JobLog.jsp | 6 ++--- webapp/view/query/RemoveJobs.jsp | 4 +++ webapp/view/reports/RemoveDBrecords.jsp | 10 -------- webapp/view/reports/RemoveJobs.jsp | 42 +++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 13 deletions(-) delete mode 100644 webapp/view/reports/RemoveDBrecords.jsp create mode 100644 webapp/view/reports/RemoveJobs.jsp diff --git a/webapp/view/query/JobLog.jsp b/webapp/view/query/JobLog.jsp index 2afcf3f..9310f25 100644 --- a/webapp/view/query/JobLog.jsp +++ b/webapp/view/query/JobLog.jsp @@ -18,9 +18,9 @@
-

- -
+

+ +
diff --git a/webapp/view/query/RemoveJobs.jsp b/webapp/view/query/RemoveJobs.jsp index cf3459f..d5c138f 100644 --- a/webapp/view/query/RemoveJobs.jsp +++ b/webapp/view/query/RemoveJobs.jsp @@ -22,6 +22,7 @@

Job with the job Id

+

@@ -30,18 +31,21 @@ +

Jobs executed from the IP

+

Jobs with the protein subsequence

+

diff --git a/webapp/view/reports/RemoveDBrecords.jsp b/webapp/view/reports/RemoveDBrecords.jsp deleted file mode 100644 index 67e120d..0000000 --- a/webapp/view/reports/RemoveDBrecords.jsp +++ /dev/null @@ -1,10 +0,0 @@ - - - - -Jobs have been removed from ProteoCache - - -

ProteoCache removed : ${result} jobs

- - \ No newline at end of file diff --git a/webapp/view/reports/RemoveJobs.jsp b/webapp/view/reports/RemoveJobs.jsp new file mode 100644 index 0000000..b1d62fa --- /dev/null +++ b/webapp/view/reports/RemoveJobs.jsp @@ -0,0 +1,42 @@ + + +<%@ 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"%> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> + + + + +
+ + + + +
+
+

Information for removed jobs

+
+
+ + +

${njobs} jobs have been removed for time period: to (${ndays} days)

+ + +

Job ${id} has been removed.

+ + +

Jobs launched from ${ip} have been removed. ${njobs} jobs have been removed.

+ + +

Jobs launched with sequence ${seq} have been removed. ${njobs} jobs have been removed.

+ + +
+
+ + +
+ + \ No newline at end of file -- 1.7.10.2