- Calendar cal = Calendar.getInstance();
- date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate());
- date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
+ date1 = theEaerlistDate;
+ date2 = theCurrentDate;
+ }
+
+ // dates in string format
+ String trimmeddate1 = date1.replaceAll("\\s", "");
+ String trimmeddate2 = date2.replaceAll("\\s", "");
+ // dates in long format
+ long longDate1 = DateFormatter.DateParsing(date1, formaterYYMMDD);
+ long longDate2 = DateFormatter.DateParsing(date2, formaterYYMMDD);
+ String error = DateChecking(trimmeddate1, trimmeddate2, longDate1, longDate2);
+ if (error != null) {
+ model.put("error", error);
+ model.put("date1", date1);
+ model.put("date2", date2);
+ return "query/JobStatistics";