From 556a610949dc3a310bfd40cf75788c7c3fa49dbd Mon Sep 17 00:00:00 2001
From: Fredrik Norberg <fnorbe@dsv.su.se>
Date: Thu, 28 Jul 2011 17:10:21 +0200
Subject: [PATCH] added adminchecklistpage
---
.../admin/pages/AdminCheckListPage.html | 13 +++
.../admin/pages/AdminCheckListPage.java | 34 ++++++
.../admin/panels/AdminTabMenuPanel.java | 2 +
.../panels/CreateCheckListTemplatePanel.html | 5 +-
.../checklists/panels/TrafficLightPanel.java | 79 -------------
.../checklists/panels/ViewCheckListPanel.java | 110 ++++++++++++++++++
6 files changed, 160 insertions(+), 83 deletions(-)
create mode 100644 src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.html
create mode 100644 src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java
create mode 100644 src/main/java/se/su/dsv/scipro/checklists/panels/ViewCheckListPanel.java
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.html b/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.html
new file mode 100644
index 0000000000..27c3803811
--- /dev/null
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>CheckLists</title>
+</head>
+<body>
+ <wicket:extend>
+ <div wicket:id="cCLPanel"></div>
+ </wicket:extend>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java
new file mode 100644
index 0000000000..f9d2db1f21
--- /dev/null
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/AdminCheckListPage.java
@@ -0,0 +1,34 @@
+package se.su.dsv.scipro.admin.pages;
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.SubmitLink;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
+
+import se.su.dsv.scipro.checklists.panels.CreateCheckListTemplatePanel;
+import se.su.dsv.scipro.data.dao.interfaces.GeneralSystemSettingsDao;
+import se.su.dsv.scipro.data.dataobjects.GeneralSystemSettings;
+import se.su.dsv.scipro.project.panels.ProjectPartnerPanel;
+import se.su.dsv.scipro.security.auth.Authorization;
+import se.su.dsv.scipro.security.auth.roles.Roles;
+
+/**
+ * @author Fredrik Norberg - fnorbe@dsv.su.se
+ *
+ */
+
+@Authorization(authorizedRoles={Roles.SYSADMIN, Roles.ADMIN})
+public class AdminCheckListPage extends AbstractAdminPage {
+
+
+ public static final String MAIN_MENU_LABEL = "CheckLists";
+
+ public AdminCheckListPage(PageParameters pp) {
+ super(pp);
+ add(new CreateCheckListTemplatePanel("cCLPanel"));
+ }
+
+}
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/AdminTabMenuPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/AdminTabMenuPanel.java
index 33c8432b34..fb319be8bc 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/AdminTabMenuPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/AdminTabMenuPanel.java
@@ -6,6 +6,7 @@ import java.util.List;
import org.apache.wicket.Page;
import se.su.dsv.scipro.admin.pages.AbstractAdminPage;
+import se.su.dsv.scipro.admin.pages.AdminCheckListPage;
import se.su.dsv.scipro.admin.pages.AdminFinalSeminarPage;
import se.su.dsv.scipro.admin.pages.AdminProjectPartnerPage;
import se.su.dsv.scipro.admin.pages.AdminRolePage;
@@ -39,6 +40,7 @@ public class AdminTabMenuPanel extends AbstractMenuPanel {
items.add(new MenuItem("Settings", AdminGeneralSettingsPage.class, ImageIcon.ICON_SETTINGS));
items.add(new MenuItem("Role management", AdminRolePage.class));
items.add(new MenuItem("Project partner", AdminProjectPartnerPage.class));
+ items.add(new MenuItem("CheckList", AdminCheckListPage.class));
return items;
}
diff --git a/src/main/java/se/su/dsv/scipro/checklists/panels/CreateCheckListTemplatePanel.html b/src/main/java/se/su/dsv/scipro/checklists/panels/CreateCheckListTemplatePanel.html
index ae81354e01..7f29e0238d 100644
--- a/src/main/java/se/su/dsv/scipro/checklists/panels/CreateCheckListTemplatePanel.html
+++ b/src/main/java/se/su/dsv/scipro/checklists/panels/CreateCheckListTemplatePanel.html
@@ -5,6 +5,7 @@
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
</head>
<body>
+
<wicket:panel>
<div wicket:id="feedbackPanel"></div>
<form wicket:id="form">
@@ -13,10 +14,6 @@
</div>
<input wicket:id="button" type="submit"/>
</form>
- <div>
- <a href="#" wicket:id="link">Print</a>
- </div>
-
<div>
<a href="#" wicket:id="newLink">New Link</a>
</div>
diff --git a/src/main/java/se/su/dsv/scipro/checklists/panels/TrafficLightPanel.java b/src/main/java/se/su/dsv/scipro/checklists/panels/TrafficLightPanel.java
index 149ec7bdfc..81dcdee7ba 100644
--- a/src/main/java/se/su/dsv/scipro/checklists/panels/TrafficLightPanel.java
+++ b/src/main/java/se/su/dsv/scipro/checklists/panels/TrafficLightPanel.java
@@ -38,18 +38,6 @@ public class TrafficLightPanel extends Panel {
private static final long serialVersionUID = 8862892008428526067L;
- @SpringBean
- private CheckListDao checkListDao;
-
- @SpringBean
- private CheckListAnswerDao checkListAnswerDao;
-
- @SpringBean
- private CheckListQuestionDao checkListQuestionDao;
-
- @SpringBean
- private CheckListTemplateDao checkListTemplateDao;
-
public TrafficLightPanel(String id) {
super(id);
@@ -94,71 +82,4 @@ public class TrafficLightPanel extends Panel {
group.add(lightList);
}
-
- List<CheckList> checkLists = checkListDao.findCheckLists(SciProSession.get()
- .getActiveProject());{
- if (checkLists.size() < 1) {
- CheckList checkList = new CheckList("Test", SciProSession.get().getActiveProject());
- CheckListQuestion checkListQuestion = new CheckListQuestion("Testquestion?");
- checkListQuestion = checkListQuestionDao.save(checkListQuestion);
- checkList.getQuestions().add(checkListQuestion);
- checkList = checkListDao.save(checkList);
- }
-
- ListView<CheckList> checkListsListView = new ListView<CheckList>("checkLists", checkLists) {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<CheckList> item) {
-
- ListView<CheckListQuestion> listView = new ListView<CheckListQuestion>(
- "listView",
- new ArrayList<CheckListQuestion>(item.getModel().getObject().getQuestions())) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<CheckListQuestion> item) {
- CheckListQuestion checkListQuestion = item.getModel().getObject();
- if(checkListQuestion.getAnswers().size() == 0){
- CheckListAnswer checkListAnswer = new CheckListAnswer(SciProSession.get().getUser(), CheckListQuestionAnswer.GREEN);
- checkListAnswer = checkListAnswerDao.save(checkListAnswer);
- checkListQuestion.getAnswers().add(checkListAnswer);
- checkListQuestionDao.save(checkListQuestion);
-
- }
- item.add(new Label("question", item.getModel().getObject().getQuestion()));
-
- ListView<CheckListAnswer> listView = new ListView<CheckListAnswer>(
- "listViewAnswer",
- new ArrayList<CheckListAnswer>(item.getModel().getObject().getAnswers())) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<CheckListAnswer> item) {
- item.add(new Label("answer", item.getModel().getObject().getAnswer().toString()));
-
-
- }
-
- };
- item.add(listView);
-
- }
-
- };
-
- item.add(listView);
-
- }
- };
-
- add(checkListsListView);
- };
-
}
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
new file mode 100644
index 0000000000..3dab763499
--- /dev/null
+++ b/src/main/java/se/su/dsv/scipro/checklists/panels/ViewCheckListPanel.java
@@ -0,0 +1,110 @@
+package se.su.dsv.scipro.checklists.panels;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
+
+import se.su.dsv.scipro.SciProSession;
+import se.su.dsv.scipro.data.dao.interfaces.CheckListAnswerDao;
+import se.su.dsv.scipro.data.dao.interfaces.CheckListDao;
+import se.su.dsv.scipro.data.dao.interfaces.CheckListQuestionDao;
+import se.su.dsv.scipro.data.dao.interfaces.CheckListTemplateDao;
+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.enums.CheckListQuestionAnswer;
+
+public class ViewCheckListPanel extends Panel {
+
+
+ private static final long serialVersionUID = 1L;
+
+ @SpringBean
+ private CheckListDao checkListDao;
+
+ @SpringBean
+ private CheckListAnswerDao checkListAnswerDao;
+
+ @SpringBean
+ private CheckListQuestionDao checkListQuestionDao;
+
+ @SpringBean
+ private CheckListTemplateDao checkListTemplateDao;
+
+
+ public ViewCheckListPanel(String id){
+ super(id);
+
+ List<CheckList> checkLists = checkListDao.findCheckLists(SciProSession.get()
+ .getActiveProject());{
+ if (checkLists.size() < 1) {
+ CheckList checkList = new CheckList("Test", SciProSession.get().getActiveProject());
+ CheckListQuestion checkListQuestion = new CheckListQuestion("Testquestion?");
+ checkListQuestion = checkListQuestionDao.save(checkListQuestion);
+ checkList.getQuestions().add(checkListQuestion);
+ checkList = checkListDao.save(checkList);
+ }
+
+ ListView<CheckList> checkListsListView = new ListView<CheckList>("checkLists", checkLists) {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(ListItem<CheckList> item) {
+
+ ListView<CheckListQuestion> listView = new ListView<CheckListQuestion>(
+ "listView",
+ new ArrayList<CheckListQuestion>(item.getModel().getObject().getQuestions())) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(ListItem<CheckListQuestion> item) {
+ CheckListQuestion checkListQuestion = item.getModel().getObject();
+ if(checkListQuestion.getAnswers().size() == 0){
+ CheckListAnswer checkListAnswer = new CheckListAnswer(SciProSession.get().getUser(), CheckListQuestionAnswer.GREEN);
+ checkListAnswer = checkListAnswerDao.save(checkListAnswer);
+ checkListQuestion.getAnswers().add(checkListAnswer);
+ checkListQuestionDao.save(checkListQuestion);
+
+ }
+ item.add(new Label("question", item.getModel().getObject().getQuestion()));
+
+ ListView<CheckListAnswer> listView = new ListView<CheckListAnswer>(
+ "listViewAnswer",
+ new ArrayList<CheckListAnswer>(item.getModel().getObject().getAnswers())) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(ListItem<CheckListAnswer> item) {
+ item.add(new Label("answer", item.getModel().getObject().getAnswer().toString()));
+
+
+ }
+
+ };
+ item.add(listView);
+
+ }
+
+ };
+
+ item.add(listView);
+
+ }
+ };
+
+ add(checkListsListView);
+ };
+
+ }
+}