Index: openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	18 Dec 2005 06:23:30 -0000	1.12
+++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml	18 Dec 2005 13:28:21 -0000	1.13
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="curriculum-central" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="all_pending_units_of_study">All Pending Units of Study</msg>
+  <msg key="your_pending_units_of_study">Your Pending Units of Study</msg>
+  <msg key="list_of_all_pending_units_of_study">List of all pending Units of Study:</msg>
+  <msg key="pending_units_of_study">Pending Units of Study</msg>
+  <msg key="you_are_the_unit_coordinator_of_pending_uos">You are the Unit Coordinator of the following pending Units of Study:</msg>
+  <msg key="none_pending">None Pending</msg>
   <msg key="uos">UoS</msg>
   <msg key="go_live">Go Live</msg>
+  <msg key="current_state">Current State</msg>
   <msg key="search">Search</msg>
   <msg key="activity_log">Activity Log</msg>
   <msg key="coordinate">Coordinate</msg>
Index: openacs-4/packages/curriculum-central/tcl/staff-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/staff-procs-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/tcl/staff-procs-postgresql.xql	18 Dec 2005 13:28:21 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+    <fullquery name="curriculum_central::staff::pretty_name.get_pretty_name">
+      <querytext>
+        SELECT s.title || ' ' || u.first_names || ' ' || u.last_name
+	    AS pretty_name
+	FROM cc_staff s, cc_users u
+	WHERE s.staff_id = u.user_id
+	AND s.staff_id = :staff_id
+      </querytext>
+    </fullquery>
+</queryset>
Index: openacs-4/packages/curriculum-central/tcl/staff-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/staff-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/tcl/staff-procs.tcl	18 Dec 2005 13:28:21 -0000	1.1
@@ -0,0 +1,26 @@
+ad_library {
+
+    Curriculum Central Stream Library
+    
+    Procedures that deal with staff
+
+    @creation-date 2005-12-18
+    @author Nick Carroll <ncarroll@ee.usyd.edu.au>
+    @cvs-id $Id: staff-procs.tcl,v 1.1 2005/12/18 13:28:21 ncarroll Exp $
+
+}
+
+namespace eval curriculum_central::staff {}
+
+ad_proc -public curriculum_central::staff::pretty_name {
+    staff_id
+} {
+    Returns the pretty name for the given staff ID.  The pretty name is
+    the staff member's title followed by their first and last names.
+
+    @param staff_id The ID of the staff member to retrieve the pretty name
+    for.
+    @return Returns the pretty name of the given staff member.
+} {
+    return [db_string get_pretty_name {}]
+}
Index: openacs-4/packages/curriculum-central/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/curriculum-central/www/index.adp	15 Dec 2005 06:27:41 -0000	1.7
+++ openacs-4/packages/curriculum-central/www/index.adp	18 Dec 2005 13:28:22 -0000	1.8
@@ -14,3 +14,11 @@
 <li><a href="@faculties.faculty_dept_url@">@faculties.faculty_name@</a></li>
 </multiple>
 </ul>
+
+<h3>Things To Do</h3>
+<ul>
+<li>View Unit Coordinators</li>
+<li>View Catalog of Units of Study</li>
+<li>View all Units of Study by Streams</li>
+<li>View Course Maps</li>
+</ul>
Index: openacs-4/packages/curriculum-central/www/coordinate/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/index.adp	15 Dec 2005 06:27:41 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/index.adp	18 Dec 2005 13:28:22 -0000	1.2
@@ -4,7 +4,11 @@
 
 <ul>
 <li><a href="uos-add">#curriculum-central.add_unit_of_study#</a></li>
+<li><a href="uos-pending">#curriculum-central.your_pending_units_of_study#</a></li>
+<li><a href="uos-all-pending">#curriculum-central.all_pending_units_of_study#</a></li>
 </ul>
 
