DMC/scipro
7
0
Fork 0
Code Issues28 Pull Requests2 Actions Projects1 Releases Wiki Activity

indication is removed if the user is the one who makes a change in the checklist

Browse Source
This commit is contained in:
Fredrik Friis 2012-04-13 18:45:05 +09:00
parent d50681c2b7
commit ce82fe1bb9
2 changed files with 22 additions and 12 deletions
src/main/java/se/su/dsv/scipro/checklists/panels
AnswerDialogPanel.javaViewCheckListPanel.java

30
src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.java

@ -7,23 +7,23 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.odlabs.wiquery.ui.dialog.Dialog;
import se.su.dsv.scipro.checklists.panels.AnswerDialogPanel.AnswerDialog;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.data.dao.interfaces.CheckListAnswerDao;
import se.su.dsv.scipro.data.dao.interfaces.CheckListQuestionDao;
import se.su.dsv.scipro.data.dataobjects.CheckListAnswer;
import se.su.dsv.scipro.data.dataobjects.CheckListQuestion;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.data.enums.CheckListQuestionAnswer;
import se.su.dsv.scipro.springdata.services.ChecklistService;
public class AnswerDialogPanel extends Panel {
private static final long serialVersionUID = 1L;
private AnswerDialog dialog;
public AnswerDialogPanel(String id, User currentUser) {
public AnswerDialogPanel(String id, User currentUser, Long checklistId) {
super(id);
dialog = new AnswerDialog("answerDialog", currentUser);
dialog = new AnswerDialog("answerDialog", currentUser, checklistId);
add(dialog);
}
@ -32,35 +32,42 @@ public class AnswerDialogPanel extends Panel {
private static final long serialVersionUID = 1L;
@SpringBean
private CheckListAnswerDao checkListAnswerDao;
private Long checklistId;
@SpringBean
private CheckListQuestionDao checkListQuestionDao;
private final User currentUser;
public AnswerDialog(String id, User currentUser) {
public AnswerDialog(String id, User currentUser, Long checklistId) {
super(id);
this.checklistId = checklistId;
this.currentUser = currentUser;
setModal(true);
setAutoOpen(false);
setWidth(400);
setHeight(400);
add(new AnswerForm("answerForm"));
add(new AnswerForm("answerForm", checklistId));
}
public void dialogContent(CheckListQuestion clq) {
setTitle(clq.getQuestion());
replace(new AnswerForm("answerForm", clq));
replace(new AnswerForm("answerForm", clq, checklistId));
}
private class AnswerForm extends Form<Void> {
@SpringBean
private ChecklistService checklistService;
private static final long serialVersionUID = 1L;
private TrafficLightPanel trafficLights;
private CheckListQuestion clq;
private CheckListAnswer answer;
private TextArea<String> commentArea;
private String comment;
public AnswerForm(String id, CheckListQuestion clq) {
public AnswerForm(String id, CheckListQuestion clq, Long checklistId) {
super(id);
setMultiPart(true);
answer = clq.getAnswerFromUser(currentUser);
@ -81,7 +88,7 @@ public class AnswerDialogPanel extends Panel {
add(commentArea);
}
public AnswerForm(String id) {
public AnswerForm(String id, Long checklistId) {
super(id);
add(new TrafficLightPanel("trafficLights"));
add(new TextArea<String>("commentArea"));
@ -96,6 +103,7 @@ public class AnswerDialogPanel extends Panel {
clq = checkListQuestionDao.reLoad(clq);
clq.addAnswer(checkListAnswerDao.save(clAnswer));
clq = checkListQuestionDao.save(clq);
checklistService.updateUserLastOpenDate(checklistService.findOne(checklistId), SciProSession.get().getUser());
setResponsePage(getPage());
}
}

4
src/main/java/se/su/dsv/scipro/checklists/panels/ViewCheckListPanel.java

@ -37,6 +37,7 @@ public class ViewCheckListPanel extends Panel {
private static final long serialVersionUID = 1L;
private AnswerDialogPanel answerDialog;
private Long checklistId;
@SpringBean
private CheckListDao checkListDao;
@ -55,6 +56,7 @@ public class ViewCheckListPanel extends Panel {
public ViewCheckListPanel(final String id, final Long checkListId) {
super(id);
this.checklistId = checkListId;
checklistService.updateUserLastOpenDate(checklistService.findOne(checkListId), SciProSession.get().getUser());
LoadableDetachableModel<CheckListModel> checkListModel =
new LoadableDetachableModel<CheckListModel>() {
@ -82,7 +84,7 @@ public class ViewCheckListPanel extends Panel {
}
private void initComponents(final IModel<CheckListModel> checkListModel) {
answerDialog = new AnswerDialogPanel("answerDialog", getCurrentUser());
answerDialog = new AnswerDialogPanel("answerDialog", getCurrentUser(), checklistId);
add(answerDialog);
ListView<CheckListQuestion> checkListQuestions =