show nothing if user is not employee
This commit is contained in:
parent
aa219ceb8c
commit
23a73b2f5c
@ -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.EmployeeService;
|
||||||
import se.su.dsv.scipro.springdata.services.GenericService;
|
import se.su.dsv.scipro.springdata.services.GenericService;
|
||||||
import se.su.dsv.scipro.springdata.services.ProjectIdeaService;
|
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 se.su.dsv.scipro.supervisor.panels.WatsonInfoPanel;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
@ -53,51 +54,57 @@ public class SupervisorMyProjectIdeasPage extends AbstractSupervisorProjectIdeaP
|
|||||||
dialog.add(new EmptyPanel("dialogPanel"));
|
dialog.add(new EmptyPanel("dialogPanel"));
|
||||||
add(dialog);
|
add(dialog);
|
||||||
|
|
||||||
add(new GenericDataPanel<ProjectIdea>("dp") {
|
if (employeeService.findByUser(SciProSession.get().getUser()) != null){
|
||||||
|
add(new GenericDataPanel<ProjectIdea>("dp") {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public GenericService getService() {
|
public GenericService getService() {
|
||||||
return projectIdeaService;
|
return projectIdeaService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSortString() {
|
public String getSortString() {
|
||||||
return "dateCreated";
|
return "dateCreated";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IColumn[] getColumns() {
|
public IColumn[] getColumns() {
|
||||||
IColumn[] columns = new IColumn[3];
|
IColumn[] columns = new IColumn[3];
|
||||||
columns[0] = new PropertyColumn<ProjectIdea>(Model.of("Level"), "projectClass", "projectClass");
|
columns[0] = new PropertyColumn<ProjectIdea>(Model.of("Level"), "projectClass", "projectClass");
|
||||||
|
|
||||||
// columns[1] = new PropertyColumn<ProjectIdea>(Model.of("Title"), "title", "title");
|
// 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
|
@Override
|
||||||
protected void onClick(IModel<ProjectIdea> clicked, AjaxRequestTarget target) {
|
protected void onClick(IModel<ProjectIdea> clicked, AjaxRequestTarget target) {
|
||||||
ProjectIdea pi = projectIdeaService.findOne(clicked.getObject().getId());
|
ProjectIdea pi = projectIdeaService.findOne(clicked.getObject().getId());
|
||||||
dialog.replace(new WatsonInfoPanel("dialogPanel", pi));
|
dialog.replace(new WatsonInfoPanel("dialogPanel", pi));
|
||||||
dialog.setTitle("Project idea: " + clicked.getObject().getTitle());
|
dialog.setTitle("Project idea: " + clicked.getObject().getTitle());
|
||||||
target.addComponent(dialog);
|
target.addComponent(dialog);
|
||||||
dialog.open(target);
|
dialog.open(target);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
columns[2] = new DateColumn<ProjectIdea>(Model.of("Received"), "match.dateCreated", "match.dateCreated");
|
columns[2] = new DateColumn<ProjectIdea>(Model.of("Received"), "match.dateCreated", "match.dateCreated");
|
||||||
return columns;
|
return columns;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterator<ProjectIdea> getIterator() {
|
public Iterator<ProjectIdea> getIterator() {
|
||||||
return projectIdeaService.findByMatchedTo(employeeService.findByUser(SciProSession.get().getUser()), new PageRequest(getTable().getCurrentPage(), getTable().getRowsPerPage(), getSort())).iterator();
|
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())));
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user