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

Fixing exercise.lib.php calls

Browse Source
skala
Julio Montoya 14 years ago
parent 354b40e59b
commit 0dc1990e6d
10 changed files with 28 additions and 25 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. 12
      main/admin/skills_gradebook.php
  2. 11
      main/exercice/adminhp.php
  3. 8
      main/exercice/exercise.lib.php
  4. 2
      main/exercice/exercise_result.php
  5. 2
      main/exercice/exercise_show.php
  6. 3
      main/exercice/exercise_submit.php
  7. 5
      main/exercice/overview.php
  8. 2
      main/exercice/result.php
  9. 2
      main/inc/ajax/exercise.ajax.php
  10. 6
      main/inc/lib/gradebook.lib.php

12
main/admin/skills_gradebook.php
Unescape View File

@ -35,9 +35,9 @@ $columns = array(get_lang('Name'), get_lang('Skills'), get_lang('Actions'
//Column config
$column_model = array(
array('name'=>'name', 'index'=>'name', 'width'=>'200', 'align'=>'left'),
array('name'=>'skills', 'index'=>'skills', 'width'=>'300', 'align'=>'left','sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
array('name'=>'name', 'index'=>'name', 'width'=>'200', 'align'=>'left'),
array('name'=>'skills', 'index'=>'skills', 'width'=>'300', 'align'=>'left','sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
);
//Autowidth
$extra_params['autowidth'] = 'true';
@ -69,16 +69,16 @@ switch($action) {
$id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
$gradebook_info = $gradebook->get($id);
$url = api_get_self().'?action='.$action.'&id='.$id;
$form = $gradebook->show_skill_form($id, $url);
$form = $gradebook->show_skill_form($id, $url, $gradebook_info['name']);
if ($form->validate()) {
$values = $form->exportValues();
$res = $gradebook->update_skills_to_gradebook($values['id'], $values['skill']);
if ($res) {
Display::display_confirmation_message(get_lang('ItemAdded'));
}
}
echo Display::tag('h1',$gradebook_info['name']);
}
$form->display();
//echo Display::tag('h2',$gradebook_info['name']);
break;
}
Display::display_footer();

11
main/exercice/adminhp.php
Unescape View File

@ -9,14 +9,15 @@
/**
* Code
*/
include 'exercise.class.php';
include 'question.class.php';
include 'answer.class.php';
include 'exercise.lib.php';
require_once 'exercise.class.php';
require_once 'question.class.php';
require_once 'answer.class.php';
// name of the language file that needs to be included
$language_file='exercice';
include('../inc/global.inc.php');
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
$this_section=SECTION_COURSES;
if (isset($_REQUEST["cancel"])) {

8
main/exercice/exercise.lib.php
Unescape View File

@ -22,10 +22,10 @@ $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$TBL_REPONSES = Database::get_course_table(TABLE_QUIZ_ANSWER);
$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
$main_user_table = Database::get_main_table(TABLE_MAIN_USER);
$main_course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$TBL_TRACK_EXERCICES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
$TBL_TRACK_ATTEMPT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
$main_user_table = Database::get_main_table(TABLE_MAIN_USER);
$main_course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$TBL_TRACK_EXERCICES = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
$TBL_TRACK_ATTEMPT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);

2
main/exercice/exercise_result.php
Unescape View File

@ -17,7 +17,6 @@
* Code
*/
require_once 'exercise.class.php';
require_once 'exercise.lib.php';
require_once 'question.class.php';
require_once 'answer.class.php';
@ -25,6 +24,7 @@ require_once 'answer.class.php';
$language_file='exercice';
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
if ($_GET['origin']=='learnpath') {
require_once '../newscorm/learnpath.class.php';

2
main/exercice/exercise_show.php
Unescape View File

@ -18,11 +18,11 @@ $language_file = array('exercice');
// including additional libraries
require_once 'exercise.class.php';
require_once 'exercise.lib.php';
require_once 'question.class.php'; //also defines answer type constants
require_once 'answer.class.php';
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';

3
main/exercice/exercise_submit.php
Unescape View File

@ -30,7 +30,7 @@
require_once 'exercise.class.php';
require_once 'question.class.php';
require_once 'answer.class.php';
require_once 'exercise.lib.php';
$debug = 1; //debug value is set in the exercise.class.php file
@ -38,6 +38,7 @@ $debug = 1; //debug value is set in the exercise.class.php file
$language_file = 'exercice';
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
$this_section = SECTION_COURSES;

5
main/exercice/overview.php
Unescape View File

@ -9,12 +9,11 @@
/**
* Code
*/
require_once 'exercise.class.php';
require_once 'exercise.lib.php';
$language_file = 'exercice';
require_once 'exercise.class.php';
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
$this_section = SECTION_COURSES;
// Notice for unauthorized people.

2
main/exercice/result.php
Unescape View File

@ -15,11 +15,11 @@ $language_file = array('exercice');
// including additional libraries
require_once 'exercise.class.php';
require_once 'exercise.lib.php';
require_once 'question.class.php'; //also defines answer type constants
require_once 'answer.class.php';
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
if (empty($origin) ) {
$origin = $_REQUEST['origin'];

2
main/inc/ajax/exercise.ajax.php
Unescape View File

@ -7,8 +7,8 @@
require_once '../../exercice/exercise.class.php';
require_once '../../exercice/question.class.php';
require_once '../../exercice/answer.class.php';
require_once '../../exercice/exercise.lib.php';
require_once '../global.inc.php';
require_once '../../exercice/exercise.lib.php';
api_protect_course_script(true);
$action = $_REQUEST['a'];

6
main/inc/lib/gradebook.lib.php
Unescape View File

@ -69,11 +69,13 @@ class Gradebook extends Model {
* @param string action add, edit
* @return obj form validator obj
*/
public function show_skill_form($gradebook_id, $url) {
public function show_skill_form($gradebook_id, $url, $header = null) {
$form = new FormValidator('gradebook_add_skill', 'POST', $url);
// Settting the form elements
$header = get_lang('Add');
if (!isset($header)) {
$header = get_lang('Add');
}
$form->addElement('header', '', $header);
$id = isset($_GET['id']) ? intval($_GET['id']) : '';
$form->addElement('hidden', 'id', $id);

Write Preview
Loading…
Cancel
Save