Index: openacs-4/packages/curriculum-central/tcl/uos-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/uos-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/curriculum-central/tcl/uos-procs.tcl	15 Dec 2005 11:15:06 -0000	1.5
+++ openacs-4/packages/curriculum-central/tcl/uos-procs.tcl	18 Dec 2005 06:23:30 -0000	1.6
@@ -50,13 +50,17 @@
                     pretty_name "#curriculum-central.stream_coordinator#"
 		    callbacks { 
                         workflow.Role_DefaultAssignees_CreationUser
+			curriculum-central.StreamCoordinator_Default_Assignees
+			curriculum-central.StreamCoordinator_Assignee_PickList
+			curriculum-central.StreamCoordinator_Assignee_SubQuery
                     }
                 }
                 unit_coordinator {
                     pretty_name "#curriculum-central.unit_coordinator#"
                     callbacks {
-                        workflow.Role_PickList_CurrentAssignees
-                        workflow.Role_AssigneeSubquery_RegisteredUsers
+			curriculum-central.UnitCoordinator_Default_Assignees
+			curriculum-central.UnitCoordinator_Assignee_PickList
+			curriculum-central.UnitCoordinator_Assignee_SubQuery
                     }
                 }
 		lecturer {
@@ -102,7 +106,8 @@
 			lecturer
 		    }
                     privileges { write }
-                    always_enabled_p t
+                    enabled_states { submitted }
+		    assigned_states { open }
                     edit_fields { 
 			contact_hours
 			assessments
@@ -125,7 +130,7 @@
                 submit {
                     pretty_name "#curriculum-central.submit#"
                     pretty_past_tense "#curriculum-central.submitted#"
-                    assigned_role unit_coordinator
+                    assigned_role { unit_coordinator }
                     enabled_states { submitted }
                     assigned_states { open }
                     new_state submitted
@@ -134,7 +139,7 @@
                 close {
                     pretty_name "#curriculum-central.close#"
                     pretty_past_tense "#curriculum-central.closed#"
-                    assigned_role stream_coordinator
+                    assigned_role { stream_coordinator }
                     assigned_states { submitted }
                     new_state closed
                     privileges { write }
@@ -147,7 +152,7 @@
                     pretty_past_tense "#curriculum-central.reopened#"
                     allowed_roles { stream_coordinator unit_coordinator }
                     enabled_states { submitted closed }
-                    new_state open
+                    new_state { open }
                     privileges { write }
                 }
             }
@@ -482,7 +487,7 @@
 #####
 
 ad_proc -private curriculum_central::uos::format_log_title::pretty_name {} {
-    return "[_ curriculum-central.res_code_to_log_title]"
+    return "[_ curriculum-central.activity_log]"
 }
 
 ad_proc -private curriculum_central::uos::format_log_title::format_log_title {
@@ -494,11 +499,7 @@
 } {
     array set data $data_arraylist
 
-    if { [info exists data(resolution)] } {
-        return [curriculum_central::resolution_pretty $data(resolution)]
-    } else {
-        return {}
-    }
+    return {}
 }
 
 
@@ -517,9 +518,26 @@
     object_id
     role_id
 } {
-    return [db_list select_unit_coordinators {} -default {}]
+    return [db_list select_unit_coordinators {}]
 }
 
+ad_proc -private curriculum_central::uos::get_unit_coordinator::get_pick_list {
+    case_id
+    object_id
+    role_id
+} {
+    return [db_list select_unit_coordinators {}]
+}
+
+ad_proc -private curriculum_central::uos::get_unit_coordinator::get_subquery {
+    case_id
+    object_id
+    role_id
+} {
+    return [db_map unit_coordinator_subquery]
+}
+
+
 #####
 #
 # Get Stream Coordinator
@@ -535,10 +553,26 @@
     object_id
     role_id
 } {
-    return [db_list select_stream_coordinators {} -default {}]
+    return [db_list select_stream_coordinators {}]
 }
 
+ad_proc -private curriculum_central::uos::get_stream_coordinator::get_pick_list {
+    case_id
+    object_id
+    role_id
+} {
+    return [db_list select_stream_coordinators {}]
+}
 
+ad_proc -private curriculum_central::uos::get_stream_coordinator::get_subquery {
+    case_id
+    object_id
+    role_id
+} {
+    return [db_map stream_coordinator_subquery]
+}
+
+
 #####
 #
 # Notification Info