DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

Merge branch 'rmverification' into develop

Browse Source
This commit is contained in:
Rasmus Ivö 2012-02-14 13:23:35 +01:00
commit ffb3727a42
15 changed files with 124 additions and 89 deletions

2
src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionPanel.java

@ -26,6 +26,7 @@ import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.match.dao.interfaces.ExemptionDao;
import se.su.dsv.scipro.match.dao.interfaces.ExemptionDaoParams;
import se.su.dsv.scipro.match.dataobject.Exemption;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
public class AdminExemptionPanel extends Panel {
@ -138,6 +139,7 @@ public class AdminExemptionPanel extends Panel {
};
item.add(removeLink);
removeLink.add(new ImageObject("removeIcon", ImageObject.SIXTEEN + ImageObject.DELETE));
removeLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this?"));
}

10
src/main/java/se/su/dsv/scipro/admin/panels/AdminListCheckListTemplatePanel.java

@ -38,6 +38,7 @@ import se.su.dsv.scipro.data.dataobjects.ProjectEventTemplate;
import se.su.dsv.scipro.data.dataobjects.ScheduleTemplate;
import se.su.dsv.scipro.data.enums.CheckListRole;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
/**
* @author Fredrik Norberg - fnorbe@dsv.su.se
@ -220,7 +221,7 @@ public class AdminListCheckListTemplatePanel extends Panel{
target.addComponent(container);
}
/*
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
return new AjaxCallDecorator() {
@ -234,11 +235,14 @@ public class AdminListCheckListTemplatePanel extends Panel{
}
};
}
*/
};
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this template?"));
item.add(deleteLink);
CheckListTemplate clt = item.getModelObject();
for (ScheduleTemplate st : scheduleDao.findAll()){

4
src/main/java/se/su/dsv/scipro/admin/panels/AdminViewCheckListTemplatePanel.java

@ -25,6 +25,7 @@ import se.su.dsv.scipro.data.dao.interfaces.CheckListTemplateDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dataobjects.CheckListTemplate;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
public class AdminViewCheckListTemplatePanel extends Panel {
private static final long serialVersionUID = 1L;
@ -133,7 +134,8 @@ public class AdminViewCheckListTemplatePanel extends Panel {
}
};
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this question?"));
}
};
//Setup response callback

5
src/main/java/se/su/dsv/scipro/checklists/panels/FunctionalListCheckListTemplatePanel.java

@ -33,6 +33,7 @@ import se.su.dsv.scipro.dataproviders.CheckListTemplateDataProvider;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.reusable.FilterBooleanPanel;
import se.su.dsv.scipro.reusable.FilterStringPanel;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
/**
*
@ -228,6 +229,8 @@ public class FunctionalListCheckListTemplatePanel extends Panel{
checklistTemplateDao.delete(clt2);
ajaxRefresh(target);
}
/*
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
return new AjaxCallDecorator() {
@ -240,9 +243,11 @@ public class FunctionalListCheckListTemplatePanel extends Panel{
}
};
}
*/
};
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this template?"));
item.setOutputMarkupId(true);
}
}; //finish adding stuff to the rows inside the list

2
src/main/java/se/su/dsv/scipro/commentthread/panels/CommentThreadPanel.java

@ -38,6 +38,7 @@ import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.message.panels.CustomPagingNavigator;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
/**
* @author Johan Aschan - aschan@dsv.su.se
@ -148,6 +149,7 @@ public class CommentThreadPanel extends Panel {
CommentDeleteLink commentDeleteLink = new CommentDeleteLink("deleteComment", c);
CommentEditLink commentEditLink = new CommentEditLink("editComment", c);
commentDeleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this?"));
item.add(commentDeleteLink);
// item.add(commentEditLink);

2
src/main/java/se/su/dsv/scipro/components/autocomplete/MultiObjectAutoCompleteField.java

@ -46,6 +46,7 @@ import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.value.IValueMap;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
/**
* Wicket component for selecting a single object of type T with an identifier of type I via
@ -212,6 +213,7 @@ public class MultiObjectAutoCompleteField<O extends Serializable/* object */,I /
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.SIXTEEN + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this?"));
add(item);
}

2
src/main/java/se/su/dsv/scipro/components/autocomplete/TeamMemberMultiObjectAutoCompleteField.java

