moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-13093 "Continue" link jumps over items; merged from MOODLE_19_STABLE

Browse source
This commit is contained in:
skodak 2008-03-15 15:05:06 +00:00
parent f043289d2f
commit 9fb2de4ea7
4 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/scorm/datamodels/aicclib.php
View file

@ -333,6 +333,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
} }
$result->attemptleft = $scorm->maxattempt - $attempt; $result->attemptleft = $scorm->maxattempt - $attempt;
if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){ if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){
// drop keys so that we can access array sequentially
$scoes = array_values($scoes);
// //
// Retrieve user tracking data for each learning object // Retrieve user tracking data for each learning object
// //
@ -355,7 +357,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
$findnext = false; $findnext = false;
$parents[$level]='/'; $parents[$level]='/';
foreach ($scoes as $sco) { foreach ($scoes as $pos=>$sco) {
$isvisible = false; $isvisible = false;
$sco->title = stripslashes($sco->title); $sco->title = stripslashes($sco->title);
if ($optionaldatas = scorm_get_sco($sco->id, SCO_DATA)) { if ($optionaldatas = scorm_get_sco($sco->id, SCO_DATA)) {
@ -395,7 +397,11 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
if ($isvisible) { if ($isvisible) {
$result->toc .= "\t\t<li>"; $result->toc .= "\t\t<li>";
} }
$nextsco = next($scoes); if (isset($scoes[$pos+1])) {
$nextsco = $scoes[$pos+1];
} else {
$nextsco = false;
}
$nextisvisible = false; $nextisvisible = false;
if (($nextsco !== false) && ($optionaldatas = scorm_get_sco($nextsco->id, SCO_DATA))) { if (($nextsco !== false) && ($optionaldatas = scorm_get_sco($nextsco->id, SCO_DATA))) {
if (!isset($optionaldatas->isvisible) || (isset($optionaldatas->isvisible) && ($optionaldatas->isvisible == 'true'))) { if (!isset($optionaldatas->isvisible) || (isset($optionaldatas->isvisible) && ($optionaldatas->isvisible == 'true'))) {

10
mod/scorm/datamodels/scorm_12lib.php
View file

@ -189,6 +189,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
} }
$result->attemptleft = $scorm->maxattempt - $attempt; $result->attemptleft = $scorm->maxattempt - $attempt;
if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){ if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){
// drop keys so that we can access array sequentially
$scoes = array_values($scoes);
// //
// Retrieve user tracking data for each learning object // Retrieve user tracking data for each learning object
// //
@ -211,7 +213,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
$findnext = false; $findnext = false;
$parents[$level]='/'; $parents[$level]='/';
foreach ($scoes as $sco) { foreach ($scoes as $pos=>$sco) {
$isvisible = false; $isvisible = false;
$sco->title = stripslashes($sco->title); $sco->title = stripslashes($sco->title);
if ($optionaldatas = scorm_get_sco($sco->id, SCO_DATA)) { if ($optionaldatas = scorm_get_sco($sco->id, SCO_DATA)) {
@ -252,7 +254,11 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
if ($isvisible) { if ($isvisible) {
$result->toc .= "\t\t<li>"; $result->toc .= "\t\t<li>";
} }
$nextsco = next($scoes); if (isset($scoes[$pos+1])) {
$nextsco = $scoes[$pos+1];
} else {
$nextsco = false;
}
$nextisvisible = false; $nextisvisible = false;
if (($nextsco !== false) && ($optionaldatas = scorm_get_sco($nextsco->id, SCO_DATA))) { if (($nextsco !== false) && ($optionaldatas = scorm_get_sco($nextsco->id, SCO_DATA))) {
if (!isset($optionaldatas->isvisible) || (isset($optionaldatas->isvisible) && ($optionaldatas->isvisible == 'true'))) { if (!isset($optionaldatas->isvisible) || (isset($optionaldatas->isvisible) && ($optionaldatas->isvisible == 'true'))) {

10
mod/scorm/datamodels/scorm_13lib.php
View file

@ -35,6 +35,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
} }
$result->attemptleft = $scorm->maxattempt - $attempt; $result->attemptleft = $scorm->maxattempt - $attempt;
if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){ if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){
// drop keys so that we can access array sequentially
$scoes = array_values($scoes);
// //
// Retrieve user tracking data for each learning object // Retrieve user tracking data for each learning object
// //
@ -61,7 +63,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
$nextid = 0; $nextid = 0;
$findnext = false; $findnext = false;
$parents[$level]='/'; $parents[$level]='/';
foreach ($scoes as $sco) { foreach ($scoes as $pos=>$sco) {
$isvisible = false; $isvisible = false;
$sco->title = stripslashes($sco->title); $sco->title = stripslashes($sco->title);
if (isset($optionaldatas[$sco->identifier])) { if (isset($optionaldatas[$sco->identifier])) {
@ -97,7 +99,11 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
$parents[$level]=$sco->parent; $parents[$level]=$sco->parent;
} }
} }
$nextsco = next($scoes); if (isset($scoes[$pos+1])) {
$nextsco = $scoes[$pos+1];
} else {
$nextsco = false;
}
$nextisvisible = false; $nextisvisible = false;
if (($nextsco !== false) && (isset($optionaldatas[$nextsco->identifier]))) { if (($nextsco !== false) && (isset($optionaldatas[$nextsco->identifier]))) {
if (!isset($optionaldatas[$nextsco->identifier]->isvisible) || if (!isset($optionaldatas[$nextsco->identifier]->isvisible) ||

10
mod/scorm/lib.php
View file

@ -257,10 +257,12 @@ function scorm_user_complete($course, $user, $mod, $scorm) {
} }
$report .= "<ul id='0' class='$liststyle'>"; $report .= "<ul id='0' class='$liststyle'>";
if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){ if ($scoes = get_records_select('scorm_scoes',"scorm='$scorm->id' $organizationsql order by id ASC")){
// drop keys so that we can access array sequentially
$scoes = array_values($scoes);
$level=0; $level=0;
$sublist=1; $sublist=1;
$parents[$level]='/'; $parents[$level]='/';
foreach ($scoes as $sco) { foreach ($scoes as $pos=>$sco) {
if ($parents[$level]!=$sco->parent) { if ($parents[$level]!=$sco->parent) {
if ($level>0 && $parents[$level-1]==$sco->parent) { if ($level>0 && $parents[$level-1]==$sco->parent) {
$report .= "\t\t</ul></li>\n"; $report .= "\t\t</ul></li>\n";
@ -283,7 +285,11 @@ function scorm_user_complete($course, $user, $mod, $scorm) {
} }
} }
$report .= "\t\t<li>"; $report .= "\t\t<li>";
$nextsco = next($scoes); if (isset($scoes[$pos+1])) {
$nextsco = $scoes[$pos+1];
} else {
$nextsco = false;
}
if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) { if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
$sublist++; $sublist++;
} else { } else {