DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests6 Actions Projects1 Releases Wiki Activity

Redesigned UpcomingEventsPanel

Browse Source
This commit is contained in:
Fredrik Norberg 2011-07-22 10:39:56 +02:00
parent ad0ed5b84b
commit a2036ab5ec
6 changed files with 20 additions and 22 deletions
src/main
java/se/su/dsv/scipro
data
dao/jpa
EventDaoJPAImp.java
dataobjects
ProjectEvent.java
project
pages
ProjectPartnerPage.java
panels
EventLayoutPanel.htmlEventLayoutPanel.java
webapp/css
scipro.css

1
src/main/java/se/su/dsv/scipro/data/dao/jpa/EventDaoJPAImp.java

@ -64,7 +64,6 @@ public class EventDaoJPAImp extends LazyDeleteAbstractDaoJPAImp<Event> implement
events.addAll(d.getEventsByUserAndProject(u, p, fromDate, toDate, limit)); events.addAll(d.getEventsByUserAndProject(u, p, fromDate, toDate, limit));
} }
Collections.sort(events); Collections.sort(events);
System.out.println(events);
return events; return events;
} }

2
src/main/java/se/su/dsv/scipro/data/dataobjects/ProjectEvent.java

@ -67,7 +67,7 @@ public class ProjectEvent extends Event {
@Override @Override
protected void onFormSubmit(AjaxRequestTarget target) { protected void onFormSubmit(AjaxRequestTarget target) {
System.out.println("On form submitt in event class"); //System.out.println("On form submitt in event class");
callback.doCallback(target); callback.doCallback(target);
} }

1
src/main/java/se/su/dsv/scipro/project/pages/ProjectPartnerPage.java

@ -119,7 +119,6 @@ public class ProjectPartnerPage extends ProjectPage {
wmc.add(dataView); wmc.add(dataView);
wmc.setOutputMarkupId(true); wmc.setOutputMarkupId(true);
pagingNavigator = new PagingNavigator("navigator", dataView); pagingNavigator = new PagingNavigator("navigator", dataView);
System.out.println(dataView.size());
wmc.add(pagingNavigator); wmc.add(pagingNavigator);
add(wmc); add(wmc);

19
src/main/java/se/su/dsv/scipro/project/panels/EventLayoutPanel.html

@ -2,18 +2,17 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body> <body>
<wicket:panel> <wicket:panel>
<div wicket:id="showDetailsIcon" class="left"></div> <p></p>
<a href="#" class="right" wicket:id="eventPageLink"><img wicket:id="eventPageLinkIcon" /></a><div wicket:id="eventDueDate" class="span-1 left month"></div> <span class="event-title" wicket:id="eventTitle">Event title here</span>
<div> <div>
<img wicket:id="eventDeleteIcon" class="right" />
<img wicket:id="eventEditIcon" class="right" />
<div>
<div wicket:id="showDetailsIcon" class="left"></div>
<span wicket:id="eventDueDate" class="span-2 left month"></span>
<div> <div>
<span wicket:id="eventTitle">Event title here</span> <a href="#" wicket:id="eventPageLink"><span wicket:id="statusIcon"></span></a>
</div>
<img wicket:id="eventDeleteIcon" class="right" />
<img wicket:id="eventEditIcon" class="right" />
<span class ="right"></span>
<div wicket:id="statusIcon"></div>
</div> </div>
</div> </div>
<p></p> <p></p>

9
src/main/java/se/su/dsv/scipro/project/panels/EventLayoutPanel.java

@ -23,13 +23,11 @@ import se.su.dsv.scipro.data.dataobjects.Event;
import se.su.dsv.scipro.data.dataobjects.HandInActivity; import se.su.dsv.scipro.data.dataobjects.HandInActivity;
import se.su.dsv.scipro.data.dataobjects.Project; import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.User; import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.icons.ActionIcon;
import se.su.dsv.scipro.icons.AjaxActionIcon; import se.su.dsv.scipro.icons.AjaxActionIcon;
import se.su.dsv.scipro.icons.ExpandContractActionIcon; import se.su.dsv.scipro.icons.ExpandContractActionIcon;
import se.su.dsv.scipro.icons.IconPanel; import se.su.dsv.scipro.icons.IconPanel;
import se.su.dsv.scipro.icons.ImageIcon; import se.su.dsv.scipro.icons.ImageIcon;
import se.su.dsv.scipro.schedule.baseevent.panels.EventScheduleDetailsPanel; import se.su.dsv.scipro.schedule.baseevent.panels.EventScheduleDetailsPanel;
import se.su.dsv.scipro.schedule.calendar.icon.CalendarIconImage;
import se.su.dsv.scipro.util.IAjaxCallback; import se.su.dsv.scipro.util.IAjaxCallback;
import se.su.dsv.scipro.util.JavascriptEventConfirmation; import se.su.dsv.scipro.util.JavascriptEventConfirmation;
import se.su.dsv.scipro.util.WiQueryCoreEffectsHelper; import se.su.dsv.scipro.util.WiQueryCoreEffectsHelper;
@ -56,8 +54,8 @@ public abstract class EventLayoutPanel extends Panel {
//add(new CalendarIconImage("calendarIcon", event.getDueDate())); //add(new CalendarIconImage("calendarIcon", event.getDueDate()));
//add(new DateLabel("month", new Model<Date>(event.getDueDate()), new PatternDateConverter("MMM", false))); //add(new DateLabel("month", new Model<Date>(event.getDueDate()), new PatternDateConverter("MMM", false)));
add(new Label("eventTitle", event.getTitle()));
add(new DateLabel("eventDueDate", new Model<Date>(event.getDueDate()), new PatternDateConverter("yyyy-MM-dd HH:mm", false))); add(new DateLabel("eventDueDate", new Model<Date>(event.getDueDate()), new PatternDateConverter("yyyy-MM-dd HH:mm", false)));
add(new Label("eventTitle", event.getTitle()));
final WebMarkupContainer eventDetailsContainer = new WebMarkupContainer("eventDetailsContainer"); final WebMarkupContainer eventDetailsContainer = new WebMarkupContainer("eventDetailsContainer");
eventDetailsContainer.setOutputMarkupId(true); eventDetailsContainer.setOutputMarkupId(true);
@ -91,8 +89,7 @@ public abstract class EventLayoutPanel extends Panel {
} }
}; };
ImageIcon eventPageLinkIcon = new ImageIcon("eventPageLinkIcon", ActionIcon.ICON_DETAILS);
eventPageLink.add(eventPageLinkIcon);
add(eventPageLink); add(eventPageLink);
add(new AjaxActionIcon("eventEditIcon", AjaxActionIcon.ICON_EDIT){ add(new AjaxActionIcon("eventEditIcon", AjaxActionIcon.ICON_EDIT){
@ -172,7 +169,7 @@ public abstract class EventLayoutPanel extends Panel {
} }
} }
add(new IconPanel("statusIcon", statusIcon){ eventPageLink.add(new IconPanel("statusIcon", statusIcon){
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override

10
src/main/webapp/css/scipro.css

@ -1035,7 +1035,11 @@ div.wicket-aa ul li.selected {
} }
.month{ .month{
font-size: 2em; font-size: 1em;
font-style: strong; font-style: strong;
padding:0.2em; }
.event-title{
font-size: 1.4em;
font-style: strong;
} }