@ -31,6 +31,7 @@ import se.su.dsv.scipro.data.dataobjects.ProjectTeamMember;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.data.enums.ProjectTeamMemberRoles;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
public class TeamMemberMultiObjectAutoCompleteField<O extends ProjectTeamMember/* object */,I /* its id */ extends Serializable> extends MultiObjectAutoCompleteField<O,I>{
@ -118,6 +119,7 @@ public class TeamMemberMultiObjectAutoCompleteField<O extends ProjectTeamMember/
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this?"));
add(item);
}
};

2
src/main/java/se/su/dsv/scipro/components/autocomplete/UserProjectMultiObjectAutoCompleteField.java

@ -54,6 +54,7 @@ import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.opponent.models.OpponentModel;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
/**
* Wicket component for selecting a single object of type T with an identifier
@ -248,6 +249,7 @@ public class UserProjectMultiObjectAutoCompleteField<O extends Serializable/* ob
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.SIXTEEN + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this?"));
final DropDownChoice<Project> projectDropDown = new DropDownChoice<Project>(
"project", new Model<Project>(),

113
src/main/java/se/su/dsv/scipro/conference/panels/ConferencePanel.java

@ -116,48 +116,12 @@ public class ConferencePanel extends Panel {
item.add(new DateFormatter(DateFormatter.FORMAT.EXTENDED).createFormattedDateLabel("messageDate", bm.getDateCreated()));
ConfirmLink deleteLink = new ConfirmLink("delete", "Any comments on the message will be removed. Continue?"){
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
MessageBoard mb = messageBoardModel.getObject();
mb.removeFromBoardMessages(boardMessageDao.reLoad(bm));
messageBoardDao.save(mb);
boardMessageDao.delete(boardMessageDao.reLoad(bm));
webMarkupContainer.removeAll();
loadUserDataView(new BoardMessageDataProvider(messageBoardModel));
webMarkupContainer.add(dataView);
webMarkupContainer.add(new PagingNavigator("pagingNavigator", dataView));
target.addComponent(webMarkupContainer);
}
@Override
public boolean isVisible() {
// SciProSession session = SciProSession.get();
// if (session.authorizedForRole(Roles.ADMIN))
// return true;
// return false;
//
if (bm.getFromUser().equals(SciProSession.get().getUser())){
return true;
}
else {
return false;
}
}
};
// AjaxLink<Void> deleteLink = new AjaxLink<Void>("delete"){
//
// ConfirmLink deleteLink = new ConfirmLink("delete", "Any comments on the message will be removed. Continue?"){
//
// private static final long serialVersionUID = 1L;
//
//
// @Override
// public void onClick(AjaxRequestTarget target) {
//
// MessageBoard mb = messageBoardModel.getObject();
// mb.removeFromBoardMessages(boardMessageDao.reLoad(bm));
// messageBoardDao.save(mb);
@ -167,8 +131,8 @@ public class ConferencePanel extends Panel {
// webMarkupContainer.add(dataView);
// webMarkupContainer.add(new PagingNavigator("pagingNavigator", dataView));
// target.addComponent(webMarkupContainer);
//
// }
//
//
// @Override
// public boolean isVisible() {
@ -176,7 +140,7 @@ public class ConferencePanel extends Panel {
//// if (session.authorizedForRole(Roles.ADMIN))
//// return true;
//// return false;
////
////
// if (bm.getFromUser().equals(SciProSession.get().getUser())){
// return true;
// }
@ -184,11 +148,48 @@ public class ConferencePanel extends Panel {
// return false;
// }
// }
//
// };
AjaxLink<Void> deleteLink = new AjaxLink<Void>("delete"){
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
MessageBoard mb = messageBoardModel.getObject();
mb.removeFromBoardMessages(boardMessageDao.reLoad(bm));
messageBoardDao.save(mb);
boardMessageDao.delete(boardMessageDao.reLoad(bm));
webMarkupContainer.removeAll();
loadUserDataView(new BoardMessageDataProvider(messageBoardModel));
webMarkupContainer.add(dataView);
webMarkupContainer.add(new PagingNavigator("pagingNavigator", dataView));
target.addComponent(webMarkupContainer);
}
@Override
public boolean isVisible() {
// SciProSession session = SciProSession.get();
// if (session.authorizedForRole(Roles.ADMIN))
// return true;
// return false;
//
if (bm.getFromUser().equals(SciProSession.get().getUser())){
return true;
}
else {
return false;
}
}
};
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.SIXTEEN + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Any comments on the message will be removed. Continue?"));
int commentSize = commentThreadDao.getCommentThreadSize(bm);
String comments = " Comments";
@ -345,19 +346,19 @@ public class ConferencePanel extends Panel {
}
}
abstract public class ConfirmLink extends AjaxLink {
/**
*
*/
private static final long serialVersionUID = 1L;
public ConfirmLink(String id, String msg) {
super(id);
add(new JavascriptEventConfirmation("onclick", msg));
}
@Override
abstract public void onClick(AjaxRequestTarget target);
}
// abstract public class ConfirmLink extends AjaxLink {
// /**
// *
// */
// private static final long serialVersionUID = 1L;
//
// public ConfirmLink(String id, String msg) {
// super(id);
// add(new JavascriptEventConfirmation("onclick", msg));
// }
//
// @Override
// abstract public void onClick(AjaxRequestTarget target);
//
// }
}

