diff --git a/src/main/java/org/olat/modules/taxonomy/manager/TaxonomyCompetenceDAO.java b/src/main/java/org/olat/modules/taxonomy/manager/TaxonomyCompetenceDAO.java index c7d6bc850dddddc7773c8341984e6929008953b8..aff19cabd581a7aa048a296b6c614da48eaa15a5 100644 --- a/src/main/java/org/olat/modules/taxonomy/manager/TaxonomyCompetenceDAO.java +++ b/src/main/java/org/olat/modules/taxonomy/manager/TaxonomyCompetenceDAO.java @@ -103,6 +103,7 @@ public class TaxonomyCompetenceDAO { .append(" inner join competence.identity ident") .append(" inner join fetch competence.taxonomyLevel taxonomyLevel") .append(" inner join fetch taxonomyLevel.taxonomy taxonomy") + .append(" left join fetch taxonomyLevel.type taxonomyLevelType") .append(" where ident.key=:identityKey"); if(typeList.size() > 0) { sb.append(" and competence.type in (:types)"); diff --git a/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetenceTableModel.java b/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetenceTableModel.java index 10db9804cd924e102616d741d986cf248fbd7931..063f927a163aad32a2af61279bee6f61d49b085d 100644 --- a/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetenceTableModel.java +++ b/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetenceTableModel.java @@ -26,6 +26,7 @@ import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFle import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiSortableColumnDef; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel; import org.olat.core.gui.components.form.flexible.impl.elements.table.SortableFlexiTableDataModel; +import org.olat.modules.taxonomy.TaxonomyLevelType; /** * @@ -62,6 +63,10 @@ implements SortableFlexiTableDataModel<IdentityCompetenceRow> { case taxonomyExternalId: return row.getTaxonomy().getExternalId(); case taxonomyLevelIdentifier: return row.getTaxonomyLevel().getIdentifier(); case taxonomyLevelDisplayName: return row.getTaxonomyLevel().getDisplayName(); + case taxonomyLevelType: { + TaxonomyLevelType type = row.getTaxonomyLevel().getType(); + return type == null ? null : type.getDisplayName(); + } case taxonomyLevelExternalId: return row.getTaxonomyLevel().getExternalId(); case type: return row.getCompetenceType(); default: return null; @@ -79,6 +84,7 @@ implements SortableFlexiTableDataModel<IdentityCompetenceRow> { taxonomyExternalId("table.header.taxonomy.externalId"), taxonomyLevelIdentifier("table.header.taxonomy.level.identifier"), taxonomyLevelDisplayName("table.header.taxonomy.level.displayName"), + taxonomyLevelType("table.header.taxonomy.level.type"), taxonomyLevelExternalId("table.header.taxonomy.level.externalId"), type("table.header.competence.type"); diff --git a/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetencesController.java b/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetencesController.java index b0d3b178e3b091cb8ac1b74da93237f591d2404c..57d88f921308fc9f63476d3ea05648a78f9aa8ab 100644 --- a/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetencesController.java +++ b/src/main/java/org/olat/modules/taxonomy/ui/IdentityCompetencesController.java @@ -107,6 +107,7 @@ public class IdentityCompetencesController extends FormBasicController implement columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, IdCompetenceCols.taxonomyLevelIdentifier)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdCompetenceCols.taxonomyLevelDisplayName)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, IdCompetenceCols.taxonomyLevelExternalId)); + columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdCompetenceCols.taxonomyLevelType)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdCompetenceCols.type, new TaxonomyCompetenceTypeRenderer(getTranslator()))); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("remove", translate("remove"), "remove")); diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties index 1375df76a9ce0820ae9a915b56f15c852af5d8df..ad43b5ccde8dbfbb4d7de6bb4e4b005c49087b6b 100644 --- a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties @@ -72,6 +72,7 @@ table.header.taxonomy.level.displayName=Anzeigename table.header.taxonomy.level.externalId=Level Ext. Ref. table.header.taxonomy.level.identifier=Kennzeichen table.header.taxonomy.level.num.children=Anzahl +table.header.taxonomy.level.type=Ebenentyp table.header.taxonomy.level.type.identifier=Ebenentyp table.header.type.displayName=Name table.header.type.identifier=Bezeichnung diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties index 75ba36d2e63e764dddf850c4bb188e8a0d3ac82f..c8823672825ece63aafa792d3710bfe5e2289972 100644 --- a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties @@ -72,6 +72,7 @@ table.header.taxonomy.level.displayName=Level table.header.taxonomy.level.externalId=Level ext. ref. table.header.taxonomy.level.identifier=Level ID table.header.taxonomy.level.num.children=Number +table.header.taxonomy.level.type=Level type table.header.taxonomy.level.type.identifier=Level type table.header.type.displayName=Name table.header.type.identifier=Identifier