- added recruitment fields to im_freelancers

- modified im_view_columns to contain "order_by_clause"
- modified /intranet/users/index.tcl to use the new order_by_clause
  and to select a specific view for user groups (Freelancers etc.),
  thus allowing for "dynamic subclassing".

sql/oracle/intranet-views.sql

@@ -75,18 +75,21 @@ create table im_view_columns (
 				references im_views,
 	-- group_id=NULL identifies the default view.
 	-- however, there may be customized views for a specific group
-	group_id			integer
+	group_id		integer
 				constraint im_view_columns_group_id_fk
 				references groups,
 	column_name		varchar(100) not null,
 	-- tcl command being executed using "eval" for rendering the column
 	column_render_tcl	varchar(4000),
-	-- for when the column name results from an "as" command
-	-- for ex., you can customize viewing columns
+	-- extra SQL components necessary in order to display this
+	-- column. All entries without "," or "and".
 	extra_select		varchar(4000),
 	extra_from		varchar(4000),
 	extra_where		varchar(4000),
+	-- where to display the column?
 	sort_order		integer not null,
+	-- how to order the SQL when the "Column Name" is selected?
+	order_by_clause		varchar(4000),
 	-- set of permission tokens that allow viewing this column,
 	-- separated with spaces and OR-joined
 	visible_for		varchar(1000)
@@ -102,7 +105,6 @@ insert into im_views (view_id, view_name, visible_for) values (10, 'user_list',
 insert into im_views (view_id, view_name, visible_for) values (11, 'user_view', 'view_users');
 insert into im_views (view_id, view_name, visible_for) values (12, 'user_contact', 'view_users');
 insert into im_views (view_id, view_name, visible_for) values (13, 'user_community', 'view_users');
-insert into im_views (view_id, view_name, visible_for) values (14, 'freelancer_list', 'view_users');
 insert into im_views (view_id, view_name, visible_for) values (20, 'project_list', 'view_projects');
 insert into im_views (view_id, view_name, visible_for) values (21, 'project_costs', 'view_projects');
 insert into im_views (view_id, view_name, visible_for) values (22, 'project_status', 'view_projects');
@@ -267,46 +269,6 @@ extra_select, extra_where, sort_order, visible_for) values (206,10,NULL,'Home Ph
 commit;
 
 
---------------------------------------------------------------
--- FreelancersListPage
---
-delete from im_view_columns where column_id >= 1400 and column_id < 1499;
---
--- insert into im_view_columns 
--- (column_id, view_id, group_id, column_name, column_render_tcl,
-
--- extra_select, extra_where, sort_order, visible_for) values 
--- (1407,14,NULL,'#','$user_id','','',6,'');
-
-insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
-extra_select, extra_where, sort_order, visible_for) values (1400,14,NULL,'Name',
-'"<a href=/intranet/users/view?user_id=$user_id>$name</a>"','','',2,'');
-
-insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
-extra_select, extra_where, sort_order, visible_for) values (1401,14,NULL,'Email',
-'"<a href=mailto:$email>$email</a>"','','',3,'');
-
-insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
-extra_select, extra_where, sort_order, visible_for) values (1403,14,NULL,'MSM',
-'"<A HREF=\"http://arkansasmall.tcworks.net:8080/message/msn/$msn_email\">
-<IMG SRC=\"http://arkansasmall.tcworks.net:8080/msn/$msn_email\"
-width=21 height=22 border=0 ALT=\"MSN Status\"></A>"','','',5,'');
-
-insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
-extra_select, extra_where, sort_order, visible_for) values (1404,14,NULL,'Work Phone',
-'$work_phone','','',6,'');
-
-insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
-extra_select, extra_where, sort_order, visible_for) values (1405,14,NULL,'Cell Phone',
-'$cell_phone','','',7,'');
-
-insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
-extra_select, extra_where, sort_order, visible_for) values (1406,14,NULL,'Home Phone',
-'$home_phone','','',8,'');
---
-commit;
-
-
 
 -------------------------------------------------------------------
 -- UsersViewPage

sql/oracle/upgrade/upgrade-2.0.0-2.0.1.sql

@@ -2,3 +2,5 @@
 alter table im_view_columns add
 	extra_from		varchar(4000);
 
+alter table im_view_columns add 
+	order_by_clause         varchar(4000);