Now showing manually entered comments separately

www/task-action.adp

@@ -193,3 +193,7 @@ set reassign_p [im_permission $user_id wf_reassign_tasks]
     </else>
 </if>
 
+<if @task_comments_cnt@ gt 0>
+<h2><%=[lang::message::lookup "" acs-workflow.Previous_Comments "Previous Comments"] %></h2>
+@task_comments_html;noquote@
+</if>
\ No newline at end of file

www/task-action.tcl

@@ -6,5 +6,30 @@
 
 set user_id [ad_conn user_id]
 
-ad_return_template
 
+# ------------------------------------------------------------
+# Check for manually entered comments and display them prominently
+# ------------------------------------------------------------
+
+set task_comments_html ""
+set task_comments_sql "
+	select
+		to_char(o.creation_date, 'YYYY-MM-DD HH24:MI') as creation_date,
+		im_name_from_user_id(o.creation_user) as user_name,
+		je.action_pretty,
+		je.msg as comment
+	from	journal_entries je,
+		acs_objects o
+	where	je.journal_id = o.object_id and
+		je.object_id in (
+				select	case_id
+				from	wf_tasks
+				where	task_id = $task(task_id)
+		) and
+		je.action ~ 'task \[0-9\]+ finish'
+"
+
+set task_comments_html [im_ad_hoc_query -format html -border 0 $task_comments_sql]
+set task_comments_cnt [db_string comment_count "select count(*) from ($task_comments_sql) t"]
+
+ad_return_template

www/task.adp

 <master>
-<property name=title>@task.task_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+  <property name=title>@task.task_name;noquote@</property>
+  <property name="context">@context;noquote@</property>
 
-	<div class="component">
-		<table width="100%">
-		<tr>
-		<td>
-		<div class="component_header_rounded" >
-			<div class="component_header">
-				<div class="component_title"><%=[lang::message::lookup "" intranet-workflow.Task "Task"]%>: @task.task_name@</div>
-				      <div class="component_icons"></div>
-				</div>
-			</div>
-		</td>
-		</tr>
-		<tr>
-		<td>
-			<div class="component_body">
-				<table width="100%">
-					<tr>
-						<multiple name="panels">
-						        <td valign="top">
-	    							<include src="@panels.template_url;noquote@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_vars" &="return_url">
-			        			</td>
-						</multiple>
-					</tr>
-				</table>
-			 </div>	
-		</td></tr>
-		</table>
-	</div>
-<p>
+  <div class="component">
+    <table width="100%">
+      <tr>
+	<td>
+	  <div class="component_header_rounded" >
+	    <div class="component_header">
+	      <div class="component_title"><%=[lang::message::lookup "" intranet-workflow.Task "Task"]%>: @task.task_name@</div>
+	      <div class="component_icons"></div>
+	    </div>
+	  </div>
+	</td>
+      </tr>
+      <tr>
+	<td>
+	  <div class="component_body">
+	    <table width="100%">
+	      <tr>
+		<multiple name="panels">
+		  <td valign="top">
+	    	    <include src="@panels.template_url;noquote@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_vars" &="return_url">
+		  </td>
+		</multiple>
+	      </tr>
+	    </table>
+	  </div>	
+      </td></tr>
+    </table>
+  </div>
+  <p>
 
 <if @extreme_p@ eq 1> 
 
-        <div class="component">
-                <table width="100%">
-                <tr>
-                <td>
-                <div class="component_header_rounded" >
-                        <div class="component_header">
-                                <div class="component_title"><%=[lang::message::lookup "" intranet-workflow.Admin_Actions "Admin actions"]%></div>
-                                      <div class="component_icons"></div>
-                                </div>
-                        </div>
-                </td>
-                </tr>
-                <tr>
-                <td>
-                        <div class="component_body">
-				<table class="panel" width="100%">
-					<tr><td>
-						<ul class="admin_links">
-						<multiple name="extreme_actions">
-						    <li><a href="@extreme_actions.url@">@extreme_actions.title@</a></li>
-						</multiple>
-						</ul>
-					</td></tr>
-				</table>
-                         </div>
-                </td></tr>
-                </table>
-        </div>
+      <div class="component">
+        <table width="100%">
+          <tr>
+            <td>
+              <div class="component_header_rounded" >
+                <div class="component_header">
+                  <div class="component_title"><%=[lang::message::lookup "" intranet-workflow.Admin_Actions "Admin actions"]%></div>
+                  <div class="component_icons"></div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <div class="component_body">
+		<table class="panel" width="100%">
+		  <tr><td>
+		      <ul class="admin_links">
+			<multiple name="extreme_actions">
+			  <li><a href="@extreme_actions.url@">@extreme_actions.title@</a></li>
+			</multiple>
+		      </ul>
+		  </td></tr>
+		</table>
+              </div>
+          </td></tr>
+        </table>
+      </div>
 </if>
 
-<p>
+  <p>
 
-<include src="journal" case_id="@case_id;noquote@">
+    <include src="journal" case_id="@case_id;noquote@">
 
 </master>