Lite smärre designändringar i schematemlates, har även skapat en sida för enskilda events
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@524 73ecded7-942e-4092-bab0-0e58ef0ee984
This commit is contained in:
dan-kjel
parent
c93f201a60
commit
e93ef9c8c2
src/main/java/se/su/dsv/scipro/schedule
@ -2,9 +2,29 @@
|
||||
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
|
||||
<body>
|
||||
<wicket:extend>
|
||||
<h4 wicket:id="eventTitle">Event title</h4>
|
||||
<div wicket:id="detailsPanel"></div>
|
||||
<div wicket:id="commentsPanel"></div>
|
||||
<h3 wicket:id="eventTitle">Event title</h3>
|
||||
<div class="span-16 last append-bottom">
|
||||
<strong>Date of event:</strong>
|
||||
<div>
|
||||
<span wicket:id="eventDueDate">Date of event</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="span-16 last append-bottom">
|
||||
<strong>Description:</strong>
|
||||
<div>
|
||||
<span wicket:id="eventDescription"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="span-16 last append-bottom">
|
||||
<strong>Creator:</strong>
|
||||
<div>
|
||||
<span wicket:id="eventCreator"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div wicket:id="classSpecificDetails" class="span-16 last append-bottom"></div>
|
||||
<div wicket:id="commentsPanel" class="span-16 last append-bottom"></div>
|
||||
</wicket:extend>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,11 +1,18 @@
|
||||
package se.su.dsv.scipro.schedule.pages;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.wicket.PageParameters;
|
||||
import org.apache.wicket.datetime.PatternDateConverter;
|
||||
import org.apache.wicket.datetime.markup.html.basic.DateLabel;
|
||||
import org.apache.wicket.markup.html.basic.Label;
|
||||
import org.apache.wicket.markup.html.basic.MultiLineLabel;
|
||||
import org.apache.wicket.model.Model;
|
||||
import org.apache.wicket.spring.injection.annot.SpringBean;
|
||||
|
||||
import se.su.dsv.scipro.SciProSession;
|
||||
import se.su.dsv.scipro.commentthread.panel.CommentThreadPanel;
|
||||
import se.su.dsv.scipro.components.ExpandableMultiLineLabel;
|
||||
import se.su.dsv.scipro.data.dao.interfaces.CommentThreadDao;
|
||||
import se.su.dsv.scipro.data.dao.interfaces.EventDao;
|
||||
import se.su.dsv.scipro.data.dataobjects.Event;
|
||||
@ -17,8 +24,6 @@ public class EventPage extends SchedulePage {
|
||||
|
||||
@SpringBean
|
||||
private CommentThreadDao commentThreadDao;
|
||||
|
||||
private Event event;
|
||||
|
||||
public EventPage(PageParameters pp) {
|
||||
super(pp);
|
||||
@ -28,14 +33,18 @@ public class EventPage extends SchedulePage {
|
||||
//TODO: 404
|
||||
}
|
||||
|
||||
event = eventDao.load(eventId);
|
||||
final Event event = eventDao.load(eventId);
|
||||
|
||||
if(!projectDao.isPartOf(SciProSession.get().getUser(), project)){
|
||||
System.out.println("Not allowed!");
|
||||
}
|
||||
|
||||
add(new Label("eventTitle", event.getTitle()));
|
||||
add(event.getDisplayPanel("detailsPanel"));
|
||||
add(new DateLabel("eventDueDate", new Model<Date>(event.getDueDate()), new PatternDateConverter("yyyy-MM-dd HH:mm", false)));
|
||||
add(event.getCreator().getDisplayComponent("eventCreator"));
|
||||
String desc = event.getDescription() == null ? "This event has no description" : event.getDescription();
|
||||
add(new ExpandableMultiLineLabel("eventDescription", 200, desc, true));
|
||||
add(event.getScheduleDetailsPanel("classSpecificDetails"));
|
||||
|
||||
add(new CommentThreadPanel("commentsPanel", "Event", event.getId(), 10));
|
||||
}
|
||||
|
||||
@ -2,8 +2,12 @@
|
||||
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
|
||||
<body>
|
||||
<wicket:panel>
|
||||
<span>Creator: </span><span wicket:id="creator"></span>
|
||||
<div class="prepend-top append-bottom">
|
||||
<strong>Creator:</strong>
|
||||
<div class="append-bottom">
|
||||
<span wicket:id="creator"></span>
|
||||
</div>
|
||||
<strong>Description:</strong>
|
||||
<div class="append-bottom">
|
||||
<span wicket:id="eventDescription"></span>
|
||||
</div>
|
||||
<div wicket:id="classSpecificDetails"></div>
|
||||
|
||||
@ -94,25 +94,6 @@ public class EventPanel extends Panel {
|
||||
pp.add("eid", String.valueOf(event.getId()));
|
||||
setResponsePage(EventPage.class, pp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isVisible(){
|
||||
if(SciProSession.get().authorizedForRole(Roles.SYSADMIN)){
|
||||
return true;
|
||||
}
|
||||
if(event.getDueDate().before(new Date())){
|
||||
return false;
|
||||
}
|
||||
|
||||
if(event instanceof GroupEvent){
|
||||
User loggedInUser = SciProSession.get().getUser();
|
||||
if(loggedInUser.equals(event.getCreator())){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
ImageIcon eventPageLinkIcon = new ImageIcon("eventPageLinkIcon", ActionIcon.ICON_DETAILS);
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<body>
|
||||
<wicket:panel>
|
||||
|
||||
<span>Participants:</span>
|
||||
<strong>Participants:</strong>
|
||||
<div class="scheduleEventParticipants" wicket:id="eventParticipants">
|
||||
<span wicket:id="participant" class="icon icon-project">Event participant here</span>
|
||||
</div>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
|
||||
<body>
|
||||
<wicket:panel>
|
||||
<span>Participants:</span>
|
||||
<strong>Participants:</strong>
|
||||
<div class="scheduleEventParticipants" wicket:id="eventParticipants">
|
||||
<span wicket:id="participant">Event participant here</span>
|
||||
</div>
|
||||
|
||||
@ -2,78 +2,66 @@
|
||||
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
|
||||
<body>
|
||||
<wicket:panel>
|
||||
<div class="span-22 last">
|
||||
<span>Mindre textareas...</span>
|
||||
<div class="span-22 last">
|
||||
<div class="info-box rounded-box span-9 append-1">
|
||||
<span>Always remember to hit save if you've made any changes</span>
|
||||
</div>
|
||||
|
||||
<div class="info-box rounded-box span-9 last">
|
||||
<span>Drag and drop the events to order them</span>
|
||||
</div>
|
||||
|
||||
<form wicket:id="templateForm">
|
||||
<div class="span-10 append-1 ">
|
||||
<fieldset>
|
||||
<legend>General</legend>
|
||||
<div class="formRow">
|
||||
<span>Name:</span><br />
|
||||
<input type="text" wicket:id="templateName" name="templateName" />
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<span>Description:</span><br />
|
||||
<textarea wicket:id="templateDescription" name="templateDescription"></textarea>
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<span>Active:</span>
|
||||
<input type="checkbox" wicket:id="active" name="active" />
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<span>Days total: </span><span wicket:id="totalEstimatedTime">Number of days</span>
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<input type="submit" wicket:id="saveButton" />
|
||||
<input type="submit" wicket:id="cancelButton" />
|
||||
<div wicket:id="feedbackContainer">
|
||||
<div wicket:id="feedbackPanel"></div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<!--
|
||||
<div class="info-box rounded-box span-5 last">
|
||||
<span>Always remember to hit save if you've made any changes</span>
|
||||
<div class="formRow">
|
||||
<span>Name:</span><br />
|
||||
<input type="text" wicket:id="templateName" name="templateName" />
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<span>Description:</span><br />
|
||||
<textarea wicket:id="templateDescription" name="templateDescription"></textarea>
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<span>Active:</span>
|
||||
<input type="checkbox" wicket:id="active" name="active" />
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<span>Days total: </span><span wicket:id="totalEstimatedTime">Number of days</span>
|
||||
</div>
|
||||
<div class="formRow">
|
||||
<input type="submit" wicket:id="saveButton" />
|
||||
<input type="submit" wicket:id="cancelButton" />
|
||||
<div wicket:id="feedbackContainer">
|
||||
<div wicket:id="feedbackPanel"></div>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
<div class="span-9 last">
|
||||
<fieldset>
|
||||
<legend>Events</legend>
|
||||
<!--
|
||||
<div class="span-4 append-1">
|
||||
<p>Organize the events</p>
|
||||
<div class="span-11 last">
|
||||
<div class="formRow">
|
||||
<img wicket:id="addEventTemplate" /><span>Add event template to schedule</span>
|
||||
<div wicket:id="addEventTemplateContainer" class="rounded-box" style="display:none;">
|
||||
<div wicket:id="addEventTemplateFormPanel"></div>
|
||||
</div>
|
||||
<div class="info-box rounded-box span-4 last">
|
||||
<span>Drag and drop the events to order them</span>
|
||||
</div>
|
||||
-->
|
||||
<div class="formRow">
|
||||
<img wicket:id="addEventTemplate" /><span>Add event template to schedule</span>
|
||||
<div wicket:id="addEventTemplateContainer" class="rounded-box" style="display:none;">
|
||||
<div wicket:id="addEventTemplateFormPanel"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div wicket:id="eventTemplateListContainer">
|
||||
<div wicket:id="eventTemplates" class="connectedSortable rounded-box">
|
||||
<div>
|
||||
<div class="box-title">
|
||||
<span wicket:id="eventTemplateTitle">Event template title</span>
|
||||
<img wicket:id="deleteEventTemplateIcon" class="right" />
|
||||
<img wicket:id="editEventTemplateIcon" class="right"></img>
|
||||
</div>
|
||||
<div>
|
||||
<span>Estimated days:</span><span wicket:id="eventTemplateTimeConsumption">Event template time consumption</span>
|
||||
</div>
|
||||
</div>
|
||||
<div wicket:id="eventTemplateListContainer">
|
||||
<div wicket:id="eventTemplates" class="connectedSortable rounded-box">
|
||||
<div>
|
||||
<div class="box-title">
|
||||
<span wicket:id="eventTemplateTitle">Event template title</span>
|
||||
<img wicket:id="deleteEventTemplateIcon" class="right" />
|
||||
<img wicket:id="editEventTemplateIcon" class="right"></img>
|
||||
</div>
|
||||
<div>
|
||||
<span>Estimated days:</span><span wicket:id="eventTemplateTimeConsumption">Event template time consumption</span>
|
||||
</div>
|
||||
<div wicket:id="editEventTemplateContainer">
|
||||
<div wicket:id="eventTemplateFormContainer">
|
||||
<div wicket:id="editEventTemplateFormPanel"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div wicket:id="editEventTemplateContainer">
|
||||
<div wicket:id="eventTemplateFormContainer">
|
||||
<div wicket:id="editEventTemplateFormPanel"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user