Skip to content
Snippets Groups Projects
Commit 7a796f2d authored by srosse's avatar srosse
Browse files

OO-2042: separe owners, coaches and participants

parent c0924328
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
*/ */
package org.olat.course.nodes.members; package org.olat.course.nodes.members;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
...@@ -57,25 +56,24 @@ public class MembersPrintController extends BasicController { ...@@ -57,25 +56,24 @@ public class MembersPrintController extends BasicController {
mainVC.contextPut("avatarBaseURL", avatarBaseURL); mainVC.contextPut("avatarBaseURL", avatarBaseURL);
mainVC.contextPut("userPropertyHandlers", userPropertyHandlers); mainVC.contextPut("userPropertyHandlers", userPropertyHandlers);
List<Member> members = new ArrayList<>();
if(owners != null && owners.size() > 0) { if(owners != null && owners.size() > 0) {
members.addAll(owners); initFormMemberList("owners", translate("members.owners"), owners);
} }
if(coaches != null && coaches.size() > 0) { if(coaches != null && coaches.size() > 0) {
members.addAll(coaches); initFormMemberList("coaches", translate("members.coaches"), coaches);
} }
if(participants != null && participants.size() > 0) { if(participants != null && participants.size() > 0) {
members.addAll(participants); initFormMemberList("participants", translate("members.participants"), participants);
} }
initFormMemberList("members", members);
MainPanel mainPanel = new MainPanel("membersPrintPanel"); MainPanel mainPanel = new MainPanel("membersPrintPanel");
mainPanel.setContent(mainVC); mainPanel.setContent(mainVC);
putInitialPanel(mainPanel); putInitialPanel(mainPanel);
} }
private void initFormMemberList(String name, List<Member> members) { private void initFormMemberList(String name, String label, List<Member> members) {
VelocityContainer listVC = createVelocityContainer("printList"); VelocityContainer listVC = createVelocityContainer("printList");
listVC.contextPut("label", label);
listVC.contextPut("avatarBaseURL", avatarBaseURL); listVC.contextPut("avatarBaseURL", avatarBaseURL);
listVC.contextPut("members", members); listVC.contextPut("members", members);
listVC.contextPut("userPropertyHandlers", userPropertyHandlers); listVC.contextPut("userPropertyHandlers", userPropertyHandlers);
......
...@@ -3,8 +3,14 @@ ...@@ -3,8 +3,14 @@
</div> </div>
<h1>$r.translate("print.title")</h1> <h1>$r.translate("print.title")</h1>
<h3>$courseTitle</h3> <h3>$courseTitle</h3>
#if($r.available("members")) #if($r.available("owners"))
$r.render("members") $r.render("owners")
#end
#if($r.available("coaches"))
$r.render("coaches")
#end
#if($r.available("participants"))
$r.render("participants")
#end #end
<script type='text/javascript'> <script type='text/javascript'>
/* <![CDATA[ */ /* <![CDATA[ */
......
<div class="clearfix">
<h4>$label</h4>
#foreach($member in $members) #foreach($member in $members)
<div class="o_cmember col-xs-3 col-sm-3 col-md-3"> <div class="o_cmember col-xs-3 col-sm-3 col-md-3">
<div class="clearfix"> <div class="clearfix">
...@@ -26,3 +28,4 @@ ...@@ -26,3 +28,4 @@
<div class="clearfix"> </div> <div class="clearfix"> </div>
#end #end
#end #end
</div>
\ No newline at end of file
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