Minor - Format code - refs #2412

pull/2624/head
Angel Fernando Quiroz Campos 8 years ago
parent 6cd142ffd6
commit 1e5cacd722
  1. 25
      main/session/about.php
  2. 435
      main/template/default/session/about.tpl

@ -1,11 +1,13 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Entity\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CourseBundle\Entity\CCourseDescription;
use Chamilo\UserBundle\Entity\User;
use ChamiloSession as Session;
/**
* Session about page
@ -24,6 +26,7 @@ $sessionId = isset($_GET['session_id']) ? (int) $_GET['session_id'] : 0;
$em = Database::getManager();
/** @var Session $session */
$session = $em->find('ChamiloCoreBundle:Session', $sessionId);
if (!$session) {
@ -35,6 +38,7 @@ $sessionCourses = $em->getRepository('ChamiloCoreBundle:Session')->getCoursesOrd
$fieldsRepo = $em->getRepository('ChamiloCoreBundle:ExtraField');
$fieldTagsRepo = $em->getRepository('ChamiloCoreBundle:ExtraFieldRelTag');
$userRepo = UserManager::getRepository();
/** @var SequenceRepository $sequenceResourceRepo */
$sequenceResourceRepo = $em->getRepository('ChamiloCoreBundle:SequenceResource');
$tagField = $fieldsRepo->findOneBy([
@ -46,6 +50,7 @@ $courseValues = new ExtraFieldValue('course');
$userValues = new ExtraFieldValue('user');
$sessionValues = new ExtraFieldValue('session');
/** @var Course $sessionCourse */
foreach ($sessionCourses as $sessionCourse) {
$courseTags = [];
@ -87,8 +92,16 @@ foreach ($sessionCourses as $sessionCourse) {
]
);
$courseDescription = $courseObjectives = $courseTopics = $courseMethodology = $courseMaterial = $courseResources = $courseAssessment = '';
$courseDescription = '';
$courseObjectives = '';
$courseTopics = '';
$courseMethodology = '';
$courseMaterial = '';
$courseResources = '';
$courseAssessment = '';
$courseCustom = [];
/** @var CCourseDescription $descriptionTool */
foreach ($courseDescriptionTools as $descriptionTool) {
switch ($descriptionTool->getDescriptionType()) {
case CCourseDescription::TYPE_DESCRIPTION:
@ -206,8 +219,8 @@ if ($checker) {
BuyCoursesPlugin::PRODUCT_TYPE_SESSION
);
if ($sessionIsPremium) {
Session::write('SessionIsPremium', true);
Session::write('sessionId', $sessionId);
ChamiloSession::write('SessionIsPremium', true);
ChamiloSession::write('sessionId', $sessionId);
}
}
@ -216,7 +229,9 @@ $redirectToSession = $redirectToSession ? '?s='.$sessionId : false;
$coursesInThisSession = SessionManager::get_course_list_by_session_id($sessionId);
$coursesCount = count($coursesInThisSession);
$redirectToSession = $coursesCount == 1 && $redirectToSession ? $redirectToSession.'&cr='.array_values($coursesInThisSession)[0]['directory'] : $redirectToSession;
$redirectToSession = $coursesCount == 1 && $redirectToSession
? ($redirectToSession.'&cr='.array_values($coursesInThisSession)[0]['directory'])
: $redirectToSession;
$template->assign('redirect_to_session', $redirectToSession);
$template->assign('courses', $courses);

@ -1,121 +1,124 @@
<section id="about-course">
{% if is_subscribed and user_session_time != -0 and user_session_time >= 1 %}
<div class="alert alert-info">
{{ 'AlreadyRegisteredToSession'|get_lang }}
</div>
<div class="alert alert-info">
{{ 'AlreadyRegisteredToSession'|get_lang }}
</div>
{% elseif is_subscribed and user_session_time < 1 %}
<div class="alert alert-warning">
{{ 'YourSessionTimeIsExpired'|get_lang }}
</div>
<div class="alert alert-warning">
{{ 'YourSessionTimeIsExpired'|get_lang }}
</div>
{% endif %}
<section class="session">
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-md-8">
<h2 class="session-title">{{ session.name }}</h2>
{% if show_tutor %}
<div class="session-tutor">
<em class="fa fa-user"></em> {{ 'SessionGeneralCoach'|get_lang }}: <em>{{ session.generalCoach.getCompleteName() }}</em>
</div>
{% endif %}
{% if session.getShowDescription() %}
<div class="session-description">
{{ session.getDescription() }}
</div>
{% endif %}
<div class="share-social-media">
<ul class="sharing-buttons">
<li>
{{ "ShareWithYourFriends"|get_lang }}
</li>
<li>
<a href="https://www.facebook.com/sharer/sharer.php?{{ {'u': page_url }|url_encode }}"
target="_blank" class="btn btn-facebook btn-inverse btn-xs">
<em class="fa fa-facebook"></em> Facebook
</a>
</li>
<li>
<a href="https://twitter.com/home?{{ {'status': session.getName() ~ ' ' ~ page_url }|url_encode }}"
target="_blank" class="btn btn-twitter btn-inverse btn-xs">
<em class="fa fa-twitter"></em> Twitter
</a>
</li>
<li>
<a href="https://www.linkedin.com/shareArticle?{{ {'mini': 'true', 'url': page_url , 'title': session.getName() }|url_encode }}"
target="_blank" class="btn btn-linkedin btn-inverse btn-xs">
<em class="fa fa-linkedin"></em> Linkedin
</a>
</li>
</ul>
</div>
</div>
<div class="col-md-4">
<div class="session-info">
<div class="date">
<p>
{% if session.duration %}
{{ 'SessionDurationXDaysTotal'|get_lang|format(session.duration) }}
{% else %}
{{ session_date.display }}
{% endif %}
</p>
</div>
{% if is_premium == false %}
<h5>{{ 'CourseSubscription'|get_lang }}</h5>
<div class="session-subscribe">
{% if _u.logged and not is_subscribed %}
{{ subscribe_button }}
{% elseif not _u.logged %}
{% if 'allow_registration'|api_get_setting != 'false' %}
<a href="{{ _p.web_main ~ 'auth/inscription.php' ~ redirect_to_session }}" class="btn btn-success btn-block btn-lg">
<i class="fa fa-pencil" aria-hidden="true"></i> {{ 'SignUp'|get_lang }}
</a>
{% endif %}
{% endif %}
</div>
{% else %}
<div class="session-price">
<div class="sale-price">
{{ 'SalePrice'|get_lang }}
</div>
<div class="price-text">
{{ is_premium.iso_code }} {{ is_premium.price }}
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-md-8">
<h2 class="session-title">{{ session.name }}</h2>
{% if show_tutor %}
<div class="session-tutor">
<em class="fa fa-user"></em> {{ 'SessionGeneralCoach'|get_lang }}:
<em>{{ session.generalCoach.getCompleteName() }}</em>
</div>
<div class="buy-box">
<a href="{{ _p.web }}plugin/buycourses/src/process.php?i={{ is_premium.product_id }}&t={{ is_premium.product_type }}" class="btn btn-lg btn-primary btn-block">{{ 'BuyNow'|get_lang }}</a>
{% endif %}
{% if session.getShowDescription() %}
<div class="session-description">
{{ session.getDescription() }}
</div>
</div>
{% endif %}
{% if has_requirements %}
<div class="session-requirements">
<h5>{{ 'RequiredSessions'|get_lang }}</h5>
{% for sequence in sequences %}
{% if sequence.requirements %}
<p>
{{ sequence.name }} :
{% for requirement in sequence.requirements %}
<a href="{{ _p.web ~ 'session/' ~ requirement.getId ~ '/about/' }}">
{{ requirement.getName }}
</a>
{% endfor %}
</p>
<div class="share-social-media">
<ul class="sharing-buttons">
<li>
{{ "ShareWithYourFriends"|get_lang }}
</li>
<li>
<a href="https://www.facebook.com/sharer/sharer.php?{{ {'u': page_url }|url_encode }}"
target="_blank" class="btn btn-facebook btn-inverse btn-xs">
<em class="fa fa-facebook"></em> Facebook
</a>
</li>
<li>
<a href="https://twitter.com/home?{{ {'status': session.getName() ~ ' ' ~ page_url }|url_encode }}"
target="_blank" class="btn btn-twitter btn-inverse btn-xs">
<em class="fa fa-twitter"></em> Twitter
</a>
</li>
<li>
<a href="https://www.linkedin.com/shareArticle?{{ {'mini': 'true', 'url': page_url , 'title': session.getName() }|url_encode }}"
target="_blank" class="btn btn-linkedin btn-inverse btn-xs">
<em class="fa fa-linkedin"></em> Linkedin
</a>
</li>
</ul>
</div>
</div>
<div class="col-md-4">
<div class="session-info">
<div class="date">
<p>
{% if session.duration %}
{{ 'SessionDurationXDaysTotal'|get_lang|format(session.duration) }}
{% else %}
{{ session_date.display }}
{% endif %}
{% endfor %}
</p>
</div>
{% endif %}
{% if is_premium == false %}
<h5>{{ 'CourseSubscription'|get_lang }}</h5>
<div class="session-subscribe">
{% if _u.logged and not is_subscribed %}
{{ subscribe_button }}
{% elseif not _u.logged %}
{% if 'allow_registration'|api_get_setting != 'false' %}
<a href="{{ _p.web_main ~ 'auth/inscription.php' ~ redirect_to_session }}"
class="btn btn-success btn-block btn-lg">
<i class="fa fa-pencil" aria-hidden="true"></i> {{ 'SignUp'|get_lang }}
</a>
{% endif %}
{% endif %}
</div>
{% else %}
<div class="session-price">
<div class="sale-price">
{{ 'SalePrice'|get_lang }}
</div>
<div class="price-text">
{{ is_premium.iso_code }} {{ is_premium.price }}
</div>
<div class="buy-box">
<a href="{{ _p.web }}plugin/buycourses/src/process.php?i={{ is_premium.product_id }}&t={{ is_premium.product_type }}"
class="btn btn-lg btn-primary btn-block">{{ 'BuyNow'|get_lang }}</a>
</div>
</div>
{% endif %}
{% if has_requirements %}
<div class="session-requirements">
<h5>{{ 'RequiredSessions'|get_lang }}</h5>
{% for sequence in sequences %}
{% if sequence.requirements %}
<p>
{{ sequence.name }} :
{% for requirement in sequence.requirements %}
<a href="{{ _p.web ~ 'session/' ~ requirement.getId ~ '/about/' }}">
{{ requirement.getName }}
</a>
{% endfor %}
</p>
{% endif %}
{% endfor %}
</div>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</section>
{% for course_data in courses %}
{% set course_video = '' %}
{% for extra_field in course_data.extra_fields %}
{% if extra_field.value.getField().getVariable() == 'video_url' %}
{% set course_video = extra_field.value.getValue() %}
{% endif %}
{% endif %}
{% endfor %}
<div class="panel panel-default panel-course">
<div class="panel-body">
@ -134,9 +137,9 @@
</div>
<div class="col-sm-7">
{% if courses|length > 1 %}
<div class="course-title">
<h3>{{ course_data.course.getTitle }}</h3>
</div>
<div class="course-title">
<h3>{{ course_data.course.getTitle }}</h3>
</div>
{% endif %}
<div class="course-description">
{{ course_data.description.getContent }}
@ -144,143 +147,151 @@
</div>
</div>
{% if course_data.tags %}
<div class="panel-tags">
<div class="panel-tags">
<ul class="list-inline course-tags">
<li>{{ 'Tags'|get_lang }} :</li>
{% for tag in course_data.tags %}
<li class="tag-value">
<span>{{ tag.getTag }}</span>
</li>
{% endfor %}
</ul>
</div>
<ul class="list-inline course-tags">
<li>{{ 'Tags'|get_lang }} :</li>
{% for tag in course_data.tags %}
<li class="tag-value">
<span>{{ tag.getTag }}</span>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
</div>
</div>
<section class="course">
<div class="row">
<div class="col-md-8">
<div class="panel panel-default">
<div class="panel-body">
<h3 class="sub-title">{{ "CourseInformation"|get_lang }}</h3>
<div class="course-information read-more-area">
{% if course_data.objectives %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.objectives.getTitle }}</h4>
<div class="content-info">
{{ course_data.objectives.getContent }}
</div>
</div>
{% endif %}
<div class="row">
<div class="col-md-8">
<div class="panel panel-default">
<div class="panel-body">
<h3 class="sub-title">{{ "CourseInformation"|get_lang }}</h3>
<div class="course-information read-more-area">
{% if course_data.objectives %}
<div class="topics">
<h4 class="title-info"><em
class="fa fa-book"></em> {{ course_data.objectives.getTitle }}</h4>
<div class="content-info">
{{ course_data.objectives.getContent }}
</div>
</div>
{% endif %}
{% if course_data.topics %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.topics.getTitle }}</h4>
<div class="content-info">
{{ course_data.topics.getContent }}
</div>
</div>
{% endif %}
{% if course_data.topics %}
<div class="topics">
<h4 class="title-info"><em
class="fa fa-book"></em> {{ course_data.topics.getTitle }}</h4>
<div class="content-info">
{{ course_data.topics.getContent }}
</div>
</div>
{% endif %}
{% if course_data.methodology %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.methodology.getTitle }}</h4>
<div class="content-info">
{{ course_data.methodology.getContent }}
</div>
</div>
{% endif %}
{% if course_data.methodology %}
<div class="topics">
<h4 class="title-info"><em
class="fa fa-book"></em> {{ course_data.methodology.getTitle }}</h4>
<div class="content-info">
{{ course_data.methodology.getContent }}
</div>
</div>
{% endif %}
{% if course_data.material %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.material.getTitle }}</h4>
<div class="content-info">
{{ course_data.material.getContent }}
</div>
</div>
{% endif %}
{% if course_data.material %}
<div class="topics">
<h4 class="title-info"><em
class="fa fa-book"></em> {{ course_data.material.getTitle }}</h4>
<div class="content-info">
{{ course_data.material.getContent }}
</div>
</div>
{% endif %}
{% if course_data.resources %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.resources.getTitle }}</h4>
<div class="content-info">
{{ course_data.resources.getContent }}
</div>
</div>
{% endif %}
{% if course_data.resources %}
<div class="topics">
<h4 class="title-info"><em
class="fa fa-book"></em> {{ course_data.resources.getTitle }}</h4>
<div class="content-info">
{{ course_data.resources.getContent }}
</div>
</div>
{% endif %}
{% if course_data.assessment %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.assessment.getTitle }}</h4>
<div class="content-info">
{{ course_data.assessment.getContent }}
</div>
</div>
{% endif %}
{% if course_data.assessment %}
<div class="topics">
<h4 class="title-info"><em
class="fa fa-book"></em> {{ course_data.assessment.getTitle }}</h4>
<div class="content-info">
{{ course_data.assessment.getContent }}
</div>
</div>
{% endif %}
{% if course_data.custom %}
{% for custom in course_data.custom %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ custom.getTitle }}</h4>
<div class="content-info">
{{ custom.getContent }}
</div>
{% if course_data.custom %}
{% for custom in course_data.custom %}
<div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ custom.getTitle }}
</h4>
<div class="content-info">
{{ custom.getContent }}
</div>
</div>
{% endfor %}
{% endif %}
</div>
{% endfor %}
{% endif %}
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-body">
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-body">
{% if course_data.coaches %}
<div class="panel-teachers">
<h3 class="sub-title">{{ "Coaches"|get_lang }}</h3>
{% for coach in course_data.coaches %}
<div class="coach-information">
<div class="coach-header">
<div class="coach-avatar">
<img class="img-circle img-responsive" src="{{ coach.image }}" alt="{{ coach.complete_name }}">
</div>
<div class="coach-title">
<h4>{{ coach.complete_name }}</h4>
{% if coach.diploma %}
<p>{{ coach.diploma }}</p>
{% endif %}
</div>
</div>
{% if coach.openarea %}
<div class="open-area {{ course_data.coaches | length >= 2 ? 'open-more' : ' ' }}">
<p>{{ coach.openarea }}</p>
{% if course_data.coaches %}
<div class="panel-teachers">
<h3 class="sub-title">{{ "Coaches"|get_lang }}</h3>
{% for coach in course_data.coaches %}
<div class="coach-information">
<div class="coach-header">
<div class="coach-avatar">
<img class="img-circle img-responsive" src="{{ coach.image }}"
alt="{{ coach.complete_name }}">
</div>
<div class="coach-title">
<h4>{{ coach.complete_name }}</h4>
{% if coach.diploma %}
<p>{{ coach.diploma }}</p>
{% endif %}
</div>
</div>
{% if coach.openarea %}
<div class="open-area {{ course_data.coaches | length >= 2 ? 'open-more' : ' ' }}">
<p>{{ coach.openarea }}</p>
</div>
{% endif %}
{% for coach_extra_field in coach.extra_fields %}
<dl class="coach-extrafield">
<dt class="extrafield_dt dt_{{ coach_extra_field.value.getField().getVariable() }}">{{ coach_extra_field.value.getField().getDisplayText() }}</dt>
<dd class="extrafield_dd dd_{{ coach_extra_field.value.getField().getVariable() }}">{{ coach_extra_field.value.getValue() }}</dd>
</dl>
{% endfor %}
</div>
{% endfor %}
</div>
{% endif %}
{% for coach_extra_field in coach.extra_fields %}
<dl class="coach-extrafield">
<dt class="extrafield_dt dt_{{coach_extra_field.value.getField().getVariable()}}">{{ coach_extra_field.value.getField().getDisplayText() }}</dt>
<dd class="extrafield_dd dd_{{coach_extra_field.value.getField().getVariable()}}">{{ coach_extra_field.value.getValue() }}</dd>
</dl>
{% endfor %}
</div>
{% endfor %}
</div>
{% endif %}
{% endif %}
</div>
</div>
</div>
</div>
</div>
</section>
{% endfor %}
</div>
</div>
</section>
<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function () {
$('.course-information').readmore({
speed: 100,
lessLink: '<a class="hide-content" href="#">{{ 'SetInvisible' | get_lang }}</a>',

Loading…
Cancel
Save