Version 5.1

innershell · innershell · commit 669ef90f5fa1 · 2019-07-03T22:23:11.000-06:00
diff --git a/README.md b/README.md
@@ -70,6 +70,11 @@ None yet.
 4. The submissions dashboard to capture feedback for machine learning.
 
 # Changelog
+## 5.1 (Show Answers on Questions Page)
+- Show/hide answers in the questions listing page (admin only).
+- Hyperlink from the answer to the next question to ask.
+- Fixed bug where published algorithms are not being hyperlinked.
+
 ## 5.0 (Checkbox Improvements)
 - Scores can have different SOAP note sections.
 - Added Date questions that display a calendar date picker.
diff --git a/SQL/multiple-choice-answers.sql b/SQL/multiple-choice-answers.sql
diff --git a/SQL/query.sql b/SQL/query.sql
diff --git a/SQL/quiz-goto-sort.sql b/SQL/quiz-goto-sort.sql
diff --git a/controllers/questions.php b/controllers/questions.php
@@ -108,6 +108,7 @@ static function list_questions() {
 		
 		$quiz = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".CHAINED_QUIZZES." WHERE id=%d", intval($_GET['quiz_id'])));
 		$questions = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".CHAINED_QUESTIONS." WHERE quiz_id=%d ORDER BY sort_order, id", intval($_GET['quiz_id'])));
+		$choices = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".CHAINED_CHOICES." WHERE quiz_id=%d ORDER BY id", intval($_GET['quiz_id'])));
 		$count = count($questions);
 		include(CHAINED_PATH."/views/questions.html.php");
 	} // end list_quizzes
diff --git a/controllers/quizzes.php b/controllers/quizzes.php
@@ -55,7 +55,7 @@ static function edit_quiz() {
 	   $output = stripslashes($quiz->output); 
 	   
 	   // is this quiz currently published?
-		$is_published = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%[chained-quiz ".intval($_GET['id'])."]%' 
+		$is_published = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%[triage-algorithm ".intval($_GET['id'])."]%' 
 				AND post_status='publish' AND post_title!=''");	
 		include(CHAINED_PATH.'/views/quiz.html.php');
 	} // end edit_quiz
