From c86219062e481244ec9abbb3409a7f184d716c3a Mon Sep 17 00:00:00 2001
From: Celestino Bellone <celestino@exteso.com>
Date: Thu, 6 Aug 2015 17:05:55 +0200
Subject: [PATCH] #66 - sort categories by status

---
 .../alfio/controller/EventController.java     |  4 +-
 .../WEB-INF/templates/event/show-event.ms     | 78 ++-----------------
 .../templates/event/ticket-category.ms        | 72 +++++++++++++++++
 3 files changed, 80 insertions(+), 74 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/templates/event/ticket-category.ms

diff --git a/src/main/java/alfio/controller/EventController.java b/src/main/java/alfio/controller/EventController.java
index c882dcab6b..35c070518c 100644
--- a/src/main/java/alfio/controller/EventController.java
+++ b/src/main/java/alfio/controller/EventController.java
@@ -27,6 +27,7 @@
 import alfio.model.Event;
 import alfio.model.PromoCodeDiscount;
 import alfio.model.SpecialPrice;
+import alfio.model.TicketCategory;
 import alfio.model.modification.TicketReservationWithOptionalCodeModification;
 import alfio.model.modification.support.LocationDescriptor;
 import alfio.model.system.Configuration;
@@ -197,7 +198,8 @@ public String showEvent(@PathVariable("eventName") String eventName,
         final EventDescriptor eventDescriptor = new EventDescriptor(event);
 		model.addAttribute("event", eventDescriptor)//
 			.addAttribute("organizer", organizationRepository.getById(event.getOrganizationId()))
-			.addAttribute("ticketCategories", ticketCategories)//
+			.addAttribute("ticketCategories", ticketCategories.stream().filter(tc -> !tc.getExpired()).collect(Collectors.toList()))//
+			.addAttribute("expiredCategories", ticketCategories.stream().filter(SaleableTicketCategory::getExpired).collect(Collectors.toList()))//
 			.addAttribute("hasAccessPromotions", hasAccessPromotions)
 			.addAttribute("promoCode", specialCode.map(SpecialPrice::getCode).orElse(null))
 			.addAttribute("locationDescriptor", ld)
diff --git a/src/main/webapp/WEB-INF/templates/event/show-event.ms b/src/main/webapp/WEB-INF/templates/event/show-event.ms
index 04a5bd0f62..89bbae331b 100644
--- a/src/main/webapp/WEB-INF/templates/event/show-event.ms
+++ b/src/main/webapp/WEB-INF/templates/event/show-event.ms
@@ -48,7 +48,7 @@
 
 <hr/>
 
-<div class="row">
+<div class="row wMarginBottom">
     <div class="col-xs-12 event-description">
         {{event.description}}
     </div>
@@ -114,79 +114,11 @@
 <form method="post" action="{{request.contextPath}}/event/{{event.shortName}}/reserve-tickets" class="form-horizontal">
 	<ul class="list-group">
 	{{#ticketCategories}}
-		<li class="list-group-item {{#expired}}text-muted{{/expired}} ticket-category-restricted-{{accessRestricted}}">
-			<div class="form-group">
-				<div class="col-sm-7" id="{{id}}-label">
-					<label class="control-label">{{name}}</label>
-					{{^expired}}
-					<div>
-						{{#saleInFuture}}
-							{{#i18n}}show-event.sales-not-started{{/i18n}}
-						{{/saleInFuture}}
-						{{^saleInFuture}}
-							{{#i18n}}show-event.sales-end [{{#format-date}}{{zonedExpiration}} dd.MM.yyyy HH:mm locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}
-						{{/saleInFuture}}
-					</div>
-					{{/expired}}
-					{{#expired}}
-					<div>
-						{{#i18n}}show-event.sales-ended [{{#format-date}}{{zonedExpiration}} dd.MM.yyyy HH:mm locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}
-					</div>
-					{{/expired}}
-					<div>
-						{{description}}
-					</div>
-				</div>
-				<div class="col-sm-3">
-					<label class="control-label">
-						{{#free}}
-							{{#i18n}}common.free{{/i18n}}	
-						{{/free}}
-						{{^free}}
-							{{#expired}}
-                                {{finalPrice}} {{event.currency}}
-                            {{/expired}}
-							{{^expired}}
-                                {{#hasPromoCodeDiscount}}
-                                    <del>{{finalPrice}}</del>
-                                    <mark>{{discountedPrice}}</mark>
-                                    {{event.currency}}
-                                {{/hasPromoCodeDiscount}}
-                                {{^hasPromoCodeDiscount}}
-                                    {{finalPrice}} {{event.currency}}
-                                {{/hasPromoCodeDiscount}}
-                                <i class="fa fa-info-circle text-info tooltip-handler" title="{{#event.vatIncluded}}{{#i18n}}show-event.incVat [{{event.vat}}]{{/i18n}}{{/event.vatIncluded}}{{^event.vatIncluded}}{{#i18n}}show-event.excVat [{{event.vat}}]{{/i18n}}{{/event.vatIncluded}}"></i>
-							{{/expired}}
-						{{/free}}
-					</label>
-				</div>
-				<div class="col-sm-2 text-align-center">
-					{{#saleable}}
-						<input name="reservation[{{-index}}].ticketCategoryId" value="{{id}}" type="hidden">
-						<select aria-labelledby="{{id}}-label" name="reservation[{{-index}}].amount" class="form-control text-align-center" placeholder="0" autocomplete="off">
-							{{#accessRestricted}}
-								<option value="0">0</option>
-								<option value="1">1</option>
-							{{/accessRestricted}}
-							{{^accessRestricted}}
-								{{#amountOfTickets}}<option value="{{this}}">{{this}}</option>{{/amountOfTickets}}
-							{{/accessRestricted}}
-						</select>
-					{{/saleable}}
-					{{^saleable}}
-						<label class="control-label">
-							{{#soldOut}}
-								{{#i18n}}show-event.sold-out{{/i18n}}
-							{{/soldOut}}
-							{{^soldOut}}
-								{{#i18n}}show-event.not-available{{/i18n}}
-							{{/soldOut}}
-						</label>
-					{{/saleable}}
-				</div>
-			</div>
-		</li>
+		{{> /event/ticket-category.ms }}
 	{{/ticketCategories}}
+	{{#expiredCategories}}
+		{{> /event/ticket-category.ms }}
+	{{/expiredCategories}}
 	</ul>
 
 {{#hasPromoCodeDiscount}}
diff --git a/src/main/webapp/WEB-INF/templates/event/ticket-category.ms b/src/main/webapp/WEB-INF/templates/event/ticket-category.ms
new file mode 100644
index 0000000000..2d7f5faaf6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/templates/event/ticket-category.ms
@@ -0,0 +1,72 @@
+<li class="list-group-item {{#expired}}text-muted expired{{/expired}} ticket-category-restricted-{{accessRestricted}}">
+    <div class="form-group">
+        <div class="col-sm-7" id="{{id}}-label">
+            <label class="control-label">{{name}}</label>
+            {{^expired}}
+                <div>
+                    {{#saleInFuture}}
+                        {{#i18n}}show-event.sales-not-started{{/i18n}}
+                    {{/saleInFuture}}
+                    {{^saleInFuture}}
+                        {{#i18n}}show-event.sales-end [{{#format-date}}{{zonedExpiration}} dd.MM.yyyy HH:mm locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}
+                    {{/saleInFuture}}
+                </div>
+            {{/expired}}
+            {{#expired}}
+                <div>
+                    {{#i18n}}show-event.sales-ended [{{#format-date}}{{zonedExpiration}} dd.MM.yyyy HH:mm locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}
+                </div>
+            {{/expired}}
+            <div>
+                {{description}}
+            </div>
+        </div>
+        <div class="col-sm-3">
+            <label class="control-label">
+                {{#free}}
+                    {{#i18n}}common.free{{/i18n}}
+                {{/free}}
+                {{^free}}
+                    {{#expired}}
+                        {{finalPrice}} {{event.currency}}
+                    {{/expired}}
+                    {{^expired}}
+                        {{#hasPromoCodeDiscount}}
+                            <del>{{finalPrice}}</del>
+                            <mark>{{discountedPrice}}</mark>
+                            {{event.currency}}
+                        {{/hasPromoCodeDiscount}}
+                        {{^hasPromoCodeDiscount}}
+                            {{finalPrice}} {{event.currency}}
+                        {{/hasPromoCodeDiscount}}
+                        <i class="fa fa-info-circle text-info tooltip-handler" title="{{#event.vatIncluded}}{{#i18n}}show-event.incVat [{{event.vat}}]{{/i18n}}{{/event.vatIncluded}}{{^event.vatIncluded}}{{#i18n}}show-event.excVat [{{event.vat}}]{{/i18n}}{{/event.vatIncluded}}"></i>
+                    {{/expired}}
+                {{/free}}
+            </label>
+        </div>
+        <div class="col-sm-2 text-align-center">
+            {{#saleable}}
+                <input name="reservation[{{-index}}].ticketCategoryId" value="{{id}}" type="hidden">
+                <select aria-labelledby="{{id}}-label" name="reservation[{{-index}}].amount" class="form-control text-align-center" placeholder="0" autocomplete="off">
+                    {{#accessRestricted}}
+                        <option value="0">0</option>
+                        <option value="1">1</option>
+                    {{/accessRestricted}}
+                    {{^accessRestricted}}
+                        {{#amountOfTickets}}<option value="{{this}}">{{this}}</option>{{/amountOfTickets}}
+                    {{/accessRestricted}}
+                </select>
+            {{/saleable}}
+            {{^saleable}}
+                <label class="control-label">
+                    {{#soldOut}}
+                        {{#i18n}}show-event.sold-out{{/i18n}}
+                    {{/soldOut}}
+                    {{^soldOut}}
+                        {{#i18n}}show-event.not-available{{/i18n}}
+                    {{/soldOut}}
+                </label>
+            {{/saleable}}
+        </div>
+    </div>
+</li>
\ No newline at end of file