Skip to content

Commit 5cb284f

Browse files
ghillertghillert
committed
Updating schedule and evaluations
1 parent 8707e4b commit 5cb284f

17 files changed

Lines changed: 3078 additions & 392 deletions

‎src/main/java/com/devnexus/ting/core/model/ScheduleItemList.java‎

Lines changed: 149 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2011 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -48,18 +48,22 @@ public class ScheduleItemList implements Serializable {
4848
private Integer numberOfRooms;
4949
private SortedSet<Date> days;
5050

51-
@XmlElement(name="scheduleItems")
51+
@XmlElement(name="scheduleItems")
5252
private List<ScheduleItem> scheduleItems;
5353

54-
@XmlElement(name="headerItems")
55-
private List<ScheduleItem> headerItems;
56-
private transient Map<Date, List<ScheduleItem>> headerItemsByDate;
54+
@XmlElement(name="headerItems")
55+
private List<ScheduleItem> headerItems;
56+
private transient Map<Date, List<ScheduleItem>> headerItemsByDate;
5757

58-
@XmlElement(name="breakoutItems")
59-
private List<ScheduleItem> breakoutItems;
58+
@XmlElement(name="registrationItems")
59+
private List<ScheduleItem> registrationItems;
60+
private transient Map<Date, List<ScheduleItem>> registrationItemsByDate;
6061

62+
@XmlElement(name="breakoutItems")
63+
private List<ScheduleItem> breakoutItems;
6164

62-
private transient Map<Date, List<ScheduleItem>> breakoutItemsByDate;
65+
66+
private transient Map<Date, List<ScheduleItem>> breakoutItemsByDate;
6367

6468
public SortedSet<Date> getDays() {
6569
return days;
@@ -133,97 +137,142 @@ public void setScheduleItems(List<ScheduleItem> scheduleItems) {
133137
this.scheduleItems = scheduleItems;
134138
}
135139

136-
public List<ScheduleItem> getHeaderItems() {
137-
if (headerItems == null) {
138-
headerItems = new ArrayList<ScheduleItem>();
139-
for (ScheduleItem item : scheduleItems) {
140-
if (isHeaderItem(item)) {
141-
headerItems.add(item);
142-
}
143-
}
144-
}
145-
return headerItems;
146-
}
147-
148-
public List<ScheduleItem> getBreakoutItems() {
149-
if (breakoutItems == null) {
150-
breakoutItems = new ArrayList<ScheduleItem>();
151-
for (ScheduleItem item : scheduleItems) {
152-
if (isBreakoutItem(item)) {
153-
breakoutItems.add(item);
154-
}
155-
}
156-
}
157-
return breakoutItems;
158-
}
159-
160-
public boolean isHeaderItem(ScheduleItem item) {
161-
return !item.getScheduleItemType().equals(ScheduleItemType.SESSION) && !item.getScheduleItemType().equals(ScheduleItemType.BREAK);
162-
}
163-
164-
public boolean isBreakoutItem(ScheduleItem item) {
165-
return item.getScheduleItemType().equals(ScheduleItemType.SESSION);
166-
}
167-
168-
169-
public List<ScheduleItem> findHeaderItemsOnDate(Date search) {
170-
if (headerItemsByDate == null) {
171-
headerItemsByDate = new HashMap<Date, List<ScheduleItem>>(scheduleItems.size());
172-
for (Date date : days) {
173-
for (ScheduleItem item : getHeaderItems()) {
174-
List<ScheduleItem> items = headerItemsByDate.get(date);
175-
if (items == null) {
176-
items = new ArrayList<ScheduleItem>(getHeaderItems().size());
177-
headerItemsByDate.put(date, items);
178-
}
179-
180-
if (item.getFromTime().getDate() == date.getDate()) {
181-
items.add(item);
182-
}
183-
}
184-
}
185-
}
186-
return headerItemsByDate.get(search);
187-
}
188-
189-
public List<ScheduleItem> findBreakoutItemsOnDate(Date search) {
190-
if (breakoutItemsByDate == null) {
191-
breakoutItemsByDate = new HashMap<Date, List<ScheduleItem>>(scheduleItems.size());
192-
for (Date date : days) {
193-
for (ScheduleItem item : getBreakoutItems()) {
194-
List<ScheduleItem> items = breakoutItemsByDate.get(date);
195-
if (items == null) {
196-
items = new ArrayList<ScheduleItem>(getBreakoutItems().size());
197-
breakoutItemsByDate.put(date, items);
198-
}
199-
200-
if (item.getFromTime().getDate() == date.getDate()) {
201-
items.add(item);
202-
}
203-
}
204-
}
205-
}
206-
return breakoutItemsByDate.get(search);
207-
}
208-
209-
public SortedSet<Room> findRooms(Date date) {
210-
211-
SortedSet<Room>rooms = new TreeSet<Room>();
212-
for (ScheduleItem item : findBreakoutItemsOnDate(date)) {
213-
rooms.add(item.getRoom());
214-
}
215-
216-
return rooms;
217-
}
218-
219-
public List<ScheduleItem> findBreakoutItemsOnDateInRoom(Date date, Room room) {
220-
ArrayList<ScheduleItem> items = new ArrayList<ScheduleItem>();
221-
for (ScheduleItem item : findBreakoutItemsOnDate(date)) {
222-
if (item.getRoom().equals(room)) {
223-
items.add(item);
224-
}
225-
}
226-
return items;
227-
}
140+
public List<ScheduleItem> getRegistrationItems() {
141+
if (registrationItems == null) {
142+
registrationItems = new ArrayList<ScheduleItem>();
143+
for (ScheduleItem item : scheduleItems) {
144+
if (isRegistrationItem(item)) {
145+
registrationItems.add(item);
146+
}
147+
}
148+
}
149+
return registrationItems;
150+
}
151+
152+
public List<ScheduleItem> getHeaderItems() {
153+
if (headerItems == null) {
154+
headerItems = new ArrayList<ScheduleItem>();
155+
for (ScheduleItem item : scheduleItems) {
156+
if (isHeaderItem(item)) {
157+
headerItems.add(item);
158+
}
159+
}
160+
}
161+
return headerItems;
162+
}
163+
164+
public List<ScheduleItem> getBreakoutItems() {
165+
if (breakoutItems == null) {
166+
breakoutItems = new ArrayList<ScheduleItem>();
167+
for (ScheduleItem item : scheduleItems) {
168+
if (isBreakoutItem(item)) {
169+
breakoutItems.add(item);
170+
}
171+
}
172+
}
173+
return breakoutItems;
174+
}
175+
176+
public boolean isHeaderItem(ScheduleItem item) {
177+
return !item.getScheduleItemType().equals(ScheduleItemType.SESSION) && !item.getScheduleItemType().equals(ScheduleItemType.BREAK);
178+
}
179+
180+
public boolean isRegistrationItem(ScheduleItem item) {
181+
return item.getScheduleItemType().equals(ScheduleItemType.REGISTRATION);
182+
}
183+
184+
public boolean isBreakoutItem(ScheduleItem item) {
185+
return item.getScheduleItemType().equals(ScheduleItemType.SESSION);
186+
}
187+
188+
public List<ScheduleItem> findRegistrationItemsOnDate(Date search) {
189+
if (registrationItems == null) {
190+
registrationItemsByDate = new HashMap<>();
191+
for (Date date : days) {
192+
for (ScheduleItem item : getRegistrationItems()) {
193+
List<ScheduleItem> items = registrationItemsByDate.get(date);
194+
if (items == null) {
195+
items = new ArrayList<ScheduleItem>(getRegistrationItems().size());
196+
registrationItemsByDate.put(date, items);
197+
}
198+
if (item.getFromTime().getDate() == date.getDate()) {
199+
items.add(item);
200+
}
201+
}
202+
}
203+
}
204+
return registrationItemsByDate.get(search);
205+
}
206+
207+
public List<ScheduleItem> findHeaderItemsOnDate(Date search) {
208+
if (headerItemsByDate == null) {
209+
headerItemsByDate = new HashMap<Date, List<ScheduleItem>>(scheduleItems.size());
210+
for (Date date : days) {
211+
for (ScheduleItem item : getHeaderItems()) {
212+
List<ScheduleItem> items = headerItemsByDate.get(date);
213+
if (items == null) {
214+
items = new ArrayList<ScheduleItem>(getHeaderItems().size());
215+
headerItemsByDate.put(date, items);
216+
}
217+
218+
if (item.getFromTime().getDate() == date.getDate()) {
219+
items.add(item);
220+
}
221+
}
222+
}
223+
}
224+
return headerItemsByDate.get(search);
225+
}
226+
227+
public List<ScheduleItem> findBreakItemsOnDate(Date search) {
228+
final List<ScheduleItem> breakItems = new ArrayList<>();
229+
230+
for (ScheduleItem item : scheduleItems) {
231+
if ((search.getDate() == item.getFromTime().getDate()) && ScheduleItemType.BREAK.equals(item.getScheduleItemType())) {
232+
breakItems.add(item);
233+
}
234+
}
235+
return breakItems;
236+
}
237+
238+
public List<ScheduleItem> findBreakoutItemsOnDate(Date search) {
239+
if (breakoutItemsByDate == null) {
240+
breakoutItemsByDate = new HashMap<Date, List<ScheduleItem>>(scheduleItems.size());
241+
for (Date date : days) {
242+
for (ScheduleItem item : getBreakoutItems()) {
243+
List<ScheduleItem> items = breakoutItemsByDate.get(date);
244+
if (items == null) {
245+
items = new ArrayList<ScheduleItem>(getBreakoutItems().size());
246+
breakoutItemsByDate.put(date, items);
247+
}
248+
249+
if (item.getFromTime().getDate() == date.getDate()) {
250+
items.add(item);
251+
}
252+
}
253+
}
254+
}
255+
return breakoutItemsByDate.get(search);
256+
}
257+
258+
public SortedSet<Room> findRooms(Date date) {
259+
260+
SortedSet<Room>rooms = new TreeSet<Room>();
261+
for (ScheduleItem item : findBreakoutItemsOnDate(date)) {
262+
rooms.add(item.getRoom());
263+
}
264+
265+
return rooms;
266+
}
267+
268+
public List<ScheduleItem> findBreakoutItemsOnDateInRoom(Date date, Room room) {
269+
ArrayList<ScheduleItem> items = new ArrayList<ScheduleItem>();
270+
for (ScheduleItem item : findBreakoutItemsOnDate(date)) {
271+
if (item.getRoom().equals(room)) {
272+
items.add(item);
273+
}
274+
}
275+
return items;
276+
}
228277

229278
}

‎src/main/java/com/devnexus/ting/web/config/WebConfig.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.jboss.aerogear.unifiedpush.SenderClient;
2323
import org.springframework.beans.factory.annotation.Autowired;
24+
import org.springframework.beans.factory.annotation.Qualifier;
2425
import org.springframework.context.MessageSource;
2526
import org.springframework.context.annotation.Bean;
2627
import org.springframework.context.annotation.ComponentScan;
@@ -99,6 +100,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
99100
private Jaxb2Marshaller jaxbMarshaller;
100101

101102
@Autowired
103+
@Qualifier("mvcConversionService")
102104
private ConfigurableConversionService conversionService;
103105

104106
@Autowired
@@ -293,18 +295,18 @@ public SimpleMappingExceptionResolver simpleMappingExceptionResolver() {
293295
public ConfigurableWroFilter wro4jFilter() {
294296
final ConfigurableWroFilter wroFilter = new ConfigurableWroFilter();
295297

296-
wroFilter.setDebug(false);
297-
// wroFilter.setDebug(true);
298-
// wroFilter.setCacheUpdatePeriod(1);
299-
// wroFilter.setModelUpdatePeriod(1);
298+
// wroFilter.setDebug(false);
299+
wroFilter.setDebug(true);
300+
wroFilter.setCacheUpdatePeriod(1);
301+
wroFilter.setModelUpdatePeriod(1);
300302

301303
final ConfigurableWroManagerFactory wroManagerFactory = new ConfigurableWroManagerFactory();
302304
final SimpleProcessorsFactory simpleProcessorsFactory = new SimpleProcessorsFactory();
303305

304306
simpleProcessorsFactory.addPreProcessor(new CssImportPreProcessor());
305307
simpleProcessorsFactory.addPostProcessor(new Less4jProcessor());
306308
simpleProcessorsFactory.addPostProcessor(new YUICssCompressorProcessor());
307-
simpleProcessorsFactory.addPostProcessor(new UglifyJsProcessor());
309+
//simpleProcessorsFactory.addPostProcessor(new UglifyJsProcessor());
308310

309311
wroManagerFactory.setProcessorsFactory(simpleProcessorsFactory);
310312
wroManagerFactory.setModelFactory(new DevNexusWroModelFactory());
@@ -321,9 +323,11 @@ public WroModel create() {
321323
.addResource(Resource.create("/assets/js/jquery.modernizr.js", ResourceType.JS))
322324
.addResource(Resource.create("/assets/js/jquery.scrollTo.js", ResourceType.JS))
323325
.addResource(Resource.create("/assets/js/jquery.easing.min.js", ResourceType.JS))
326+
.addResource(Resource.create("/assets/js/jquery-plugins/jquery.succinct.js", ResourceType.JS))
324327
.addResource(Resource.create("/assets/js/bootstrap.min.js", ResourceType.JS))
325328
.addResource(Resource.create("/assets/js/other/masonry.pkgd.js", ResourceType.JS))
326329
.addResource(Resource.create("/assets/js/jquery-plugins/jquery.fittext.js", ResourceType.JS))
330+
.addResource(Resource.create("/assets/js/other/scrollr.js", ResourceType.JS))
327331
.addResource(Resource.create("/assets/js/other/imagesloaded.pkgd.min.js", ResourceType.JS)));
328332
}
329333

‎src/main/java/com/devnexus/ting/web/controller/SiteController.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public String scheduleForCurrentEvent(final Model model,
8787
@RequestParam(required=false, value="old") boolean old) {
8888

8989
final Event event = businessService.getCurrentEvent();
90+
model.addAttribute("event", event);
9091

9192
if (event != null) {
9293
final ScheduleItemList scheduleItemList = businessService.getScheduleForEvent(event.getId());
@@ -106,6 +107,7 @@ public String scheduleForCurrentEvent(final Model model,
106107
public String newscheduleForCurrentEvent(final Model model) {
107108

108109
final Event event = businessService.getCurrentEvent();
110+
model.addAttribute("event", event);
109111

110112
if (event != null) {
111113
final ScheduleItemList scheduleItemList = businessService.getScheduleForEvent(event.getId());
@@ -141,6 +143,7 @@ public String pastConferences(final Model model) {
141143
public String scheduleV2(@PathVariable("eventKey") String eventKey, final Model model) {
142144

143145
final Event event = businessService.getEventByEventKey(eventKey);
146+
model.addAttribute("event", event);
144147

145148
final ScheduleItemList scheduleItemList = businessService.getScheduleForEvent(event.getId());
146149

0 commit comments

Comments
 (0)