DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

editing keywords is disabled for supervisors, but still OK for students when handing in project ideas

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-15 13:04:33 +09:00
parent 9263fef170
commit 2d33826c48
4 changed files with 22 additions and 3 deletions

2
src/main/java/se/su/dsv/scipro/project/panels/KeywordSelectionPanel.html

@ -11,7 +11,7 @@
</wicket:enclosure>-->
<wicket:enclosure child="researchAreaGroup">
<div class="span-16 prepend-top">
<label for="researchAreaGroup">Select research area(s): </label><br />
<label for="researchAreaGroup" wicket:id="researchAreaLabel">Select research area(s): </label><br />
<span wicket:id="researchAreaGroup">
<span wicket:id="areas">
<input type="checkbox" wicket:id="check" />

17
src/main/java/se/su/dsv/scipro/project/panels/KeywordSelectionPanel.java

@ -103,6 +103,14 @@ public class KeywordSelectionPanel extends Panel {
protected boolean isResearchAreaKeywordsAvailable(){
return true;
}
/**
* Override to make research area keywords uneditable.
* @return true
*/
protected boolean isResearchAreaKeywordsEditable(){
return true;
}
/**
* Override to make unit keywords unavailable for selection.
* @return true
@ -145,6 +153,13 @@ public class KeywordSelectionPanel extends Panel {
else
researchAreaGroup.setRequired(researchAreaKeywordsAreRequired());
add(researchAreaGroup);
if (isResearchAreaKeywordsEditable()){
add(new Label("researchAreaLabel", "Select research area(s): "));
}
else {
add(new Label("researchAreaLabel", "Editing research areas here is disabled. They are imported from Daisy so they must be changed there."));
}
}
private void addRegularKeywordSelection() {
KeywordType keyword = keywordTypeDao.findByType(KeywordTypeDao.TYPE.REGULAR);
@ -174,7 +189,7 @@ public class KeywordSelectionPanel extends Panel {
regularKeywordsPalette.setVisible(isRegularKeywordsAvailable());
regularKeywordsPalette.setEnabled(isRegularKeywordsAvailable());
researchAreaGroup.setVisible(isResearchAreaKeywordsAvailable());
researchAreaGroup.setEnabled(isResearchAreaKeywordsAvailable());
researchAreaGroup.setEnabled(isResearchAreaKeywordsEditable());
/*unitSelect.setVisible((isUnitKeywordsAvailable()));
unitSelect.setEnabled((isUnitKeywordsAvailable()));
unitSelect.setEnabled(false);*/

2
src/main/java/se/su/dsv/scipro/user/panels/EmployeeProfilePanel.html

@ -2,7 +2,7 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
<div><label>Tick what languages you can supervise in: </label></div>
<div><label>Select what languages you can supervise in: </label></div>
<div wicket:id="languageSelection"></div>
<div wicket:id="keywordSelection"></div>
</wicket:extend>

4
src/main/java/se/su/dsv/scipro/user/panels/EmployeeProfilePanel.java

@ -70,6 +70,10 @@ public class EmployeeProfilePanel extends UserProfilePanel {
protected boolean isUnitKeywordsAvailable(){
return true;
}
@Override
protected boolean isResearchAreaKeywordsEditable(){
return false;
}
};
add(keywordSelectionPanel);
}