Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Made some changes on scorm_seq_overall

  • Loading branch information...
commit a59b393433a595c8e2bed7a4b58ce92d4711a8f0 1 parent 980c089
authored

Showing 1 changed file with 5 additions and 6 deletions. Show diff stats Hide diff stats

  1. 11  mod/scorm/datamodels/sequencinglib.php
11  mod/scorm/datamodels/sequencinglib.php
@@ -14,11 +14,12 @@ function scorm_seq_overall ($scoid,$userid,$request,$attempt) {
14 14
         if ($seq->sequencing != null) {
15 15
             $seq = scorm_seq_sequencing($scoid,$userid,$seq);
16 16
 			if($seq->sequencing == 'exit'){//return the control to the LTS
17  
-				return true;
  17
+				return 'true';
18 18
 			}
19 19
         }
20 20
         if ($seq->delivery != null) {
21 21
             $seq = scorm_sequencing_delivery($scoid,$userid,$seq);
  22
+			$seq = scorm_content_delivery_environment ($seq,$userid);
22 23
         }
23 24
     }
24 25
     if ($seq->exception != null) {
@@ -502,9 +503,7 @@ function scorm_seq_measure_rollup($sco,$userid){
502 503
         foreach ($children as $child){
503 504
 		    $child = scorm_get_sco ($child);
504 505
 			if (!isset($child->tracked) || ($child->tracked == 1))
505  
-				//check if we haven't done any attempt to see if this activity has been tracked
506  
-				//it could be $child->tracked == true
507  
-
  506
+	
508 507
 			    $rolledupobjective = null;// we set the rolled up activity to undefined
509 508
 				$objectives = get_records('scorm_seq_objective','scoid',$child->id);
510 509
                 foreach ($objective as $objective){
@@ -558,7 +557,7 @@ function scorm_seq_objective_rollup_measure($sco,$userid){
558 557
 
559 558
 	$objectives = get_records('scorm_seq_objective','scoid',$sco->id);
560 559
     foreach ($objectives as $objective){
561  
-	    if ($objective->primaryobj == true){//Objective contributes to rollup I'm using primaryobj field, but not 
  560
+	    if ($objective->primaryobj == true){
562 561
 		    $targetobjective = $objective;
563 562
 			break;
564 563
 		}
@@ -586,7 +585,7 @@ function scorm_seq_objective_rollup_measure($sco,$userid){
586 585
 
587 586
 				$sco = scorm_get_sco ($sco->id);
588 587
 
589  
-				if (!$isactive || ($isactive && (!isset($sco->measuresatisfactionifactive) || $sco->measuresatisfactionifactive == true))){//This condition is really odd. It's in the SeqNav.pdf on page 193, line 3.1.2.1
  588
+				if (!$isactive || ($isactive && (!isset($sco->measuresatisfactionifactive) || $sco->measuresatisfactionifactive == true))){
590 589
 				    if($normalizedmeasure->value >= $targetobjective->minnormalizedmeasure){
591 590
 					    scorm_seq_set('objectiveprogressstatus',$sco->id,$userid);
592 591
 					    scorm_seq_set('objectivesatisfiedstatus',$sco->id,$userid);

0 notes on commit a59b393

Please sign in to comment.
Something went wrong with that request. Please try again.