X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FDailyStatisticsController.java;h=d6a0c1eaeebbb4e27d41e7b957f33eb2d6b4277a;hb=c1ae48e93c766434005e5d5201af8ad23bc0a59b;hp=142a2981260252a593ae9ab2214dbb1b462ba1af;hpb=bf5e83e2959a3b88963cb9a8da68fc50ce4329af;p=proteocache.git

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index 142a298..d6a0c1e 100644
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -22,10 +22,11 @@ import compbio.statistic.StatisticsProt;
  * @author Natasha Sherstneva
  */
 @Controller
-public class DailyStatisticsController {
+public class DailyStatisticsController extends BasicController {
 
-	@RequestMapping(value = "/stat", method = RequestMethod.GET)
+	@RequestMapping(value = "/stat/jobs/query", method = RequestMethod.GET)
 	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);
@@ -34,12 +35,13 @@ public class DailyStatisticsController {
 		model.put("date1", date1);
 		model.put("date2", date2);
 
-		return "queryJobStatistics";
+		return "query/JobStatistics";
 	}
 
-	@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) {
+		model.put("username", getPrincipalName());
 		final long startTime = System.currentTimeMillis();
 
 		CassandraRequester cr = new CassandraRequester();
@@ -59,9 +61,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)
+			throws ParseException {
+		model.put("username", getPrincipalName());
 		final long startTime = System.currentTimeMillis();
 
 		String realdate;