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 32fcc57fbd
commit ccbbbc7b92
3 changed files with 153 additions and 137 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. 216
      main/exercise/exercise_submit_modal.php
  2. 17
      main/gradebook/lib/be/evaluation.class.php
  3. 57
      main/lp/openoffice_text_document.class.php

216
main/exercise/exercise_submit_modal.php
Unescape View File

@ -4,9 +4,9 @@
use ChamiloSession as Session;
/**
* @package chamilo.exercise
* @author Julio Montoya <gugli100@gmail.com>
*/
* @package chamilo.exercise
* @author Julio Montoya <gugli100@gmail.com>
*/
require_once __DIR__.'/../inc/global.inc.php';
api_protect_course_script(false);
@ -79,40 +79,40 @@ if (isset($_GET['choice'])) {
// Getting the options by js
if (empty($choice_value)) {
echo "<script>
// this works for only radio buttons
var f = self.parent.window.document.frm_exercise;
var choice_js='';
var hotspot = new Array();
var hotspotcoord = new Array();
var counter=0;
for ( var i = 0; i < f.elements.length; i++ ) {
if (f.elements[i].type=='radio' && f.elements[i].checked) {
choice_js = f.elements[i].value;
// this works for only radio buttons
var f = self.parent.window.document.frm_exercise;
var choice_js='';
var hotspot = new Array();
var hotspotcoord = new Array();
var counter=0;
for ( var i = 0; i < f.elements.length; i++ ) {
if (f.elements[i].type=='radio' && f.elements[i].checked) {
choice_js = f.elements[i].value;
counter ++;
}
if (f.elements[i].type=='hidden' ) {
name = f.elements[i].name;
if (name.substr(0,7)=='hotspot')
hotspot.push(f.elements[i].value);
if (name.substr(0,20)=='hotspot_coordinates')
hotspotcoord.push(f.elements[i].value);
}
}
if (counter==0) {
choice_js=-1; // this is an error
}
";
// IMPORTANT
//this is the real redirect function
//echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
}
if (f.elements[i].type=='hidden' ) {
name = f.elements[i].name;
if (name.substr(0,7)=='hotspot')
hotspot.push(f.elements[i].value);
if (name.substr(0,20)=='hotspot_coordinates')
hotspotcoord.push(f.elements[i].value);
}
}
if (counter==0) {
choice_js=-1; // this is an error
}
";
// IMPORTANT
//this is the real redirect function
//echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
echo ' url = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
echo "$('#global-modal .modal-body').load(url);";
echo '</script>';
echo '</script>';
exit;
}
@ -152,9 +152,9 @@ Session::write('exerciseResultCoordinates', $exerciseResultCoordinates);
if($questionNum >= $nbrQuestions)
{
if($debug>0){echo str_repeat('&nbsp;',0).'Redirecting to exercise_result.php - Remove debug option to let this happen'."<br />\n";}
// goes to the script that will show the result of the exercise
// goes to the script that will show the result of the exercise
// header("Location: exercise_result.php?origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
// echo 'location result';
// echo 'location result';
}*/
// creates a temporary Question object
@ -431,29 +431,29 @@ if (!empty($choice_value)) {
$final_excess = 100;
}
$table_resume = '<table class="data_table">
<tr class="row_odd">
<td></td>
<td ><b>'.get_lang('Requirements').'</b></td>
<td><b>'.get_lang('YourAnswer').'</b></td>
</tr>
<tr class="row_even">
<td><b>'.get_lang('Overlap').'</b></td>
<td>'.get_lang('Min').' '.$threadhold1.'</td>
<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
</tr>
<tr>
<td><b>'.get_lang('Excess').'</b></td>
<td>'.get_lang('Max').' '.$threadhold2.'</td>
<td><div style="color:'.$excess_color.'">'.(($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
</tr>
<tr class="row_even">
<td><b>'.get_lang('Missing').'</b></td>
<td>'.get_lang('Max').' '.$threadhold3.'</td>
<td><div style="color:'.$missing_color.'">'.(($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
</tr>
</table>';
$table_resume = '<table class="data_table">
<tr class="row_odd">
<td></td>
<td ><b>'.get_lang('Requirements').'</b></td>
<td><b>'.get_lang('YourAnswer').'</b></td>
</tr>
<tr class="row_even">
<td><b>'.get_lang('Overlap').'</b></td>
<td>'.get_lang('Min').' '.$threadhold1.'</td>
<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
</tr>
<tr>
<td><b>'.get_lang('Excess').'</b></td>
<td>'.get_lang('Max').' '.$threadhold2.'</td>
<td><div style="color:'.$excess_color.'">'.(($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
</tr>
<tr class="row_even">
<td><b>'.get_lang('Missing').'</b></td>
<td>'.get_lang('Max').' '.$threadhold3.'</td>
<td><div style="color:'.$missing_color.'">'.(($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
</tr>
</table>';
}
Session::write('newquestionList', $newquestionList);
$links = '';
@ -510,45 +510,45 @@ if (isset($try) && $try == 1) {
// the link to theory (a learning path)
if (!empty($lp)) {
$lp_url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
$list = new LearnpathList(api_get_user_id());
$flat_list = $list->get_flat_list();
$lp_url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
$list = new LearnpathList(api_get_user_id());
$flat_list = $list->get_flat_list();
$links .= Display:: return_icon(
'theory.gif',
'',
array('style' => 'padding-left:0px;padding-right:5px;')
).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
'theory.gif',
'',
array('style' => 'padding-left:0px;padding-right:5px;')
).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
}
$links .= '<br />';
// the link to an external website or link
if (!empty($url)) {
$links .= Display:: return_icon(
'link.gif',
'',
array('style' => 'padding-left:0px;padding-right:5px;')
'link.gif',
'',
array('style' => 'padding-left:0px;padding-right:5px;')
).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
}
// the link to finish the test
if ($destinationid == -1) {
$links .= Display:: return_icon(
'finish.gif',
'',
array('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')
).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
'finish.gif',
'',
array('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')
).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
} else {
// the link to other question
if (in_array($destinationid, $questionList)) {
$objQuestionTmp = Question :: read($destinationid);
$questionName = $objQuestionTmp->selectTitle();
$num_value_array = (array_keys($questionList, $destinationid));
// the link to other question
if (in_array($destinationid, $questionList)) {
$objQuestionTmp = Question :: read($destinationid);
$questionName = $objQuestionTmp->selectTitle();
$num_value_array = (array_keys($questionList, $destinationid));
$links .= Display:: return_icon(
'quiz.png',
'',
array('style' => 'padding-left:0px;padding-right:5px;')
).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
}
}
}
echo '<script>
@ -565,30 +565,30 @@ function SendEx(num) {
</script>';
if ($links != '') {
echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
if ($answerType == HOT_SPOT_DELINEATION) {
if ($organs_at_risk_hit > 0) {
//$message='<p>'.get_lang('YourDelineation').'</p>';
//$message.=$table_resume;
$message .= '<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
//if ($wrong_results) { }
$message .= '<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
$message .= '<p>'.$comment.'</p>';
} else {
$message = '<p>'.get_lang('YourDelineation').'</p>';
$message .= $table_resume;
$message .= '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
$message .= '<p>'.$comment.'</p>';
}
echo $message;
} else {
echo '<p>'.$comment.'</p>';
}
echo '<h3>'.$links.'</h3>';
echo '</div>';
Session::write('hot_spot_result', $message);
$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
if ($answerType == HOT_SPOT_DELINEATION) {
if ($organs_at_risk_hit > 0) {
//$message='<p>'.get_lang('YourDelineation').'</p>';
//$message.=$table_resume;
$message .= '<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
//if ($wrong_results) { }
$message .= '<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
$message .= '<p>'.$comment.'</p>';
} else {
$message = '<p>'.get_lang('YourDelineation').'</p>';
$message .= $table_resume;
$message .= '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
$message .= '<p>'.$comment.'</p>';
}
echo $message;
} else {
echo '<p>'.$comment.'</p>';
}
echo '<h3>'.$links.'</h3>';
echo '</div>';
Session::write('hot_spot_result', $message);
$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
//reseting the exerciseResult variable
Session::write('exerciseResult', $exerciseResult);
@ -597,11 +597,11 @@ if ($links != '') {
$_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
$_SESSION['questionListExtra'.$exerciseId] = $_SESSION['questionList'];
} else {
$questionNum++;
echo '<script>
self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
//self.parent.tb_remove();
</script>';
$questionNum++;
echo '<script>
self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
//self.parent.tb_remove();
</script>';
}
echo '</div>';

17
main/gradebook/lib/be/evaluation.class.php
Unescape View File

@ -225,7 +225,7 @@ class Evaluation implements GradebookItem
$sql = 'SELECT * FROM '.$tbl_grade_evaluations;
$paramcount = 0;
if (isset ($id)) {
if (isset($id)) {
$sql .= ' WHERE id = '.intval($id);
$paramcount++;
}
@ -670,7 +670,11 @@ class Evaluation implements GradebookItem
$subcats = Category::load(null, null, null, $catid);
foreach ($subcats as $cat) {
$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
$targets = $this->add_target_subcategories(
$targets,
$level + 1,
$cat->get_id()
);
}
return $targets;
}
@ -694,6 +698,7 @@ class Evaluation implements GradebookItem
* and return them as an array of Evaluation objects
* @param int $cat_id parent category (use 'null' to retrieve them in all categories)
* @param int $stud_id student id
* @return array
*/
public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
{
@ -722,6 +727,8 @@ class Evaluation implements GradebookItem
/**
* Get a list of students that do not have a result record for this evaluation
* @param string $first_letter_user
* @return array
*/
public function get_not_subscribed_students($first_letter_user = '')
{
@ -777,14 +784,14 @@ class Evaluation implements GradebookItem
* @param int locked 1 or unlocked 0
*
**/
function lock($locked)
public function lock($locked)
{
$table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
$sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
Database::query($sql);
}
function check_lock_permissions()
public function check_lock_permissions()
{
if (api_is_platform_admin()) {
return true;
@ -795,7 +802,7 @@ class Evaluation implements GradebookItem
}
}
function delete_linked_data()
public function delete_linked_data()
{
}

57
main/lp/openoffice_text_document.class.php
Unescape View File

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Defines the OpenOfficeDocument class, which is meant as a conversion
* tool from Office text documents (.doc, .sxw, .odt, .docx) to
@ -15,11 +16,12 @@ require_once 'openoffice_document.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
/**
* @package chamilo.learnpath.openofficedocument
*/
class OpenOfficeTextDocument extends OpenofficeDocument {
class OpenOfficeTextDocument extends OpenofficeDocument
{
public $split_steps;
/**
@ -30,8 +32,13 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
* @param integer Creator user id
* @return void
*/
public function __construct($split_steps = false, $course_code = null, $resource_id = null, $user_id = null) {
$this -> split_steps = $split_steps;
public function __construct(
$split_steps = false,
$course_code = null,
$resource_id = null,
$user_id = null
) {
$this->split_steps = $split_steps;
parent::__construct($course_code, $resource_id, $user_id);
}
@ -44,7 +51,9 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
{
$_course = api_get_course_info();
// We get a content where ||page_break|| indicates where the page is broken.
if (!file_exists($this->base_work_dir.'/'.$this->created_dir.'/'.$this->file_name.'.html')) { return false; }
if (!file_exists($this->base_work_dir.'/'.$this->created_dir.'/'.$this->file_name.'.html')) {
return false;
}
$content = file_get_contents($this->base_work_dir.'/'.$this->created_dir.'/'.$this->file_name.'.html');
unlink($this->base_work_dir.'/'.$this->file_path);
@ -71,7 +80,9 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
// Chamilo styles.
$my_style = api_get_setting('stylesheets');
if (empty($my_style)) { $my_style = 'chamilo'; }
if (empty($my_style)) {
$my_style = 'chamilo';
}
$style_to_import = "<style type=\"text/css\">\r\n";
$style_to_import .= '@import "'.api_get_path(WEB_CODE_PATH).'css/'.$my_style.'/default.css";'."\n";
$style_to_import .= "</style>\r\n";
@ -98,10 +109,9 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
* @param string Content
* @return void
*/
function dealPerChapter($header, $content)
public function dealPerChapter($header, $content)
{
$_course = api_get_course_info();
$content = str_replace('||page_break||', '', $content);
// Get all the h1.
@ -122,9 +132,9 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
$items_to_create[get_lang('Introduction')] = $intro_content;
for ($i = 0; $i < count($matches[0]); $i++) {
if (empty($matches[1][$i]))
if (empty($matches[1][$i])) {
continue;
}
$content = api_strstr($content, $matches[0][$i]);
if ($i + 1 !== count($matches[0])) {
@ -155,7 +165,6 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
);
if ($document_id) {
// Put the document in item_property update.
api_item_property_update(
$_course,
@ -188,20 +197,20 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
* @param string Page body
* @return void
*/
function dealPerPage($header, $body)
public function dealPerPage($header, $body)
{
$_course = api_get_course_info();
// Split document to pages.
$pages = explode('||page_break||', $body);
$first_item = 0;
foreach ($pages as $key => $page_content) {
// For every pages, we create a new file.
$key += 1;
$page_content = $this->format_page_content($header, $page_content, $this->base_work_dir.$this->created_dir);
$page_content = $this->format_page_content(
$header,
$page_content,
$this->base_work_dir.$this->created_dir
);
$html_file = $this->created_dir.'-'.$key.'.html';
$handle = fopen($this->base_work_dir.$this->created_dir.'/'.$html_file, 'w+');
fwrite($handle, $page_content);
@ -243,7 +252,7 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
//echo Display::return_message(print_r($_POST));
$di = new ChamiloIndexer();
isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
$di->connectDb(NULL, NULL, $lang);
$di->connectDb(null, null, $lang);
$ic_slide = new IndexableChunk();
$ic_slide->addValue('title', $slide_name);
$specific_fields = get_specific_field_list();
@ -294,7 +303,8 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
* Returns additional Java command parameters
* @return string The additional parameters to be used in the Java call
*/
function add_command_parameters() {
public function add_command_parameters()
{
return ' -d woogie "'.$this->base_work_dir.'/'.$this->file_path.'" "'.$this->base_work_dir.$this->created_dir.'/'.$this->file_name.'.html"';
}
@ -304,8 +314,8 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
* @param string Page content
* @return string Formatted page content
*/
function format_page_content($header, $content) {
public function format_page_content($header, $content)
{
// Limit the width of the doc.
list($max_width, $max_height) = explode('x', api_get_setting('service_ppt2lp', 'size'));
@ -330,7 +340,6 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
$defined_width = preg_match("|width=([^\s]*)|i", $images[0][$key], $img_width);
$img_width = $img_width[1];
if (!$defined_width) {
$image_size = api_getimagesize($this->base_work_dir.$this->created_dir.'/'.$image);
$img_width = $image_size['width'];
$img_height = $image_size['height'];
@ -340,7 +349,6 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
$picture_resized = str_ireplace('<img', '<img width="'.$new_width.'" ', $images[0][$key]);
$content = str_replace($images[0][$key], $picture_resized, $content);
}
} elseif ($img_width > $max_width - 10) {
$picture_resized = str_ireplace('width='.$img_width, 'width="'.($max_width - 10).'"', $images[0][$key]);
$content = str_replace($images[0][$key], $picture_resized, $content);
@ -353,7 +361,8 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
/**
* Add documents to the visioconference (to be implemented)
*/
function add_docs_to_visio() {
public function add_docs_to_visio()
{
}
}

Write Preview
Loading…
Cancel
Save