Skip to content
Snippets Groups Projects
Commit 4eeb504b authored by srosse's avatar srosse
Browse files

OO-3178: show a message if there isn't any taxonomy level select to add a competence on

parent 4feddaf1
No related branches found
No related tags found
No related merge requests found
......@@ -203,24 +203,28 @@ public class IdentityCompetencesController extends FormBasicController implement
}
private void doAddTaxonomyLevelsAsCompetence(TaxonomyLevel selectedLevel, TaxonomyCompetenceTypes competenceType) {
boolean found = false;
List<TaxonomyCompetence> currentCompetences = taxonomyService.getTaxonomyCompetences(assessedIdentity, competenceType);
for(TaxonomyCompetence currentCompetence:currentCompetences) {
if(selectedLevel.equals(currentCompetence.getTaxonomyLevel())) {
found = true;
if(selectedLevel == null) {
showWarning("warning.atleastone.level.competence");
} else {
boolean found = false;
List<TaxonomyCompetence> currentCompetences = taxonomyService.getTaxonomyCompetences(assessedIdentity, competenceType);
for(TaxonomyCompetence currentCompetence:currentCompetences) {
if(selectedLevel.equals(currentCompetence.getTaxonomyLevel())) {
found = true;
}
}
if(!found) {
TaxonomyLevel taxonomyLevel = taxonomyService.getTaxonomyLevel(selectedLevel);
Taxonomy taxonomy = taxonomyLevel.getTaxonomy();
TaxonomyCompetence competence = taxonomyService.addTaxonomyLevelCompetences(taxonomyLevel, assessedIdentity, competenceType, null);
String after = taxonomyService.toAuditXml(competence);
taxonomyService.auditLog(TaxonomyCompetenceAuditLog.Action.addCompetence, null, after, null, taxonomy, competence, assessedIdentity, getIdentity());
}
loadModel();
tableEl.reset(true, true, true);
}
if(!found) {
TaxonomyLevel taxonomyLevel = taxonomyService.getTaxonomyLevel(selectedLevel);
Taxonomy taxonomy = taxonomyLevel.getTaxonomy();
TaxonomyCompetence competence = taxonomyService.addTaxonomyLevelCompetences(taxonomyLevel, assessedIdentity, competenceType, null);
String after = taxonomyService.toAuditXml(competence);
taxonomyService.auditLog(TaxonomyCompetenceAuditLog.Action.addCompetence, null, after, null, taxonomy, competence, assessedIdentity, getIdentity());
}
loadModel();
tableEl.reset(true, true, true);
}
private void doConfirmRemove(UserRequest ureq, IdentityCompetenceRow row) {
......
......@@ -73,6 +73,7 @@ public class SelectTaxonomyLevelController extends FormBasicController {
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
taxonomyTreesModel = new GenericTreeModel();
taxonomyTreesEl = uifactory.addTreeMultiselect("taxonomy", null, formLayout, taxonomyTreesModel, this);
taxonomyTreesEl.setRootVisible(false);
uifactory.addFormCancelButton("cancel", formLayout, ureq, getWindowControl());
uifactory.addFormSubmitButton("ok", formLayout);
......
......@@ -130,5 +130,6 @@ teach=Dozieren
tools=$\:table.header.actions
type.taxonomy.level=Ebenentyp zuweisen
warning.atleastone.level=Sie m\u00FCssen mindestens eine Ebene w\u00E4hlen dass Sie editieren d\u00FCrfen.
warning.atleastone.level.competence=Sie m\u00FCssen mindestens eine Ebene w\u00E4hlen.
warning.delete.level=Die Ebene darf nicht gel\u00F6scht werden. Sie wird noch benutzt.
warning.delete.level.type=Der Ebenentype wurde nicht gel\u00F6scht. Er ist noch benutzt.
......@@ -129,5 +129,6 @@ teach=Teach
tools=$\:table.header.actions
type.taxonomy.level=Assign level type
warning.atleastone.level=You must at least one taxonomy level you can edit.
warning.atleastone.level.competence=You must at least one taxonomy level.
warning.delete.level=The level cannot be deleted because it is still in use.
warning.delete.level.type=The level type "{0}" was not deleted because it is still in use.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment