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

Added infor texts when rendering info about added keywords to the list of unmatch project ideas.

Browse Source
This commit is contained in:
Tom Vahlman 2012-03-22 18:18:58 +01:00
parent b8003103d9
commit acea2a7211
2 changed files with 25 additions and 6 deletions
src/main/java/se/su/dsv/scipro/supervisor/panels
SupervisorUnmatchedThesisPanel.htmlSupervisorUnmatchedThesisPanel.java

4
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorUnmatchedThesisPanel.html

@ -32,7 +32,7 @@
<ul wicket:id="keyWordsContainer">
<li wicket:id="keywordList">
<h5>
<span wicket:id="keyWord">[keyword]</span> (<span wicket:id="keyWordType">[keyWordType]</span>)
<span wicket:id="keyWord">[keyword]</span> (<span wicket:id="keyWordType">[keyWordType]</span>)<span wicket:id ="isDeleted" style="color: red;">[is deleted]</span>
<img wicket:id="deleteKeyWordIcon" />
</h5>
</li>
@ -44,7 +44,7 @@
<div class="span-3" wicket:id="projectClassPanel">
</div>
<div class="span-12">
<label>Include deleted keywords:</label><br />
<label>Include inactive keywords:</label><br />
<input type="checkbox" wicket:id="includeDeleted" />
<span wicket:id="deletedLabel">[label]</span>
</div>

27
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorUnmatchedThesisPanel.java

@ -64,7 +64,12 @@ public class SupervisorUnmatchedThesisPanel extends Panel {
private ProjectClassDao projectClassDao;
private Label deletedLabel = new Label("deletedLabel", Boolean.FALSE.toString());
private Label deletedLabel = new Label("deletedLabel", Boolean.FALSE.toString()) {
@Override
public boolean isVisible() {
return false;
}
};
public SupervisorUnmatchedThesisPanel(String id, final Component feedBackPanel) {
super(id);
@ -254,7 +259,12 @@ public class SupervisorUnmatchedThesisPanel extends Panel {
keywords.add(newSelection);
}
((ListView) keyWordsContainer.get("keywordList")).setModelObject(keywords);
Session.get().info("Added the keyword " + newSelection + " to the search terms.");
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Added the keyword ").append(newSelection).append(" (").append(newSelection.getType().getName()).append(") to the search terms.");
if(newSelection.isDeleted()) {
stringBuilder.append(" The keyword is inactive");
}
Session.get().info(stringBuilder.toString());
this.setModelObject(null);
this.clearInput();
pTarget.addComponent(this);
@ -286,8 +296,18 @@ public class SupervisorUnmatchedThesisPanel extends Panel {
//To change body of implemented methods use File | Settings | File Templates.
final Keyword keyword = keywordListItem.getModelObject();
keywordListItem.add(new Label("keyWord",keyword.getKeyword()));
keywordListItem.add(new Label("isDeleted", " keyword is inactive ") {
private static final long serialVersionUID = -8762949529390464842L;
@Override
public boolean isVisible() {
return keyword.isDeleted();
}
});
keywordListItem.add(new Label("keyWordType",keyword.getType().getName()));
AjaxActionIcon deleteKeyWordIcon = new AjaxActionIcon("deleteKeyWordIcon", ImageObject.SIXTEEN + ImageObject.DELETE2){
AjaxActionIcon deleteKeyWordIcon = new AjaxActionIcon("deleteKeyWordIcon", ImageObject.SIXTEEN + ImageObject.DELETE){
private static final long serialVersionUID = -8732262906336014797L;
@Override
@ -335,7 +355,6 @@ public class SupervisorUnmatchedThesisPanel extends Panel {
protected void onUpdate(AjaxRequestTarget target) {
if (getModelObject()) {
deletedLabel.setDefaultModel(new Model(Boolean.TRUE.toString()));
} else {
deletedLabel.setDefaultModel(new Model(Boolean.FALSE.toString()));
}