Skip to content

Commit

Permalink
Adds lib GradebookUtils class to avoid unneeded requires
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmontoyaa
jmontoyaa committed Feb 13, 2015
1 parent d4dcaea commit 272710b
Show file tree
Hide file tree
Showing 70 changed files with 1,322 additions and 1,557 deletions.
3 changes: 0 additions & 3 deletions main/admin/export_certificates.php
View file
Expand Up @@ -13,9 +13,6 @@

require_once '../inc/global.inc.php';

require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';

Display::display_header(null);

$form = new FormValidator('export_certificate');
Expand Down
2 changes: 1 addition & 1 deletion main/attendance/attendance_add.php
View file
Expand Up @@ -44,7 +44,7 @@
$form->addElement('checkbox', 'attendance_qualify_gradebook', '', get_lang('QualifyAttendanceGradebook'),'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
$form->addElement('html','<div id="options_field" style="display:none">');

load_gradebook_select_in_tool($form);
GradebookUtils::load_gradebook_select_in_tool($form);

$form->addElement('text', 'attendance_qualify_title', get_lang('TitleColumnGradebook'));
$form->applyFilter('attendance_qualify_title', 'html_filter');
Expand Down
4 changes: 2 additions & 2 deletions main/attendance/attendance_edit.php
View file
Expand Up @@ -52,7 +52,7 @@
$form->addElement('checkbox', 'attendance_qualify_gradebook', '', get_lang('QualifyAttendanceGradebook'),'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
$form->addElement('html','<div id="options_field" style="display:none">');
}
load_gradebook_select_in_tool($form);
GradebookUtils::load_gradebook_select_in_tool($form);
$form->addElement('text', 'attendance_qualify_title', get_lang('TitleColumnGradebook'));
$form->applyFilter('attendance_qualify_title', 'html_filter');
$form->addElement('text', 'attendance_weight', get_lang('QualifyWeight'),'value="0.00" Style="width:40px" onfocus="javascript: this.select();"');
Expand All @@ -69,7 +69,7 @@
$default['attendance_qualify_title'] = $attendance_qualify_title;
$default['attendance_weight'] = $attendance_weight;

$link_info = is_resource_in_course_gradebook(api_get_course_id(), 7, $attendance_id, api_get_session_id());
$link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 7, $attendance_id, api_get_session_id());
$default['category_id'] = $link_info['category_id'];
$form->setDefaults($default);
$form->display();
4 changes: 0 additions & 4 deletions main/attendance/index.php
View file
Expand Up @@ -21,13 +21,9 @@

// including files
require_once '../inc/global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
require_once api_get_path(LIBRARY_PATH).'app_view.php';

require_once 'attendance_controller.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/fe/exportgradebook.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

$current_course_tool = TOOL_ATTENDANCE;

Expand Down
7 changes: 2 additions & 5 deletions main/exercice/exercice.php
View file
Expand Up @@ -21,8 +21,6 @@
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_QUIZ;

require_once '../gradebook/lib/be.inc.php';

// Setting the tabs
$this_section = SECTION_COURSES;

Expand Down Expand Up @@ -227,10 +225,9 @@
// deletes an exercise
if ($exercise_action_locked == false) {
$objExerciseTmp->delete();
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
$link_info = is_resource_in_course_gradebook(api_get_course_id(), 1, $exerciseId, api_get_session_id());
$link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 1, $exerciseId, api_get_session_id());
if ($link_info !== false) {
remove_resource_from_course_gradebook($link_info['id']);
GradebookUtils::remove_resource_from_course_gradebook($link_info['id']);
}
Display :: display_confirmation_message(get_lang('ExerciseDeleted'));
}
Expand Down
1 change: 0 additions & 1 deletion main/exercice/exercise_report.php
View file
Expand Up @@ -15,7 +15,6 @@

// including the global library
require_once '../inc/global.inc.php';
require_once '../gradebook/lib/be.inc.php';

// Setting the tabs
$this_section = SECTION_COURSES;
Expand Down
1 change: 0 additions & 1 deletion main/exercice/hotpotatoes_exercise_report.php
View file
Expand Up @@ -14,7 +14,6 @@

// including the global library
require_once '../inc/global.inc.php';
require_once '../gradebook/lib/be.inc.php';

// Setting the tabs
$this_section = SECTION_COURSES;
Expand Down
9 changes: 2 additions & 7 deletions main/forum/editpost.php
View file
Expand Up @@ -27,11 +27,6 @@

