Skip to content
Snippets Groups Projects
Commit 307a375d authored by srosse's avatar srosse
Browse files

OO-4067: tab curriculum in user overview of user management

parent 2ce9dbb4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 21 deletions
src/main/java/org/olat/admin/user/UserAdminController.java
+ 20
− 2
View file @ 307a375d
......@@ -64,6 +64,8 @@ import org.olat.core.util.vfs.QuotaManager;
import org.olat.course.certificate.ui.CertificateAndEfficiencyStatementListController;
import org.olat.ldap.LDAPLoginManager;
import org.olat.ldap.LDAPLoginModule;
import org.olat.modules.curriculum.CurriculumModule;
import org.olat.modules.curriculum.ui.CurriculumListController;
import org.olat.modules.lecture.LectureModule;
import org.olat.modules.lecture.ui.ParticipantLecturesOverviewController;
import org.olat.modules.taxonomy.TaxonomyModule;
......@@ -100,7 +102,7 @@ public class UserAdminController extends BasicController implements Activateable
private static final String NLS_FOUND_PROPERTY = "found.property";
private static final String NLS_EDIT_UPROFILE = "edit.uprofile";
private static final String NLS_EDIT_UPREFS = "edit.uprefs";
private static final String NLS_EDIT_UPCRED = "edit.upwd";
private static final String NLS_EDIT_UPCRED = "edit.upwd";
private static final String NLS_EDIT_UAUTH = "edit.uauth";
private static final String NLS_EDIT_UPROP = "edit.uprop";
private static final String NLS_EDIT_UROLES = "edit.uroles";
......@@ -112,7 +114,8 @@ public class UserAdminController extends BasicController implements Activateable
private static final String NLS_VIEW_EFF_STATEMENTS = "view.effStatements";
private static final String NLS_VIEW_SUBSCRIPTIONS = "view.subscriptions";
private static final String NLS_VIEW_LECTURES = "view.lectures";
private static final String NLS_VIEW_COMPETENCES = "view.competences";
private static final String NLS_VIEW_COMPETENCES = "view.competences";
private static final String NLS_VIEW_CURRICULUM = "view.curriculum";
private VelocityContainer myContent;
private final TooledStackedPanel stackPanel;
......@@ -126,6 +129,7 @@ public class UserAdminController extends BasicController implements Activateable
// controllers used in tabbed pane
private TabbedPane userTabP;
private Controller prefsCtr, propertiesCtr, pwdCtr, quotaCtr, rolesCtr, userShortDescrCtr;
private CurriculumListController curriculumCtr;
private UserRelationsController relationsCtrl;
private DisplayPortraitController portraitCtr;
private UserAuthenticationsEditorController authenticationsCtr;
......@@ -156,6 +160,8 @@ public class UserAdminController extends BasicController implements Activateable
@Autowired
private TaxonomyModule taxonomyModule;
@Autowired
private CurriculumModule curriculumModule;
@Autowired
private QuotaManager quotaManager;
@Autowired
private OrganisationService organisationService;
......@@ -491,6 +497,18 @@ public class UserAdminController extends BasicController implements Activateable
return competencePanel;
});
}
if(curriculumModule.isEnabled() && (isUserManagerOf || isRolesManagerOf || isAdminOf || isPrincipalOf)) {
userTabP.addTab(translate(NLS_VIEW_CURRICULUM), uureq -> {
curriculumCtr = new CurriculumListController(uureq, getWindowControl(), identity);
listenTo(curriculumCtr);
BreadcrumbedStackedPanel competencePanel = new BreadcrumbedStackedPanel("curriculums", getTranslator(), curriculumCtr);
competencePanel.pushController(translate(NLS_VIEW_CURRICULUM), curriculumCtr);
curriculumCtr.setBreadcrumbPanel(competencePanel);
competencePanel.setInvisibleCrumb(1);
return competencePanel;
});
}
// now push to velocity
myContent.put("userTabP", userTabP);
......
src/main/java/org/olat/admin/user/_content/udispatcher.html
+ 1
− 1
View file @ 307a375d
......@@ -4,7 +4,7 @@
#if($r.isTrue($showTitle))
<h4>$r.translate("content.usermgmt.userfound")</h4>
#end
<div class="o_user_infos">
<div class="o_user_infos row">
<div class="o_user_portrait">$r.render("portrait")</div>
<div class="o_user_infos_inner">
$r.render("userShortDescription")
......
src/main/java/org/olat/admin/user/_i18n/LocalStrings_de.properties
+ 1
− 0
View file @ 307a375d
......@@ -207,6 +207,7 @@ usermanagers=Benutzerverwalter
view.access=Buchungen
view.competences=Kompetenzen
view.courses=Lernressourcen
view.curriculum=Curriculum
view.effStatements=Statements
view.groups=Gruppen
view.lectures=Lektionen
......
src/main/java/org/olat/admin/user/_i18n/LocalStrings_en.properties
+ 1
− 0
View file @ 307a375d
......@@ -205,6 +205,7 @@ usermanagers=User manager
view.access=Bookings
view.competences=Competences
view.courses=Learning resources
view.curriculum=Curriculum
view.effStatements=Statements
view.groups=Groups
view.lectures=Lectures
......
src/main/java/org/olat/modules/curriculum/CurriculumSecurityCallbackFactory.java
+ 25
− 0
View file @ 307a375d
......@@ -45,6 +45,14 @@ public class CurriculumSecurityCallbackFactory {
return new DefaultCurriculumSecurityCallback(false, Collections.emptyList());
}
/**
* @return A security callback without any administration permissions
* but view calendars and lectures.
*/
public static final CurriculumSecurityCallback userLookCallback() {
return new UserLookCurriculumSecurityCallback();
}
public static final CurriculumSecurityCallback createCallback(Roles roles) {
boolean admin = roles.isCurriculumManager() || roles.isAdministrator();
return new DefaultCurriculumSecurityCallback(admin, Collections.emptyList());
......@@ -54,6 +62,23 @@ public class CurriculumSecurityCallbackFactory {
return new DefaultCurriculumSecurityCallback(canManage, ownedRefs);
}
private static class UserLookCurriculumSecurityCallback extends DefaultCurriculumSecurityCallback {
public UserLookCurriculumSecurityCallback() {
super(false, Collections.emptyList());
}
@Override
public boolean canViewAllCalendars() {
return true;
}
@Override
public boolean canViewAllLectures() {
return true;
}
}
private static class DefaultCurriculumSecurityCallback implements CurriculumSecurityCallback {
private final boolean admin;
......
src/main/java/org/olat/modules/curriculum/ui/CurriculumElementListController.java
+ 22
− 9
View file @ 307a375d
......@@ -58,6 +58,7 @@ import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.id.Identity;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.Roles;
import org.olat.core.id.context.BusinessControlFactory;
......@@ -70,7 +71,7 @@ import org.olat.modules.curriculum.CurriculumElement;
import org.olat.modules.curriculum.CurriculumElementMembership;
import org.olat.modules.curriculum.CurriculumElementWithView;
import org.olat.modules.curriculum.CurriculumRef;
import org.olat.modules.curriculum.CurriculumSecurityCallbackFactory;
import org.olat.modules.curriculum.CurriculumSecurityCallback;
import org.olat.modules.curriculum.CurriculumService;
import org.olat.modules.curriculum.model.CurriculumElementRefImpl;
import org.olat.modules.curriculum.model.CurriculumElementRepositoryEntryViews;
......@@ -117,6 +118,8 @@ public class CurriculumElementListController extends FormBasicController impleme
private final boolean guestOnly;
private final CurriculumRef curriculum;
private final MapperKey mapperThumbnailKey;
private final Identity assessedIdentity;
private final CurriculumSecurityCallback secCallback;
private RepositoryEntryDetailsController detailsCtrl;
private CurriculumElementCalendarController calendarsCtrl;
......@@ -136,10 +139,13 @@ public class CurriculumElementListController extends FormBasicController impleme
@Autowired
private RepositoryManager repositoryManager;
public CurriculumElementListController(UserRequest ureq, WindowControl wControl, BreadcrumbPanel stackPanel, CurriculumRef curriculum) {
public CurriculumElementListController(UserRequest ureq, WindowControl wControl, BreadcrumbPanel stackPanel,
Identity assessedIdentity, CurriculumRef curriculum, CurriculumSecurityCallback secCallback) {
super(ureq, wControl, "curriculum_element_list", Util.createPackageTranslator(RepositoryService.class, ureq.getLocale()));
this.curriculum = curriculum;
this.stackPanel = stackPanel;
this.secCallback = secCallback;
this.assessedIdentity = assessedIdentity;
guestOnly = ureq.getUserSession().getRoles().isGuestOnly();
mapperThumbnailKey = mapperService.register(null, "repositoryentryImage", new RepositoryEntryImageMapper());
......@@ -161,7 +167,9 @@ public class CurriculumElementListController extends FormBasicController impleme
elementIdentifierCol.setCellRenderer(new CurriculumElementCompositeRenderer("select", new TextFlexiCellRenderer()));
columnsModel.addFlexiColumnModel(elementIdentifierCol);
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, ElementViewCols.select));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ElementViewCols.mark));
if(assessedIdentity.equals(getIdentity())) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ElementViewCols.mark));
}
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ElementViewCols.details));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ElementViewCols.calendars));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ElementViewCols.start));
......@@ -169,7 +177,11 @@ public class CurriculumElementListController extends FormBasicController impleme
tableModel = new CurriculumElementWithViewsDataModel(columnsModel);
tableEl = uifactory.addTableElement(getWindowControl(), "table", tableModel, 50, false, getTranslator(), formLayout);
tableEl.setAvailableRendererTypes(FlexiTableRendererType.custom, FlexiTableRendererType.classic);
tableEl.setRendererType(FlexiTableRendererType.custom);
if(assessedIdentity.equals(getIdentity())) {
tableEl.setRendererType(FlexiTableRendererType.custom);
} else {
tableEl.setRendererType(FlexiTableRendererType.classic);
}
tableEl.setElementCssClass("o_curriculumtable");
tableEl.setCustomizeColumns(true);
tableEl.setEmtpyTableMessageKey("table.curriculum.empty");
......@@ -181,7 +193,8 @@ public class CurriculumElementListController extends FormBasicController impleme
row.setDomReplacementWrapperRequired(false); // sets its own DOM id in velocity container
tableEl.setRowRenderer(row, this);
tableEl.setAndLoadPersistedPreferences(ureq, "my-curriculum-elements-v3-" + curriculum.getKey());
tableEl.setAndLoadPersistedPreferences(ureq, "my-curriculum-elements-v3-"
+ (assessedIdentity.equals(getIdentity()) ? "" : "look-") + curriculum.getKey());
}
private List<FlexiTableFilter> getFilters() {
......@@ -243,7 +256,7 @@ public class CurriculumElementListController extends FormBasicController impleme
private void loadModel(UserRequest ureq) {
Roles roles = ureq.getUserSession().getRoles();
List<CurriculumRef> curriculumList = Collections.singletonList(curriculum);
List<CurriculumElementRepositoryEntryViews> elementsWithViews = curriculumService.getCurriculumElements(getIdentity(), roles, curriculumList);
List<CurriculumElementRepositoryEntryViews> elementsWithViews = curriculumService.getCurriculumElements(assessedIdentity, roles, curriculumList);
Set<Long> repoKeys = new HashSet<>(elementsWithViews.size() * 3);
List<OLATResource> resourcesWithAC = new ArrayList<>(elementsWithViews.size() * 3);
......@@ -256,7 +269,7 @@ public class CurriculumElementListController extends FormBasicController impleme
}
}
List<OLATResourceAccess> resourcesWithOffer = acService.filterResourceWithAC(resourcesWithAC);
repositoryService.filterMembership(getIdentity(), repoKeys);
repositoryService.filterMembership(assessedIdentity, repoKeys);
List<CurriculumElementWithViewsRow> rows = new ArrayList<>(elementsWithViews.size() * 3);
for(CurriculumElementRepositoryEntryViews elementWithViews:elementsWithViews) {
......@@ -559,9 +572,9 @@ public class CurriculumElementListController extends FormBasicController impleme
}
}
List<RepositoryEntry> entries = repositoryService.loadByKeys(entryKeys);
calendarsCtrl = new CurriculumElementCalendarController(ureq, bwControl, element, entries,
CurriculumSecurityCallbackFactory.createDefaultCallback());
calendarsCtrl = new CurriculumElementCalendarController(ureq, bwControl, element, entries, secCallback);
listenTo(calendarsCtrl);
stackPanel.pushController(translate("calendars"), calendarsCtrl);
}
......
src/main/java/org/olat/modules/curriculum/ui/CurriculumListController.java
+ 43
− 9
View file @ 307a375d
......@@ -38,12 +38,15 @@ import org.olat.core.gui.components.stack.BreadcrumbedStackedPanel;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.generic.dtabs.Activateable2;
import org.olat.core.id.Identity;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry;
import org.olat.core.util.resource.OresHelper;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumRef;
import org.olat.modules.curriculum.CurriculumSecurityCallback;
import org.olat.modules.curriculum.CurriculumSecurityCallbackFactory;
import org.olat.modules.curriculum.CurriculumService;
import org.olat.modules.curriculum.ui.CurriculumManagerDataModel.CurriculumCols;
import org.olat.modules.curriculum.ui.component.CurriculumActiveCellRenderer;
......@@ -62,16 +65,44 @@ public class CurriculumListController extends FormBasicController implements Act
private FlexiTableElement tableEl;
private CurriculumManagerDataModel tableModel;
private final BreadcrumbedStackedPanel stackPanel;
private BreadcrumbedStackedPanel stackPanel;
private CurriculumSecurityCallback secCallback;
private CurriculumElementListController elementListCtrl;
private Identity assessedIdentity;
@Autowired
private CurriculumService curriculumService;
/**
* This opens the list of the curriculum of the loged in user with standard permissions.
*
* @param ureq The user request
* @param wControl The window control
* @param stackPanel The bread crumb panel
*/
public CurriculumListController(UserRequest ureq, WindowControl wControl, BreadcrumbedStackedPanel stackPanel) {
super(ureq, wControl, "curriculum_list");
this.stackPanel = stackPanel;
assessedIdentity = getIdentity();
secCallback = CurriculumSecurityCallbackFactory.createDefaultCallback();
initForm(ureq);
loadModel();
}
/**
* This opens the list of curriculums of the specified user.
*
* @param ureq The user request
* @param wControl The window control
* @param assessedIdentity The identity to look at the curriculums
*/
public CurriculumListController(UserRequest ureq, WindowControl wControl, Identity assessedIdentity) {
super(ureq, wControl, "curriculum_list");
this.assessedIdentity = assessedIdentity;
secCallback = CurriculumSecurityCallbackFactory.userLookCallback();
initForm(ureq);
loadModel();
......@@ -80,6 +111,10 @@ public class CurriculumListController extends FormBasicController implements Act
public String getName() {
return "curriculum";
}
public void setBreadcrumbPanel(BreadcrumbedStackedPanel stackPanel) {
this.stackPanel = stackPanel;
}
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
......@@ -88,17 +123,15 @@ public class CurriculumListController extends FormBasicController implements Act
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.active, new CurriculumActiveCellRenderer(getTranslator())));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.displayName, "select"));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.identifier, "select"));
DefaultFlexiColumnModel toolsCol = new DefaultFlexiColumnModel(CurriculumCols.tools);
toolsCol.setExportable(false);
toolsCol.setAlwaysVisible(true);
columnsModel.addFlexiColumnModel(toolsCol);
tableModel = new CurriculumManagerDataModel(columnsModel, getLocale());
tableEl = uifactory.addTableElement(getWindowControl(), "table", tableModel, 20, false, getTranslator(), formLayout);
tableEl.setCustomizeColumns(true);
tableEl.setEmtpyTableMessageKey("table.curriculum.empty");
tableEl.setFilters("activity", getFilters(), false);
tableEl.setSelectedFilterKey("active");
if(assessedIdentity.equals(getIdentity())) {
tableEl.setSelectedFilterKey("active");
}
tableEl.setAndLoadPersistedPreferences(ureq, "cur-curriculum-list-v2");
}
......@@ -112,8 +145,8 @@ public class CurriculumListController extends FormBasicController implements Act
}
private void loadModel() {
List<Curriculum> curriculums = curriculumService.getMyCurriculums(getIdentity());
List<CurriculumRef> activeRefs = curriculumService.getMyActiveCurriculumRefs(getIdentity());
List<Curriculum> curriculums = curriculumService.getMyCurriculums(assessedIdentity);
List<CurriculumRef> activeRefs = curriculumService.getMyActiveCurriculumRefs(assessedIdentity);
List<Long> activeKeys = activeRefs.stream().map(CurriculumRef::getKey).collect(Collectors.toList());
List<CurriculumRow> rows = curriculums.stream()
.map(c -> new CurriculumRow(c, activeKeys.contains(c.getKey())))
......@@ -176,7 +209,8 @@ public class CurriculumListController extends FormBasicController implements Act
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Curriculum", row.getKey());
WindowControl swControl = addToHistory(ureq, ores, null);
elementListCtrl = new CurriculumElementListController(ureq, swControl, stackPanel, row);
elementListCtrl = new CurriculumElementListController(ureq, swControl, stackPanel,
assessedIdentity, row, secCallback);
listenTo(elementListCtrl);
stackPanel.pushController(row.getDisplayName(), elementListCtrl);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment