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

Fix hotspot creation issue when relpath not empty …

Browse Source 
See https://support.chamilo.org/issues/8027

Conflicts:
	main/inc/lib/javascript/hotspot/js/hotspot.js
1.10.x
baelmyhu 10 years ago committed by José Loguercio
parent 383576cd67
commit f0c4e728ba
6 changed files with 28 additions and 16 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. 6
      main/exercice/exercise.class.php
  2. 11
      main/exercice/exercise_show.php
  3. 4
      main/exercice/export/scorm/scorm_classes.php
  4. 4
      main/exercice/hotspot_admin.inc.php
  5. 9
      main/inc/lib/exercise.lib.php
  6. 10
      main/inc/lib/javascript/hotspot/js/hotspot.js

6
main/exercice/exercise.class.php
Unescape View File

@ -3956,12 +3956,14 @@ class Exercise
// We made an extra table for the answers
if ($show_result) {
$relPath = api_get_path(REL_PATH);
// if ($origin != 'learnpath') {
echo '</table></td></tr>';
echo "
<tr>
<td colspan=\"2\">
<p><em>" . get_lang('HotSpot') . "</em></p>
<div id=\"hotspot-solution-$questionId\"></div>
<script>
@ -3970,9 +3972,11 @@ class Exercise
questionId: $questionId,
exerciseId: $exeId,
selector: '#hotspot-solution-$questionId',
for: 'solution'
for: 'solution',
relPath: '$relPath'
});
});
</script>
</td>
</tr>

11
main/exercice/exercise_show.php
Unescape View File

@ -369,8 +369,8 @@ foreach ($questionList as $questionId) {
$totalScore += $question_result['score'];
if ($show_results) {
echo '</table></td></tr>';
$relPath = api_get_path(REL_PATH);
echo '</table></td></tr>';
echo "
<tr>
<td colspan=\"2\">
@ -381,7 +381,8 @@ foreach ($questionList as $questionId) {
questionId: $questionId,
exerciseId: $id,
selector: '#hotspot-solution',
for: 'solution'
for: 'solution',
relPath: '$relPath'
});
});
</script>
@ -511,6 +512,7 @@ foreach ($questionList as $questionId) {
$resfree = Database::query($queryfree);
$questionScore= Database::result($resfree,0,"marks");
$totalScore+=$questionScore;
$relPath = api_get_path(REL_PATH);
echo '</table></td></tr>';
echo "
@ -523,7 +525,8 @@ foreach ($questionList as $questionId) {
questionId: $questionId,
exerciseId: $id,
selector: '#hotspot-solution',
for: 'solution'
for: 'solution',
relPath: '$relPath'
});
});
</script>

4
main/exercice/export/scorm/scorm_classes.php
Unescape View File

@ -637,6 +637,7 @@ class ScormAnswerHotspot extends Answer
$canClick = true;
//$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
//echo $tes;
$relPath = api_get_path(REL_PATH);
$html .= <<<HTML
<tr>
<td>
@ -646,7 +647,8 @@ class ScormAnswerHotspot extends Answer
new HotspotQuestion({
questionId: {$this->questionJSId},
selector: '#hotspot-{$this->questionJSId}',
for: 'user'
for: 'user',
relPath: '$relPath'
});
});
</script>

4
main/exercice/hotspot_admin.inc.php
Unescape View File

@ -1038,14 +1038,14 @@ if ($modifyAnswers) {
questionId: <?php echo $modifyAnswers ?>,
selector: '#hotspot-container',
for: 'admin',
relpath: '<?php echo $relPath ?>'
relPath: '<?php echo $relPath ?>'
});
<?php } else { ?>
new HotspotQuestion({
questionId: <?php echo $modifyAnswers ?>,
selector: '#hotspot-container',
for: 'admin',
relpath: '<?php echo $relPath ?>'
relPath: '<?php echo $relPath ?>'
});
<?php } ?>
});

9
main/inc/lib/exercise.lib.php
Unescape View File

@ -1118,6 +1118,7 @@ HTML;
$questionDescription = $objQuestionTmp->selectDescription();
if ($freeze) {
$relPath = api_get_path(REL_PATH);
echo "
<script>
$(document).on('ready', function () {
@ -1125,7 +1126,8 @@ HTML;
questionId: $questionId,
exerciseId: $exerciseId,
selector: '#hotspot-preview-$questionId',
for: 'preview'
for: 'preview',
relPath: '$relPath'
});
});
</script>
@ -1191,7 +1193,7 @@ HOTSPOT;
}
$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
$relPath = api_get_path(REL_PATH);
$s .= "
<div class=\"col-sm-8 col-md-9\">
<div class=\"hotspot-image\"></div>
@ -1201,7 +1203,8 @@ HOTSPOT;
questionId: $questionId,
exerciseId: $exe_id,
selector: '#question_div_' + $questionId + ' .hotspot-image',
for: 'user'
for: 'user',
relPath: '$relPath'
});
});
</script>

10
main/inc/lib/javascript/hotspot/js/hotspot.js
Unescape View File

@ -1127,13 +1127,13 @@ window.HotspotQuestion = (function () {
switch (config.for) {
case 'admin':
xhrQuestion = $.getJSON(config.relpath + 'main/exercice/hotspot_actionscript_admin.as.php', {
xhrQuestion = $.getJSON(config.relPath+'main/exercice/hotspot_actionscript_admin.as.php', {
modifyAnswers: parseInt(config.questionId)
});
break;
case 'user':
xhrQuestion = $.getJSON(config.relpath + 'main/exercice/hotspot_actionscript.as.php', {
xhrQuestion = $.getJSON(config.relPath+'main/exercice/hotspot_actionscript.as.php', {
modifyAnswers: parseInt(config.questionId),
exe_id: parseInt(config.exerciseId)
});
@ -1740,13 +1740,13 @@ window.DelineationQuestion = (function () {
switch (config.for) {
case 'admin':
xhrQuestion = $.getJSON(config.relpath + 'main/exercice/hotspot_actionscript_admin.as.php', {
xhrQuestion = $.getJSON(config.relPath+'main/exercice/hotspot_actionscript_admin.as.php', {
modifyAnswers: parseInt(config.questionId)
});
break;
case 'user':
xhrQuestion = $.getJSON(config.relpath + 'main/exercice/hotspot_actionscript.as.php', {
xhrQuestion = $.getJSON(config.relPath+'main/exercice/hotspot_actionscript.as.php', {
modifyAnswers: parseInt(config.questionId)
});
break;
@ -1754,7 +1754,7 @@ window.DelineationQuestion = (function () {
case 'solution':
//no break
case 'preview':
xhrQuestion = $.getJSON(config.relpath + 'main/exercice/hotspot_answers.as.php', {
xhrQuestion = $.getJSON(config.relPath+'main/exercice/hotspot_answers.as.php', {
modifyAnswers: parseInt(config.questionId),
exe_id: parseInt(config.exerciseId)
});

Write Preview
Loading…
Cancel
Save