Browse Source

Merge pull request #774 from AngelFQC/BT9889

Improve About Session Page - refs BT#9889 #TMI
Angel Fernando Quiroz Campos 9 years ago
parent
commit
cdf1ef203a
2 changed files with 80 additions and 32 deletions
  1. 17 7
      main/session/about.php
  2. 63 25
      main/template/default/session/about.tpl

+ 17 - 7
main/session/about.php

@@ -8,6 +8,7 @@
  */
 use Chamilo\CoreBundle\Entity\ExtraField;
 use Chamilo\CourseBundle\Entity\CCourseDescription;
+use \Chamilo\CoreBundle\Entity\SequenceResource;
 
 $cidReset = true;
 
@@ -115,9 +116,18 @@ $sessionDates = SessionManager::parseSessionDates([
 
 $sessionRequirements = $sequenceResourceRepo->getRequirements(
     $session->getId(),
-    \Chamilo\CoreBundle\Entity\SequenceResource::SESSION_TYPE
+    SequenceResource::SESSION_TYPE
 );
 
+$hasRequirements = false;
+
+foreach ($sessionRequirements as $sequence) {
+    if (!empty($sequence['requirements'])) {
+        $hasRequirements = true;
+        break;
+    }
+}
+
 $courseController = new CoursesController();
 
 /* View */
@@ -138,7 +148,7 @@ $template->assign(
     $courseController->getRegisteredInSessionButton(
         $session->getId(),
         $session->getName(),
-        !empty($sessionRequirements)
+        $hasRequirements
     )
 );
 
@@ -148,14 +158,14 @@ $template->assign(
     'session_extra_fields',
     $sessionValues->getAllValuesForAnItem($session->getId(), true)
 );
+$template->assign('has_requirements', $hasRequirements);
+$template->assign('sequences', $sessionRequirements);
 
 $templateFolder = api_get_configuration_value('default_template');
 
-if (!empty($templateFolder)) {
-    $content = $template->fetch($templateFolder.'/session/about.tpl');
-} else {
-    $content = $template->fetch('default/session/about.tpl');
-}
+$layout = $template->get_template('session/about.tpl');
+
+$content = $template->fetch($layout);
 
 $template->assign('header', $session->getName());
 $template->assign('content', $content);

+ 63 - 25
main/template/default/session/about.tpl

@@ -1,13 +1,48 @@
 <div id="about-session">
-    <p><i class="fa fa-clock-o"></i> <em>{{ session_date.display }}</em></p>
+    <div class="row">
+        <div class="col-xs-12">
+            <p><i class="fa fa-clock-o"></i> <em>{{ session_date.display }}</em></p>
+
+            {% if show_tutor %}
+                <p>
+                    <i class="fa fa-user"></i> {{ 'SessionGeneralCoach'|get_lang }}: <em>{{ session.generalCoach.getCompleteName() }}</em>
+                </p>
+            {% endif %}
 
-    {% if show_tutor %}
-        <p><i class="fa fa-user"></i> {{ 'SessionGeneralCoach'|get_lang }}: <em>{{ session.generalCoach.getCompleteName() }}</em></p>
-    {% endif %}
+            {% if session.getShowDescription() %}
+                <div class="lead">
+                    {{ session.getDescription() }}
+                </div>
+            {% endif %}
+        </div>
+    </div>
 
-    {% if session.getShowDescription() %}
-        <div class="lead">
-            {{ session.getDescription() }}
+    {% if has_requirements %}
+        <div class="row">
+            <div class="col-xs-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">{{ 'RequiredSessions'|get_lang }}</div>
+                    <div class="panel-body">
+                        <div class="row">
+                            {% for sequence in sequences %}
+                                <div class="col-md-4">
+                                    <dl class="dl-horizontal">
+                                        {% if sequence.requirements %}
+                                            <dt>{{ sequence.name }}</dt>
+
+                                            {% for requirement in sequence.requirements %}
+                                                <dd>
+                                                    <a href="{{ _p.web ~ 'session/' ~ requirement.getId ~ '/about/' }}">{{ requirement.getName }}</a>
+                                                </dd>
+                                            {% endfor %}
+                                        {% endif %}
+                                    </dl>
+                                </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     {% endif %}
 
@@ -26,15 +61,13 @@
             {% endif %}
         {% endfor %}
 
-        {% if courses|length > 1 %}
-            <div class="row">
+        <div class="row">
+            {% if courses|length > 1 %}
                 <div class="col-xs-12">
-                    <h2 class="text-uppercase">{{ course_data.course.getTitle }}</h2>
+                    <h3 class="text-uppercase">{{ course_data.course.getTitle }}</h3>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        <div class="row">
             {% if course_video %}
                 <div class="col-sm-6 col-md-7">
                     <div class="embed-responsive embed-responsive-16by9">
@@ -47,14 +80,6 @@
                 <div class="description-course">
                     {{ course_data.description.getContent }}
                 </div>
-                {% if course_data.tags %}
-                    <div class="tags-course">
-                        <i class="fa fa-tags"></i>
-                        {% for tag in course_data.tags %}
-                            <a href="#">{{ tag.getTag }}</a>
-                        {% endfor %}
-                    </div>
-                {% endif %}
 
                 {% if courses|length == 1 and not is_subscribed %}
                     <div class="subscribe">
@@ -64,8 +89,6 @@
             </div>
         </div>
 
-
-
         <div class="row info-course">
             <div class="col-xs-12 col-md-7">
                 <div class="panel panel-default">
@@ -79,16 +102,15 @@
                                 <div class="content-info">
                                     {{ course_data.objectives.getContent }}
                                 </div>
-
                             </div>
                         {% endif %}
+
                         {% if course_data.topics %}
                             <div class="topics">
                                 <h4 class="title-info"><i class="fa fa-book"></i> {{ "Topics"|get_lang }}</h4>
                                 <div class="content-info">
                                     {{ course_data.topics.getContent }}
                                 </div>
-
                             </div>
                         {% endif %}
                     </div>
@@ -124,6 +146,22 @@
                         </div>
                     </div>
                 {% endif %}
+
+                {% if course_data.tags %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading">{{ 'Tags'|get_lang }}</div>
+                        <div class="panel-body">
+                            <ul class="list-inline">
+                                {% for tag in course_data.tags %}
+                                    <li>
+                                        <span class="label label-info">{{ tag.getTag }}</span>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    </div>
+                {% endif %}
+
                 <div class="panel panel-default social-share">
                     <div class="panel-heading">{{ "ShareWithYourFriends"|get_lang }}</div>
                     <div class="panel-body">