1. Move query jsps into a separate directory

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

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index d508c82..d6a0c1e 100644 (file)
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -1,6 +1,5 @@
 package compbio.controllers;
 
-import java.security.Principal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -23,11 +22,11 @@ import compbio.statistic.StatisticsProt;
  * @author Natasha Sherstneva
  */
 @Controller
-public class DailyStatisticsController {
+public class DailyStatisticsController extends BasicController {
 
        @RequestMapping(value = "/stat/jobs/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());
                Calendar cal = Calendar.getInstance();
                String date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DATE);
                cal.add(Calendar.DATE, -3);
@@ -36,13 +35,13 @@ public class DailyStatisticsController {
                model.put("date1", date1);
                model.put("date2", date2);
 
-               return "queryJobStatistics";
+               return "query/JobStatistics";
        }
 
        @RequestMapping(value = "/stat/jobsdaily/results", method = RequestMethod.GET)
        public String findJobsInPeriod(@RequestParam("date1") String date1, @RequestParam("date2") String date2,
-                       @RequestParam("option") String option, Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+                       @RequestParam("option") String option, Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                final long startTime = System.currentTimeMillis();
 
                CassandraRequester cr = new CassandraRequester();
@@ -63,9 +62,9 @@ public class DailyStatisticsController {
        }
 
        @RequestMapping(value = "/stat/jobsoneday/results", method = RequestMethod.GET)
-       public String findJobsInOneDay(@RequestParam("date") String date, @RequestParam("status") String status, Map<String, Object> model,
-                       Principal principal) throws ParseException {
-               model.put("username", principal.getName());
+       public String findJobsInOneDay(@RequestParam("date") String date, @RequestParam("status") String status, Map<String, Object> model)
+                       throws ParseException {
+               model.put("username", getPrincipalName());
                final long startTime = System.currentTimeMillis();
 
                String realdate;