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

code cleanup

Browse Source
This commit is contained in:
Emil Siverhall 2012-01-30 10:29:16 +01:00
parent e3ee0874f9
commit 8d99e990ce
2 changed files with 8 additions and 21 deletions
src/main/java/se/su/dsv/scipro
admin/panels
AdminMailPanel.java
data/facade
MailFacade.java

20
src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java

@ -30,6 +30,9 @@ import se.su.dsv.scipro.data.dataobjects.MailEvent;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.data.facade.MailFacade;
/**
* Panel for mass mailing to predefined recipient sets.
*/
public class AdminMailPanel extends Panel {
@SpringBean
@ -41,7 +44,6 @@ public class AdminMailPanel extends Panel {
private Set<User> userSet;
private static final Logger logger = Logger.getLogger(AdminMailPanel.class);
private final String AUTHORS_JUSTME = "Just me"; //Dev purposes
private final String AUTHORS_ACTIVE_PROJECT = "All authors with active projects";
private final String AUTHORS_ACTIVE_BACHELOR = "Authors with active bachelor projects";
private final String AUTHORS_ACTIVE_MASTER = "Authors with active master projects";
@ -52,6 +54,7 @@ public class AdminMailPanel extends Panel {
private final String SUPERVISOR_ALL_ACTIVE = "All supervisors with active projects";
private final String SUPERVISOR_CONFIRMED = "Supervisors with confirmed project ideas";
private final String SUPERVISOR_UNCONFIRMED = "Supervisors with project ideas waiting to be confirmed";
private final String NONE = "None";
private static final long serialVersionUID = 1L;
@ -60,15 +63,12 @@ public class AdminMailPanel extends Panel {
super(id);
setUpRadioButtons();
setUpMailForm();
}
}
private void setUpMailForm() {
MailForm mailForm = new MailForm("mailForm");
add(mailForm);
add(new FeedbackPanel("feedbackPanel", new ComponentFeedbackMessageFilter(mailForm)));
}
public class MailForm extends Form<Void> {
@ -110,8 +110,7 @@ public class AdminMailPanel extends Panel {
}
@Override
protected void onSubmit() {
protected void onSubmit() {
try {
if(userSet != null && !userSet.isEmpty()) {
MailEvent me = new MailEvent(mailSubjectField.getInput(), mailBodyField.getInput(), userSet, fromName, fromEmail);
@ -129,7 +128,7 @@ public class AdminMailPanel extends Panel {
}
private void setUpRadioButtons() {
List<String> options = Arrays.asList(new String[]{"None",AUTHORS_ACTIVE_PROJECT,AUTHORS_ACTIVE_BACHELOR,AUTHORS_ACTIVE_MASTER,AUTHORS_CONFIRMED,AUTHORS_UNCONFIRMED,AUTHORS_REFUSED,SUPERVISOR_ALL,SUPERVISOR_ALL_ACTIVE,SUPERVISOR_CONFIRMED, SUPERVISOR_UNCONFIRMED});
List<String> options = Arrays.asList(new String[]{NONE,AUTHORS_ACTIVE_PROJECT,AUTHORS_ACTIVE_BACHELOR,AUTHORS_ACTIVE_MASTER,AUTHORS_CONFIRMED,AUTHORS_UNCONFIRMED,AUTHORS_REFUSED,SUPERVISOR_ALL,SUPERVISOR_ALL_ACTIVE,SUPERVISOR_CONFIRMED, SUPERVISOR_UNCONFIRMED});
final RadioChoice<String> choice = new RadioChoice<String>("radioChoices",Model.of("None"), options);
//Default values, taken from RadioChoice constructor above (Model.of(your choice)).
@ -152,10 +151,7 @@ public class AdminMailPanel extends Panel {
private Set<User> getRecipients(String choiceInput) {
Set<User> recipients = new HashSet<User>();
if(choiceInput.equals(AUTHORS_JUSTME)){
recipients = mailFacade.addJustMe();
}
else if(choiceInput.equals(AUTHORS_ACTIVE_PROJECT)){
if(choiceInput.equals(AUTHORS_ACTIVE_PROJECT)){
recipients = mailFacade.addActiveAuthors();
}
else if(choiceInput.equals(AUTHORS_ACTIVE_BACHELOR)){

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

@ -10,7 +10,6 @@ import org.springframework.stereotype.Service;
import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dao.interfaces.UserDao;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
@ -26,8 +25,6 @@ import se.su.dsv.scipro.match.dataobject.ProjectIdea;
@Service
public class MailFacade {
@Autowired
private UserDao userDao;
@Autowired
private ProjectDao projectDao;
@Autowired
@ -40,12 +37,6 @@ public class MailFacade {
private ProjectDao.Params projectParams;
private ProjectIdeaDao.Params projectIdeaParams;
private Set<User> recipients;
public Set<User> addJustMe() {
Set<User> recipients = new HashSet<User>();
recipients.add(userDao.getUserByEmail("emil-siv@dsv.su.se"));
return recipients;
}
public Set<User> addActiveAuthors() {
setProjectParams(ProjectStatus.ACTIVE, null);