chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Format code

Browse Source
pull/3959/head
Julio 4 years ago
parent f5cb4685f9
commit 18b10d3fed
4 changed files with 24 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      public/main/inc/ajax/extra_field.ajax.php
  2. 29
      public/main/search/load_search.php
  3. 25
      public/main/search/search.php
  4. 2
      src/CoreBundle/Traits/Repository/RepositoryQueryBuilderTrait.php

1
public/main/inc/ajax/extra_field.ajax.php
Unescape View File

@ -3,7 +3,6 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\ExtraFieldSavedSearch; use Chamilo\CoreBundle\Entity\ExtraFieldSavedSearch;
use Chamilo\CoreBundle\Entity\Tag;
use Chamilo\CoreBundle\Framework\Container; use Chamilo\CoreBundle\Framework\Container;
require_once __DIR__.'/../global.inc.php'; require_once __DIR__.'/../global.inc.php';

29
public/main/search/load_search.php
Unescape View File

@ -22,7 +22,7 @@ $(function() {
api_block_anonymous_users(); api_block_anonymous_users();
$allowToSee = api_is_drh() || api_is_student_boss() || api_is_platform_admin(); $allowToSee = api_is_drh() || api_is_student_boss() || api_is_platform_admin();
if ($allowToSee === false) { if (false === $allowToSee) {
api_not_allowed(true); api_not_allowed(true);
} }
$userId = api_get_user_id(); $userId = api_get_user_id();
@ -128,7 +128,7 @@ if (!empty($items)) {
/** @var ExtraFieldSavedSearch $item */ /** @var ExtraFieldSavedSearch $item */
foreach ($items as $item) { foreach ($items as $item) {
$variable = 'extra_'.$item->getField()->getVariable(); $variable = 'extra_'.$item->getField()->getVariable();
if ($item->getField()->getFieldType() === ExtraField::FIELD_TYPE_TAG) { if (ExtraField::FIELD_TYPE_TAG === $item->getField()->getFieldType()) {
$tagsData[$variable] = $item->getValue(); $tagsData[$variable] = $item->getValue();
} }
$defaults[$variable] = $item->getValue(); $defaults[$variable] = $item->getValue();
@ -216,7 +216,6 @@ $extra = $extraFieldUser->addElements(
); );
$userForm->addEndPanel(); $userForm->addEndPanel();
$userForm->addStartPanel('dispo', get_lang('Disponibilite Pendant Mon Stage')); $userForm->addStartPanel('dispo', get_lang('Disponibilite Pendant Mon Stage'));
$userForm->addHtml('<p class="text-info">'.get_lang('Disponibilite Pendant Mon Stage Explanation').'</p>'); $userForm->addHtml('<p class="text-info">'.get_lang('Disponibilite Pendant Mon Stage Explanation').'</p>');
@ -298,13 +297,13 @@ if (isset($_POST) && !empty($_POST)) {
Session::write('search_using_3', $searchChecked3); Session::write('search_using_3', $searchChecked3);
} else { } else {
$searchChecked1 = Session::read('search_using_1'); $searchChecked1 = Session::read('search_using_1');
$searchChecked1 = $searchChecked1 === null ? 'checked' : $searchChecked1; $searchChecked1 = null === $searchChecked1 ? 'checked' : $searchChecked1;
$searchChecked2 = Session::read('search_using_2'); $searchChecked2 = Session::read('search_using_2');
$searchChecked2 = $searchChecked2 === null ? 'checked' : $searchChecked2; $searchChecked2 = null === $searchChecked2 ? 'checked' : $searchChecked2;
$searchChecked3 = Session::read('search_using_3'); $searchChecked3 = Session::read('search_using_3');
$searchChecked3 = $searchChecked3 === null ? 'checked' : $searchChecked3; $searchChecked3 = null === $searchChecked3 ? 'checked' : $searchChecked3;
} }
$form->addStartPanel('dispo_avant', get_lang('Disponibilite Avant')); $form->addStartPanel('dispo_avant', get_lang('Disponibilite Avant'));
@ -564,7 +563,7 @@ if ($formSearch->validate()) {
// Search filter // Search filter
$filters = []; $filters = [];
foreach ($defaults as $key => $value) { foreach ($defaults as $key => $value) {
if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') { if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
continue; continue;
} }
if (!empty($value)) { if (!empty($value)) {
@ -629,7 +628,7 @@ if ($form->validate()) {
if ($search) { if ($search) {
// Parse params. // Parse params.
foreach ($params as $key => $value) { foreach ($params as $key => $value) {
if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') { if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
continue; continue;
} }
if (!empty($value)) { if (!empty($value)) {
@ -700,7 +699,7 @@ if ($form->validate()) {
foreach ($userData as $key => $value) { foreach ($userData as $key => $value) {
$found = strpos($key, '__persist__'); $found = strpos($key, '__persist__');
if ($found === false) { if (false === $found) {
continue; continue;
} }
} }
@ -710,7 +709,7 @@ if ($form->validate()) {
) { ) {
$wantStage = $userData['extra_filiere_want_stage']['extra_filiere_want_stage']; $wantStage = $userData['extra_filiere_want_stage']['extra_filiere_want_stage'];
if ($wantStage === 'yes') { if ('yes' === $wantStage) {
if (isset($userData['extra_filiere_user'])) { if (isset($userData['extra_filiere_user'])) {
$userData['extra_filiere'] = []; $userData['extra_filiere'] = [];
$userData['extra_filiere']['extra_filiere'] = $userData['extra_filiere_user']['extra_filiere_user']; $userData['extra_filiere']['extra_filiere'] = $userData['extra_filiere_user']['extra_filiere_user'];
@ -720,7 +719,7 @@ if ($form->validate()) {
// save in ExtraFieldSavedSearch. // save in ExtraFieldSavedSearch.
foreach ($userData as $key => $value) { foreach ($userData as $key => $value) {
if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') { if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
continue; continue;
} }
@ -822,7 +821,7 @@ if (!empty($filterToSend)) {
$userEndDatePlus = api_get_utc_datetime(substr($userEndDatePlus, 0, 11).'23:59:59'); $userEndDatePlus = api_get_utc_datetime(substr($userEndDatePlus, 0, 11).'23:59:59');
// Special OFAJ date logic // Special OFAJ date logic
if ($userEndDate == '') { if ('' == $userEndDate) {
$sql = " AND ( $sql = " AND (
(s.access_start_date >= '$userStartDateMinus') OR (s.access_start_date >= '$userStartDateMinus') OR
((s.access_start_date = '' OR s.access_start_date IS NULL) AND (s.access_end_date = '' OR s.access_end_date IS NULL)) ((s.access_start_date = '' OR s.access_start_date IS NULL) AND (s.access_end_date = '' OR s.access_end_date IS NULL))
@ -952,7 +951,7 @@ if (!empty($filterToSend)) {
if ($deleteFiliere) { if ($deleteFiliere) {
foreach ($filterToSend['rules'] as &$filterItem) { foreach ($filterToSend['rules'] as &$filterItem) {
if (isset($filterItem['field']) && $filterItem['field'] == 'extra_filiere') { if (isset($filterItem['field']) && 'extra_filiere' == $filterItem['field']) {
$filterItem = []; $filterItem = [];
} }
} }
@ -1172,13 +1171,9 @@ $userReportButton = Display::url(
['class' => 'btn btn-primary'] ['class' => 'btn btn-primary']
); );
$tpl->assign('grid', $grid.$button.$table->toHtml().$userReportButton); $tpl->assign('grid', $grid.$button.$table->toHtml().$userReportButton);
$tpl->assign('grid_js', $griJs); $tpl->assign('grid_js', $griJs);
$templateName = $tpl->get_template('search/search_extra_field.html.twig'); $templateName = $tpl->get_template('search/search_extra_field.html.twig');
$contentTemplate = $tpl->fetch($templateName); $contentTemplate = $tpl->fetch($templateName);
$tpl->assign('content', $contentTemplate); $tpl->assign('content', $contentTemplate);
$tpl->display_one_col_template(); $tpl->display_one_col_template();

25
public/main/search/search.php
Unescape View File

@ -37,7 +37,7 @@ $diagnosisComplete = $extraFieldValue->get_values_by_handler_and_field_variable(
'diagnosis_completed' 'diagnosis_completed'
); );
$diagnosisComplete = false; $diagnosisComplete = false;
if ($diagnosisComplete && isset($diagnosisComplete['value']) && $diagnosisComplete['value'] == 1) { if ($diagnosisComplete && isset($diagnosisComplete['value']) && 1 == $diagnosisComplete['value']) {
if (!isset($_GET['result'])) { if (!isset($_GET['result'])) {
header('Location:'.api_get_self().'?result=1'); header('Location:'.api_get_self().'?result=1');
exit; exit;
@ -45,12 +45,12 @@ if ($diagnosisComplete && isset($diagnosisComplete['value']) && $diagnosisComple
} }
$hide = true; $hide = true;
if ($wantStage !== false) { if (false !== $wantStage) {
$hide = $wantStage['value'] === 'yes'; $hide = 'yes' === $wantStage['value'];
} }
$defaultValueStatus = 'extraFiliere.hide()'; $defaultValueStatus = 'extraFiliere.hide()';
if ($hide === false) { if (false === $hide) {
$defaultValueStatus = ''; $defaultValueStatus = '';
} }
@ -58,7 +58,7 @@ $url = api_get_path(WEB_AJAX_PATH).'extra_field.ajax.php?a=order&user_id='.$user
// Use current user language // Use current user language
$langInfo = api_get_language_from_iso($userInfo['language']); $langInfo = api_get_language_from_iso($userInfo['language']);
$targetLanguage = $langInfo->getEnglishName(); $targetLanguage = $langInfo->getEnglishName();
$theme = 'theme_fr'; $theme = 'theme_fr';
switch ($targetLanguage) { switch ($targetLanguage) {
case 'italian': case 'italian':
@ -200,7 +200,7 @@ if (!empty($items)) {
/** @var ExtraFieldSavedSearch $item */ /** @var ExtraFieldSavedSearch $item */
foreach ($items as $item) { foreach ($items as $item) {
$variable = 'extra_'.$item->getField()->getVariable(); $variable = 'extra_'.$item->getField()->getVariable();
if ($item->getField()->getFieldType() === Extrafield::FIELD_TYPE_TAG) { if (Extrafield::FIELD_TYPE_TAG === $item->getField()->getFieldType()) {
$tagsData[$variable] = $item->getValue(); $tagsData[$variable] = $item->getValue();
} }
$defaults[$variable] = $item->getValue(); $defaults[$variable] = $item->getValue();
@ -599,7 +599,7 @@ if ($userForm->validate()) {
$isPartial = true; $isPartial = true;
} }
if ($isPartial === false) { if (false === $isPartial) {
$userData['extra_diagnosis_completed'] = 1; $userData['extra_diagnosis_completed'] = 1;
} }
@ -640,7 +640,7 @@ if ($userForm->validate()) {
foreach ($userData as $key => $value) { foreach ($userData as $key => $value) {
$found = strpos($key, '__persist__'); $found = strpos($key, '__persist__');
if ($found === false) { if (false === $found) {
continue; continue;
} }
} }
@ -650,7 +650,7 @@ if ($userForm->validate()) {
) { ) {
$wantStage = $userData['extra_filiere_want_stage']['extra_filiere_want_stage']; $wantStage = $userData['extra_filiere_want_stage']['extra_filiere_want_stage'];
if ($wantStage === 'yes') { if ('yes' === $wantStage) {
if (isset($userData['extra_filiere_user'])) { if (isset($userData['extra_filiere_user'])) {
$userData['extra_filiere'] = []; $userData['extra_filiere'] = [];
$userData['extra_filiere']['extra_filiere'] = $userData['extra_filiere_user']['extra_filiere_user']; $userData['extra_filiere']['extra_filiere'] = $userData['extra_filiere_user']['extra_filiere_user'];
@ -662,7 +662,7 @@ if ($userForm->validate()) {
$extraFieldRepo = Container::getExtraFieldRepository(); $extraFieldRepo = Container::getExtraFieldRepository();
foreach ($userData as $key => $value) { foreach ($userData as $key => $value) {
if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') { if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
continue; continue;
} }
@ -752,7 +752,7 @@ $tpl->assign('grid', '');
$tpl->assign('grid_js', ''); $tpl->assign('grid_js', '');
$tpl->assign('form_search', ''); $tpl->assign('form_search', '');
$tpl->assign('form', ''); $tpl->assign('form', '');
if ($result === false) { if (false === $result) {
$tpl->assign('form', $userFormToString); $tpl->assign('form', $userFormToString);
} else { } else {
Display::addFlash(Display::return_message(get_lang('Your session search diagnosis is saved'))); Display::addFlash(Display::return_message(get_lang('Your session search diagnosis is saved')));
@ -761,6 +761,3 @@ if ($result === false) {
$content = $tpl->fetch($tpl->get_template('search/search_extra_field.tpl')); $content = $tpl->fetch($tpl->get_template('search/search_extra_field.tpl'));
$tpl->assign('content', $content); $tpl->assign('content', $content);
$tpl->display_one_col_template(); $tpl->display_one_col_template();

2
src/CoreBundle/Traits/Repository/RepositoryQueryBuilderTrait.php
Unescape View File

@ -16,4 +16,4 @@ trait RepositoryQueryBuilderTrait
{ {
return $qb ?: $this->createQueryBuilder($alias); return $qb ?: $this->createQueryBuilder($alias);
} }
} }

Write Preview
Loading…
Cancel
Save