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 -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/uos-details-postgresql.xql 10 Feb 2006 03:44:39 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/uos-details-postgresql.xql 12 Feb 2006 12:42:48 -0000 1.2 @@ -6,35 +6,37 @@ SELECT f.faculty_id, f.faculty_name, d.department_id, d.department_name, - s.stream_name, n.uos_code, n.uos_name, wr.formal_contact_hrs + 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, cc_uos_workload w, - cc_uos_workload_revisions wr + cc_uos u, cc_uos_name n WHERE f.faculty_id = d.faculty_id AND d.department_id = s.department_id AND s.stream_id = :stream_id AND s.package_id = :package_id AND u.uos_id = :uos_id AND n.name_id = u.uos_name_id - AND w.parent_uos_id = :uos_id - AND wr.workload_revision_id = w.live_revision_id - SELECT ur.credit_value, ur.session_ids, + SELECT ur.credit_value, ur.session_ids, ur.prerequisite_ids, + ur.assumed_knowledge_ids, ur.corequisite_ids, ur.prohibition_ids, + ur.no_longer_offered_ids, s.title || ' ' || person__name(s.staff_id) AS unit_coordinator_pretty_name, dr.online_course_content, dr.objectives, dr.learning_outcomes, - dr.syllabus, dr.relevance + dr.syllabus, dr.relevance, dr.note, wr.formal_contact_hrs FROM cc_uos u, cc_uos_revisions ur, cc_staff s, cc_uos_detail d, - cc_uos_detail_revisions dr + cc_uos_detail_revisions dr, cc_uos_workload w, + cc_uos_workload_revisions wr WHERE u.uos_id = :uos_id AND u.live_revision_id = ur.uos_revision_id AND ur.unit_coordinator_id = s.staff_id AND d.parent_uos_id = u.uos_id AND dr.detail_revision_id = d.live_revision_id + AND w.parent_uos_id = :uos_id + AND wr.workload_revision_id = w.live_revision_id @@ -45,4 +47,54 @@ + + + SELECT m.name || ' (' || m.weighting || '%)' AS assessment_name + FROM cc_uos_assess_method m, cc_uos_assess a, + cc_uos_assess_method_map map + WHERE a.parent_uos_id = :uos_id + AND a.live_revision_id = map.assess_revision_id + AND map.method_id = m.method_id + + + + + + SELECT n.uos_code || ' ' || n.uos_name AS prerequisite + FROM cc_uos_name n + WHERE n.name_id IN ([join $prerequisite_ids ,]) + + + + + + SELECT n.uos_code || ' ' || n.uos_name AS assumed_knowledge + FROM cc_uos_name n + WHERE n.name_id IN ([join $assumed_knowledge_ids ,]) + + + + + + SELECT n.uos_code || ' ' || n.uos_name AS corequisite + FROM cc_uos_name n + WHERE n.name_id IN ([join $corequisite_ids ,]) + + + + + + SELECT n.uos_code || ' ' || n.uos_name AS prohibition + FROM cc_uos_name n + WHERE n.name_id IN ([join $prohibition_ids ,]) + + + + + + SELECT n.uos_code || ' ' || n.uos_name AS no_longer_offered + FROM cc_uos_name n + WHERE n.name_id IN ([join $no_longer_offered_ids ,]) + + Index: openacs-4/packages/curriculum-central/www/uos-details.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/uos-details.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/www/uos-details.adp 12 Feb 2006 06:41:40 -0000 1.2 +++ openacs-4/packages/curriculum-central/www/uos-details.adp 12 Feb 2006 12:42:48 -0000 1.3 @@ -5,60 +5,14 @@ -
+
-
- #curriculum-central.unit_coordinator# - @unit_coordinator_pretty_name@  -
-
- #curriculum-central.credit_value# - @credit_value@  -
-
- #curriculum-central.sessions# - @session_names@  -
-
- #curriculum-central.online_course_content# - @online_course_content@  -
-
- #curriculum-central.aims_and_objectives# - @objectives@  -
-
- #curriculum-central.learning_outcomes# - @learning_outcomes@  -
-
- #curriculum-central.syllabus# - @syllabus@  -
-
- #curriculum-central.relevance# - @relevance@  -
-
- #curriculum-central.contact_hours# - @formal_contact_hrs@  -
-
- #curriculum-central.assessments# - TODO -
-
- #curriculum-central.core_uos_for# - TODO -
-
- #curriculum-central.recommended_uos_for# - TODO -
-
- #curriculum-central.prerequisites# - TODO -
-
+ + + + + + + +
@details.label;noquote@@details.value;noquote@ 
-
\ No newline at end of file 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 -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/uos-details.tcl 10 Feb 2006 03:44:39 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/uos-details.tcl 12 Feb 2006 12:42:48 -0000 1.2 @@ -28,6 +28,55 @@ # Retrieve Unit of Study details. db_1row uos_details {} -set session_names [join [db_list session_names {}] ", "] +# Create a multirow containing all the UoS details. +template::multirow create details label value +template::multirow append details [_ curriculum-central.unit_coordinator] \ + $unit_coordinator_pretty_name + +template::multirow append details [_ curriculum-central.credit_value] \ + $credit_value + +template::multirow append details [_ curriculum-central.sessions] \ + [join [db_list session_names {}] ", "] + +template::multirow append details \ + [_ curriculum-central.online_course_content] $online_course_content + +template::multirow append details [_ curriculum-central.aims_and_objectives] \ + [template::util::richtext::get_property html_value $objectives] + +template::multirow append details [_ curriculum-central.learning_outcomes] \ + [template::util::richtext::get_property html_value $learning_outcomes] + +template::multirow append details [_ curriculum-central.syllabus] \ + [template::util::richtext::get_property html_value $syllabus] + +template::multirow append details [_ curriculum-central.relevance] \ + relevance [template::util::richtext::get_property html_value $relevance] + +template::multirow append details [_ curriculum-central.contact_hours] \ + [template::util::richtext::get_property html_value $formal_contact_hrs] + +template::multirow append details [_ curriculum-central.assessments] \ + [join [db_list assessment_names {}] ", "] + +template::multirow append details [_ curriculum-central.prerequisites] \ + [join [db_list prerequisites {}] ", "] + +template::multirow append details [_ curriculum-central.assumed_knowledge] \ + [join [db_list assumed_knowledge {}] ", "] + +template::multirow append details [_ curriculum-central.corequisites] \ + [join [db_list corequisites {}] ", "] + +template::multirow append details [_ curriculum-central.prohibitions] \ + [join [db_list prohibitions {}] ", "] + +template::multirow append details [_ curriculum-central.no_longer_offered] \ + [join [db_list no_longer_offered {}] ", "] + +template::multirow append details [_ curriculum-central.note] \ + [template::util::richtext::get_property html_value $note] + ad_return_template Index: openacs-4/packages/curriculum-central/www/resources/curriculum-central.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/resources/curriculum-central.css,v diff -u -r1.10 -r1.11 --- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css 12 Feb 2006 06:41:40 -0000 1.10 +++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css 12 Feb 2006 12:42:48 -0000 1.11 @@ -277,39 +277,23 @@ /* Styles for lists */ -#cc-list-container { - margin: 0px; - padding: 0px; - width: 700px; +#cc-list-container table { + width: 100%; } -#cc-list-container div.row { - clear: both; -} - -#cc-list-container span.label { - float:left; - background-color: #CCCCCC; - text-align: right; - padding: 5px 10px 5px 10px; - margin: 1px; - width: 200px; +#cc-list-container table tr td { font-weight: bold; font-size: 12px; -} - -#cc-list-container span.value { - float: left; - text-align: left; - margin: 0px; padding: 5px 10px 5px 10px; margin: 1px; - background-color: #F0F0F0; - width: 456px; - font-weight: bold; - font-size: 12px; + vertical-align: top; } -.spacer { - clear: both; +#cc-list-container table tr td.label { + background-color: #CCCCCC; + width: 160px; } + +#cc-list-container table tr td.value { + background-color: #F0F0F0; +}