DMC/scipro
7
0
Fork 0
Code Issues30 Pull Requests3 Actions Projects1 Releases Wiki Activity

indication is now removed when user opens the checklist

Browse Source
This commit is contained in:
Fredrik Friis 2012-04-13 18:33:25 +09:00
parent 906a39096c
commit d50681c2b7
3 changed files with 14 additions and 16 deletions
src/main/java/se/su/dsv/scipro
checklists/panels
ViewCheckListPanel.java
springdata
serviceimpls
ChecklistServiceImpl.java
services
ChecklistService.java

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

@ -1,14 +1,8 @@
package se.su.dsv.scipro.checklists.panels; package se.su.dsv.scipro.checklists.panels;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.extensions.markup.html.basic.SmartLinkLabel; import org.apache.wicket.extensions.markup.html.basic.SmartLinkLabel;
import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebMarkupContainer;
@ -23,22 +17,20 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model; import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.SciProSession; import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.components.SciProTooltipBehavior; import se.su.dsv.scipro.components.SciProTooltipBehavior;
import se.su.dsv.scipro.data.dao.interfaces.CheckListDao; import se.su.dsv.scipro.data.dao.interfaces.CheckListDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao; import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dataobjects.CheckList; import se.su.dsv.scipro.data.dataobjects.*;
import se.su.dsv.scipro.data.dataobjects.CheckListAnswer;
import se.su.dsv.scipro.data.dataobjects.CheckListQuestion;
import se.su.dsv.scipro.data.dataobjects.FileDescription;
import se.su.dsv.scipro.data.dataobjects.Member;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectScheduleEvent;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.data.enums.CheckListQuestionAnswer; import se.su.dsv.scipro.data.enums.CheckListQuestionAnswer;
import se.su.dsv.scipro.data.enums.CheckListRole; import se.su.dsv.scipro.data.enums.CheckListRole;
import se.su.dsv.scipro.repository.FileRepository; import se.su.dsv.scipro.repository.FileRepository;
import se.su.dsv.scipro.springdata.services.ChecklistService;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public class ViewCheckListPanel extends Panel { public class ViewCheckListPanel extends Panel {
@ -54,12 +46,16 @@ public class ViewCheckListPanel extends Panel {
@SpringBean @SpringBean
private ProjectDao projectDao; private ProjectDao projectDao;
@SpringBean
private ChecklistService checklistService;
private Project project; private Project project;
private CheckList checkList; private CheckList checkList;
public ViewCheckListPanel(final String id, final Long checkListId) { public ViewCheckListPanel(final String id, final Long checkListId) {
super(id); super(id);
checklistService.updateUserLastOpenDate(checklistService.findOne(checkListId), SciProSession.get().getUser());
LoadableDetachableModel<CheckListModel> checkListModel = LoadableDetachableModel<CheckListModel> checkListModel =
new LoadableDetachableModel<CheckListModel>() { new LoadableDetachableModel<CheckListModel>() {

1
src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ChecklistServiceImpl.java

@ -34,6 +34,7 @@ public class ChecklistServiceImpl extends AbstractQueryService<CheckList, Long>
} }
@Override @Override
@Transactional ( readOnly = false )
public CheckList updateUserLastOpenDate(CheckList checklist, User user) { public CheckList updateUserLastOpenDate(CheckList checklist, User user) {
checklist.getUserLastOpenDate().put(user, new Date()); checklist.getUserLastOpenDate().put(user, new Date());
return checklistRepo.save(checklist); return checklistRepo.save(checklist);

1
src/main/java/se/su/dsv/scipro/springdata/services/ChecklistService.java

@ -7,6 +7,7 @@ import se.su.dsv.scipro.data.dataobjects.User;
* @author: fred-fri * @author: fred-fri
* date: 2012 03 26 * date: 2012 03 26
*/ */
//@Component
public interface ChecklistService extends CrudService<CheckList, Long>, QueryService<CheckList, Long> { public interface ChecklistService extends CrudService<CheckList, Long>, QueryService<CheckList, Long> {
public CheckList updateUserLastOpenDate(CheckList checklist, User user); public CheckList updateUserLastOpenDate(CheckList checklist, User user);