Merge branch 'master' into servlets

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

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index b6d5bde..d6a0c1e 100644 (file)
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -4,7 +4,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Controller;
@@ -12,19 +11,22 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import compbio.engine.JobStatus;
 import compbio.cassandra.DateBean;
 import compbio.cassandra.TotalJobsStatisticBean;
 import compbio.statistic.CassandraRequester;
+import compbio.statistic.StatisticsProt;
 
 /**
  * @author Alexander Sherstnev
  * @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);
@@ -33,18 +35,19 @@ 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();
                if (option.equals("AllDates,off")) {
                        Calendar cal = Calendar.getInstance();
-                       date1 = cr.earliestDateString();
+                       date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate());
                        date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
                }
                model.put("date1", date1);
@@ -58,8 +61,10 @@ public class DailyStatisticsController {
                return "/reportJobStatistics";
        }
 
-       @RequestMapping(value = "/stat/oneday", method = RequestMethod.GET)
-       public String findJobsInOneDay(@RequestParam("date") String date, 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;
@@ -76,13 +81,18 @@ public class DailyStatisticsController {
                        realdate = date;
                }
 
+               if (null == JobStatus.getJobStatus(status)) {
+                       return "support/Notimplemented";
+               }
+
                CassandraRequester cr = new CassandraRequester();
                // IMPORTANT: input should be suppied in the format: DD/MM/YYYY
-               DateBean r = cr.readJobByDay(realdate);
+               DateBean r = cr.readJobByDay(realdate, JobStatus.getJobStatus(status));
                model.put("results", r);
                if (r != null)
                        model.put("njobs", r.getJobidAndSeq().size());
                model.put("date", realdate);
+               model.put("status", status);
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                return "/reportJobStatisticsOneDay";