From 23a73b2f5cad6560cdc551534f01b604f318c3bb Mon Sep 17 00:00:00 2001
From: fred-fri <fred-fri@dsv.su.se>
Date: Fri, 3 Aug 2012 12:30:32 +0900
Subject: [PATCH] show nothing if user is not employee
---
.../pages/SupervisorMyProjectIdeasPage.java | 77 ++++++++++---------
1 file changed, 42 insertions(+), 35 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyProjectIdeasPage.java b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyProjectIdeasPage.java
index 4b320f80b7..da242dd632 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyProjectIdeasPage.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyProjectIdeasPage.java
@@ -20,6 +20,7 @@ import se.su.dsv.scipro.reusable.SafeLongToIntService;
import se.su.dsv.scipro.springdata.services.EmployeeService;
import se.su.dsv.scipro.springdata.services.GenericService;
import se.su.dsv.scipro.springdata.services.ProjectIdeaService;
+import se.su.dsv.scipro.supervisor.panels.SupervisorMyProjectsPanel;
import se.su.dsv.scipro.supervisor.panels.WatsonInfoPanel;
import java.util.Iterator;
@@ -53,51 +54,57 @@ public class SupervisorMyProjectIdeasPage extends AbstractSupervisorProjectIdeaP
dialog.add(new EmptyPanel("dialogPanel"));
add(dialog);
- add(new GenericDataPanel<ProjectIdea>("dp") {
+ if (employeeService.findByUser(SciProSession.get().getUser()) != null){
+ add(new GenericDataPanel<ProjectIdea>("dp") {
- @Override
- public GenericService getService() {
- return projectIdeaService;
- }
+ @Override
+ public GenericService getService() {
+ return projectIdeaService;
+ }
- @Override
- public String getSortString() {
- return "dateCreated";
- }
+ @Override
+ public String getSortString() {
+ return "dateCreated";
+ }
- @Override
- public IColumn[] getColumns() {
- IColumn[] columns = new IColumn[3];
- columns[0] = new PropertyColumn<ProjectIdea>(Model.of("Level"), "projectClass", "projectClass");
+ @Override
+ public IColumn[] getColumns() {
+ IColumn[] columns = new IColumn[3];
+ columns[0] = new PropertyColumn<ProjectIdea>(Model.of("Level"), "projectClass", "projectClass");
// columns[1] = new PropertyColumn<ProjectIdea>(Model.of("Title"), "title", "title");
- columns[1] = new ClickableTitleColumn<ProjectIdea>(Model.of("Title"), "title", "title") {
+ columns[1] = new ClickableTitleColumn<ProjectIdea>(Model.of("Title"), "title", "title") {
- @Override
- protected void onClick(IModel<ProjectIdea> clicked, AjaxRequestTarget target) {
- ProjectIdea pi = projectIdeaService.findOne(clicked.getObject().getId());
- dialog.replace(new WatsonInfoPanel("dialogPanel", pi));
- dialog.setTitle("Project idea: " + clicked.getObject().getTitle());
- target.addComponent(dialog);
- dialog.open(target);
- }
- };
+ @Override
+ protected void onClick(IModel<ProjectIdea> clicked, AjaxRequestTarget target) {
+ ProjectIdea pi = projectIdeaService.findOne(clicked.getObject().getId());
+ dialog.replace(new WatsonInfoPanel("dialogPanel", pi));
+ dialog.setTitle("Project idea: " + clicked.getObject().getTitle());
+ target.addComponent(dialog);
+ dialog.open(target);
+ }
+ };
- columns[2] = new DateColumn<ProjectIdea>(Model.of("Received"), "match.dateCreated", "match.dateCreated");
- return columns;
- }
+ columns[2] = new DateColumn<ProjectIdea>(Model.of("Received"), "match.dateCreated", "match.dateCreated");
+ return columns;
+ }
- @Override
- public Iterator<ProjectIdea> getIterator() {
- return projectIdeaService.findByMatchedTo(employeeService.findByUser(SciProSession.get().getUser()), new PageRequest(getTable().getCurrentPage(), getTable().getRowsPerPage(), getSort())).iterator();
- }
+ @Override
+ public Iterator<ProjectIdea> getIterator() {
+ return projectIdeaService.findByMatchedTo(employeeService.findByUser(SciProSession.get().getUser()), new PageRequest(getTable().getCurrentPage(), getTable().getRowsPerPage(), getSort())).iterator();
+ }
+
+ @Override
+ public int getSize() {
+ return safeLongToIntService.safeLongToInt(projectIdeaService.countByMatchedTo(employeeService.findByUser(SciProSession.get().getUser())));
+ }
+
+ });
+ } else {
+ add(new EmptyPanel("dp"));
+ }
- @Override
- public int getSize() {
- return safeLongToIntService.safeLongToInt(projectIdeaService.countByMatchedTo(employeeService.findByUser(SciProSession.get().getUser())));
- }
- });
}
}