Format code

1.9.x
Julio Montoya 11 years ago
parent 09373a96d5
commit 9f516e9dc4
  1. 2
      main/gradebook/lib/fe/catform.class.php
  2. 24
      main/gradebook/lib/fe/dataform.class.php
  3. 7
      main/gradebook/lib/fe/displaygradebook.php
  4. 22
      main/gradebook/lib/fe/evalform.class.php
  5. 2
      main/gradebook/lib/fe/gradebooktable.class.php
  6. 8
      main/gradebook/lib/fe/linkaddeditform.class.php
  7. 15
      main/gradebook/lib/fe/linkform.class.php
  8. 13
      main/gradebook/lib/fe/resulttable.class.php
  9. 9
      main/gradebook/lib/fe/scoredisplayform.class.php
  10. 27
      main/gradebook/lib/fe/userform.class.php
  11. 34
      main/gradebook/lib/fe/usertable.class.php
  12. 2
      main/gradebook/lib/gradebook_data_generator.class.php
  13. 7
      main/gradebook/lib/gradebook_functions_users.inc.php
  14. 28
      main/gradebook/lib/scoredisplay.class.php
  15. 60
      main/gradebook/lib/user_data_generator.class.php

@ -12,12 +12,10 @@ require_once dirname(__FILE__).'/../be.inc.php';
*/
class CatForm extends FormValidator
{
const TYPE_ADD = 1;
const TYPE_EDIT = 2;
const TYPE_MOVE = 3;
const TYPE_SELECT_COURSE = 4;
private $category_object;
/**

@ -1,24 +1,18 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__).'/../../../inc/global.inc.php';
require_once dirname(__FILE__).'/../be.inc.php';
require_once dirname(__FILE__).'/../gradebook_functions.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'groupmanager.lib.php';
/**
* Extends formvalidator with import and export forms
* Extends FormValidator with import and export forms
* @author Stijn Konings
* @package chamilo.gradebook
*/
class DataForm extends FormValidator {
class DataForm extends FormValidator
{
const TYPE_IMPORT = 1;
const TYPE_EXPORT = 2;
const TYPE_EXPORT_PDF = 3;
@ -32,20 +26,19 @@ class DataForm extends FormValidator {
* @param method
* @param action
*/
function DataForm($form_type, $form_name, $method = 'post', $action = null, $target='', $locked_status) {
public function DataForm($form_type, $form_name, $method = 'post', $action = null, $target='', $locked_status)
{
parent :: __construct($form_name, $method, $action,$target);
$this->form_type = $form_type;
if ($this->form_type == self :: TYPE_IMPORT) {
$this->build_import_form();
}
elseif ($this->form_type == self :: TYPE_EXPORT) {
} elseif ($this->form_type == self :: TYPE_EXPORT) {
if ($locked_status == 0) {
$this->build_export_form_option(false);
} else {
$this->build_export_form();
}
}
elseif ($this->form_type == self :: TYPE_EXPORT_PDF) {
} elseif ($this->form_type == self :: TYPE_EXPORT_PDF) {
$this->build_pdf_export_form();
}
$this->setDefaults();
@ -64,7 +57,6 @@ class DataForm extends FormValidator {
));
}
protected function build_export_form() {
$this->addElement('header', get_lang('ChooseFormat'));
$this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');

@ -1,11 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Class
* Class DisplayGradebook
* @package chamilo.gradebook
*/
class DisplayGradebook

@ -1,23 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__) . '/../../../inc/global.inc.php';
require_once dirname(__FILE__) . '/../be.inc.php';
require_once dirname(__FILE__) . '/../gradebook_functions.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'groupmanager.lib.php';
/**
* Extends formvalidator with add&edit forms for evaluations
* @author Stijn Konings
* @package chamilo.gradebook
*/
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#evaluation_title").focus();
@ -27,9 +15,15 @@ $(document).ready(function () {
});
</script>';
/**
* Class EvalForm
*
* Extends FormValidator with add&edit forms for evaluations
* @author Stijn Konings
* @package chamilo.gradebook
*/
class EvalForm extends FormValidator
{
const TYPE_ADD = 1;
const TYPE_EDIT = 2;
const TYPE_MOVE = 3;

@ -530,7 +530,7 @@ class GradebookTable extends SortableTable
* @param unknown_type $item
* @return string
*/
private function build_name_link ($item)
private function build_name_link($item)
{
$view = isset($_GET['view']) ? Security::remove_XSS($_GET['view']) : null;
switch ($item->get_item_type()) {

@ -1,12 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__).'/../../../inc/global.inc.php';
require_once dirname(__FILE__).'/../be.inc.php';
require_once dirname(__FILE__).'/../gradebook_functions.inc.php';

@ -1,18 +1,13 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__).'/../../../inc/global.inc.php';
require_once dirname(__FILE__).'/../be.inc.php';
require_once dirname(__FILE__).'/../gradebook_functions.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'groupmanager.lib.php';
/**
* Class LinkForm
* Forms related to links
* @author Stijn Konings
* @author Bert Steppé (made more generic)
@ -35,7 +30,8 @@ class LinkForm extends FormValidator
* @param method
* @param action
*/
function LinkForm($form_type, $category_object,$link_object, $form_name, $method = 'post', $action = null, $extra = null) {
function LinkForm($form_type, $category_object,$link_object, $form_name, $method = 'post', $action = null, $extra = null)
{
parent :: __construct($form_name, $method, $action);
if (isset ($category_object)) {
@ -54,7 +50,8 @@ class LinkForm extends FormValidator
//$this->setDefaults();
}
protected function build_move() {
protected function build_move()
{
$renderer =& $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');

@ -1,16 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__).'/../../../inc/global.inc.php';
require_once dirname(__FILE__).'/../be.inc.php';
/**
* Class ResultTable
* Table to display results for an evaluation
* @author Stijn Konings
* @author Bert Steppé
@ -18,7 +13,6 @@ require_once dirname(__FILE__).'/../be.inc.php';
*/
class ResultTable extends SortableTable
{
private $datagen;
private $evaluation;
private $allresults;
@ -27,7 +21,8 @@ class ResultTable extends SortableTable
/**
* Constructor
*/
function ResultTable ($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false) {
public function ResultTable ($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);
$this->datagen = new ResultsDataGenerator($evaluation, $results, true);

@ -1,16 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__).'/../../../inc/global.inc.php';
require_once dirname(__FILE__).'/../gradebook_functions.inc.php';
/**
* Class ScoreDisplayForm
* Form for the score display dialog
* @author Stijn Konings
* @author Bert Steppé

@ -1,18 +1,14 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__).'/../../../inc/global.inc.php';
require_once dirname(__FILE__).'/../be.inc.php';
require_once dirname(__FILE__).'/../gradebook_functions.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'groupmanager.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.php';
/**
* Class UserForm
* Extends formvalidator with import and export forms
* @author Stijn Konings
* @package chamilo.gradebook
@ -29,7 +25,8 @@ class UserForm extends FormValidator
* @param method
* @param action
*/
function UserForm($form_type, $user, $form_name, $method= 'post', $action= null) {
public function UserForm($form_type, $user, $form_name, $method= 'post', $action= null)
{
parent :: __construct($form_name, $method, $action);
$this->form_type= $form_type;
if (isset ($user)) {
@ -47,7 +44,8 @@ class UserForm extends FormValidator
$this->setDefaults();
}
protected function build_simple_search() {
protected function build_simple_search()
{
if (isset($_GET['search']) && (!empty($_GET['search']))) {
$this->setDefaults(array(
'keyword' => Security::remove_XSS($_GET['search'])
@ -59,7 +57,8 @@ class UserForm extends FormValidator
$this->addElement('style_submit_button','submit',get_lang('Search'),'class="search"');
}
protected function build_user_info_form() {
protected function build_user_info_form()
{
if (api_is_western_name_order()) {
$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
$this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
@ -73,10 +72,14 @@ class UserForm extends FormValidator
$this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
$this->addElement('style_submit_button', 'submit', get_lang('Back'),'class="save"');
}
function display() {
function display()
{
parent :: display();
}
function setDefaults($defaults= array(), $filter = null) {
function setDefaults($defaults= array(), $filter = null)
{
parent :: setDefaults($defaults, $filter);
}
}

@ -1,16 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
require_once dirname(__FILE__).'/../../../inc/global.inc.php';
require_once dirname(__FILE__).'/../be.inc.php';
/**
* Class UserTable
* Table to display flat view of a student's evaluations and links
* @author Stijn Konings
* @author Bert Steppé (refactored, optimised, use of caching, datagenerator class)
@ -18,21 +13,17 @@ require_once dirname(__FILE__).'/../be.inc.php';
*/
class UserTable extends SortableTable
{
private $userid;
private $datagen;
/**
* Constructor
*/
function UserTable ($userid, $evals = array(), $links = array(), $addparams = null) {
public function UserTable ($userid, $evals = array(), $links = array(), $addparams = null)
{
parent :: __construct ('userlist', null, null, 0);
$this->userid = $userid;
$this->datagen = new UserDataGenerator($userid, $evals, $links);
if (isset($addparams)) {
$this->set_additional_parameters($addparams);
}
@ -54,16 +45,16 @@ class UserTable extends SortableTable
/**
* Function used by SortableTable to get total number of items in the table
*/
function get_total_number_of_items () {
function get_total_number_of_items ()
{
return $this->datagen->get_total_items_count();
}
/**
* Function used by SortableTable to generate the data to display
*/
function get_table_data ($from = 1) {
function get_table_data ($from = 1)
{
$scoredisplay = ScoreDisplay :: instance();
// determine sorting type
@ -116,14 +107,13 @@ class UserTable extends SortableTable
return $sortable_data;
}
// Other functions
private function build_type_column ($item) {
private function build_type_column($item)
{
return build_type_icon_tag($item->get_icon_name());
}
private function build_name_link ($item) {
private function build_name_link($item)
{
switch ($item->get_item_type()) {
// evaluation
case 'E' :

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
/**
* GradebookDataGenerator Class
* Class GradebookDataGenerator
* Class to select, sort and transform object data into array data,
* used for the general gradebook view
* @author Bert Steppé

@ -12,10 +12,9 @@
*/
function get_users_in_course($course_id)
{
$tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_session_course_user = Database:: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_user = Database:: get_main_table(TABLE_MAIN_USER);
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname ASC' : ' ORDER BY lastname, firstname ASC';
$current_session = api_get_session_id();

@ -1,12 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Init
*/
// Score display types constants
define('SCORE_DIV', 1); // X / Y
@ -27,11 +20,12 @@ define('SCORE_DIV_SIMPLE_WITH_CUSTOM', 11); // X - Good!
define('SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS', 12); // X - Good!
define('SCORE_BOTH',1);
define('SCORE_ONLY_DEFAULT',2);
define('SCORE_ONLY_CUSTOM',3);
define('SCORE_BOTH', 1);
define('SCORE_ONLY_DEFAULT', 2);
define('SCORE_ONLY_CUSTOM', 3);
/**
* Class ScoreDisplay
* Class to display scores according to the settings made by the platform admin.
* This class works as a singleton: call instance() to retrieve an object.
* @author Bert Steppé
@ -39,7 +33,12 @@ define('SCORE_ONLY_CUSTOM',3);
*/
class ScoreDisplay
{
// Singleton stuff
private $coloring_enabled;
private $color_split_value;
private $custom_enabled;
private $upperlimit_included;
private $custom_display;
private $custom_display_conv;
/**
* Get the instance of this class
@ -76,13 +75,6 @@ class ScoreDisplay
}
}
private $coloring_enabled;
private $color_split_value;
private $custom_enabled;
private $upperlimit_included;
private $custom_display;
private $custom_display_conv;
/**
* Protected constructor - call instance() to instantiate
*/

@ -1,10 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Script
* @package chamilo.gradebook
*/
/**
* Class UserDataGenerator
* Class to select, sort and transform object data into array data,
* used for a student's general view
* @author Bert Steppé
@ -12,7 +10,6 @@
*/
class UserDataGenerator
{
// Sorting types constants
const UDG_SORT_TYPE = 1;
const UDG_SORT_NAME = 2;
@ -33,7 +30,8 @@ class UserDataGenerator
private $scorecache;
private $avgcache;
function UserDataGenerator($userid, $evals = array(), $links = array()) {
public function UserDataGenerator($userid, $evals = array(), $links = array())
{
$this->userid = $userid;
$evals_filtered = array();
foreach ($evals as $eval) {
@ -66,7 +64,8 @@ class UserDataGenerator
/**
* Get total number of items (rows)
*/
public function get_total_items_count() {
public function get_total_items_count()
{
return count($this->items);
}
@ -81,7 +80,8 @@ class UserDataGenerator
* 5: student's score
* 6: student's score as custom display (only if custom scoring enabled)
*/
public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false) {
public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false)
{
// do some checks on count, redefine if invalid value
if (!isset($count)) {
$count = count ($this->items) - $start;
@ -157,7 +157,8 @@ class UserDataGenerator
// Sort functions
// Make sure to only use functions as defined in the GradebookItem interface !
function sort_by_type($item1, $item2) {
function sort_by_type($item1, $item2)
{
if ($item1->get_item_type() == $item2->get_item_type()) {
return $this->sort_by_name($item1,$item2);
} else {
@ -165,13 +166,15 @@ class UserDataGenerator
}
}
function sort_by_course($item1, $item2) {
function sort_by_course($item1, $item2)
{
$name1 = api_strtolower($this->get_course_name_from_code_cached($item1->get_course_code()));
$name2 = api_strtolower($this->get_course_name_from_code_cached($item2->get_course_code()));
return api_strnatcmp($name1, $name2);
}
function sort_by_category($item1, $item2) {
function sort_by_category($item1, $item2)
{
$cat1 = $this->get_category_cached($item1->get_category_id());
$cat2 = $this->get_category_cached($item2->get_category_id());
$name1 = api_strtolower($this->get_category_name_to_display($cat1));
@ -179,31 +182,34 @@ class UserDataGenerator
return api_strnatcmp($name1, $name2);
}
function sort_by_name($item1, $item2) {
function sort_by_name($item1, $item2)
{
return api_strnatcmp($item1->get_name(),$item2->get_name());
}
function sort_by_average($item1, $item2) {
function sort_by_average($item1, $item2)
{
$score1 = $this->avgcache[$item1->get_item_type() . $item1->get_id()];
$score2 = $this->avgcache[$item2->get_item_type() . $item2->get_id()];
return $this->compare_scores($score1, $score2);
}
function sort_by_score($item1, $item2) {
function sort_by_score($item1, $item2)
{
$score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
$score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
return $this->compare_scores($score1, $score2);
}
function sort_by_mask($item1, $item2) {
function sort_by_mask($item1, $item2)
{
$score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
$score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
}
function compare_scores ($score1, $score2) {
function compare_scores ($score1, $score2)
{
if (!isset($score1)) {
return (isset($score2) ? 1 : 0);
} elseif (!isset($score2)) {
@ -213,22 +219,22 @@ class UserDataGenerator
} else {
return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
}
}
// Other functions
private function build_course_name ($item) {
private function build_course_name ($item)
{
return $this->get_course_name_from_code_cached($item->get_course_code());
}
private function build_category_name ($item) {
private function build_category_name ($item)
{
$cat = $this->get_category_cached($item->get_category_id());
return $this->get_category_name_to_display($cat);
}
private function build_average_column ($item, $ignore_score_color) {
private function build_average_column ($item, $ignore_score_color)
{
if (isset($this->avgcache)) {
$avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()];
} else {
@ -243,7 +249,8 @@ class UserDataGenerator
return $scoredisplay->display_score($avgscore, $displaytype);
}
private function build_result_column ($item, $ignore_score_color) {
private function build_result_column ($item, $ignore_score_color)
{
$studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
$scoredisplay = ScoreDisplay :: instance();
$displaytype = SCORE_DIV_PERCENT;
@ -253,7 +260,8 @@ class UserDataGenerator
return $scoredisplay->display_score($studscore, $displaytype, SCORE_ONLY_DEFAULT);
}
private function build_mask_column ($item, $ignore_score_color) {
private function build_mask_column($item, $ignore_score_color)
{
$studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
$scoredisplay = ScoreDisplay :: instance();
$displaytype = SCORE_DIV_PERCENT;

Loading…
Cancel
Save