DMC/scipro
7
0
Fork 0
Code Issues28 Pull Requests6 Actions Projects1 Wiki Activity

Merge branch 'matchSettings' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2012-09-14 09:30:01 +02:00
commit 7d6e94e19e
5 changed files with 75 additions and 9 deletions

1
src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminSettingsPage.java

@ -30,6 +30,7 @@ public abstract class AbstractAdminSettingsPage extends AbstractAdminPage {
items.add(new MenuItem("Final seminar general settings", AdminFinalSeminarSettingsPage.class));
items.add(new MenuItem("Final seminar project level settings", AdminFinalSeminarSettingsPerProjectClassPage.class));
items.add(new MenuItem("Peer portal settings", AdminPeerSettingsPage.class));
items.add(new MenuItem("Match settings", AdminMatchSettingsPage.class));
items.add(new MenuItem("Edit levels", AdminProjectClassSettingsPage.class));
items.add(new MenuItem("Notification settings", AdminNotificationSettingsPage.class));
return items;

7
src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html

@ -38,13 +38,6 @@
<td><input name="8" type="checkbox" wicket:id="remoteExport" />
</td>
</tr>
<tr>
<td><label for="9">Partner confirmation time limit in number of days:</label>
</td>
<td><input name="9" type="text" wicket:id="confirmationDays" />
</td>
</tr>
</table>
<button type="submit">

2
src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java

@ -38,14 +38,12 @@ public class AdminGeneralSettingsPage extends AbstractAdminSettingsPage {
TextField<String> smtpServer = new RequiredTextField<String>("smtpServer");
CheckBox remoteExport = new CheckBox("remoteExport");
CheckBox mailNotifications = new CheckBox("mailNotifications");
TextField<Integer> partnerConfirmationDays = new RequiredTextField<Integer>("confirmationDays");
add(mailFromName);
add(systemFromMail);
add(smtpServer);
add(mailNotifications);
add(remoteExport);
add(partnerConfirmationDays);
}

29
src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminMatchSettingsPage.html Normal file

@ -0,0 +1,29 @@
<!DOCTYPE html>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
<h5 class="peer-title">Match Settings</h5>
<form wicket:id="matchSettingsForm">
<div class="info-box rounded-box">This setting controls how many days
(X) before a selected supervisor idea which is awaiting students
partner confirmation is deselected. E.g. if student A selects a
supervisor idea and selects student B as a partner, B will have X
days to confirm that B wants to be the partner on the supervisor
project idea. If B does not confirm, the supervisor idea will be
deselected for both students.</div>
<table>
<tr>
<td><label for="9">Partner confirmation time limit in number of days:</label>
</td>
<td><input name="9" type="text" wicket:id="confirmationDays" />
</td>
</tr>
</table>
<button type="submit">
Save changes
</button>
</form>
</wicket:extend>
</body>
</html>

45
src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminMatchSettingsPage.java Normal file

@ -0,0 +1,45 @@
package se.su.dsv.scipro.admin.pages.settings;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.admin.pages.AbstractAdminSettingsPage;
import se.su.dsv.scipro.data.dao.interfaces.GeneralSystemSettingsDao;
import se.su.dsv.scipro.data.dataobjects.GeneralSystemSettings;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles = { Roles.SYSADMIN})
public class AdminMatchSettingsPage extends AbstractAdminSettingsPage {
@SpringBean
private GeneralSystemSettingsDao generalSystemSettingsDao;
public AdminMatchSettingsPage(final PageParameters pp) {
super(pp);
add(new AdminMatchSettingsForm(
"matchSettingsForm",
new CompoundPropertyModel<GeneralSystemSettings>(generalSystemSettingsDao.getGeneralSystemSettingsInstance())));
}
private class AdminMatchSettingsForm extends Form<GeneralSystemSettings> {
private static final long serialVersionUID = 1L;
public AdminMatchSettingsForm(String id, IModel<GeneralSystemSettings> model) {
super(id, model);
TextField<Integer> partnerConfirmationDays = new RequiredTextField<Integer>("confirmationDays");
add(partnerConfirmationDays);
}
@Override
protected void onSubmit() {
setModelObject( generalSystemSettingsDao.save(getModelObject()) );
info("Match settings saved");
}
}
}