#233 partition expired events: set cutoff date for two week, show sol…

…d tickets statistic
alfio-event · Jan 7, 2017 · 1b92dfd · 1b92dfd
1 parent dad1e6d
commit 1b92dfd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java
@@ -160,12 +160,12 @@ public List<EventStatistic> getAllEvents(Principal principal) {
 
     @RequestMapping(value = "/active-events", method = GET)
     public List<EventStatistic> getAllActiveEvents(Principal principal) {
-        return eventStatisticsManager.getAllEventsWithStatisticsFilteredBy(principal.getName(), event -> !event.expired());
+        return eventStatisticsManager.getAllEventsWithStatisticsFilteredBy(principal.getName(), event -> !event.expiredSince(14));
     }
 
     @RequestMapping(value = "/expired-events", method = GET)
     public List<EventStatistic> getAllExpiredEvents(Principal principal) {
-        return eventStatisticsManager.getAllEventsWithStatisticsFilteredBy(principal.getName(), Event::expired);
+        return eventStatisticsManager.getAllEventsWithStatisticsFilteredBy(principal.getName(), event -> event.expiredSince(14));
     }
 
     @RequestMapping(value = "/events/{name}", method = GET)

diff --git a/src/main/java/alfio/model/Event.java b/src/main/java/alfio/model/Event.java
@@ -294,6 +294,10 @@ private static boolean mustUseFirstAndLastName(Event event) {
     }
 
     public boolean expired() {
-        return ZonedDateTime.now(getZoneId()).truncatedTo(ChronoUnit.DAYS).isAfter(getEnd().truncatedTo(ChronoUnit.DAYS));
+        return expiredSince(0);
+    }
+
+    public boolean expiredSince(int days) {
+        return ZonedDateTime.now(getZoneId()).truncatedTo(ChronoUnit.DAYS).minusDays(days).isAfter(getEnd().truncatedTo(ChronoUnit.DAYS));
     }
 }
diff --git a/src/main/webapp/resources/js/admin/feature/expired-events-list/expired-events-list.html b/src/main/webapp/resources/js/admin/feature/expired-events-list/expired-events-list.html
@@ -31,6 +31,9 @@ <h1 class="panel-title">Past events</h1>
                     </td>
                     <td data-ng-class-even="'active'" class="hidden-xs">{{event.formattedBegin | formatDate}} / {{event.formattedEnd | formatDate}}</td>
                     <td data-ng-class-even="'active'" class="text-right">
+                        <a class="btn btn-primary btn-xs hidden-xs" data-ui-sref="events.single.detail({eventName: event.shortName})">
+                            <i class="fa fa-ticket"></i> {{(event.soldTickets + event.checkedInTickets)}} / {{event.availableSeats}}
+                        </a>
                         <a class="btn btn-primary btn-xs hidden-xs" data-ui-sref="events.single.detail({eventName: event.shortName})">
                             <i class="fa fa-bar-chart"></i> Detail
                         </a>