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 -N -r1.39 -r1.40 --- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml 13 Feb 2006 01:30:06 -0000 1.39 +++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml 15 Feb 2006 11:42:59 -0000 1.40 @@ -2,6 +2,7 @@ UoS + All Units of Study Overview Edit UoS Name General Description @@ -318,6 +319,8 @@ Create streams. Add a Stream View Streams + All Units of Study offered by this department + View Units of Study by degree streams: View Units of Study for: View degree streams for: View curriculum for: Index: openacs-4/packages/curriculum-central/www/all-uos-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/all-uos-view.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/all-uos-view.tcl 15 Feb 2006 11:07:35 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/all-uos-view.tcl 15 Feb 2006 11:42:59 -0000 1.2 @@ -48,7 +48,7 @@ set year_session_group "${year_id}${session_id}" set base_return_url "all-uos-view" - set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url}] + set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url department_id}] set core_id [curriculum_central::stream::stream_uos_relation_name \ -id $core_id] Index: openacs-4/packages/curriculum-central/www/stream-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-view.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/www/stream-view.tcl 13 Feb 2006 11:46:54 -0000 1.2 +++ openacs-4/packages/curriculum-central/www/stream-view.tcl 15 Feb 2006 11:42:59 -0000 1.3 @@ -48,7 +48,7 @@ set year_session_group "${year_id}${session_id}" set base_return_url "stream-view" - set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url}] + set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url department_id}] set core_id [curriculum_central::stream::stream_uos_relation_name \ -id $core_id] Index: openacs-4/packages/curriculum-central/www/uos-details-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/uos-details-postgresql.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/www/uos-details-postgresql.xql 12 Feb 2006 12:42:48 -0000 1.2 +++ openacs-4/packages/curriculum-central/www/uos-details-postgresql.xql 15 Feb 2006 11:42:59 -0000 1.3 @@ -5,7 +5,7 @@ - SELECT f.faculty_id, f.faculty_name, d.department_id, d.department_name, + SELECT f.faculty_id, f.faculty_name, d.department_name, s.stream_name, n.uos_code, n.uos_name FROM cc_faculty f, cc_department d, cc_stream s, cc_uos u, cc_uos_name n @@ -18,6 +18,20 @@ + + + SELECT f.faculty_id, f.faculty_name, d.department_name, + n.uos_code, n.uos_name + FROM cc_faculty f, cc_department d, + cc_uos u, cc_uos_name n + WHERE f.faculty_id = d.faculty_id + AND d.department_id = :department_id + AND d.package_id = :package_id + AND u.uos_id = :uos_id + AND n.name_id = u.uos_name_id + + + SELECT ur.credit_value, ur.session_ids, ur.prerequisite_ids, Index: openacs-4/packages/curriculum-central/www/uos-details.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/uos-details.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/curriculum-central/www/uos-details.tcl 15 Feb 2006 11:07:35 -0000 1.4 +++ openacs-4/packages/curriculum-central/www/uos-details.tcl 15 Feb 2006 11:42:59 -0000 1.5 @@ -8,6 +8,7 @@ uos_id:integer stream_id:optional {base_return_url "stream-map"} + department_id:integer } set package_id [ad_conn package_id] @@ -35,13 +36,23 @@ "$stream_name - $return_view_type"] \ $page_title] } else { - #db_1row context_details_no_stream {} + db_1row context_details_no_stream {} - set page_title "" - set context "" + set page_title "${uos_code} ${uos_name}" + + set context [list \ + [list [export_vars -url -base faculty-depts \ + {faculty_name faculty_id}] \ + $faculty_name] \ + [list [export_vars -url -base dept-streams \ + {department_name department_id}] \ + $department_name] \ + [list [export_vars -url -base $base_return_url \ + {department_id}] \ + "[_ curriculum-central.all_uos] - [_ curriculum-central.overview]"] \ + $page_title] } - # Retrieve Unit of Study details. db_1row uos_details {}