37
src/main/java/se/su/dsv/scipro/message/panels/SentMessagesPanel.java

@ -32,6 +32,7 @@ import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.message.models.MessageListModel;
import se.su.dsv.scipro.message.models.ViewMessageModel;
import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
public class SentMessagesPanel extends Panel {
private static final long serialVersionUID = -7916059356375447441L;
@ -139,9 +140,9 @@ public class SentMessagesPanel extends Panel {
public JsScope callback() {
return JsScope.quickScope(new JsStatement().$(item).toggleClass("active"));
}
}));
rdl.add(new JavascriptEventConfirmation("onclick", "Do you really want do delete this message: \"" + rdl.privateMessage.getSubject() + "\"?"));
item.add(rdl);
}
};
@ -203,22 +204,24 @@ public class SentMessagesPanel extends Panel {
/* (non-Javadoc)
* @see org.apache.wicket.ajax.markup.html.AjaxLink#getAjaxCallDecorator()
*/
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
return new AjaxCallDecorator() {
private static final long serialVersionUID = 8989126586010432130L;
/* (non-Javadoc)
* @see org.apache.wicket.ajax.calldecorator.AjaxCallDecorator#decorateScript(java.lang.CharSequence)
*/
@Override
public CharSequence decorateScript(CharSequence script) {
String subj = privateMessage.getSubject();
String ret = "if(!confirm('Do you really want do delete this message: \"" + subj + "\"?')) return false; " + script;
return ret;
}
};
}
// @Override
// protected IAjaxCallDecorator getAjaxCallDecorator() {
// return new AjaxCallDecorator() {
// private static final long serialVersionUID = 8989126586010432130L;
//
// /* (non-Javadoc)
// * @see org.apache.wicket.ajax.calldecorator.AjaxCallDecorator#decorateScript(java.lang.CharSequence)
// */
// @Override
// public CharSequence decorateScript(CharSequence script) {
// String subj = privateMessage.getSubject();
// String ret = "if(!confirm('Do you really want do delete this message: \"" + subj + "\"?')) return false; " + script;
// return ret;
// }
// };
// }
}

6
src/main/java/se/su/dsv/scipro/opponent/panels/FinalSeminarDetailsPanel.java

