DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
fred-fri 2012-07-25 10:57:22 +09:00
parent d0b8e11177
commit 224e055b71
3 changed files with 3 additions and 19 deletions
src/main/java/se/su/dsv/scipro
datatables/project
ProjectTitleColumn$LinkPanel.htmlProjectTitleColumn.java
supervisor/panels
SupervisorMyProjectsPanel.java

0
src/main/java/se/su/dsv/scipro/datatables/ProjectTitleColumn$LinkPanel.html → src/main/java/se/su/dsv/scipro/datatables/project/ProjectTitleColumn$LinkPanel.html

2
src/main/java/se/su/dsv/scipro/datatables/ProjectTitleColumn.java → src/main/java/se/su/dsv/scipro/datatables/project/ProjectTitleColumn.java

@ -1,4 +1,4 @@
package se.su.dsv.scipro.datatables;
package se.su.dsv.scipro.datatables.project;
import org.apache.wicket.PageParameters;
import org.apache.wicket.ajax.AjaxRequestTarget;

20
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java

@ -1,34 +1,22 @@
package se.su.dsv.scipro.supervisor.panels;
import com.sun.jersey.core.impl.provider.entity.FormMultivaluedMapProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RadioChoice;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.admin.panels.match.EmployeeAutoCompleteDivPanel;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.data.dataobjects.ProjectFollower;
import se.su.dsv.scipro.data.enums.ProjectStatus;
import se.su.dsv.scipro.data.enums.ProjectTeamMemberRoles;
import se.su.dsv.scipro.datatables.ClickableTitleColumn;
import se.su.dsv.scipro.datatables.DateColumn;
import se.su.dsv.scipro.datatables.GenericDataPanel;
import se.su.dsv.scipro.datatables.ProjectTitleColumn;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import se.su.dsv.scipro.datatables.project.ProjectTitleColumn;
import se.su.dsv.scipro.reusable.FilterRolePanel;
import se.su.dsv.scipro.reusable.SafeLongToIntService;
import se.su.dsv.scipro.springdata.services.EmployeeService;
@ -36,8 +24,6 @@ import se.su.dsv.scipro.springdata.services.GenericService;
import se.su.dsv.scipro.springdata.services.ProjectClassService;
import se.su.dsv.scipro.springdata.services.ProjectService;
import java.text.Normalizer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@ -59,14 +45,12 @@ public class SupervisorMyProjectsPanel extends Panel {
private GenericDataPanel<Project> dp;
// private ProjectClass filterClass;
private ProjectTeamMemberRoles filterptmr;
private Collection<ProjectClass> projectClasses;
public SupervisorMyProjectsPanel(String id) {
super(id);
// filterClass = projectClassService.getProjectClass(ProjectClass.BACHELOR);
filterptmr = null;
projectClasses = new HashSet<ProjectClass>();
@ -113,7 +97,7 @@ public class SupervisorMyProjectsPanel extends Panel {
columns[3] = new ProjectTitleColumn(Model.of("Title"), "title", "title") {
@Override
protected void onClick(IModel clicked, AjaxRequestTarget target) {
//do nothing
}
};