DMC/scipro
7
0
Fork 0
Code Issues31 Pull Requests5 Actions Projects1 Releases Wiki Activity

added new page according to request

Browse Source
This commit is contained in:
fred-fri 2012-05-23 16:07:04 +09:00
parent f01bc46ca3
commit c13270d9ef
8 changed files with 98 additions and 7 deletions

3
src/main/java/se/su/dsv/scipro/SciProApplication.java

@ -197,7 +197,8 @@ public class SciProApplication extends RepositoryApplication implements IThemabl
mountBookmarkablePage("supervisor/forum", SupervisorConferencePage.class);
mountBookmarkablePage("supervisor/checklist", SupervisorChecklistPage.class);
mountBookmarkablePage("supervisor/checklist/viewchecklist", SupervisorViewCheckListPage.class);
mountBookmarkablePage("supervisor/mysettings", SupervisorProfilePage.class);
mountBookmarkablePage("supervisor/mysettings/myprofile", SupervisorProfilePage.class);
mountBookmarkablePage("supervisor/mysettings/notificationsettings", SupervisorProfilePage.class);
mountBookmarkablePage("supervisor/project/activityplan", SupervisorActivityPlanPage.class);
mountBookmarkablePage("supervisor/project/files", SupervisorFilePage.class);
/*

13
src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorMySettingsPage.html Normal file

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
<div class="prepend-top span-24 last">
<div wicket:id="finalSeminarMenu" class="span-24 last append-bottom"></div>
<div class="span-24 last">
<wicket:child />
</div>
</div>
</wicket:extend>
</body>
</html>

33
src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorMySettingsPage.java Normal file

@ -0,0 +1,33 @@
package se.su.dsv.scipro.supervisor.pages;
import org.apache.wicket.PageParameters;
import se.su.dsv.scipro.components.AbstractMenuPanel;
import java.util.ArrayList;
import java.util.List;
public abstract class AbstractSupervisorMySettingsPage extends AbstractSupervisorPage {
public AbstractSupervisorMySettingsPage(final PageParameters pp) {
super(pp);
add(new AbstractMenuPanel("finalSeminarMenu", AbstractSupervisorMySettingsPage.class, this.getClass()){
private static final long serialVersionUID = 1L;
@Override
protected List<MenuItem> getItemList() {
final List<MenuItem> items = new ArrayList<MenuItem>();
items.add(new MenuItem("My profile", SupervisorProfilePage.class));
items.add(new MenuItem("Notification settings", SupervisorNotificationSettingsPage.class));
return items;
}
@Override
protected MenuType getMenuType() {
return MenuType.HORIZONTAL;
}
});
}
}

12
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorNotificationSettingsPage.html Normal file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
<div class="span-24 prepend-top">
<div wicket:id="notificationPanel"></div>
<!--<div wicket:id="supervisorProfile"></div>-->
</div>
</wicket:extend>
</body>
</html>

34
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorNotificationSettingsPage.java Normal file

@ -0,0 +1,34 @@
package se.su.dsv.scipro.supervisor.pages;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.match.dao.interfaces.SupervisorDao;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.supervisor.panels.ProfilePanel;
import se.su.dsv.scipro.supervisor.panels.SupervisorNotificationSettingsPanel;
import se.su.dsv.scipro.user.panels.UserProfilePanelFactory;
@Authorization(authorizedRoles={Roles.EMPLOYEE})
//@Authorization(authorizedRoles={Roles.SYSADMIN})
public class SupervisorNotificationSettingsPage extends AbstractSupervisorMySettingsPage {
@SpringBean
SupervisorDao supervisorDao;
@SpringBean
private UserProfilePanelFactory factory;
public SupervisorNotificationSettingsPage(final PageParameters pp){
super(pp);
//add(factory.createUserProfilePanelForUser("supervisorProfile",getUser()));
if (supervisorDao.getFrom(getUser()) == null){
// add(new EmptyPanel("supervisorProfile"));
add(new EmptyPanel("notificationPanel"));
}
else {
// add(new ProfilePanel("supervisorProfile", new Model<Employee>(supervisorDao.getFrom(getUser()))));
add(new SupervisorNotificationSettingsPanel("notificationPanel"));
}
}
}

2
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.html

@ -3,7 +3,7 @@
<body>
<wicket:extend>
<div class="span-24 prepend-top">
<div wicket:id="notificationPanel"></div>
<!--<div wicket:id="notificationPanel"></div>-->
<div wicket:id="supervisorProfile"></div>
</div>

7
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java

@ -15,7 +15,7 @@ import se.su.dsv.scipro.user.panels.UserProfilePanelFactory;
@Authorization(authorizedRoles={Roles.EMPLOYEE})
//@Authorization(authorizedRoles={Roles.SYSADMIN})
public class SupervisorProfilePage extends AbstractSupervisorPage {
public class SupervisorProfilePage extends AbstractSupervisorMySettingsPage {
@SpringBean
SupervisorDao supervisorDao;
@SpringBean
@ -24,13 +24,12 @@ public class SupervisorProfilePage extends AbstractSupervisorPage {
super(pp);
//add(factory.createUserProfilePanelForUser("supervisorProfile",getUser()));
if (supervisorDao.getFrom(getUser()) == null){
add(new EmptyPanel("notificationPanel"));
add(new EmptyPanel("supervisorProfile"));
// add(new EmptyPanel("notificationPanel"));
}
else {
add(new SupervisorNotificationSettingsPanel("notificationPanel"));
add(new ProfilePanel("supervisorProfile", new Model<Employee>(supervisorDao.getFrom(getUser()))));
// add(new SupervisorNotificationSettingsPanel("notificationPanel"));
}
}
}

1
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNotificationSettingsPanel.html

@ -3,7 +3,6 @@
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:panel>
<div><b>Notification settings:</b></div>
<div wicket:id="wmc">
<table class="rounded-corner">
<thead>