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

removed artifacts for force accept

Browse Source
This commit is contained in:
fred-fri 2012-08-02 11:49:04 +09:00
parent 82a6d8d3ef
commit 7991a7e8c4
3 changed files with 16 additions and 18 deletions
src/main/java/se/su/dsv/scipro/admin/pages
match
AutomaticMatchPanel.java
settings
AdminGeneralSettingsPage.htmlAdminGeneralSettingsPage.java

2
src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java

@ -141,7 +141,7 @@ public class AutomaticMatchPanel extends Panel {
for (Match match : result1.matches) { for (Match match : result1.matches) {
if(match.getPoints() >= points) { if(match.getPoints() >= points) {
match.setCreatedBy(SciProSession.get().getUser()); match.setCreatedBy(SciProSession.get().getUser());
match.setStatus(Match.Status.CONFIRMED); match.setStatus(Match.Status.CONFIRMED);
match = matchDao.save(match); match = matchDao.save(match);

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

@ -38,18 +38,18 @@
<!--<td><input name="7" type="checkbox" wicket:id="remoteExport" />--> <!--<td><input name="7" type="checkbox" wicket:id="remoteExport" />-->
<!--</td>--> <!--</td>-->
<!--</tr>--> <!--</tr>-->
<tr> <!--<tr>-->
<td><label for="7">Supervisors can accept and decline project ideas:</label> <!--<td><label for="7">Supervisors can accept and decline project ideas:</label>-->
</td> <!--</td>-->
<td><input name="7" type="checkbox" wicket:id="supervisorsCanAcceptDeclinePIs" /> <!--<td><input name="7" type="checkbox" wicket:id="supervisorsCanAcceptDeclinePIs" />-->
</td> <!--</td>-->
</tr> <!--</tr>-->
<tr> <!--<tr>-->
<td><label for="7">Matching algorithm matches are force accepted:</label> <!--<td><label for="7">Matching algorithm matches are force accepted:</label>-->
</td> <!--</td>-->
<td><input name="7" type="checkbox" wicket:id="matchAlgorithmMatchesAreForceAccepted" /> <!--<td><input name="7" type="checkbox" wicket:id="matchAlgorithmMatchesAreForceAccepted" />-->
</td> <!--</td>-->
</tr> <!--</tr>-->
</table> </table>

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

@ -38,16 +38,14 @@ public class AdminGeneralSettingsPage extends AbstractAdminSettingsPage {
TextField<String> smtpServer = new RequiredTextField<String>("smtpServer"); TextField<String> smtpServer = new RequiredTextField<String>("smtpServer");
CheckBox remoteExport = new CheckBox("remoteExport"); CheckBox remoteExport = new CheckBox("remoteExport");
CheckBox mailNotifications = new CheckBox("mailNotifications"); CheckBox mailNotifications = new CheckBox("mailNotifications");
CheckBox supervisorsCanAcceptDeclinePIs = new CheckBox("supervisorsCanAcceptDeclinePIs");
CheckBox matchAlgorithmMatchesAreForceAccepted = new CheckBox("matchAlgorithmMatchesAreForceAccepted");
add(mailFromName); add(mailFromName);
add(systemFromMail); add(systemFromMail);
add(smtpServer); add(smtpServer);
add(mailNotifications); add(mailNotifications);
add(remoteExport); // add(remoteExport);
add(supervisorsCanAcceptDeclinePIs);
add(matchAlgorithmMatchesAreForceAccepted);
} }
@Override @Override