partly working security: registration form, authorization, simple authentification

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

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index 142a298..d508c82 100644 (file)
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -1,5 +1,6 @@
 package compbio.controllers;
 
+import java.security.Principal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -24,8 +25,9 @@ import compbio.statistic.StatisticsProt;
 @Controller
 public class DailyStatisticsController {
 
-       @RequestMapping(value = "/stat", method = RequestMethod.GET)
-       public String initFindForm(Map<String, Object> model) {
+       @RequestMapping(value = "/stat/jobs/query", method = RequestMethod.GET)
+       public String initFindForm(Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
                Calendar cal = Calendar.getInstance();
                String date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DATE);
                cal.add(Calendar.DATE, -3);
@@ -37,9 +39,10 @@ public class DailyStatisticsController {
                return "queryJobStatistics";
        }
 
-       @RequestMapping(value = "/stat/query", method = RequestMethod.GET)
+       @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) {
+                       @RequestParam("option") String option, Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
                final long startTime = System.currentTimeMillis();
 
                CassandraRequester cr = new CassandraRequester();
@@ -59,9 +62,10 @@ public class DailyStatisticsController {
                return "/reportJobStatistics";
        }
 
-       @RequestMapping(value = "/stat/oneday", method = RequestMethod.GET)
-       public String findJobsInOneDay(@RequestParam("date") String date, @RequestParam("status") String status, Map<String, Object> model) throws ParseException {
-
+       @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());
                final long startTime = System.currentTimeMillis();
 
                String realdate;