X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FDailyStatisticsController.java;fp=server%2Fcompbio%2Fcontrollers%2FDailyStatisticsController.java;h=d508c82149581aa1ad160e4f5d4d32d85820ee39;hb=6b59d49dbcca1616d74c2814d87faf47e3aa7cf2;hp=142a2981260252a593ae9ab2214dbb1b462ba1af;hpb=95f270e6b3ec72bd29b5ac6e09f803dbaa64380e;p=proteocache.git

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index 142a298..d508c82 100644
--- 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;