Version 5.0

Author: innershell

README.md

@@ -70,6 +70,11 @@ None yet.
 4. The submissions dashboard to capture feedback for machine learning.
 
 # Changelog
+## 5.0 (Checkbox Improvements)
+- Scores can have different SOAP note sections.
+- Added Date questions that display a calendar date picker.
+- Follow-up questions to multiple checkbox answers selected.
+
 ## 4.0 (Points)
 - Algorithms can generate a score (i.e., points).
 - Sort algorithms listing by title.

controllers/quizzes.php

@@ -145,23 +145,42 @@ static function answer_question() {
 		$question = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".CHAINED_QUESTIONS." WHERE id=%d", intval($_POST['question_id'])));
 
 		// prepare $answer var		
-		// $answer = ($question->qtype == 'checkbox') ? @$_POST['answers'] : @$_POST['answer'];
 		$answer = '';
 		$answer_text = '';
-		if ($question->qtype == 'text') {
+
+		switch($question->qtype) {
+			case 'text':
+				$answer = @$_POST['answers'];
+				$answer_text = @$_POST['answer_texts'];
+				break;
+			case 'date':
+				$answer = @$_POST['answers'];
+				$answer_text = @$_POST['answer_texts'];
+				break;
+			case 'checkbox':
+				$answer = @$_POST['answers'];
+				break;
+			case 'radio':
+				$answer = @$_POST['answer'];
+					break;
+		}
+
+
+
+/* 		if ($question->qtype == 'text') {
 			$answer = @$_POST['answers'];
 			$answer_text = @$_POST['answer_texts'];
 		} elseif ($question->qtype == 'checkbox') {
 			$answer = @$_POST['answers'];
 		} else {
 			$answer = @$_POST['answer'];
-		}
+		} */
 
 		// Check to make sure answer is provided.
 		if(empty($answer)) $answer = 0;
 		$answer = esc_sql($answer);
 
-		// Convert radio button answers into an array. Text and checkbox answers will arrive as an array.
+		// Convert multiple answers into an array. Text and checkbox answers will arrive as an array.
 		/** Might be able to avoid this code if radio buttons are named as an array in the form input. */
 		if(!is_array($answer)) $answer = array($answer);
 		if (!is_array($answer_text)) $answer_text = array($answer_text);
@@ -173,7 +192,7 @@ static function answer_question() {
 		// figure out next question
 		$next_question = $_question->next($question, $answer);
 
-		// NEW! Store the answer
+		// Store the answer
 		if(!empty($_SESSION['chained_completion_id'])) {
 			//$i = 0;
 			for ($i = 0; $i < count($answer); $i++) {
@@ -203,45 +222,6 @@ static function answer_question() {
 			}
 		}
 
-/* 		// store the answer
-		if(!empty($_SESSION['chained_completion_id'])) {
-			if(is_array($answer)) {
-				$answer = implode(",", $answer);
-				//$answer = chained_int_array($answer);
-
-				// Get all the provider notes corresponding to the answers.
-				$provider_notes = $wpdb->get_results("SELECT provider_note FROM ".CHAINED_CHOICES." WHERE id in (".$answer.")");
-				$prepared_answer = "";
-				$i = 0;
-				foreach($provider_notes as $note) {
-					$prepared_answer .= $note->provider_note . " " . $answer_text[$i] . " ";
-					$i++;
-				}
-				$answer_text = $prepared_answer;
-			}
-			
-			$comments = empty($_POST['comments']) ? '' : sanitize_text_field($_POST['comments']);
-
-			// make sure to avoid duplicates and only update the answer if it already exists
-			$exists = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".CHAINED_USER_ANSWERS."
-				WHERE quiz_id=%d AND completion_id=%d AND question_id=%d", 
-				$quiz->id, intval($_SESSION['chained_completion_id']), $question->id));			
-			
-			if($exists) {
-				$wpdb->query($wpdb->prepare("UPDATE ".CHAINED_USER_ANSWERS." SET
-					answer=%s, answer_text=%s, points=%f, comments=%s WHERE quiz_id=%d AND completion_id=%d AND question_id=%d", 
-					$answer, $answer_text, $points, $comments, $quiz->id, intval($_SESSION['chained_completion_id']), $question->id));			
-			}
-			else {				
-				$wpdb->query($wpdb->prepare("INSERT INTO ".CHAINED_USER_ANSWERS." SET
-					quiz_id=%d, completion_id=%d, question_id=%d, answer=%s, answer_text=%s, points=%f, comments=%s",
-					$quiz->id, intval($_SESSION['chained_completion_id']), $question->id, $answer, $answer_text, $points, $comments));				
-			}		
-			
-			// update the "completed" record as non empty
-			$wpdb->query($wpdb->prepare("UPDATE ".CHAINED_COMPLETED." SET not_empty=1 WHERE id=%d", intval($_SESSION['chained_completion_id'])));
-		} */
-		
 		if(!empty($next_question->id)) {
 			$question = $next_question;
 			$choices = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".CHAINED_CHOICES." 

controllers/results.php

@@ -22,7 +22,11 @@ static function manage() {
 
  		if(!empty($_POST['save']) and check_admin_referer('chained_result')) {
  			try {
- 				$_POST['description'] = $_POST['description'.intval($_POST['id'])];
+				$_POST['description'] = $_POST['description'.intval($_POST['id'])];
+				$_POST['subjective'] = $_POST['subjective'.intval($_POST['id'])];
+				$_POST['objective'] = $_POST['objective'.intval($_POST['id'])];
+				$_POST['assessment'] = $_POST['assessment'.intval($_POST['id'])];
+				$_POST['plan'] = $_POST['plan'.intval($_POST['id'])];
  				$_result->save($_POST, $_POST['id']);
  			}
  			catch(Exception $e) {

css/main.css

@@ -59,4 +59,12 @@ div.soap-note {
 	background-color: #ffffff;
 	padding: 10px;
 	box-shadow: 5px 5px 10px #0D0D0D;
+}
+
+.page-title {
+	font-size: 32px;
+}
+
+.warning-text {
+	color: red;
 }

js/common.js

@@ -14,7 +14,7 @@ chainedQuiz.goon = function(quizID, url) {
 		if(this.checked) anyChecked = true; 	
 	});
 
-	if(!anyChecked && qType != 'text') {
+	if(!anyChecked && qType != 'text' && qType != 'date') {
 		alert(chained_i18n.please_answer);
 		jQuery('#chained-quiz-action-' + quizID).removeAttr('disabled');
 		return false;
@@ -45,38 +45,36 @@ chainedQuiz.goon = function(quizID, url) {
 	data += '&chainedquiz_action=answer';
 	this.questions_answered++;
 	data += '&total_questions=' + this.questions_answered;
-	
-	// console.log(data);
 	jQuery.post(url, data, function(msg) {
-		  parts = msg.split("|CHAINEDQUIZ|");
-		  points = parseFloat(parts[0]);
-		  if(isNaN(points)) points = 0;
-		  chainedQuiz.points += points;		  
-			
-			if(jQuery('body').scrollTop() > 250) {				
-				jQuery('html, body').animate({
-			   		scrollTop: jQuery('#chained-quiz-wrap-'+quizID).offset().top -100
-			   }, 500);   
-			}		  
+		parts = msg.split("|CHAINEDQUIZ|");
+		points = parseFloat(parts[0]);
+		if(isNaN(points)) points = 0;
+		chainedQuiz.points += points;		  
+
+		if(jQuery('body').scrollTop() > 250) {				
+			jQuery('html, body').animate({
+				scrollTop: jQuery('#chained-quiz-wrap-'+quizID).offset().top -100
+			}, 500);
+		}
+
+		jQuery('#chained-quiz-action-' + quizID).removeAttr('disabled');
+		
+		// redirect?
+		if(parts[1].indexOf('[CHAINED_REDIRECT]') != -1) {
+			var sparts = parts[1].split('[CHAINED_REDIRECT]');
+			window.location=sparts[1];
+		}
+		else {
+			// load next question or the final screen
+			jQuery('#chained-quiz-div-'+quizID).html(parts[1]);	
 
-		  jQuery('#chained-quiz-action-' + quizID).removeAttr('disabled');
-		  
-		  // redirect?
-		  if(parts[1].indexOf('[CHAINED_REDIRECT]') != -1) {
-		  	  var sparts = parts[1].split('[CHAINED_REDIRECT]');
-		  	  window.location=sparts[1];
-		  }
-		  else {
-		  		// load next question or the final screen
-		  	  jQuery('#chained-quiz-div-'+quizID).html(parts[1]);	
-		  	  
-			  // hide/show "go ahead" button depending on comment in the HTML code
-			  if(parts[1].indexOf('<!--hide_go_ahead-->') != -1) jQuery('#chained-quiz-action-' + quizID).hide();
-			  else jQuery('#chained-quiz-action-' + quizID).show();			  	  
-		  	  	  
-		     jQuery('#chained-quiz-form-' + quizID + ' input[name=points]').val(chainedQuiz.points);
-		     chainedQuiz.initializeQuestion(quizID);
-		  }
+			// hide/show "go ahead" button depending on comment in the HTML code
+			if(parts[1].indexOf('<!--hide_go_ahead-->') != -1) jQuery('#chained-quiz-action-' + quizID).hide();
+			else jQuery('#chained-quiz-action-' + quizID).show();			  	  
+				
+			jQuery('#chained-quiz-form-' + quizID + ' input[name=points]').val(chainedQuiz.points);
+			chainedQuiz.initializeQuestion(quizID);
+		}
 	});
 }
 

media/green-tick-icon-100.png

@@ -8,7 +8,7 @@ static function install($update = false) {
 		global $wpdb;	
 		$wpdb -> show_errors();
 
-		// If new activation, run the initiatlize some variables first.
+		// If new activation, initialize some variables first.
 		if(!$update) self::init();
 
 		// CHAINED_QUIZZES
@@ -116,25 +116,31 @@ static function install($update = false) {
 			$wpdb->query($sql);
 		} 
 
-		// setup the default options (when not yet saved ever)
-		if(get_option('chained_sender_name') == '') {
+		// Setup the default options (when not yet saved ever)
+		if (get_option('chained_sender_name') == '') {
 			update_option('chained_sender_name', __('WordPress Admin', 'chained'));
 			update_option('chained_sender_email', get_option('admin_email'));
 			update_option('chained_admin_subject', __('User results on {{quiz-name}}', 'chained'));
 			update_option('chained_user_subject', __('Your results on {{quiz-name}}', 'chained'));
 		}
 
 		$current_version = get_option('chained_version');
+		error_log("Current 'chained_version' = ".$current_version);
 
 		/** PERFORM VERSION-SPECIFIC UPGRADES HERE **/
 		if ($current_version < '2.2') {
 			update_option('chained_delete_data', 'no');
-		} else if ($current_version < '4.0') {
+		} elseif ($current_version < '4.0') {
 			update_option('chained_debug_mode', 'off');
+		} elseif ($current_version < '5.0') {
+			$wpdb->query("ALTER TABLE ".CHAINED_RESULTS." ADD COLUMN subjective TEXT AFTER description;");
+			$wpdb->query("ALTER TABLE ".CHAINED_RESULTS." ADD COLUMN objective TEXT AFTER subjective;");
+			$wpdb->query("ALTER TABLE ".CHAINED_RESULTS." ADD COLUMN assessment TEXT AFTER objective;");
+			$wpdb->query("ALTER TABLE ".CHAINED_RESULTS." ADD COLUMN plan TEXT AFTER assessment;");
 		}
 
 		// Set the current plugin version number.
-		update_option('chained_version', '4.0');
+		update_option('chained_version', '5.0');
 		// exit;
 	}
 
@@ -144,8 +150,9 @@ static function menu() {
 
 		add_menu_page(__('Triage Algorithm', 'chained'), __('Triage Algorithm', 'chained'), $chained_caps, "chained_quizzes", array('ChainedQuizQuizzes', "manage"));
 		add_submenu_page('chained_quizzes', __('Algorithms', 'chained'), __('Algorithms', 'chained'), $chained_caps, 'chained_quizzes', array('ChainedQuizQuizzes', "manage"));					
-		add_submenu_page('chained_quizzes', __('Settings', 'chained'), __('Settings', 'chained'), 'manage_options', 'chainedquiz_options', array('ChainedQuiz','options'));				
+		add_submenu_page('chained_quizzes', __('Settings', 'chained'), __('Settings', 'chained'), 'manage_options', 'chainedquiz_options', array('ChainedQuiz','options'));
 		add_submenu_page('chained_quizzes', __('Social Sharing', 'chained'), __('Social Sharing', 'chained'), $chained_caps, 'chainedquiz_social_sharing', array('ChainedSharing','options'));				
+		add_submenu_page('chained_quizzes', __('Help', 'chained'), __('Help', 'chained'), $chained_caps, 'chainedquiz_help', array('ChainedQuiz','help'));
 
 		add_submenu_page(NULL, __('Chained Quiz Results', 'chained'), __('Chained Quiz Results', 'chained'), $chained_caps, 'chainedquiz_results', array('ChainedQuizResults','manage'));	
 		add_submenu_page(NULL, __('Chained Quiz Questions', 'chained'), __('Chained Quiz Questions', 'chained'), $chained_caps, 'chainedquiz_questions', array('ChainedQuizQuestions','manage'));	
@@ -165,7 +172,7 @@ static function scripts() {
 				'chained-common',
 				CHAINED_URL.'js/common.js',
 				false,
-				'4.0',
+				'5.0',
 				false
 		);
 		wp_enqueue_script("chained-common");
@@ -180,37 +187,28 @@ static function init() {
 		load_plugin_textdomain( 'chained', false, CHAINED_RELATIVE_PATH."/languages/" );
 		if (!session_id()) @session_start();
 
-		// define table names 
+		// Define table names as named constants.
 		define( 'CHAINED_QUIZZES', $wpdb->prefix. "chained_quizzes");
 		define( 'CHAINED_QUESTIONS', $wpdb->prefix. "chained_questions");
 		define( 'CHAINED_CHOICES', $wpdb->prefix. "chained_choices");
 		define( 'CHAINED_RESULTS', $wpdb->prefix. "chained_results");
 		define( 'CHAINED_COMPLETED', $wpdb->prefix. "chained_completed");
 		define( 'CHAINED_USER_ANSWERS', $wpdb->prefix. "chained_user_answers");
-		define( 'CHAINED_VERSION', get_option('chained_version'));
+		//define( 'CHAINED_VERSION', get_option('chained_version'));
 
-		// shortcodes
+		// Register shortcodes offered by this plugin.
 		add_shortcode('triage-algorithm', array("TriageShortcodes", "algorithmShortcodeHandler"));
 		add_shortcode('triage-submissions', array("TriageShortcodes", "responsesShortcodeHandler"));
 		add_shortcode('chained-share', array("ChainedSharing", "display"));		
 
-		// once daily delete empty records older than 1 day
-		// if(get_option('chainedquiz_cleanup') != date("Y-m-d") and defined('CHAINED_COMPLETED')) {
-		// 	$wpdb->query("DELETE FROM ".CHAINED_COMPLETED." WHERE not_empty=0 AND datetime < '".current_time('mysql')."' - INTERVAL 24 HOUR");
-		// 	update_option('chainedquiz_cleanup', date("Y-m-d"));
-		// }
-		
 		add_action('template_redirect', array('ChainedSharing', 'social_share_snippet'));
 
 		// default CSV separator if not set
-		if(get_option('chained_csv_delim') == '') {
+		if (get_option('chained_csv_delim') == '') {
 			update_option('chained_csv_delim', ',');
 			update_option('chained_csv_quotes', '1');
 		}
 
-		// $version = get_option('chained_version');
-		// if($version < '0.8') self::install(true);
-
 		// Go ahead and activate the plugin now by running the install script.
 		self::install(true);
 	}
@@ -264,6 +262,6 @@ static function options() {
 	}	
 
 	static function help() {
-		require(CHAINED_PATH."/views/help.php");
+		require(CHAINED_PATH."/views/help.html.php");
 	}	
 }