DMC/scipro
7
0
Fork 0
Code Issues39 Pull Requests8 Actions Projects1 Releases Wiki Activity

Added option to only have thesis support as recipient for both projects and project ideas. This needs a user with thesis support e-mail in the database to work with the current mail event model.

Browse Source
This commit is contained in:
Emil Siverhall 2012-02-12 21:39:23 +01:00
parent 19f19af1a4
commit 3c0cc1d5c9
3 changed files with 5 additions and 3 deletions
src/main/java/se/su/dsv/scipro
components
ProjectIdeaMailChoice.javaProjectMailChoice.java
data/facade
MailFacade.java

5
src/main/java/se/su/dsv/scipro/components/ProjectIdeaMailChoice.java

@ -10,6 +10,7 @@ import org.apache.wicket.model.Model;
public class ProjectIdeaMailChoice extends RadioChoice<String> {
private static final long serialVersionUID = 2266943297142066435L;
public final static String THESIS_SUPPORT = "Thesis support (emil.siverhall@gmail.com)";
public final static String AUTHORS_CONFIRMED = "Authors with confirmed project ideas";
public final static String AUTHORS_UNCONFIRMED = "Authors with project ideas waiting to be confirmed";
public final static String AUTHORS_REFUSED = "Authors with refused project ideas";
@ -19,7 +20,7 @@ public class ProjectIdeaMailChoice extends RadioChoice<String> {
public ProjectIdeaMailChoice(String id) {
super(id);
initChoices();
setModel(Model.of(AUTHORS_CONFIRMED));
setModel(Model.of(THESIS_SUPPORT));
}
public ProjectIdeaMailChoice(String id, IModel<String> model) {
@ -29,7 +30,7 @@ public class ProjectIdeaMailChoice extends RadioChoice<String> {
}
private void initChoices() {
List<String> options = Arrays.asList(new String[]{AUTHORS_CONFIRMED,AUTHORS_UNCONFIRMED,AUTHORS_REFUSED,SUPERVISOR_CONFIRMED, SUPERVISOR_UNCONFIRMED});
List<String> options = Arrays.asList(new String[]{THESIS_SUPPORT,AUTHORS_CONFIRMED,AUTHORS_UNCONFIRMED,AUTHORS_REFUSED,SUPERVISOR_CONFIRMED, SUPERVISOR_UNCONFIRMED});
setChoices(options);
}

2
src/main/java/se/su/dsv/scipro/components/ProjectMailChoice.java

@ -12,7 +12,7 @@ public class ProjectMailChoice extends RadioChoice<String> {
private static final long serialVersionUID = 2266943297142066435L;
public final static String THESIS_SUPPORT = "Thesis support (emil.siverhall@gmail.com)";
public final static String AUTHORS_ACTIVE_PROJECT = "Authors with active projects on selected project level";
public final static String SUPERVISOR_ALL_ACTIVE = "All supervisors with active projects";
public final static String SUPERVISOR_ALL_ACTIVE = "Head supervisors with active projects";
public final static String ACTIVE_CO_SUPERVISORS = "Co-supervisors with active projects";
public final static String ACTIVE_REVIEWERS = "Reviewers of active projects";

1
src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java

@ -184,6 +184,7 @@ public class MailFacade {
public Set<User> addThesisSupport() {
recipients = new HashSet<User>();
//this needs to be changed to Thesis support user. needs to be created?
recipients.add(userDao.getUserByEmail("emil.siverhall@gmail.com"));
return recipients;
}