Format code

pull/2487/head
Julio 9 years ago
parent 914c0e24d8
commit fc59a623ba
  1. 20
      main/badge/assign.php
  2. 1
      main/badge/issued.php
  3. 12
      main/badge/issued_all.php
  4. 15
      main/session/add_many_session_to_category.php
  5. 1
      main/session/add_students_to_session.php
  6. 7
      main/session/add_users_to_session.php
  7. 27
      main/session/session_add.php

@ -43,14 +43,13 @@ $skills = $skillRepo->findBy([
$url = api_get_path(WEB_CODE_PATH)."badge/assign.php?user=".$_REQUEST['user']."&id=";
$htmlHeadXtra[] = ''
. '<script>'
. '$( document ).ready(function() {'
. '$("#skill").on("change", function() {'
. '$(location).attr("href", "'. $url .'"+$(this).val());'
. '});'
. '});'
. '</script>';
$htmlHeadXtra[] = '<script>
$( document ).ready(function() {
$("#skill").on("change", function() {
$(location).attr("href", "'. $url .'"+$(this).val());
});
});
</script>';
$skillsOptions = [];
$acquiredLevel = [];
@ -87,9 +86,7 @@ if (!$profile) {
}
if ($profile) {
$profileId = $profile->getId();
$levels = $skillLevelRepo->findBy([
'profile' => $profileId
]);
@ -175,8 +172,7 @@ if ($form->validate()) {
$form->setDefaults(['user_name' => $user->getCompleteName()]);
$form->freeze(['user_name']);
//View
$template = new Template('');
$template->assign('header', get_lang('AssignSkill'));
$template->assign('content', $form->returnForm());
$template->display_one_col_template();
$template->display_one_col_template();

@ -7,7 +7,6 @@
* @package chamilo.badge
*/
require_once '../inc/global.inc.php';
require_once '../inc/lib/baker.lib.php';
$issue = isset($_REQUEST['issue']) ? intval($_REQUEST['issue']) : 0;

@ -7,7 +7,6 @@
* @package chamilo.badge
*/
require_once '../inc/global.inc.php';
require_once '../inc/lib/baker.lib.php';
$userId = isset($_GET['user']) ? intval($_GET['user']) : 0;
$skillId = isset($_GET['skill']) ? intval($_GET['skill']) : 0;
@ -132,9 +131,7 @@ foreach ($userSkills as $index => $skillIssue) {
}
if ($profile) {
$profileId = $profile->getId();
$levels = $skillLevelRepo->findBy([
'profile' => $profileId
]);
@ -149,10 +146,13 @@ foreach ($userSkills as $index => $skillIssue) {
$profileId = key($profileLevel);
$acquiredLevel[$profileId] = $profileLevel[$profileId];
}
}
$formAcquiredLevel = new FormValidator('acquired_level'.$skillIssue->getId(), 'post', $skillIssue->getIssueUrlAll());
$formAcquiredLevel = new FormValidator(
'acquired_level'.$skillIssue->getId(),
'post',
$skillIssue->getIssueUrlAll()
);
$formAcquiredLevel->addSelect('acquired_level', get_lang('AcquiredLevel'), $acquiredLevel);
$formAcquiredLevel->addHidden('user', $skillIssue->getUser()->getId());
$formAcquiredLevel->addHidden('issue', $skillIssue->getId());
@ -161,7 +161,7 @@ foreach ($userSkills as $index => $skillIssue) {
if ($formAcquiredLevel->validate() && $allowComment) {
$values = $formAcquiredLevel->exportValues();
$level = $skillLevelRepo->find(intval($values['acquired_level']));
$level = $skillLevelRepo->find($values['acquired_level']);
$skillIssue->setAcquiredLevel($level);
$entityManager->persist($skillIssue);

@ -16,16 +16,15 @@ $xajax->registerFunction('search_courses');
$this_section = SECTION_PLATFORM_ADMIN;
// setting breadcrumbs
//$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
// Database Table Definitions
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
// setting the name of the tool
$tool_name = get_lang('SubscribeSessionsToCategory');
@ -49,7 +48,7 @@ if (!api_is_platform_admin() && !api_is_session_admin()) {
$xajax -> processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = '
<script type="text/javascript">
<script>
function add_course_to_session (code, content) {
document.getElementById("course_to_add").value = "";
document.getElementById("ajax_list_courses_single").innerHTML = "";

@ -13,7 +13,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
// setting breadcrumbs
//$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
// Setting the name of the tool

@ -21,8 +21,11 @@ $addProcess = isset($_GET['add']) ? Security::remove_XSS($_GET['add']) : null;
SessionManager::protectSession($id_session);
// setting breadcrumbs
$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
$interbreadcrumb[] = array(
'url' => "resume_session.php?id_session=".$id_session,
"name" => get_lang('SessionOverview'),
);
// Database Table Definitions
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);

@ -78,7 +78,6 @@ $interbreadcrumb[] = array(
'name' => get_lang('SessionList'),
);
function search_coachs($needle)
{
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@ -192,19 +191,19 @@ $(function() {
});
</script>';
$form->addHtml(''
. '<div class="form-group">'
. '<label for="cropImage" id="labelCropImage" class="col-sm-2 control-label"></label>'
. '<div class="col-sm-8">'
. '<div id="cropImage" class="cropCanvas">'
. '<img id="previewImage" >'
. '</div>'
. '<div>'
. '<button class="btn btn-primary hidden" name="cropButton" id="cropButton"><em class="fa fa-crop"></em> '.get_lang('CropYourPicture').'</button>'
. '</div>'
. '</div>'
. '</div>'
. '');
$form->addHtml('
<div class="form-group">
label for="cropImage" id="labelCropImage" class="col-sm-2 control-label"></label>
<div class="col-sm-8">
<div id="cropImage" class="cropCanvas">
<img id="previewImage">
</div>
<div>
<button class="btn btn-primary hidden" name="cropButton" id="cropButton"><em class="fa fa-crop"></em> '.get_lang('CropYourPicture').'</button>
</div>
</div>
</div>
');
$form->addHidden('cropResult', '');
$form->addButtonNext(get_lang('NextStep'));

Loading…
Cancel
Save