From af8ed6dcbaadb156d3004769838ca37c9093af95 Mon Sep 17 00:00:00 2001
From: csantossaenz <csantossaenz>
Date: Mon, 7 May 2007 12:55:31 +0000
Subject: [PATCH] Added some manifest data to the scorm_scoes_data table

---
 mod/scorm/datamodels/sequencinglib.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/mod/scorm/datamodels/sequencinglib.php b/mod/scorm/datamodels/sequencinglib.php
index 65e629bcfe..7a8deca57d 100755
--- a/mod/scorm/datamodels/sequencinglib.php
+++ b/mod/scorm/datamodels/sequencinglib.php
@@ -512,12 +512,12 @@ function scorm_seq_measure_rollup($sco,$userid){
 		            }
  	            }
 				if ($rolledupobjective != null){
-
-					$measureweight = get_record('scorm_scoes_track','scoid',$child->id,'userid',$userid,'element','objectivemeasureweight');
-					$countedmeasures = $countedmeasures + ($measureweight->value);
+                    $child = scorm_get_sco($child->id);
+				
+					$countedmeasures = $countedmeasures + ($child->measureweight);
 					if (!scorm_seq_is('objectivemeasurestatus',$sco->id,$userid)) {
 						$normalizedmeasure = get_record('scorm_scoes_track','scoid',$child->id,'userid',$userid,'element','objectivenormalizedmeasure');
-						$totalmeasure = $totalmeasure + (($normalizedmeasure->value) * ($measureweight->value));
+						$totalmeasure = $totalmeasure + (($normalizedmeasure->value) * ($child->measureweight));
 						$valid = true;
 					}
 
@@ -960,7 +960,7 @@ function scorm_seq_check_child ($sco, $action, $userid){
 	$sco=scorm_get_sco($sco->id);
 	$r = get_record('scorm_scoes_track','scoid',$sco->id,'userid',$userid,'element','activityattemptcount');
 	if ($action == 'satisfied' || $action == 'notsatisfied'){
-	  if (!scorm_seq_is('rollupobjectivesatisfied',$sco->id,$userid){
+	  if (!$sco->rollupobjectivesatisfied){
 		$included = true;
 		if (($action == 'satisfied' && $sco->requiredforsatisfied == 'ifnotsuspended') || ($action == 'notsatisfied' && $sco->requiredfornotsatisfied == 'ifnotsuspended')){
 			
@@ -987,7 +987,7 @@ function scorm_seq_check_child ($sco, $action, $userid){
       }
 	}
     if ($action == 'completed' || $action == 'incomplete'){
-		if (!scorm_seq_is('rollupprogresscompletion',$sco->id,$userid){
+		if (!$sco->rollupprogresscompletion){
 		    $included = true;
 
             if (($action == 'completed' && $sco->requiredforcompleted == 'ifnotsuspended') || ($action == 'incomplete' && $sco->requiredforincomplete == 'ifnotsuspended')){
@@ -2121,6 +2121,20 @@ function scorm_terminate_descendent_attempts ($activity,$userid,$seq){
 			}
 		}
 }
+
+function scorm_sequencing_exception($seq){
+    if($seq->exception != null){
+
+	   // switch($seq->exception) { We still have to do the cases
+
+               
+					 notify("Exception");
+               
+	}
+}
+
+
+
 /*
 
 function scorm_seq_objective_progress_status($sco,$userid){
-- 
2.39.5