DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

Revert previous change because of Jenkins complaints.

Browse Source
This commit is contained in:
Tom Vahlman 2012-03-27 23:04:23 +02:00
parent 3a76999fe8
commit e658de0ed5
2 changed files with 40 additions and 67 deletions
src/main/java/se/su/dsv/scipro/admin/panels
ManualMatchPanel.javaManualSetReviewerPanel.java

72
src/main/java/se/su/dsv/scipro/admin/panels/ManualMatchPanel.java

@ -23,7 +23,7 @@ import se.su.dsv.scipro.match.dao.interfaces.MatchDao;
import se.su.dsv.scipro.match.dao.interfaces.SupervisorDao;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import se.su.dsv.scipro.reusable.EmployeeAutoComplete;
import se.su.dsv.wicket.components.AutoCompleteObjectField;
public class ManualMatchPanel extends Panel {
@ -46,7 +46,7 @@ public class ManualMatchPanel extends Panel {
public ManualMatchPanel(String id, final IModel<Match> matchModel, final Component feedbackPanel, final Match.Status status) {
super(id);
Component localFeedback = new FeedbackPanel("localFeedback");
EmployeeAutoComplete autoCompleteObjectField =
AutoCompleteObjectField<Employee, Long> autoCompleteObjectField =
createDsvAutocompleteComponent(matchModel.getObject().getProjectIdea(), status);
autoCompleteObjectField.setOutputMarkupId(true);
saveButton = createSubmitLink(matchModel, feedbackPanel, status, localFeedback, autoCompleteObjectField);
@ -60,20 +60,15 @@ public class ManualMatchPanel extends Panel {
add(currentFragment);
}
private String createNameAndEmail(Employee employee) {
return employee.getNameAsString() + " <" + employee.getEmailAsString()+">";
}
private boolean testACInputString(EmployeeAutoComplete autoCompleteObjectField) {
return autoCompleteObjectField.getModelObject() == null ||
autoCompleteObjectField.getInput() == null ||
autoCompleteObjectField.getInput().isEmpty() ||
!autoCompleteObjectField.getInput().equals(createNameAndEmail(autoCompleteObjectField.getModelObject()));
private boolean testACInputString(AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
return autocompleteReviewerField.getModelObject() == null ||
autocompleteReviewerField.getInput() == null ||
autocompleteReviewerField.getInput().isEmpty() ||
!autocompleteReviewerField.getInput().equals(autocompleteReviewerField.getModelObject().getNameAsString());
}
private ConfirmerAjaxSubmitLink createSubmitLink(final IModel<Match> matchModel, final Component feedbackPanel, final Match.Status status,
final Component localFeedback, final EmployeeAutoComplete autoCompleteObjectField) {
final Component localFeedback, final AutoCompleteObjectField<Employee, Long> autoCompleteObjectField) {
return new ConfirmerAjaxSubmitLink("saveButton") {
private static final long serialVersionUID = -1820883998549197409L;
@Override
@ -85,7 +80,7 @@ public class ManualMatchPanel extends Panel {
matchModel.getObject().setSupervisor(autoCompleteObjectField.getModelObject() != null ? autoCompleteObjectField.getModelObject():null);
matchModel.getObject().setStatus(status);
matchDao.changeStatus(SciProSession.get().getUser(), matchModel.getObject(), null);
Session.get().info(createMatchMessage(createNameAndEmail(autoCompleteObjectField.getModelObject()), matchModel.getObject().getProjectIdea().getTitle(), status));
Session.get().info(createMatchMessage(autoCompleteObjectField.getModelObject().getNameAsString(), matchModel.getObject().getProjectIdea().getTitle(), status));
setResponsePage(AdminManageProjectIdeaPage.class);
target.addComponent(feedbackPanel);
}
@ -106,7 +101,7 @@ public class ManualMatchPanel extends Panel {
}
private Fragment createButtonFragment(final Match.Status status, final Form<Employee> matchForm,
final EmployeeAutoComplete autoCompleteObjectField) {
final AutoCompleteObjectField<Employee, Long> autoCompleteObjectField) {
Fragment buttonFragment = new Fragment("main", "buttonFragment", this) {
private static final long serialVersionUID = 2699118307386334814L;
@ -151,7 +146,7 @@ public class ManualMatchPanel extends Panel {
}
private void clearInputAndAddToTarget(AjaxRequestTarget target, final EmployeeAutoComplete autoCompleteObjectField) {
private void clearInputAndAddToTarget(AjaxRequestTarget target, final AutoCompleteObjectField autoCompleteObjectField) {
//noinspection unchecked
autoCompleteObjectField.setModelObject(null);
autoCompleteObjectField.clearInput();
@ -168,7 +163,7 @@ public class ManualMatchPanel extends Panel {
alternateFragment = tempFragment;
}
private Fragment createMatchFragment(final Form<Employee> matchForm, Component localFeedback, final EmployeeAutoComplete autoCompleteObjectField) {
private Fragment createMatchFragment(final Form<Employee> matchForm, Component localFeedback, final AutoCompleteObjectField<Employee, Long> autoCompleteObjectField ) {
Fragment matchFragment = new Fragment("main", "matchFragment", this) {
private static final long serialVersionUID = -7770434904843562942L;
@ -196,8 +191,8 @@ public class ManualMatchPanel extends Panel {
return matchFragment;
}
EmployeeAutoComplete createDsvAutocompleteComponent(final ProjectIdea projectIdea, final Match.Status status) {
return new EmployeeAutoComplete("autoComplete") {
AutoCompleteObjectField<Employee, Long> createDsvAutocompleteComponent(final ProjectIdea projectIdea, final Match.Status status) {
return new AutoCompleteObjectField<Employee, Long>("autoComplete", Employee.class) {
private static final long serialVersionUID = 7734889540424308421L;
@Override
@ -232,34 +227,17 @@ public class ManualMatchPanel extends Panel {
return supervisorDao.getAutoCompleteCapableSupervisors(input, 6).iterator();
}
@Override
public void action(AjaxRequestTarget pTarget, Employee newSelection) {
super.onNewSelection(pTarget, newSelection);
if (newSelection != null) {
if (pTarget != null) {
final String declineMessage = createDeclineMessage(newSelection, projectIdea, status);
if(declineMessage != null && !declineMessage.isEmpty()) {
saveButton.setMessageContentHTML(declineMessage);
pTarget.addComponent(saveButton);
} else {
saveButton.setMessageContentHTML(createConfirmationMessage(newSelection, status));
pTarget.addComponent(saveButton);
}
}
}
}
@Override
public void onNewSelection(AjaxRequestTarget pTarget, Employee newSelection) {
super.onNewSelection(pTarget, newSelection);
if (newSelection != null) {
if (pTarget != null) {
final String declineMessage = createDeclineMessage(newSelection, projectIdea, status);
final String declineMessage = createDeclineMessage(newSelection.getUser(), projectIdea, status);
if(declineMessage != null && !declineMessage.isEmpty()) {
saveButton.setMessageContentHTML(declineMessage);
pTarget.addComponent(saveButton);
} else {
saveButton.setMessageContentHTML(createConfirmationMessage(newSelection, status));
saveButton.setMessageContentHTML(createConfirmationMessage(newSelection.getUser(), status));
pTarget.addComponent(saveButton);
}
}
@ -271,12 +249,12 @@ public class ManualMatchPanel extends Panel {
/**
*
* This method is used to return a match message that the employee was matched or suggested to supervise the project idea .
* @param nameAndEmail the name and email of the employee
* @param employeeName the name of the employee
* @param projectIdeaTitle the title of the project idea
* @param status the status of the match
* @return String the match message
*/
private String createMatchMessage(final String nameAndEmail, final String projectIdeaTitle, Match.Status status) {
private String createMatchMessage(final String employeeName, final String projectIdeaTitle, Match.Status status) {
StringBuilder messageStr = new StringBuilder();
messageStr.append("The project idea ");
messageStr.append(projectIdeaTitle != null ? projectIdeaTitle : "");
@ -285,7 +263,7 @@ public class ManualMatchPanel extends Panel {
} else if (status.equals(Match.Status.PUBLISHED)) {
messageStr.append(" was suggested to ");
}
messageStr.append(nameAndEmail != null ? nameAndEmail : "" );
messageStr.append(employeeName != null ? employeeName : "" );
messageStr.append(".");
return messageStr.toString();
}
@ -298,13 +276,13 @@ public class ManualMatchPanel extends Panel {
* @param status the status of the match
* @return String the decline message
*/
private String createDeclineMessage(Employee supervisor, ProjectIdea projectIdea, Match.Status status) {
private String createDeclineMessage(User supervisor, ProjectIdea projectIdea, Match.Status status) {
if(supervisor != null && projectIdea != null) {
final String declineMessage = projectIdeaFacade.declineMessageWhenRejectedMatch(supervisor.getUser(), projectIdea);
final String declineMessage = projectIdeaFacade.declineMessageWhenRejectedMatch(supervisor, projectIdea);
StringBuilder stringBuilder = new StringBuilder();
if(declineMessage != null && !declineMessage.isEmpty()) {
stringBuilder.append("The project idea has already been rejected by ");
stringBuilder.append(createNameAndEmail(supervisor));
stringBuilder.append(supervisor.getFullName());
stringBuilder.append(". The decline message was: '");
stringBuilder.append(declineMessage);
if(status.equals(Match.Status.CONFIRMED)) {
@ -312,7 +290,7 @@ public class ManualMatchPanel extends Panel {
} else if (status.equals(Match.Status.PUBLISHED)) {
stringBuilder.append("'. Do you want to suggest the project idea anyway?");
}
}
}
return stringBuilder.toString();
}
return null;
@ -326,14 +304,14 @@ public class ManualMatchPanel extends Panel {
* @param status the status of the match
* @return String the confirmation message
*/
private String createConfirmationMessage(Employee supervisor, Match.Status status) {
private String createConfirmationMessage(User supervisor, Match.Status status) {
StringBuilder stringBuilder = new StringBuilder();
if(status.equals(Match.Status.CONFIRMED)) {
stringBuilder.append("Confirm that you want to match the project idea to ");
} else if (status.equals(Match.Status.PUBLISHED)) {
stringBuilder.append("Confirm that you want to suggest the project idea to ");
}
stringBuilder.append(createNameAndEmail(supervisor));
stringBuilder.append(supervisor.getFullName());
stringBuilder.append(".");
return stringBuilder.toString();
}

35
src/main/java/se/su/dsv/scipro/admin/panels/ManualSetReviewerPanel.java

@ -16,7 +16,7 @@ import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.match.dao.interfaces.ProjectIdeaDao;
import se.su.dsv.scipro.match.dao.interfaces.SupervisorDao;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import se.su.dsv.scipro.reusable.EmployeeAutoComplete;
import se.su.dsv.wicket.components.AutoCompleteObjectField;
import java.util.Iterator;
@ -38,7 +38,7 @@ public class ManualSetReviewerPanel extends Panel {
super(id);
setOutputMarkupPlaceholderTag(true);
Component localFeedback = new FeedbackPanel("localFeedback");
EmployeeAutoComplete autocompleteReviewerField = createDsvAutocompleteComponent(projectIdeaModel.getObject());
AutoCompleteObjectField<Employee, Long> autocompleteReviewerField = createDsvAutocompleteComponent(projectIdeaModel.getObject());
autocompleteReviewerField.setOutputMarkupId(true);
saveButton = createSubmitLink(projectIdeaModel, feedbackPanel, localFeedback, autocompleteReviewerField);
saveButton.setOutputMarkupId(true);
@ -48,20 +48,15 @@ public class ManualSetReviewerPanel extends Panel {
add(currentFragment);
}
private String createNameAndEmail(EmployeeAutoComplete autoCompleteObjectField) {
return autoCompleteObjectField.getModelObject().getNameAsString() + " <" + autoCompleteObjectField.getModelObject().getEmailAsString()+">";
}
private boolean testACInputString(EmployeeAutoComplete autoCompleteObjectField) {
return autoCompleteObjectField.getModelObject() == null ||
autoCompleteObjectField.getInput() == null ||
autoCompleteObjectField.getInput().isEmpty() ||
!autoCompleteObjectField.getInput().equals(createNameAndEmail(autoCompleteObjectField));
private boolean testACInputString(AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
return autocompleteReviewerField.getModelObject() == null ||
autocompleteReviewerField.getInput() == null ||
autocompleteReviewerField.getInput().isEmpty() ||
!autocompleteReviewerField.getInput().equals(autocompleteReviewerField.getModelObject().getNameAsString());
}
private ConfirmerAjaxSubmitLink createSubmitLink(final IModel<ProjectIdea> projectIdeaModel, final Component feedbackPanel,
final Component localFeedback, final EmployeeAutoComplete autocompleteReviewerField) {
final Component localFeedback, final AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
return new ConfirmerAjaxSubmitLink("saveButton") {
private static final long serialVersionUID = -1852298712407811714L;
@ -75,7 +70,7 @@ public class ManualSetReviewerPanel extends Panel {
ProjectIdea projectIdea = projectIdeaModel.getObject();
projectIdea.setSuggestedReviewer(autocompleteReviewerField.getModelObject());
projectIdeaDao.save(projectIdea);
Session.get().info(getInfoMessage(projectIdea.getTitle(), createNameAndEmail(autocompleteReviewerField)));
Session.get().info(getInfoMessage(projectIdea.getTitle(), autocompleteReviewerField.getModelObject().getNameAsString()));
setResponsePage(AdminManageProjectIdeaPage.class);
target.addComponent(feedbackPanel);
}
@ -98,7 +93,7 @@ public class ManualSetReviewerPanel extends Panel {
private Fragment createButtonFragment(final Form<Employee> reviewerForm, final EmployeeAutoComplete autocompleteReviewerField) {
private Fragment createButtonFragment(final Form<Employee> reviewerForm, final AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
Fragment buttonFragment = new Fragment("main", "buttonFragment", this) {
private static final long serialVersionUID = 2383077895140299047L;
@ -120,7 +115,7 @@ public class ManualSetReviewerPanel extends Panel {
return buttonFragment;
}
private void clearInputAndAddToTarget(AjaxRequestTarget target, final EmployeeAutoComplete autoCompleteObjectField) {
private void clearInputAndAddToTarget(AjaxRequestTarget target, final AutoCompleteObjectField autoCompleteObjectField) {
//noinspection unchecked
autoCompleteObjectField.setModelObject(null);
autoCompleteObjectField.clearInput();
@ -130,7 +125,7 @@ public class ManualSetReviewerPanel extends Panel {
target.addComponent(saveButton);
}
private Fragment createReviewerFragment(final Form<Employee> reviewerForm, Component localFeedback, final EmployeeAutoComplete autocompleteReviewerField) {
private Fragment createReviewerFragment(final Form<Employee> reviewerForm, Component localFeedback, final AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
Fragment reviewerFragment = new Fragment("main", "reviewerFragment", this) {
private static final long serialVersionUID = -1831632235479216987L;
@ -161,8 +156,8 @@ public class ManualSetReviewerPanel extends Panel {
return reviewerFragment;
}
EmployeeAutoComplete createDsvAutocompleteComponent(final ProjectIdea projectIdea) {
return new EmployeeAutoComplete("reviewerTextField") {
AutoCompleteObjectField<Employee, Long> createDsvAutocompleteComponent(final ProjectIdea projectIdea) {
return new AutoCompleteObjectField<Employee, Long>("reviewerTextField", Employee.class) {
private static final long serialVersionUID = 8639430940925886127L;
@Override
@ -198,7 +193,7 @@ public class ManualSetReviewerPanel extends Panel {
}
@Override
public void action(AjaxRequestTarget pTarget, Employee newSelection) {
public void onNewSelection(AjaxRequestTarget pTarget, Employee newSelection) {
super.onNewSelection(pTarget, newSelection);
if (newSelection != null) {
if (pTarget != null) {