-<h3>Status of created Units of Study</h3><BR>
-NOTE: Show listing of UoS status with respect to workflow.
+<h3>Things To Do</h3>
+<ul>
+<li>Develop Stream - Assign Units of Study to a stream (core/recommended)</li>
+</ul>
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending-postgresql.xql	18 Dec 2005 13:28:22 -0000	1.1
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+    <fullquery name="get_all_pending_uos">
+      <querytext>
+        SELECT u.uos_code, u.uos_name, u.uos_id, u.unit_coordinator_id,
+	    s.short_name, s.pretty_name
+        FROM cc_uos u,
+	    workflow_cases c,
+	    workflow_case_fsm f,
+	    workflow_fsm_states s
+	WHERE c.case_id = f.case_id
+	AND s.state_id = f.current_state
+	AND c.workflow_id = :workflow_id
+	AND u.uos_id = c.object_id
+	AND s.short_name != 'closed'
+      </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.adp	18 Dec 2005 13:28:22 -0000	1.1
@@ -0,0 +1,6 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<ul><li>#curriculum-central.list_of_all_pending_units_of_study#</li></ul>
+<listtemplate name="all_pending_uos"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-all-pending.tcl	18 Dec 2005 13:28:22 -0000	1.1
@@ -0,0 +1,54 @@
+ad_page_contract {
+    Index page for displaying all pending Units of Study.
+
+    @author Nick Carroll (nick.c@rroll.net)
+    @creation-date 2005-11-15
+    @cvs-id $Id: uos-all-pending.tcl,v 1.1 2005/12/18 13:28:22 ncarroll Exp $
+}
+
+auth::require_login
+
+set page_title [_ curriculum-central.all_pending_units_of_study]
+set context [list [list . [_ curriculum-central.coordinate]] $page_title]
+set user_id [ad_conn user_id]
+set workflow_id [curriculum_central::uos::get_instance_workflow_id]
+
+
+# If the user is a Unit Coordinator, then display list of pending Units
+# of Study that they are responsible for.
+set elements {
+    edit {
+	sub_class narrow
+	display_template {
+	    <img src="/shared/images/Edit16.gif" height="16" width="16" border="0">
+	}
+	link_url_eval {[export_vars -base uos-edit { uos_id }]}
+	link_html {title "#curriculum-central.edit_uos#"}
+    }
+    uos_code {
+	sub_class narrow
+	label "#curriculum-central.uos_code#"
+    }
+    uos_name {
+	label "#curriculum-central.uos_name#"
+    }
+    unit_coordinator {
+	label "#curriculum-central.unit_coordinator#"
+    }
+    pretty_name {
+	label "#curriculum-central.current_state#"
+    }
+}
+
+template::list::create \
+    -name all_pending_uos \
+    -multirow all_pending_uos \
+    -no_data "#curriculum-central.none_pending#" \
+    -elements $elements
+
+db_multirow -extend {unit_coordinator} all_pending_uos get_all_pending_uos {} {
+    set unit_coordinator [curriculum_central::staff::pretty_name $unit_coordinator_id]
+}
+
+
+ad_return_template
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-pending-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-pending-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-pending-postgresql.xql	18 Dec 2005 13:28:22 -0000	1.1
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.4</version></rdbms>
+
+    <fullquery name="get_users_pending_uos">
+      <querytext>
+        SELECT u.uos_code, u.uos_name, u.uos_id, s.short_name, s.pretty_name
+        FROM cc_uos u,
+	    workflow_cases c,
+	    workflow_case_fsm f,
+	    workflow_fsm_states s
+	WHERE c.case_id = f.case_id
+	AND s.state_id = f.current_state
+	AND c.workflow_id = :workflow_id
+	AND u.uos_id = c.object_id
+	AND s.short_name != 'closed'
+	AND u.unit_coordinator_id = :user_id
+      </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-pending.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-pending.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-pending.adp	18 Dec 2005 13:28:22 -0000	1.1
@@ -0,0 +1,6 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<ul><li>#curriculum-central.you_are_the_unit_coordinator_of_pending_uos#</li></ul>
+<listtemplate name="users_pending_uos"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-pending.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-pending.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-pending.tcl	18 Dec 2005 13:28:22 -0000	1.1
@@ -0,0 +1,50 @@
+ad_page_contract {
+    Index page for displaying pending Units of Study for the viewing
+    user.
+
+    @author Nick Carroll (nick.c@rroll.net)
+    @creation-date 2005-11-15
+    @cvs-id $Id: uos-pending.tcl,v 1.1 2005/12/18 13:28:22 ncarroll Exp $
+}
+
+auth::require_login
+
+set page_title [_ curriculum-central.pending_units_of_study]
+set context [list [list . [_ curriculum-central.coordinate]] $page_title]
+set user_id [ad_conn user_id]
+set workflow_id [curriculum_central::uos::get_instance_workflow_id]
+
+
+# If the user is a Unit Coordinator, then display list of pending Units
+# of Study that they are responsible for.
+set elements {
+    edit {
+	sub_class narrow
+	display_template {
+	    <img src="/shared/images/Edit16.gif" height="16" width="16" border="0">
+	}
+	link_url_eval {[export_vars -base uos-edit { uos_id }]}
+	link_html {title "#curriculum-central.edit_uos#"}
+    }
+    uos_code {
+	sub_class narrow
+	label "#curriculum-central.uos_code#"
+    }
+    uos_name {
+	label "#curriculum-central.uos_name#"
+    }
+    pretty_name {
+	label "#curriculum-central.current_state#"
+    }
+}
+
+template::list::create \
+    -name users_pending_uos \
+    -multirow users_pending_uos \
+    -no_data "#curriculum-central.none_pending#" \
+    -elements $elements
+
+db_multirow users_pending_uos get_users_pending_uos {}
+
+
+ad_return_template