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/2487/head
jmontoyaa 8 years ago
parent a924900d52
commit a8ed60247f
9 changed files with 107 additions and 71 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. 42
      main/gradebook/gradebook_view_result.php
  2. 16
      main/gradebook/lib/be/abstractlink.class.php
  3. 1
      main/gradebook/lib/be/linkfactory.class.php
  4. 67
      main/gradebook/lib/fe/displaygradebook.php
  5. 33
      main/gradebook/lib/fe/evalform.class.php
  6. 7
      main/gradebook/lib/fe/resulttable.class.php
  7. 8
      main/inc/lib/formvalidator/Rule/CompareDateTimeText.php
  8. 2
      main/inc/lib/pear/HTML/QuickForm.php
  9. 2
      main/inc/lib/pear/HTML/QuickForm/Rule/Compare.php

42
main/gradebook/gradebook_view_result.php
Unescape View File

@ -73,7 +73,7 @@ if (isset($_GET['editres'])) {
$result->set_id($edit_res_xml);
$result->set_user_id($values['hid_user_id']);
$result->set_evaluation_id($select_eval);
$row_value = isset($values['score']) ? (float) $values['score'] : 0;
$row_value = isset($values['score']) ? $values['score'] : 0;
if (!empty($row_value) || $row_value == 0) {
$result->set_score(api_number_format($row_value, api_get_setting('gradebook_number_decimals')));
}
@ -176,21 +176,43 @@ if (isset($_GET['import'])) {
}
} else {
header('Location: ' . api_get_self() . '?import=&selecteval=' . $select_eval . '&importnofile=');
Display::addFlash(Display::return_message(get_lang('ImportNoFile'), 'warning', false));
Display::addFlash(
Display::return_message(
get_lang('ImportNoFile'),
'warning',
false
)
);
exit;
}
if ($overwritescore != 0) {
header('Location: ' . api_get_self() . '?selecteval=' . $select_eval. '&importoverwritescore=' . $overwritescore);
Display::addFlash(Display::return_message(get_lang('ImportOverWriteScore') . ' ' . $overwritescore));
Display::addFlash(
Display::return_message(
get_lang('ImportOverWriteScore').' '.$overwritescore
)
);
exit;
}
if ($nr_results_added == 0) {
Display::addFlash(Display::return_message(get_lang('ProblemUploadingFile'), 'warning', false));
Display::addFlash(
Display::return_message(
get_lang('ProblemUploadingFile'),
'warning',
false
)
);
header('Location: ' . api_get_self() . '?selecteval=' . $select_eval. '&nothingadded=');
exit;
}
Display::addFlash(Display::return_message(get_lang('FileUploadComplete'), 'success', false));
Display::addFlash(
Display::return_message(
get_lang('FileUploadComplete'),
'success',
false
)
);
header('Location: ' . api_get_self() . '?selecteval=' . $select_eval . '&importok=');
exit;
}
@ -356,7 +378,8 @@ if (isset($_GET['export'])) {
if (isset($_GET['resultdelete'])) {
$result = Result :: load($_GET['resultdelete']);
$result[0]->delete();
header('Location: gradebook_view_result.php?deleteresult=&selecteval=' . $select_eval);
Display::addFlash(Display::return_message(get_lang('ResultDeleted')));
header('Location: gradebook_view_result.php?selecteval=' . $select_eval.'&'.api_get_cidreq());
exit;
}
@ -458,13 +481,6 @@ if (isset($_GET['adduser'])) {
Display :: display_confirmation_message(get_lang('UserAdded'), false);
}
if (isset($_GET['deleteresult'])) {
Display :: display_confirmation_message(get_lang('ResultDeleted'), false);
}
if (isset($_GET['editallresults'])) {
Display :: display_confirmation_message(get_lang('AllResultsEdited'), false);
}
if (isset($_GET['incorrectdata'])) {
Display :: display_warning_message(get_lang('IncorrectData'), false);
}

16
main/gradebook/lib/be/abstractlink.class.php
Unescape View File

@ -138,22 +138,22 @@ abstract class AbstractLink implements GradebookItem
return $this->visible;
}
public function set_id ($id)
public function set_id($id)
{
$this->id = $id;
}
public function set_type ($type)
public function set_type($type)
{
$this->type = $type;
}
public function set_ref_id ($ref_id)
public function set_ref_id($ref_id)
{
$this->ref_id = $ref_id;
}
public function set_user_id ($user_id)
public function set_user_id($user_id)
{
$this->user_id = $user_id;
}
@ -163,9 +163,11 @@ abstract class AbstractLink implements GradebookItem
*/
public function set_course_code($course_code)
{
$this->course_code = $course_code;
$course_info = api_get_course_info($course_code);
$this->course_id = $course_info['real_id'];
$courseInfo = api_get_course_info($course_code);
if ($courseInfo) {
$this->course_code = $course_code;
$this->course_id = $courseInfo['real_id'];
}
}
public function getStudentList()

