From d50681c2b7feb38b6feb3687f8cbb0abc93130df Mon Sep 17 00:00:00 2001
From: Fredrik Friis <fred-fri@dsv.su.se>
Date: Fri, 13 Apr 2012 18:33:25 +0900
Subject: [PATCH] indication is now removed when user opens the checklist
---
.../checklists/panels/ViewCheckListPanel.java | 28 ++++++++-----------
.../serviceimpls/ChecklistServiceImpl.java | 1 +
.../springdata/services/ChecklistService.java | 1 +
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/checklists/panels/ViewCheckListPanel.java b/src/main/java/se/su/dsv/scipro/checklists/panels/ViewCheckListPanel.java
index ff214e944d..94ad3841b0 100644
--- a/src/main/java/se/su/dsv/scipro/checklists/panels/ViewCheckListPanel.java
+++ b/src/main/java/se/su/dsv/scipro/checklists/panels/ViewCheckListPanel.java
@@ -1,14 +1,8 @@
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.markup.html.AjaxLink;
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.markup.ComponentTag;
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.PropertyModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.components.SciProTooltipBehavior;
import se.su.dsv.scipro.data.dao.interfaces.CheckListDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
-import se.su.dsv.scipro.data.dataobjects.CheckList;
-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.dataobjects.*;
import se.su.dsv.scipro.data.enums.CheckListQuestionAnswer;
import se.su.dsv.scipro.data.enums.CheckListRole;
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 {
@@ -54,12 +46,16 @@ public class ViewCheckListPanel extends Panel {
@SpringBean
private ProjectDao projectDao;
-
+
+ @SpringBean
+ private ChecklistService checklistService;
+
private Project project;
private CheckList checkList;
public ViewCheckListPanel(final String id, final Long checkListId) {
super(id);
+ checklistService.updateUserLastOpenDate(checklistService.findOne(checkListId), SciProSession.get().getUser());
LoadableDetachableModel<CheckListModel> checkListModel =
new LoadableDetachableModel<CheckListModel>() {
diff --git a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ChecklistServiceImpl.java b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ChecklistServiceImpl.java
index b626029ab7..5f2cc18db3 100644
--- a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ChecklistServiceImpl.java
+++ b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ChecklistServiceImpl.java
@@ -34,6 +34,7 @@ public class ChecklistServiceImpl extends AbstractQueryService<CheckList, Long>
}
@Override
+ @Transactional ( readOnly = false )
public CheckList updateUserLastOpenDate(CheckList checklist, User user) {
checklist.getUserLastOpenDate().put(user, new Date());
return checklistRepo.save(checklist);
diff --git a/src/main/java/se/su/dsv/scipro/springdata/services/ChecklistService.java b/src/main/java/se/su/dsv/scipro/springdata/services/ChecklistService.java
index 9213a4ef15..8f2735248b 100644
--- a/src/main/java/se/su/dsv/scipro/springdata/services/ChecklistService.java
+++ b/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
* date: 2012 03 26
*/
+//@Component
public interface ChecklistService extends CrudService<CheckList, Long>, QueryService<CheckList, Long> {
public CheckList updateUserLastOpenDate(CheckList checklist, User user);