Skip to content

Commit

Permalink
Learnpath: Remove validation on "completed" (or equivalent) lesson_st…
Browse files Browse the repository at this point in the history 
…atus to update the SCO view details in SCORM learning paths - refs #4595
  • Loading branch information
@ywarnier
ywarnier committed Feb 24, 2023
1 parent e19e39d commit a5c5c36
Showing 1 changed file with 104 additions and 125 deletions.
229 changes: 104 additions & 125 deletions main/lp/learnpathItem.class.php
View file
Expand Up @@ -2756,64 +2756,57 @@ public function save($from_outside = true, $prereqs_complete = false)
// in case it's a SCORM, we should get:
if ($this->type == 'sco' || $this->type == 'au') {
$status = $this->get_status(true);
if ($this->prevent_reinit == 1 &&
$status != $this->possible_status[0] && // not attempted
$status != $this->possible_status[1] //incomplete
) {
if ($debug) {
error_log(
'learnpathItem::save() - save reinit blocked by setting',
0
);
}
// Do nothing because the status has already been set. Don't allow it to change.
// TODO: Check there isn't a special circumstance where this should be saved.
} else {
if ($debug) {
error_log(
'learnpathItem::save() - SCORM save request received',
0
);
}
// Get all new settings from the URL
if ($from_outside) {
if ($debug) {
error_log(
'learnpathItem::save() - SCORM save request received',
'learnpathItem::save() - Getting item data from outside',
0
);
}
// Get all new settings from the URL
if ($from_outside) {
if ($debug) {
error_log(
'learnpathItem::save() - Getting item data from outside',
0
);
}
foreach ($_GET as $param => $value) {
switch ($param) {
case 'score':
$this->set_score($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting score to '.$value,
0
);
}
break;
case 'max':
$this->set_max_score($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting view_max_score to '.$value,
0
);
}
break;
case 'min':
$this->min_score = $value;
if ($debug) {
error_log(
'learnpathItem::save() - setting min_score to '.$value,
0
);
}
break;
case 'lesson_status':
if (!empty($value)) {
foreach ($_GET as $param => $value) {
switch ($param) {
case 'score':
$this->set_score($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting score to '.$value,
0
);
}
break;
case 'max':
$this->set_max_score($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting view_max_score to '.$value,
0
);
}
break;
case 'min':
$this->min_score = $value;
if ($debug) {
error_log(
'learnpathItem::save() - setting min_score to '.$value,
0
);
}
break;
case 'lesson_status':
if (!empty($value)) {
if ($this->prevent_reinit == 1 &&
$status != $this->possible_status[0] && // not attempted
$status != $this->possible_status[1] // incomplete
) {
// do nothing: status was already completed or similar and we don't want to allow the SCO to reinitialize
} else {
$this->set_status($value);
if ($debug) {
error_log(
Expand All @@ -2822,61 +2815,60 @@ public function save($from_outside = true, $prereqs_complete = false)
);
}
}
break;
case 'time':
$this->set_time($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting time to '.$value,
0
);
}
break;
case 'suspend_data':
$this->current_data = $value;
if ($debug) {
error_log(
'learnpathItem::save() - setting suspend_data to '.$value,
0
);
}
break;
case 'lesson_location':
$this->set_lesson_location($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting lesson_location to '.$value,
0
);
}
break;
case 'core_exit':
$this->set_core_exit($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting core_exit to '.$value,
0
);
}
break;
case 'interactions':
break;
case 'objectives':
break;
default:
// Ignore.
break;
}
}
} else {
if ($debug) {
error_log(
'learnpathItem::save() - Using inside item status',
0
);
}
break;
case 'time':
$this->set_time($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting time to '.$value,
0
);
}
break;
case 'suspend_data':
$this->current_data = $value;
if ($debug) {
error_log(
'learnpathItem::save() - setting suspend_data to '.$value,
0
);
}
break;
case 'lesson_location':
$this->set_lesson_location($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting lesson_location to '.$value,
0
);
}
break;
case 'core_exit':
$this->set_core_exit($value);
if ($debug) {
error_log(
'learnpathItem::save() - setting core_exit to '.$value,
0
);
}
break;
case 'interactions':
case 'objectives':
break;
default:
// Ignore.
break;
}
// Do nothing, just let the local attributes be used.
}
} else {
if ($debug) {
error_log(
'learnpathItem::save() - Using inside item status',
0
);
}
// Do nothing, just let the local attributes be used.
}
} else {
// If not SCO, such messages should not be expected.
Expand Down Expand Up @@ -3702,26 +3694,14 @@ public function write_to_db()
$rs_verified = Database::query($sql);
$row_verified = Database::fetch_array($rs_verified);

$my_case_completed = [
'completed',
'passed',
'browsed',
'failed',
];

$oldTotalTime = $row_verified['total_time'];
$this->oldTotalTime = $oldTotalTime;
$inserted = false;

$save = true;
if (isset($row_verified) && isset($row_verified['status'])) {
if (in_array($row_verified['status'], $my_case_completed)) {
$save = false;
}
}

if ((($save === false && $this->type === 'sco') ||
($this->type === 'sco' && ($credit === 'no-credit' || $mode === 'review' || $mode === 'browse'))) &&
($this->seriousgame_mode != 1 && $this->type === 'sco')
if (
$this->type === 'sco' &&
($credit === 'no-credit' || $mode === 'review' || $mode === 'browse') &&
$this->seriousgame_mode != 1
) {
if ($debug) {
error_log(
Expand All @@ -3735,7 +3715,6 @@ public function write_to_db()
}
} else {
// Check the row exists.
$inserted = false;
// This a special case for multiple attempts and Chamilo exercises.
if ($this->type === 'quiz' &&
$this->get_prevent_reinit() == 0 &&
Expand Down Expand Up @@ -3863,7 +3842,7 @@ public function write_to_db()
error_log('get_type_static: '.$my_type_lp);
}

// This is a array containing values finished
// This is an array containing values equivalent to a finished state
$case_completed = [
'completed',
'passed',
Expand Down

0 comments on commit a5c5c36

Please sign in to comment.