Merge branch 'Build5' Fixed #13

Author: innershell

models/quiz.php

@@ -396,9 +396,8 @@ function answers_table($completion_id) {
 	/**************************************************************************
 	 * FUNCTION: Builds a SOAP note using the user's answers and question config.
 	 **************************************************************************/
-	function soap_note($completion_id, $_result) {
+	function soap_note($completion_id, $result) {
 		global $wpdb;
-		$result = $_result;
 		$_question = new ChainedQuizQuestion();
 		$debug_mode = get_option('chained_debug_mode');
 		$output = '';
@@ -455,7 +454,7 @@ function soap_note($completion_id, $_result) {
 		}
 
 		// Add the description for the Algorithm Result.
-		if ($result->description) {
+		if (isset($result) && $result->description) {
 			$output .= '<li>' . $result->description . '</li>';
 			$count++;
 		}
@@ -503,7 +502,7 @@ function soap_note($completion_id, $_result) {
 		}
 
 		// Add the subjective note for the Algorithm Result.
-		if ($result->subjective) {
+		if (isset($result) && $result->subjective) {
 			$output .= '<li>' . $result->subjective . '</li>';
 			$count++;
 		}
@@ -552,7 +551,7 @@ function soap_note($completion_id, $_result) {
 		}
 
 		// Add the objective note for the Algorithm Result.
-		if ($result->objective) {
+		if (isset($result) && $result->objective) {
 			$output .= '<li>' . $result->objective . '</li>';
 			$count++;
 		}
@@ -572,9 +571,11 @@ function soap_note($completion_id, $_result) {
 		}
 
 		// Add the assessment and plan for the Algorithm Result.
-		if ($result->assessment || $result->plan) {
-			$user_answer .= '<tr><td width="50%">'.$result->assessment.'</td><td width="50%">'.$result->plan.'</td></tr>';
-			$count++;
+		if (isset($result)) {
+			if ($result->assessment || $result->plan) {
+				$user_answer .= '<tr><td width="50%">'.$result->assessment.'</td><td width="50%">'.$result->plan.'</td></tr>';
+				$count++;
+			}
 		}
 
 		$output .= $count == 0 ? '<tr><td width="50%">None (N/A)</td><td width="50%">None (N/A)</td></tr>' : $user_answer;

models/result.php

@@ -71,8 +71,8 @@ function calculate($quiz, $points) {
 			WHERE quiz_id = %d ORDER BY points_bottom DESC", $quiz->id));
 
 		foreach($results as $result) {
-			if(floatval($result->points_bottom) <= $points and $points <= floatval($result->points_top)) return $result;
-    	}	
+			if($points >= floatval($result->points_bottom) && $points <= floatval($result->points_top)) return $result;
+    	}
 
 		return null; // in case of nothing found