lok3 ILIAS-eLearning#19

ILIAS-Verein · Aug 21, 2015 · 5c23b7f · 5c23b7f
1 parent f36bf27
commit 5c23b7f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/Modules/Course/classes/Objectives/class.ilLOTestQuestionAdapter.php b/Modules/Course/classes/Objectives/class.ilLOTestQuestionAdapter.php
@@ -381,7 +381,7 @@ public function updateQuestionResult(ilTestSession $session, assQuestion $qst)
 				$ur->saveObjectiveResult(
 						$run->getObjectiveId(), 
 						$this->getAssignments()->getTypeByTest($session->getRefId()),
-						ilLOUtils::isCompleted(
+						$comp = ilLOUtils::isCompleted(
 								$this->container_id, 
 								$session->getRefId(), 
 								$run->getObjectiveId(),
@@ -394,6 +394,7 @@ public function updateQuestionResult(ilTestSession $session, assQuestion $qst)
 						$old_result['is_final']
 				);
 				$GLOBALS['ilLog']->write(__METHOD__.': '.print_r($run->getResult(),true));
+				$GLOBALS['ilLog']->write(__METHOD__.'!!!!!!!!!!!!!!!!!!!!: '.print_r($comp,TRUE));
 
 				include_once("./Services/Tracking/classes/class.ilLPStatusWrapper.php");
 				ilLPStatusWrapper::_updateStatus($this->container_id,$this->user_id);

diff --git a/Modules/Course/classes/Objectives/class.ilLOUtils.php b/Modules/Course/classes/Objectives/class.ilLOUtils.php
@@ -13,7 +13,7 @@ class ilLOUtils
 	/**
 	 * Check if objective is completed
 	 */
-	public static function isCompleted($a_cont_oid, $a_test_rid, $a_objective_id, $max_points, $reached,$limit_perc)
+	public static function isCompleted($a_cont_oid, $a_test_rid, $a_objective_id, $max_points, $reached, $limit_perc)
 	{
 		include_once './Modules/Course/classes/Objectives/class.ilLOSettings.php';
 		$settings = ilLOSettings::getInstanceByObjId($a_cont_oid);
@@ -31,13 +31,15 @@ public static function isCompleted($a_cont_oid, $a_test_rid, $a_objective_id, $m
 		}
 		else
 		{
+			$required_perc = self::lookupObjectiveRequiredPercentage($a_cont_oid, $a_objective_id, $a_test_rid, $max_points);
+
 			if(!$max_points)
 			{
 				return TRUE;
 			}
 			else
 			{
-				return ($reached / $max_points * 100) >= $limit_perc;
+				return ($reached / $max_points * 100) >= $required_perc;
 			}
 		}
 	}
@@ -219,4 +221,4 @@ public static function hasActiveRun($a_container_id, $a_test_ref_id, $a_objectiv
 	}
 
 }
-?>
+?>
diff --git a/Modules/Course/classes/class.ilCourseObjectiveResult.php b/Modules/Course/classes/class.ilCourseObjectiveResult.php
@@ -206,7 +206,7 @@ function reset($a_course_id)
 				"AND user_id = ".$ilDB->quote($this->getUserId())."";
 			$res = $ilDB->manipulate($query);
 
-			$query = "DELETE FROM ilLOUserResults ".
+			$query = "DELETE FROM loc_user_results ".
 				"WHERE ".$ilDB->in('objective_id',$objectives,false,'integer').' '.
 				"AND user_id = ".$ilDB->quote($this->getUserId())."";
 		}

diff --git a/Services/Container/classes/class.ilContainerObjectiveGUI.php b/Services/Container/classes/class.ilContainerObjectiveGUI.php
@@ -1036,10 +1036,14 @@ public static function buildObjectiveProgressBar($a_has_initial_test, $a_objecti
 
 		$next_step = $progress_txt = $bar_color = $test_url = $initial_sub = null;
 
+
+		include_once './Modules/Course/classes/Objectives/class.ilLOSettings.php';
 		// qualifying test
-		if($a_lo_result["type"] == ilLOUserResults::TYPE_QUALIFIED ||
-			($a_lo_result['type'] == ilLOUserResults::TYPE_INITIAL &&
-			ilLOSettings::getInstanceByObjId($a_lo_result['course_id'])->isInitialTestQualifying()))
+		if(
+				$a_lo_result["type"] == ilLOUserResults::TYPE_QUALIFIED or
+				($a_lo_result['type'] == ilLOUserResults::TYPE_INITIAL and 
+				ilLOSettings::getInstanceByObjId($a_lo_result['course_id'])->isInitialTestQualifying())
+		)
 		{
 			$progress_txt = $lng->txt("crs_loc_progress_result_qtest");
 			$tt_txt = $lng->txt("crs_loc_tab_qtest").": ".$tt_txt;	
@@ -1226,4 +1230,4 @@ protected function showButton($a_cmd,$a_text,$a_target = '', $a_id = "")
 			$a_target, "", '', $a_id);
 	}
 }
-?>
+?>