Add private method instead of an exteran dependence

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

diff --git a/server/compbio/controllers/JobController.java b/server/compbio/controllers/JobController.java
index 6bfe4ee..640dd29 100644 (file)
--- a/server/compbio/controllers/JobController.java
+++ b/server/compbio/controllers/JobController.java
@@ -1,7 +1,9 @@
 package compbio.controllers;
 
 import java.security.Principal;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -12,18 +14,17 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import compbio.statistic.CassandraRequester;
 import compbio.cassandra.DataBase;
-import compbio.statistic.StatisticsProt;
 
 /**
  * @author Alexander Sherstnev
  * @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,26 +32,26 @@ 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();
                if (option.equals("AllDates,off")) {
                        Calendar cal = Calendar.getInstance();
-                       date1 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate());
+                       date1 = DateFormatYYMMDD(sp.earliestDate());
                        date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
                }
                model.put("date1", date1);
@@ -65,8 +66,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));
@@ -76,4 +77,13 @@ public class JobController {
                return "reportJobLog";
        }
        
+       /*
+        * convert ???
+        */
+       private String DateFormatYYMMDD(long indate) {
+               SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd");
+               String dateString = datformat.format(new Date(indate));
+               return dateString;
+       }
+       
 }