1. Move query jsps into a separate directory

[proteocache.git] / server / compbio / controllers / JobController.java

diff --git a/server/compbio/controllers/JobController.java b/server/compbio/controllers/JobController.java
index 6bfe4ee..94045f9 100644 (file)
--- a/server/compbio/controllers/JobController.java
+++ b/server/compbio/controllers/JobController.java
@@ -19,11 +19,11 @@ import compbio.statistic.StatisticsProt;
  * @author Natasha Sherstneva
  */
 @Controller
-public class JobController {
+public class JobController extends BasicController {
 
        @RequestMapping(value = "/stat/exectime/query", method = RequestMethod.GET)
-       public String initFormExecTime(Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+       public String initFormExecTime(Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                Calendar cal = Calendar.getInstance();
                String date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DATE);
                cal.add(Calendar.DATE, -3);
@@ -31,20 +31,20 @@ public class JobController {
 
                model.put("date1", date1);
                model.put("date2", date2);
-               return "queryTimeExecution";
+               return "query/JobTimeExecution";
        }
 
        @RequestMapping(value = "/job/query", method = RequestMethod.GET)
-       public String initFindForm(Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+       public String initFindForm(Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                model.put("value", "jp_NzBOJKo");
-               return "queryJobLog";
+               return "query/JobLog";
        }
 
        @RequestMapping(value = "/stat/exectime/results", method = RequestMethod.GET)
        public String findExecTimeData(@RequestParam("date1") String date1, @RequestParam("date2") String date2,
-                       @RequestParam(value = "option", required = false) String option, Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+                       @RequestParam(value = "option", required = false) String option, Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                final long startTime = System.currentTimeMillis();
 
                CassandraRequester sp = new CassandraRequester();
@@ -65,8 +65,8 @@ public class JobController {
        }
 
        @RequestMapping(value = "/job/results", method = RequestMethod.GET)
-       public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+       public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                final long startTime = System.currentTimeMillis();
                CassandraRequester cr = new CassandraRequester();
                model.put("result", cr.readJobLog(jobid));