daily commit
This commit is contained in:
parent
546658093b
commit
7fb6513e4c
src/main/java/se/su/dsv/scipro
admin/pages
data/dao/jpa
project/panels
schedule/baseevent/panels
@ -56,7 +56,5 @@ public class AdminProjectPartnerPage extends AbstractAdminPage {
|
||||
|
||||
|
||||
}
|
||||
|
||||
//generalsystemsettings för att spara datum
|
||||
|
||||
}
|
||||
|
@ -64,6 +64,7 @@ public class EventDaoJPAImp extends LazyDeleteAbstractDaoJPAImp<Event> implement
|
||||
events.addAll(d.getEventsByUserAndProject(u, p, fromDate, toDate, limit));
|
||||
}
|
||||
Collections.sort(events);
|
||||
System.out.println(events);
|
||||
return events;
|
||||
}
|
||||
|
||||
|
@ -58,8 +58,8 @@ public class UpcomingEventPanel extends Panel{
|
||||
protected List<Event> load() {
|
||||
List<Event> list = eventDao.getEventsByUserAndProject(user, project,
|
||||
new Date(), null, null);
|
||||
Collections.reverse(list);
|
||||
/*if(amountToShow < list.size()){
|
||||
//Collections.reverse(list);
|
||||
/*if(amountToShow < list.size()){ //use this to limit the events shown
|
||||
list = list.subList(0, amountToShow);
|
||||
}*/
|
||||
|
||||
|
@ -165,8 +165,10 @@ public abstract class EventSchedulePanel extends Panel {
|
||||
statusIcon = ImageIcon.ICON_EVENT_ALERT;
|
||||
} else {
|
||||
//The event must be upcoming
|
||||
statusMsgModel.setObject("Event upcoming");
|
||||
statusIcon = ImageIcon.ICON_EVENT_UPCOMING;
|
||||
if(event.getDueDate().getTime() > new Date().getTime()){
|
||||
statusMsgModel.setObject("Event upcoming");
|
||||
statusIcon = ImageIcon.ICON_EVENT_UPCOMING;
|
||||
}
|
||||
}
|
||||
|
||||
add(new IconPanel("statusIcon", statusIcon){
|
||||
|
Loading…
x
Reference in New Issue
Block a user