Minor - Format code.

1.9.x
Julio Montoya 11 years ago
parent 8f8c35bae4
commit 4235e46f20
  1. 8
      main/gradebook/gradebook_flatview.php
  2. 8
      main/gradebook/lib/fe/linkaddeditform.class.php
  3. 5
      main/gradebook/lib/flatview_data_generator.class.php

@ -280,15 +280,11 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') {
$simple_search_form $simple_search_form
); );
// main graph // Table
$flatviewtable->display(); $flatviewtable->display();
// @todo this needs a fix
//$image_file = $flatviewtable->display_graph();
//@todo load images with jquery //@todo load images with jquery
echo '<div id="contentArea" style="text-align: center;" >'; echo '<div id="contentArea" style="text-align: center;" >';
if (!empty($image_file)) {
echo '<img src="'.$image_file.'">';
}
$flatviewtable->display_graph_by_resource(); $flatviewtable->display_graph_by_resource();
echo '</div>'; echo '</div>';
} }

@ -67,7 +67,13 @@ class LinkAddEditForm extends FormValidator
if (count($category_object) == 1) { if (count($category_object) == 1) {
$this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id()); $this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
} else { } else {
$select_gradebook = $this->addElement('select', 'select_gradebook', get_lang('SelectGradebook'), array(), array('id' => 'hide_category_id')); $select_gradebook = $this->addElement(
'select',
'select_gradebook',
get_lang('SelectGradebook'),
array(),
array('id' => 'hide_category_id')
);
$this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero'); $this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
$default_weight = 0; $default_weight = 0;

@ -438,7 +438,8 @@ class FlatViewDataGenerator
} }
if (!isset($this->params['only_total_category']) || if (!isset($this->params['only_total_category']) ||
(isset($this->params['only_total_category']) && $this->params['only_total_category'] == false) (isset($this->params['only_total_category']) &&
$this->params['only_total_category'] == false)
) { ) {
if (!$show_all) { if (!$show_all) {
$row[] = $temp_score.' '; $row[] = $temp_score.' ';
@ -533,7 +534,7 @@ class FlatViewDataGenerator
$evaluationsAdded = array(); $evaluationsAdded = array();
for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) { for ($count = 0; $count < $items_count && ($items_start + $count < count($this->evals_links)); $count++) {
/** @var AbstractLink $item */ /** @var AbstractLink $item */
$item = $this->evals_links[$count + $items_start]; $item = $this->evals_links[$count + $items_start];

Loading…
Cancel
Save