@ -156,7 +156,7 @@ public class FinalSeminarDetailsPanel extends Panel {
private static final long serialVersionUID = 1L;
{
MetaDataActionStrategy.authorize(this, Roles.ADMIN);
this.add(new JavascriptEventConfirmation("onclick", "Do you really want to delete this user-uploaded report?"));
//this.add(new JavascriptEventConfirmation("onclick", "Do you really want to delete this user-uploaded report?"));
}
@Override
@ -178,6 +178,7 @@ public class FinalSeminarDetailsPanel extends Panel {
oppCon.add(deleteOppositionLink);
deleteOppositionLink.add(new ImageObject("deleteIcon", ImageObject.SIXTEEN + ImageObject.DELETE));
deleteOppositionLink.add(new JavascriptEventConfirmation("onclick", "Do you really want to delete this user-uploaded report?"));
add(item);
}
@ -221,7 +222,7 @@ public class FinalSeminarDetailsPanel extends Panel {
private static final long serialVersionUID = 1L;
{
MetaDataActionStrategy.authorize(this, Roles.ADMIN);
this.add(new JavascriptEventConfirmation("onclick", "Do you really want to delete this user-uploaded report?"));
// this.add(new JavascriptEventConfirmation("onclick", "Do you really want to delete this user-uploaded report?"));
}
@Override
@ -240,6 +241,7 @@ public class FinalSeminarDetailsPanel extends Panel {
uploadInfoContainer.add(deleteSeminarReportLink);
deleteSeminarReportLink.add(new ImageObject("deleteIcon", ImageObject.SIXTEEN + ImageObject.DELETE));
deleteSeminarReportLink.add(new JavascriptEventConfirmation("onclick", "Do you really want to delete this user-uploaded report?"));
detailsContainer.add(uploadInfoContainer);
add(detailsContainer);

5
src/main/java/se/su/dsv/scipro/opponent/panels/OpponentListViewPanel.java

@ -37,6 +37,7 @@ import se.su.dsv.scipro.data.enums.ProjectTeamMemberRoles;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.opponent.models.OpponentModel;
import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
/**
* @author Johan Aschan - aschan@dsv.su.se
@ -223,7 +224,7 @@ public class OpponentListViewPanel extends Panel {
public boolean isVisible() {
return adminView;
}
/*
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
return new AjaxCallDecorator() {
@ -237,11 +238,13 @@ public class OpponentListViewPanel extends Panel {
}
};
}
*/
};
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "The attendees of this seminar will NOT be notified that the seminar has been deleted, are you sure you wish to delete it?"));
}
};

13
src/main/java/se/su/dsv/scipro/opponent/panels/ProjectFinalSeminarPanel.java

@ -46,10 +46,7 @@ import se.su.dsv.scipro.repository.FileRepository;
import se.su.dsv.scipro.repository.SortOrder;
import se.su.dsv.scipro.repository.components.FileDownloadLink;
import se.su.dsv.scipro.repository.components.FileOpenLink;
import se.su.dsv.scipro.util.CollectionFilterUtil;
import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.util.Predicate;
import se.su.dsv.scipro.util.TurnitinComponent;
import se.su.dsv.scipro.util.*;
public class ProjectFinalSeminarPanel extends Panel {
@ -235,8 +232,12 @@ public class ProjectFinalSeminarPanel extends Panel {
}
};
deleteReportForm.add(new SubmitLink("deleteReportSubmitLink").add(new ImageObject("deleteIcon", ImageObject.SIXTEEN + ImageObject.DELETE)));
uploadInfoContainer.add(deleteReportForm);
SubmitLink deleteLink = new SubmitLink("deleteReportSubmitLink");
deleteLink.add(new ImageObject("deleteIcon", ImageObject.SIXTEEN + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this?"));
deleteReportForm.add(deleteLink);
uploadInfoContainer.add(deleteReportForm);
add(uploadInfoContainer);
add(new Label("noOpponentsMessage", "No opponents signed up yet.") {

5
src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestListPanel.java

@ -29,6 +29,7 @@ import se.su.dsv.scipro.peer.data.dao.interfaces.PeerRequestDao;
import se.su.dsv.scipro.peer.data.dataobjects.PeerRequest;
import se.su.dsv.scipro.peer.enums.RequestStatus;
import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
public class PeerRequestListPanel extends Panel {
@ -102,7 +103,7 @@ public class PeerRequestListPanel extends Panel {
public boolean isVisible() {
return peerRequest.getStatus() == RequestStatus.WAITING;
}
/*
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
return new AjaxCallDecorator() {
@ -115,11 +116,13 @@ public class PeerRequestListPanel extends Panel {
}
};
}
*/
};
item.add(deleteLink);
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you wish to cancel this waiting Peer request?"));
}
};

5
src/main/java/se/su/dsv/scipro/project/panels/ProjectPartnerPanel.java

@ -25,6 +25,7 @@ import se.su.dsv.scipro.data.dataobjects.ProjectPartner;
import se.su.dsv.scipro.dataproviders.ProjectPartnerDataProvider;
import se.su.dsv.scipro.icons.ImageObject;
import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
public class ProjectPartnerPanel extends Panel {
@ -136,9 +137,9 @@ public class ProjectPartnerPanel extends Panel {
}
};
item.add(deleteLink);
deleteLink.add(new JavascriptEventConfirmation("onclick", "Are you sure you want to remove this project partner application?"));
deleteLink.add(new ImageObject("deleteIcon", ImageObject.TWENTYFOUR + ImageObject.DELETE));
item.add(deleteLink);
}