// Including the global initialization file.
require_once '../inc/global.inc.php';
require_once '../gradebook/lib/gradebook_functions.inc.php';
require_once '../gradebook/lib/be/gradebookitem.class.php';
require_once '../gradebook/lib/be/evaluation.class.php';
require_once '../gradebook/lib/be/abstractlink.class.php';
require_once '../gradebook/lib/gradebook_functions.inc.php';

// The section (tabs).
$this_section = SECTION_COURSES;
Expand Down Expand Up @@ -229,10 +224,10 @@ function advanced_parameters() {
$weight_calification = $values['weight_calification'];
$description = '';
$session_id = api_get_session_id();
$link_info = is_resource_in_course_gradebook(api_get_course_id(), 5, $id, $session_id);
$link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 5, $id, $session_id);
$link_id = $link_info['id'];
if (!$link_info) {
add_resource_to_course_gradebook(
GradebookUtils::add_resource_to_course_gradebook(
$values['category_id'],
api_get_course_id(),
5,
Expand Down
21 changes: 10 additions & 11 deletions main/forum/forumfunction.inc.php
View file
Expand Up @@ -170,13 +170,12 @@ function handle_forum_and_forumcategories($lp_id = null)

for ($i = 0; $i < count($list_threads); $i++) {
delete_forum_forumcategory_thread('thread', $list_threads[$i]['thread_id']);
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
$link_info = is_resource_in_course_gradebook(api_get_course_id(), 5, intval($list_threads[$i]['thread_id']), api_get_session_id());
$link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 5, intval($list_threads[$i]['thread_id']), api_get_session_id());
if ($link_info !== false) {
remove_resource_from_course_gradebook($link_info['id']);
GradebookUtils::remove_resource_from_course_gradebook($link_info['id']);
}
}
$return_message = delete_forum_forumcategory_thread($get_content, $get_id);
$return_message = GradebookUtils::delete_forum_forumcategory_thread($get_content, $get_id);
Display::display_confirmation_message($return_message, false);
}

Expand Down Expand Up @@ -2243,7 +2242,7 @@ function store_thread($current_forum, $values)
$maxqualify = $values['numeric_calification'];
$weigthqualify = $values['weight_calification'];
$resourcedescription = '';
add_resource_to_course_gradebook(
GradebookUtils::add_resource_to_course_gradebook(
$values['category_id'],
$coursecode,
$resourcetype,
Expand Down Expand Up @@ -2426,7 +2425,7 @@ function show_add_post_form($current_forum, $forum_setting, $action = '', $id =
// Thread qualify
if (Gradebook::is_active()) {
//Loading gradebook select
load_gradebook_select_in_tool($form);
GradebookUtils::load_gradebook_select_in_tool($form);
$form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'), 'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
} else {
$form->addElement('hidden', 'thread_qualify_gradebook', false);
Expand Down Expand Up @@ -2845,7 +2844,7 @@ function show_edit_post_form($forum_setting, $current_post, $current_thread, $cu
$form->addElement('label', '<strong>'.get_lang('AlterQualifyThread').'</strong>');
$form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'), 'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');

$link_info = is_resource_in_course_gradebook(api_get_course_id(), 5, $_GET['thread'], api_get_session_id());
$link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 5, $_GET['thread'], api_get_session_id());
if (!empty($link_info)) {
$defaults['thread_qualify_gradebook'] = true;
$defaults['category_id'] = $link_info['category_id'];
Expand All @@ -2865,7 +2864,7 @@ function show_edit_post_form($forum_setting, $current_post, $current_thread, $cu
}

//Loading gradebook select
load_gradebook_select_in_tool($form);
GradebookUtils::load_gradebook_select_in_tool($form);

$form->addElement('text', 'numeric_calification', get_lang('QualificationNumeric'), 'value="'.$current_thread['thread_qualify_max'].'" style="width:40px"');
$form->applyFilter('numeric_calification', 'html_filter');
Expand Down Expand Up @@ -3004,19 +3003,19 @@ function store_edit_post($values)
$sid = api_get_session_id();


$link_info = is_resource_in_course_gradebook($ccode, 5, $values['thread_id'], $sid);
$link_info = GradebookUtils::is_resource_in_course_gradebook($ccode, 5, $values['thread_id'], $sid);
$link_id = $link_info['id'];

$thread_qualify_gradebook = isset($values['thread_qualify_gradebook']) ? $values['thread_qualify_gradebook'] : null;

if ($thread_qualify_gradebook != 1) {
if ($link_info !== false) {
remove_resource_from_course_gradebook($link_id);
GradebookUtils::remove_resource_from_course_gradebook($link_id);
}
} else {
if ($link_info === false && !$_GET['thread']) {
$weigthqualify = $values['weight_calification'];
add_resource_to_course_gradebook($values['category_id'], $ccode, 5, $values['thread_id'], Database::escape_string(stripslashes($values['calification_notebook_title'])), $weigthqualify, $values['numeric_calification'], null, 0, $sid);
GradebookUtils::add_resource_to_course_gradebook($values['category_id'], $ccode, 5, $values['thread_id'], Database::escape_string(stripslashes($values['calification_notebook_title'])), $weigthqualify, $values['numeric_calification'], null, 0, $sid);
}
}
}
Expand Down
1 change: 0 additions & 1 deletion main/forum/newthread.php
View file
Expand Up @@ -30,7 +30,6 @@

// Including the global initialization file.
require_once '../inc/global.inc.php';
require_once '../gradebook/lib/gradebook_functions.inc.php';

// The section (tabs).
$this_section = SECTION_COURSES;
Expand Down
7 changes: 3 additions & 4 deletions main/forum/viewforum.php
View file
Expand Up @@ -147,13 +147,12 @@

$locked = api_resource_is_locked_by_gradebook($_GET['id'], LINK_FORUM_THREAD);
if ($locked == false) {
$message = delete_forum_forumcategory_thread($_GET['content'], $_GET['id']);
$message = GradebookUtils::delete_forum_forumcategory_thread($_GET['content'], $_GET['id']);
// Delete link
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
$link_info = is_resource_in_course_gradebook(api_get_course_id(), 5 , intval($_GET['id']), api_get_session_id());
$link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 5 , intval($_GET['id']), api_get_session_id());
$link_id = $link_info['id'];
if ($link_info !== false) {
remove_resource_from_course_gradebook($link_id);
GradebookUtils::remove_resource_from_course_gradebook($link_id);
}
}
}
Expand Down
36 changes: 13 additions & 23 deletions main/gradebook/gradebook.php
View file
Expand Up @@ -20,16 +20,6 @@
$this_section = SECTION_MYGRADEBOOK;
unset($_GET['course']);
}
require_once 'lib/be.inc.php';
require_once 'lib/scoredisplay.class.php';
require_once 'lib/gradebook_functions.inc.php';
require_once 'lib/fe/catform.class.php';
require_once 'lib/fe/evalform.class.php';
require_once 'lib/fe/linkform.class.php';
require_once 'lib/gradebook_data_generator.class.php';
require_once 'lib/fe/gradebooktable.class.php';
require_once 'lib/fe/displaygradebook.php';
require_once 'lib/fe/userform.class.php';

$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready( function() {
Expand Down Expand Up @@ -57,7 +47,7 @@ function confirmation ()

//this is called when there is no data for the course admin
if (isset ($_GET['createallcategories'])) {
block_students();
GradebookUtils::block_students();
$coursecat= Category :: get_not_created_course_categories(api_get_user_id());
if (!count($coursecat) == 0) {
foreach ($coursecat as $row) {
Expand All @@ -81,7 +71,7 @@ function confirmation ()

if (isset ($_GET['movecat'])) {
$move_cat=Security::remove_XSS($_GET['movecat']);
block_students();
GradebookUtils::block_students();
$cats= Category :: load($move_cat);
if (!isset ($_GET['targetcat'])) {
$move_form= new CatForm(CatForm :: TYPE_MOVE,
Expand Down Expand Up @@ -113,7 +103,7 @@ function confirmation ()

//move an evaluation
if (isset ($_GET['moveeval'])) {
block_students();
GradebookUtils::block_students();
$get_move_eval=Security::remove_XSS($_GET['moveeval']);
$evals= Evaluation :: load($get_move_eval);
if (!isset ($_GET['targetcat'])) {
Expand Down Expand Up @@ -149,7 +139,7 @@ function confirmation ()

//move a link
if (isset ($_GET['movelink'])) {
block_students();
GradebookUtils::block_students();
$get_move_link=Security::remove_XSS($_GET['movelink']);
$link= LinkFactory :: load($get_move_link);
$move_form= new LinkForm(LinkForm :: TYPE_MOVE, null, $link[0], 'move_link_form', null, api_get_self() . '?movelink=' . $get_move_link . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
Expand All @@ -164,7 +154,7 @@ function confirmation ()

//parameters for categories
if (isset ($_GET['visiblecat'])) {
block_students();
GradebookUtils::block_students();
if (isset ($_GET['set_visible'])) {
$visibility_command= 1;
} else {
Expand All @@ -184,7 +174,7 @@ function confirmation ()
}
}
if (isset ($_GET['deletecat'])) {
block_students();
GradebookUtils::block_students();
$cats= Category :: load($_GET['deletecat']);
//delete all categories,subcategories and results
if ($cats[0] != null) {
Expand All @@ -198,7 +188,7 @@ function confirmation ()
}
//parameters for evaluations
if (isset ($_GET['visibleeval'])) {
block_students();
GradebookUtils::block_students();
if (isset ($_GET['set_visible'])) {
$visibility_command= 1;
} else {
Expand All @@ -218,7 +208,7 @@ function confirmation ()
}
}
if (isset ($_GET['deleteeval'])) {
block_students();
GradebookUtils::block_students();
$eval= Evaluation :: load($_GET['deleteeval']);
if ($eval[0] != null) {
$eval[0]->delete_with_results();
Expand All @@ -228,7 +218,7 @@ function confirmation ()
}
//parameters for links
if (isset ($_GET['visiblelink'])) {
block_students();
GradebookUtils::block_students();
if (isset ($_GET['set_visible'])) {
$visibility_command= 1;
}else {
Expand All @@ -247,7 +237,7 @@ function confirmation ()
}
}
if (isset ($_GET['deletelink'])) {
block_students();
GradebookUtils::block_students();
//fixing #5229
if (!empty($_GET['deletelink'])) {
$link= LinkFactory :: load($_GET['deletelink']);
Expand All @@ -261,7 +251,7 @@ function confirmation ()
}
$course_to_crsind = isset ($course_to_crsind) ? $course_to_crsind : '';
if ($course_to_crsind && !isset($_GET['confirm'])) {
block_students();
GradebookUtils::block_students();
if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
die ('Error: movecat or moveeval not defined');
}
Expand All @@ -280,7 +270,7 @@ function confirmation ()
}
//actions on the sortabletable
if (isset ($_POST['action'])) {
block_students();
GradebookUtils::block_students();
$number_of_selected_items= count($_POST['id']);
if ($number_of_selected_items == '0') {
$warning_message = get_lang('NoItemsSelected');
Expand Down Expand Up @@ -524,7 +514,7 @@ function confirmation ()
}
$category = Category :: load ($_GET['cat_id']);
if ($category[0]->is_certificate_available($user_id)) {
$user= get_user_info_from_id($user_id);
$user = api_get_user_info($user_id);
$scoredisplay = ScoreDisplay :: instance();
$scorecourse = $category[0]->calc_score($user_id);
$scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
Expand Down
5 changes: 1 addition & 4 deletions main/gradebook/gradebook_add_cat.php
View file
Expand Up @@ -14,11 +14,8 @@
$_in_course = false;
}

require_once 'lib/be.inc.php';
require_once 'lib/gradebook_functions.inc.php';
require_once 'lib/fe/catform.class.php';
api_block_anonymous_users();
block_students();
GradebookUtils::block_students();

$edit_cat = isset($_REQUEST['editcat']) ? intval($_REQUEST['editcat']) : '';

Expand Down
5 changes: 1 addition & 4 deletions main/gradebook/gradebook_add_eval.php
View file
Expand Up @@ -8,14 +8,11 @@

$language_file = 'gradebook';
require_once '../inc/global.inc.php';
require_once 'lib/be.inc.php';
require_once 'lib/gradebook_functions.inc.php';
require_once 'lib/fe/evalform.class.php';
$current_course_tool = TOOL_GRADEBOOK;

api_protect_course_script();
api_block_anonymous_users();
block_students();
GradebookUtils::block_students();

$select_cat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
$is_allowedToEdit = $is_courseAdmin;
Expand Down
6 changes: 1 addition & 5 deletions main/gradebook/gradebook_add_link.php
View file
Expand Up @@ -9,16 +9,12 @@
$language_file = array('gradebook', 'exercice');

require_once '../inc/global.inc.php';
require_once 'lib/be.inc.php';
require_once 'lib/gradebook_functions.inc.php';
require_once 'lib/fe/linkform.class.php';
require_once 'lib/fe/linkaddeditform.class.php';
require_once '../forum/forumfunction.inc.php';
$current_course_tool = TOOL_GRADEBOOK;

api_protect_course_script();
api_block_anonymous_users();
block_students();
GradebookUtils::block_students();

$courseCode = isset($_GET['course_code']) ? Security::remove_XSS($_GET['course_code']) : null;
$course_info = api_get_course_info($courseCode);
Expand Down

0 comments on commit 272710b

Please sign in to comment.