@@ -82,13 +82,13 @@ static function list_quizzes() {
 		
 		// now select all posts that have watu shortcode in them
 		$posts=$wpdb->get_results("SELECT * FROM {$wpdb->posts} 
-		WHERE post_content LIKE '%[chained-quiz %]%' AND post_title!=''
+		WHERE post_content LIKE '%[triage-algorithm %]%' AND post_title!=''
 		AND post_status='publish' ORDER BY post_date DESC");	
 		
 		// match posts to exams
 		foreach($quizzes as $cnt=>$quiz) {
 			foreach($posts as $post) {
-				if(strstr($post->post_content,"[chained-quiz ".$quiz->id."]")) {
+				if(strstr($post->post_content,"[triage-algorithm ".$quiz->id."]")) {
 					$quizzes[$cnt]->post=$post;			
 					break;
 				}
diff --git a/models/basic.php b/models/basic.php
@@ -140,7 +140,7 @@ static function install($update = false) {
 		}
 
 		// Set the current plugin version number.
-		update_option('chained_version', '5.0');
+		update_option('chained_version', '5.1');
 		// exit;
 	}
    
@@ -172,7 +172,7 @@ static function scripts() {
 				'chained-common',
 				CHAINED_URL.'js/common.js',
 				false,
-				'5.0',
+				'5.1',
 				false
 		);
 		wp_enqueue_script("chained-common");
diff --git a/models/question.php b/models/question.php
@@ -185,9 +185,20 @@ function display_choices($question, $choices) {
 					return $output;
 					break;
 				case 'radio':
+					$type = $question->qtype;
+					$name = "answer";
+					
+					foreach($choices as $choice) {
+						$choice_text = stripslashes($choice->choice);
+						$choice_text = do_shortcode($choice_text);						
+						$output .= "<div class='chained-quiz-choice'><label class='chained-quiz-label'><input class='chained-quiz-frontend chained-quiz-$type' type='$type' name='$name' value='".$choice->id."' $autocontinue> $choice_text</label></div>";
+					}
+
+					return $output;
+					break;
 				case 'checkbox':
 					$type = $question->qtype;
-					$name = ($question->qtype == 'radio') ? "answer": "answers[]";
+					$name = "answers[]";
 					$noneID = null;
 
 					// Find the 'None' answer choice and cleanup data at the same time while we are already inspecting each element.
diff --git a/models/quiz.php b/models/quiz.php
@@ -292,7 +292,7 @@ function send_emails($quiz, $output, $attach_path) {
 	function auto_publish($quiz_id, $vars) {
 		global $wpdb;
 	
-		$post = array('post_content' => '[chained-quiz '.$quiz_id.']', 'post_name'=> sanitize_text_field($vars['title']), 
+		$post = array('post_content' => '[triage-algorithm '.$quiz_id.']', 'post_name'=> sanitize_text_field($vars['title']), 
 			'post_title'=>sanitize_text_field($vars['title']), 'post_status'=>'publish');
 		wp_insert_post($post);
 	}
diff --git a/readme upgrade to 5.0.txt b/readme upgrade to 5.0.txt
diff --git a/readme upgrade to 5.1.txt b/readme upgrade to 5.1.txt
@@ -0,0 +1 @@
+// These are the changes that need to be done when upgrading the plugin from 5.0 to 5.1.
diff --git a/readme.txt b/readme.txt
@@ -63,6 +63,11 @@ None yet.
 1. The submissions dashboard to capture feedback for machine learning.
 
 == Changelog ==
+= 5.1 (Show Answers on Questions Page) =
+- Show/hide answers in the questions listing page (admin only).
+- Hyperlink from the answer to the next question to ask.
+- Fixed bug where published algorithms are not being hyperlinked.
+
 = 5.0 (Checkbox Improvements) =
 - Scores can have different SOAP note sections.
 - Added Date questions that display a calendar date picker.
diff --git a/triage-algorithm.php b/triage-algorithm.php
@@ -4,7 +4,7 @@
 Plugin URI: http://windwake.io
 Description: Create a triage algorithm where questions are asked and answers translated into clinical decision support information.
 Author: WindWake Healthcare Technologies LLC
-Version: 5.0
+Version: 5.1
 Author URI: http://windwake.io
 License: GPLv2 or later
 Text domain: chained
diff --git a/views/questions.html.php b/views/questions.html.php
@@ -7,10 +7,31 @@
 			| <a href="admin.php?page=chainedquiz_results&quiz_id=<?php echo $quiz->id?>"><?php _e('Manage Results', 'chained')?></a>
 			| <a href="admin.php?page=chained_quizzes&action=edit&id=<?php echo $quiz->id?>"><?php _e('Edit This Algorithm', 'chained')?></a>
 		</p>
-		
-		<p><a href="admin.php?page=chainedquiz_questions&action=add&quiz_id=<?php echo $quiz->id?>"><?php _e('New Question', 'chained')?></a></p>
+		<p><a href="admin.php?page=chainedquiz_questions&action=add&quiz_id=<?php echo $quiz->id?>"><?php _e('New Question', 'chained')?></a> 
+		| <a href="#" onclick="jQuery('#hide_answers').toggle();jQuery('#show_answers').toggle();return false;"><?php _e('SHOW/HIDE Answers', 'chained')?></a></p>
+
 		<?php if(sizeof($questions)):?>
-			<table class="widefat">
+			<table class="widefat" id="hide_answers">
+				<tr><th>#</th><th><?php _e('ID', 'chained')?></th><th><?php _e('Question', 'chained')?></th><th><?php _e('Type', 'chained')?></th>
+					<th><?php _e('Edit / Delete', 'chained')?></th></tr>
+				<?php foreach($questions as $cnt=>$question):
+					$class = ('alternate' == @$class) ? '' : 'alternate';?>
+					<tr class="<?php echo $class?>">
+						<td><?php if($count > 1 and $cnt):?>
+							<a href="admin.php?page=chainedquiz_questions&quiz_id=<?php echo $quiz->id?>&move=<?php echo $question->id?>&dir=up"><img src="<?php echo CHAINED_URL."/img/arrow-up.png"?>" alt="<?php _e('Move Up', 'hostelpro')?>" border="0"></a>
+						<?php else:?>&nbsp;<?php endif;?>
+						<?php if($count > $cnt+1):?>	
+							<a href="admin.php?page=chainedquiz_questions&quiz_id=<?php echo $quiz->id?>&move=<?php echo $question->id?>&dir=down"><img src="<?php echo CHAINED_URL."/img/arrow-down.png"?>" alt="<?php _e('Move Down', 'hostelpro')?>" border="0"></a>
+						<?php else:?>&nbsp;<?php endif;?></td>					
+						<td><?php echo $question->id?></td>
+						<td><?php echo stripslashes($question->title)?></td>
+						<td><?php echo $question->qtype?></td>
+						<td><a href="admin.php?page=chainedquiz_questions&action=edit&id=<?php echo $question->id?>"><?php _e('Edit', 'chained')?></a> | <a href="#" onclick="chainedConfirmDelete(<?php echo $question->id?>);return false;"><?php _e('Delete', 'chained')?></a></td>
+					</tr>
+				<?php endforeach;?>	
+			</table>
+
+			<table class="widefat" id="show_answers" style="display: none;">
 				<tr><th>#</th><th><?php _e('ID', 'chained')?></th><th><?php _e('Question', 'chained')?></th><th><?php _e('Type', 'chained')?></th>
 					<th><?php _e('Edit / Delete', 'chained')?></th></tr>
 				<?php foreach($questions as $cnt=>$question):
@@ -23,7 +44,27 @@
 							<a href="admin.php?page=chainedquiz_questions&quiz_id=<?php echo $quiz->id?>&move=<?php echo $question->id?>&dir=down"><img src="<?php echo CHAINED_URL."/img/arrow-down.png"?>" alt="<?php _e('Move Down', 'hostelpro')?>" border="0"></a>
 						<?php else:?>&nbsp;<?php endif;?></td>					
 						<td><?php echo $question->id?></td><td><?php echo stripslashes($question->title)?></td>
-						<td><?php echo $question->qtype?></td><td><a href="admin.php?page=chainedquiz_questions&action=edit&id=<?php echo $question->id?>"><?php _e('Edit', 'chained')?></a> | <a href="#" onclick="chainedConfirmDelete(<?php echo $question->id?>);return false;"><?php _e('Delete', 'chained')?></a></td>
+						<td><?php echo $question->qtype?></td>
+						<td><a href="admin.php?page=chainedquiz_questions&action=edit&id=<?php echo $question->id?>"><?php _e('Edit', 'chained')?></a> | <a href="#" onclick="chainedConfirmDelete(<?php echo $question->id?>);return false;"><?php _e('Delete', 'chained')?></a></td>
+					</tr>
+					<tr class="<?php echo $class?>">
+						<td colspan="5">
+							<table>
+								<?php foreach($choices as $choice): ?>
+									<?php if ($choice->question_id == $question->id): ?>
+										<tr>
+											<td width="500px"><?php echo $choice->choice ?></td>
+											<?php if(intval($choice->goto)): ?>
+												<td style="width:100px;"><a href="admin.php?page=chainedquiz_questions&action=edit&id=<?php echo $choice->goto?>"><?php echo $choice->goto ?></a></td>
+											<?php else: ?>
+												<td style="width:100px;"><?php echo $choice->goto ?></td>
+											<?php endif;?>
+										</tr>
+									<?php endif;?>
+
+								<?php endforeach;?>
+							</table>
+						</td>
 					</tr>
 				<?php endforeach;?>	
 			</table>
diff --git a/views/quiz.html.php b/views/quiz.html.php
@@ -40,10 +40,9 @@
 				<?php endif;?>
 
 
-			<h2><?php _e('Finish Screen', 'chained')?></h2>
-			<p><?php _e('The Finish Screen is displayed to the user after the last algorithm question was answered. The following ', 'chained')?>
-			<strong><?php _e('Injection Codes', 'chained')?></strong> <?php _e(' will dynamically insert text from the algorithm for the user to see.', 'chained')?></p>
-			
+			<h2><?php _e('Patient Output', 'chained')?></h2>
+			<p><?php _e('Screen displayed to the patient upon completion of the algorithm. The following ', 'chained')?>
+			<strong><?php _e('Injection Codes', 'chained')?></strong><?php _e(' will dynamically insert text from the algorithm for the user to see.', 'chained')?></p>
 			<ul>
 				<li>{{soap-note}}</li>				
 				<li>{{questions}} <?php _e('- Total # of questions answered.', 'chained')?></li>
@@ -52,29 +51,21 @@
 				<li>{{result-text}} <?php _e('- The result (grade) text/description', 'chained')?></li>				
 				<!-- (deprecating this injection code) <li>{{answers-table}} <?php _e('- A table with the questions, answers given by the user, correct / wrong info and points collected.', 'chained')?></li> -->				
 				<!-- (let's leave this for the next version) li>{{correct}} <?php _e('- The number of correctly answered questions', 'chained')?></li> -->
-			</ul>			
+			</ul>
 			<p><?php echo wp_editor(stripslashes($output), 'output', ["textarea_rows" => 10])?></p>		
-		
-			
-			<!-- (the original email output code)
-			<p><input type="checkbox" name="email_admin" value="1" <?php if(!empty($quiz->email_admin)) echo 'checked'?> onclick="if(this.checked || this.form.email_user.checked) {jQuery('#chainedEmailSettings').show()} else {jQuery('#chainedEmailSettings').hide()};"> <?php _e('Send me email when user completes this Algorithm. It will be delivered to the email address from your main WP Settings page.', 'chained');?></p>
-			<p><input type="checkbox" name="email_user" value="1" <?php if(!empty($quiz->email_user)) echo 'checked'?> onclick="if(this.checked || this.form.email_admin.checked) {jQuery('#chainedEmailSettings').show()} else {jQuery('#chainedEmailSettings').hide()};"> <?php _e('Send email to user with their result. If the user is not logged in visitor an optional "Enter email" field will automatically appear above the Algorithm.', 'chained');?></p>
-			
-			<div id="chainedEmailSettings" style="display:<?php echo (empty($quiz->email_admin) and empty($quiz->email_user)) ? 'none' : 'block'?>;">
-				<p><input type="checkbox" name="set_email_output" value="1" <?php if(!empty($quiz->set_email_output)) echo 'checked'?> onclick="this.checked ? jQuery('#chainedEmailOutputs').show() : jQuery('#chainedEmailOutputs').hide();"> 
-				<?php _e('Set email contents (if you skip this, the final screen output will be used for emails).', 'chained');?></p>
-				
-				<div id="chainedEmailOutputs" style="display:<?php echo empty($quiz->set_email_output) ? 'none' : 'email';?>">
-					<?php echo wp_editor(stripslashes($quiz->email_output), 'email_output')?>
-					<br />
-					<p><?php _e('You can use the same variables as in the Final Output box', 'chained');?><br>
-					<?php _e('By default this content is used for both the email sent to user, and the email sent to admin. You can however use the {{{split}}} tag to make the email contents different. The content before the {{{split}}} tag will be sent to the user and the content after the {{{split}}} tag - to the admin.','chained');?></p>
-				</div>
-			</div>
-			-->
 
-			<h2><?php _e('Finish Data', 'chained')?></h2>
-			<p><?php _e('The data to be generated and saved for e-mail, provider, and dashboards. You can use the same Injection Codes as in the Final Screen box.', 'chained')?></p>
+			<h2><?php _e('Provider Output', 'chained')?></h2>
+			<p><?php _e('Screen displayed to a clinical (e.g., provider) upon completion of the algorithm. The following ', 'chained')?>
+			<strong><?php _e('Injection Codes', 'chained')?></strong><?php _e(' will dynamically insert text from the algorithm for the user to see.', 'chained')?></p>
+			<ul>
+				<li>{{soap-note}}</li>				
+				<li>{{questions}} <?php _e('- Total # of questions answered.', 'chained')?></li>
+				<li>{{points}} <?php _e('- Points for all the answers.', 'chained')?></li>
+				<li>{{result-title}} <?php _e('- The result (grade) title', 'chained')?></li>
+				<li>{{result-text}} <?php _e('- The result (grade) text/description', 'chained')?></li>				
+				<!-- (deprecating this injection code) <li>{{answers-table}} <?php _e('- A table with the questions, answers given by the user, correct / wrong info and points collected.', 'chained')?></li> -->				
+				<!-- (let's leave this for the next version) li>{{correct}} <?php _e('- The number of correctly answered questions', 'chained')?></li> -->
+			</ul>
 
 			<div id="chainedEmailSettings" style="display:block">
 				<div id="chainedEmailOutputs" style="display:email">
diff --git a/views/sidebar.html.php b/views/sidebar.html.php
@@ -1,12 +1,13 @@
 <div id="chained-related" class="chained-sidebox">
 	<h3><?php _e('ABOUT', 'chained')?></h3>
-	<p><?php _e('Version: 1.0 introduces the Triage Algorithm.', 'chained');?> </p>
-	<p><?php _e('Version: 2.0 introduces a Submissions Dashboard.', 'chained');?> </p>
-	<p><?php _e('Version: 2.1 fixed bugs.', 'chained');?> </p>
-	<p><?php _e('Version: 2.2 fixed bugs.', 'chained');?> </p>
-	<p><?php _e('Version: 3.0 introduces Billing Codes.', 'chained');?> </p>
-	<p><?php _e('Version: 4.0 introduces Algorithm Points.', 'chained');?> </p>
-	<p><?php _e('Version: 5.0 introduces Checkbox follow-up.', 'chained');?> </p>
+	<p><?php _e('Version: 1.0 introduces the Triage Algorithm.', 'chained');?></p>
+	<p><?php _e('Version: 2.0 introduces a Submissions Dashboard.', 'chained');?></p>
+	<p><?php _e('Version: 2.1 fixed bugs.', 'chained');?></p>
+	<p><?php _e('Version: 2.2 fixed bugs.', 'chained');?></p>
+	<p><?php _e('Version: 3.0 introduces Billing Codes.', 'chained');?></p>
+	<p><?php _e('Version: 4.0 introduces Algorithm Points.', 'chained');?></p>
+	<p><?php _e('Version: 5.0 introduces Checkbox follow-up.', 'chained');?></p>
+	<p><?php _e('Version: 5.1 improves Question management.', 'chained');?></p>
 </div>
 
 

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ function send_emails($quiz, $output, $attach_path) {`
`292`	`292`	`function auto_publish($quiz_id, $vars) {`
`293`	`293`	`global $wpdb;`
`294`	`294`
`295`		`- $post = array('post_content' => '[chained-quiz '.$quiz_id.']', 'post_name'=> sanitize_text_field($vars['title']),`
	`295`	`+ $post = array('post_content' => '[triage-algorithm '.$quiz_id.']', 'post_name'=> sanitize_text_field($vars['title']),`
`296`	`296`	`'post_title'=>sanitize_text_field($vars['title']), 'post_status'=>'publish');`
`297`	`297`	`wp_insert_post($post);`
`298`	`298`	`}`