- fixing Cambridge issues from Bug-List

sql/postgresql/intranet-timesheet2-workflow-create.sql

@@ -264,6 +264,48 @@ where	category_type = 'Intranet Timesheet Conf Type'
 -- Create a Timesheet Conf plugin for the ProjectViewPage.
 
 
+
+
+-- ------------------------------------------------------
+-- Workflow Graph & Journal on Absence View Page
+-- ------------------------------------------------------
+
+SELECT  im_component_plugin__new (
+	null,					-- plugin_id
+	'acs_object',				-- object_type
+	now(),					-- creation_date
+	null,					-- creation_user
+	null,					-- creation_ip
+	null,					-- context_id
+
+	'Timesheet Confirmation Workflow',	-- component_name
+	'intranet-timesheet2-workflow',		-- package_name
+	'right',				-- location
+	'/intranet-timesheet2-workflow/conf-objects/new',	-- page_url
+	null,					-- view_name
+	10,					-- sort_order
+	'im_workflow_graph_component -object_id $conf_id'
+);
+
+SELECT  im_component_plugin__new (
+	null,					-- plugin_id
+	'acs_object',				-- object_type
+	now(),					-- creation_date
+	null,					-- creation_user
+	null,					-- creation_ip
+	null,					-- context_id
+
+	'Timesheet Confirmation Journal',			-- component_name
+	'intranet-timesheet2-workflow',		-- package_name
+	'bottom',				-- location
+	'/intranet-timesheet2-workflow/conf-objects/new',	-- page_url
+	null,					-- view_name
+	100,					-- sort_order
+	'im_workflow_journal_component -object_id $conf_id'
+);
+
+
+
 -- SELECT im_component_plugin__new (
 -- 	null,				-- plugin_id
 -- 	'acs_object',			-- object_type

www/conf-objects/new.adp

@@ -4,11 +4,39 @@
 <property name="main_navbar_label">timesheet</property>
 </if>
 
-<h2>@page_title@</h2>
-<formtemplate id=form></formtemplate>
+<if @message@ not nil>
+  <div class="general-message">@message@</div>
+</if>
+
+
+<table width="100%">
+  <tr valign="top">
+    <td width="50%">
+
+	<h2>@page_title@</h2>
+	<formtemplate id=form></formtemplate>
+	<br>
+	<h2>@included_hours_msg@</h2>
+	@modify_hours_link;noquote@
+	<listtemplate name=@list_id@></listtemplate>
+
+<if @form_mode@ eq "display" >
+      <%= [im_component_bay left] %>
+</if>
 
-<br>
+    </td>
+    <td width="50%">
+
+<if @form_mode@ eq "display" >
+      <%= [im_component_bay right] %>
+</if>
+
+
+    </td>
+  </tr>
+</table>
+
+<if @form_mode@ eq "display" >
+      <%= [im_component_bay bottom] %>
+</if>
 
-<h2>@included_hours_msg@</h2>
-@modify_hours_link;noquote@
-<listtemplate name=@list_id@></listtemplate>

www/conf-objects/new.tcl

@@ -32,6 +32,7 @@ set context_bar [im_context_bar $page_title]
 
 if {![info exists enable_master_p]} { set enable_master_p 1}
 if {![info exists form_mode]} { set form_mode "display" }
+if {![info exists message]} { set message "" }
 
 # ---------------------------------------------------------------
 # Options