1
main/gradebook/lib/be/linkfactory.class.php
Unescape View File

@ -112,6 +112,5 @@ class LinkFactory
public function delete()
{
}
}

67
main/gradebook/lib/fe/displaygradebook.php
Unescape View File

@ -62,12 +62,11 @@ class DisplayGradebook
}
$scoredisplay = ScoreDisplay :: instance();
$student_score = '';
$average = "";
if (($evalobj->has_results())) { // TODO this check needed ?
$average = '';
if (($evalobj->has_results())) {
// TODO this check needed ?
$score = $evalobj->calc_score();
if ($score != null) {
$average = get_lang('Average') . ' :<b> ' . $scoredisplay->display_score($score, SCORE_AVERAGE) . '</b>';
$student_score = $evalobj->calc_score(api_get_user_id());
@ -261,7 +260,6 @@ class DisplayGradebook
}
if (!$is_course_admin && ($status <> 1 || $sessionStatus == 0) && $selectcat <> 0) {
$catcourse = Category::load($catobj->get_id());
/** @var Category $category */
$category = $catcourse[0];
@ -269,9 +267,7 @@ class DisplayGradebook
$scoredisplay = ScoreDisplay :: instance();
$allevals = $category->get_evaluations($userId, true);
$alllinks = $category->get_links($userId, true);
$allEvalsLinks = array_merge($allevals, $alllinks);
$item_value_total = 0;
$scoreinfo = null;
@ -387,14 +383,14 @@ class DisplayGradebook
if ($my_category['generate_certificates'] == 1) {
$actionsLeft .= Display::url(
Display::return_icon(
'certificate_list.png',
get_lang('GradebookSeeListOfStudentsCertificates'),
'',
ICON_SIZE_MEDIUM
),
"gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . $selectcat
);
Display::return_icon(
'certificate_list.png',
get_lang('GradebookSeeListOfStudentsCertificates'),
'',
ICON_SIZE_MEDIUM
),
"gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . $selectcat
);
}
$actionsLeft .= Display::url(
@ -470,8 +466,14 @@ class DisplayGradebook
* @param bool $show_add_qualification
* @param bool $show_add_link
*/
public function display_reduce_header_gradebook($catobj, $is_course_admin, $is_platform_admin, $simple_search_form, $show_add_qualification = true, $show_add_link = true)
{
public function display_reduce_header_gradebook(
$catobj,
$is_course_admin,
$is_platform_admin,
$simple_search_form,
$show_add_qualification = true,
$show_add_link = true
) {
//student
if (!$is_course_admin) {
$user = api_get_user_info(api_get_user_id());
@ -504,26 +506,29 @@ class DisplayGradebook
}
/**
* @param int $userid
* @param $userId
* @param $categoryId
* @return string
*/
public static function display_header_user($userid, $categoryId)
public static function display_header_user($userId, $categoryId)
{
$user_id = $userid;
$user = api_get_user_info($user_id);
$user = api_get_user_info($userId);
if (empty($user)) {
return '';
}
$catcourse = Category :: load($categoryId);
$scoredisplay = ScoreDisplay :: instance();
$scorecourse = $catcourse[0]->calc_score($user_id);
// generating the total score for a course
$allevals = $catcourse[0]->get_evaluations($user_id, true);
$alllinks = $catcourse[0]->get_links($user_id, true);
$allevals = $catcourse[0]->get_evaluations($userId, true, api_get_course_id());
$alllinks = $catcourse[0]->get_links($userId, true, api_get_course_id());
$evals_links = array_merge($allevals, $alllinks);
$item_value = 0;
$item_total = 0;
for ($count = 0; $count < count($evals_links); $count++) {
$item = $evals_links[$count];
$score = $item->calc_score($user_id);
$score = $item->calc_score($userId);
$my_score_denom = ($score[1] == 0) ? 1 : $score[1];
$item_value+=$score[0] / $my_score_denom * $item->get_weight();
$item_total+=$item->get_weight();
@ -532,17 +537,11 @@ class DisplayGradebook
$total_score = array($item_value, $item_total);
$scorecourse_display = $scoredisplay->display_score($total_score, SCORE_DIV_PERCENT);
$cattotal = Category :: load(0);
$scoretotal = $cattotal[0]->calc_score($user_id);
$scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable'));
$imageUrl = UserManager::getUserPicture($userid);
$info = '<div class="row"><div class="col-md-3">';
$info .= '<div class="thumbnail"><img src="' . $imageUrl . '" /></div>';
$info .= '<div class="thumbnail"><img src="' . $user['avatar'] . '" /></div>';
$info .= '</div>';
$info .= '<div class="col-md-6">';
$info .= get_lang('Name') . ' : <a target="_blank" href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php?u=' . $userid . '"> ' .
$info .= get_lang('Name') . ' : <a target="_blank" href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php?u=' . $userId . '"> ' .
$user['complete_name'] . '</a><br />';
if (api_get_setting('show_email_addresses') == 'true') {
@ -552,8 +551,6 @@ class DisplayGradebook
$info .= get_lang('TotalUser') . ' : <b>' . $scorecourse_display . '</b>';
$info .= '</div>';
$info .= '</div>';
echo $info;
}
}

33
main/gradebook/lib/fe/evalform.class.php
Unescape View File

@ -52,7 +52,6 @@ class EvalForm extends FormValidator
if (isset($extra1)) {
$this->extra = $extra1;
}
switch ($form_type) {
case self :: TYPE_EDIT:
$this->build_editing_form();
@ -360,22 +359,38 @@ class EvalForm extends FormValidator
'score' => $this->result_object->get_score(),
'maximum' => $this->evaluation_object->get_max()
));
$userinfo = api_get_user_info($this->result_object->get_user_id());
$userInfo = api_get_user_info($this->result_object->get_user_id());
$renderer = & $this->defaultRenderer();
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$this->addElement('label', get_lang('User'), $userinfo['complete_name']);
$this->addHeader(get_lang('User').': '.$userInfo['complete_name']);
$this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array(
'size' => '4',
'class' => 'span1',
'maxlength' => '5'
));
$this->addText(
'score',
array(
get_lang('Score'),
null,
'/ '.$this->evaluation_object->get_max(),
),
false,
array(
'size' => '4',
'maxlength' => '5',
)
);
$this->addButtonSave(get_lang('Edit'), 'submit');
$this->addElement('hidden', 'minvalue', 0);
$this->addElement('hidden', 'hid_user_id', $this->result_object->get_user_id());
$this->addElement('hidden', 'maxvalue', $this->evaluation_object->get_max());
$this->addRule('score', get_lang('OnlyNumbers'), 'numeric', null, 'client');
$this->addRule(
'score',
get_lang('OnlyNumbers'),
'numeric',
null,
'client'
);
$this->addRule(
array(
'score',

7
main/gradebook/lib/fe/resulttable.class.php
Unescape View File

@ -20,7 +20,12 @@ class ResultTable extends SortableTable
*/
public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
{
parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
parent:: __construct(
'resultlist',
null,
null,
(api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1
);
$this->datagen = new ResultsDataGenerator($evaluation, $results, true);

8
main/inc/lib/formvalidator/Rule/CompareDateTimeText.php
Unescape View File

@ -11,8 +11,9 @@ class HTML_QuickForm_Rule_CompareDateTimeText extends HTML_QuickForm_Rule_Compar
* @param string $operator The operator to use (default '==')
* @return boolean True if the 2 given dates match the operator
*/
function validate($values, $operator = null) {
$datetime1 = api_strtotime($values[0]);
function validate($values, $operator = null)
{
$datetime1 = api_strtotime($values[0]);
$datetime2 = api_strtotime($values[1]);
if (strpos($operator, 'allow_empty') !== false) {
@ -21,7 +22,8 @@ class HTML_QuickForm_Rule_CompareDateTimeText extends HTML_QuickForm_Rule_Compar
return true;
}
}
$result = parent::validate(array($datetime1, $datetime2), $operator);
$result = parent::validate(array($datetime1, $datetime2), $operator);
return $result;
}
}

2
main/inc/lib/pear/HTML/QuickForm.php
Unescape View File

@ -1774,7 +1774,7 @@ class HTML_QuickForm extends HTML_Common
}
if (count($test) > 0) {
return
"\n<script type=\"text/javascript\">\n" .
"<script>" .
"//<![CDATA[\n" .
"function validate_" . $this->_attributes['id'] . "(frm) {\n" .
" var value = '';\n" .

2
main/inc/lib/pear/HTML/QuickForm/Rule/Compare.php
Unescape View File

@ -72,7 +72,6 @@ class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
}
}
function validate($values, $operator = null)
{
$operator = $this->_findOperator($operator);
@ -95,6 +94,7 @@ class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
} else {
$check = "!(String({jsVar}[0]) {$operator} String({jsVar}[1]))";
}
return array('', "'' != {jsVar}[0] && {$check}");
}
}

Write Preview
Loading…
Cancel
Save