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.37 -r1.38 --- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml 2 Feb 2006 11:45:49 -0000 1.37 +++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml 9 Feb 2006 11:41:36 -0000 1.38 @@ -2,6 +2,13 @@ UoS + Edit UoS Name + General Description + Enter a general description for this Graduate Attribute. + Tutors + Select tutors from the list for this Unit of Study. Note: You can select more than one tutor from the list by holding down the CTRL button whilst selecting. + Note + Enter a note, if required. List of all Units of Study. All Units of Study No Units of Study have been created. @@ -190,7 +197,7 @@ Students can expect feedback for this UoS in the nature of... Feedback Provided by Students Students can provide feedback for this UoS by... - Select the lecturer for this Unit of Study. + Select the lecturer for this Unit of Study. Note: You can select more than one lecturer from the list by holding down the CTRL button whilst selecting. What are the aims and objectives for this Unit of Study? What are the learning outcomes for this Unit of Study? What are the subjects or topics that will be taught in this course? Index: openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql 2 Feb 2006 11:45:49 -0000 1.4 +++ openacs-4/packages/curriculum-central/sql/postgresql/stream-uos-map-create.sql 9 Feb 2006 11:41:36 -0000 1.5 @@ -55,7 +55,8 @@ references cr_revisions(revision_id) on delete cascade, year_id integer, - core_id integer -- core, elective, or recommended + core_id integer, -- core, elective, or recommended + note text ); -- Create the UoS revision content type. @@ -70,14 +71,15 @@ ); -select define_function_args('cc_stream_uos_map__new', 'map_id,stream_id,uos_id,year_id,core_id,creation_user,creation_ip,context_id,item_subtype;cc_stream_uos_map,content_type;cc_stream_uos_map_rev,object_type,package_id'); +select define_function_args('cc_stream_uos_map__new', 'map_id,stream_id,uos_id,year_id,core_id,note,creation_user,creation_ip,context_id,item_subtype;cc_stream_uos_map,content_type;cc_stream_uos_map_rev,object_type,package_id'); create function cc_stream_uos_map__new( integer, -- map_id integer, -- stream_id integer, -- uos_id integer, -- year_id integer, -- core_id + text, -- note integer, -- creation_user varchar, -- creation_ip integer, -- context_id @@ -93,13 +95,14 @@ p_uos_id alias for $3; p_year_id alias for $4; p_core_id alias for $5; - p_creation_user alias for $6; - p_creation_ip alias for $7; - p_context_id alias for $8; - p_item_subtype alias for $9; - p_content_type alias for $10; - p_object_type alias for $11; - p_package_id alias for $12; + p_note alias for $6; + p_creation_user alias for $7; + p_creation_ip alias for $8; + p_context_id alias for $9; + p_item_subtype alias for $10; + p_content_type alias for $11; + p_object_type alias for $12; + p_package_id alias for $13; v_map_id cc_stream_uos_map.map_id%TYPE; v_folder_id integer; @@ -147,6 +150,7 @@ v_map_id, -- map_id p_year_id, -- year_id p_core_id, -- core_id + p_note, -- note now(), -- creation_date p_creation_user, -- creation_user p_creation_ip -- creation_ip @@ -186,6 +190,7 @@ integer, -- map_id integer, -- year_id integer, -- core_id + text, -- note timestamptz, -- creation_date integer, -- creation_user varchar -- creation_ip @@ -196,9 +201,10 @@ p_map_id alias for $2; p_year_id alias for $3; p_core_id alias for $4; - p_creation_date alias for $5; - p_creation_user alias for $6; - p_creation_ip alias for $7; + p_note alias for $5; + p_creation_date alias for $6; + p_creation_user alias for $7; + p_creation_ip alias for $8; v_revision_id integer; begin @@ -222,11 +228,13 @@ INSERT INTO cc_stream_uos_map_rev ( map_rev_id, year_id, - core_id + core_id, + note ) VALUES ( v_revision_id, p_year_id, - p_core_id + p_core_id, + p_note ); -- Update the latest revision id in cc_stream_uos_map Index: openacs-4/packages/curriculum-central/sql/postgresql/uos-detail-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/uos-detail-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/sql/postgresql/uos-detail-create.sql 3 Jan 2006 03:23:27 -0000 1.1 +++ openacs-4/packages/curriculum-central/sql/postgresql/uos-detail-create.sql 9 Feb 2006 11:41:37 -0000 1.2 @@ -63,14 +63,14 @@ constraint cc_uos_detail_rev_detail_rev_id_fk references cr_revisions(revision_id) on delete cascade, - lecturer_id integer - constraint cc_uos_detail_rev_lecturer_id_fk - references users(user_id), + lecturer_ids varchar(256), + tutor_ids varchar(256), objectives text, learning_outcomes text, syllabus text, relevance text, - online_course_content varchar(256) + online_course_content varchar(256), + note text ); -- Create the UoS revision content type. @@ -93,17 +93,19 @@ null -- max_n ); -select define_function_args('cc_uos_detail__new', 'detail_id,parent_uos_id,lecturer_id,objectives,learning_outcomes,syllabus,relevance,online_course_content,creation_user,creation_ip,context_id,item_subtype;cc_uos_detail,content_type;cc_uos_detail_revision,object_type,package_id'); +select define_function_args('cc_uos_detail__new', 'detail_id,parent_uos_id,lecturer_ids,tutor_ids,objectives,learning_outcomes,syllabus,relevance,online_course_content,note,creation_user,creation_ip,context_id,item_subtype;cc_uos_detail,content_type;cc_uos_detail_revision,object_type,package_id'); create function cc_uos_detail__new( integer, -- detail_id integer, -- parent_uos_id - integer, -- lecturer_id + varchar, -- lecturer_ids + varchar, -- tutor_ids text, -- objectives text, -- learning_outcomes text, -- syllabus text, -- relevance varchar, -- online_course_content + text, -- note integer, -- creation_user varchar, -- creation_ip integer, -- context_id @@ -116,19 +118,21 @@ p_detail_id alias for $1; p_parent_uos_id alias for $2; - p_lecturer_id alias for $3; - p_objectives alias for $4; - p_learning_outcomes alias for $5; - p_syllabus alias for $6; - p_relevance alias for $7; - p_online_course_content alias for $8; - p_creation_user alias for $9; - p_creation_ip alias for $10; - p_context_id alias for $11; - p_item_subtype alias for $12; - p_content_type alias for $13; - p_object_type alias for $14; - p_package_id alias for $15; + p_lecturer_ids alias for $3; + p_tutor_ids alias for $4; + p_objectives alias for $5; + p_learning_outcomes alias for $6; + p_syllabus alias for $7; + p_relevance alias for $8; + p_online_course_content alias for $9; + p_note alias for $10; + p_creation_user alias for $11; + p_creation_ip alias for $12; + p_context_id alias for $13; + p_item_subtype alias for $14; + p_content_type alias for $15; + p_object_type alias for $16; + p_package_id alias for $17; v_detail_id cc_uos_detail.detail_id%TYPE; v_folder_id integer; @@ -168,12 +172,14 @@ v_revision_id := cc_uos_detail_revision__new ( null, -- detail_revision_id v_detail_id, -- detail_id - p_lecturer_id, -- lecturer_id + p_lecturer_ids, -- lecturer_ids + p_tutor_ids, -- tutor_ids p_objectives, -- objectives p_learning_outcomes, -- learning_outcomes p_syllabus, -- syllabus p_relevance, -- relevance p_online_course_content, -- online_course_content + p_note, -- note now(), -- creation_date p_creation_user, -- creation_user p_creation_ip -- creation_ip @@ -226,12 +232,14 @@ create or replace function cc_uos_detail_revision__new ( integer, -- detail_revision_id integer, -- detail_id - integer, -- lecturer_id + varchar, -- lecturer_ids + varchar, -- tutor_ids text, -- objectives text, -- learning_outcomes text, -- syllabus text, -- relevance varchar, -- online_course_content + text, -- note timestamptz, -- creation_date integer, -- creation_user varchar -- creation_ip @@ -240,15 +248,17 @@ declare p_detail_revision_id alias for $1; p_detail_id alias for $2; - p_lecturer_id alias for $3; - p_objectives alias for $4; - p_learning_outcomes alias for $5; - p_syllabus alias for $6; - p_relevance alias for $7; - p_online_course_content alias for $8; - p_creation_date alias for $9; - p_creation_user alias for $10; - p_creation_ip alias for $11; + p_lecturer_ids alias for $3; + p_tutor_ids alias for $4; + p_objectives alias for $5; + p_learning_outcomes alias for $6; + p_syllabus alias for $7; + p_relevance alias for $8; + p_online_course_content alias for $9; + p_note alias for $10; + p_creation_date alias for $11; + p_creation_user alias for $12; + p_creation_ip alias for $13; v_revision_id integer; v_title varchar; @@ -271,12 +281,13 @@ -- Insert into the uos-specific revision table INSERT into cc_uos_detail_revisions - (detail_revision_id, lecturer_id, objectives, - learning_outcomes, syllabus, relevance, online_course_content) + (detail_revision_id, lecturer_ids, tutor_ids, objectives, + learning_outcomes, syllabus, relevance, online_course_content, + note) VALUES - (v_revision_id, p_lecturer_id, p_objectives, + (v_revision_id, p_lecturer_ids, p_tutor_ids, p_objectives, p_learning_outcomes, p_syllabus, p_relevance, - p_online_course_content); + p_online_course_content, p_note); -- Update the latest revision id in cc_uos_detail UPDATE cc_uos_detail SET latest_revision_id = v_revision_id Index: openacs-4/packages/curriculum-central/sql/postgresql/uos-gradattr-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/uos-gradattr-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/sql/postgresql/uos-gradattr-create.sql 12 Jan 2006 07:15:23 -0000 1.2 +++ openacs-4/packages/curriculum-central/sql/postgresql/uos-gradattr-create.sql 9 Feb 2006 11:41:37 -0000 1.3 @@ -42,6 +42,7 @@ constraint cc_uos_gradattr_name_pk primary key, name varchar(256), + general_description text, package_id integer ); @@ -184,11 +185,12 @@ -- -- -select define_function_args('cc_uos_gradattr_name__new','name_id,name,creation_date;now,creation_user,creation_ip,package_id,context_id'); +select define_function_args('cc_uos_gradattr_name__new','name_id,name,general_description,creation_date;now,creation_user,creation_ip,package_id,context_id'); create function cc_uos_gradattr_name__new ( integer, -- name_id varchar, -- name + text, -- general_description timestamptz, -- creation_date integer, -- creation_user varchar, -- creation_ip @@ -198,11 +200,12 @@ declare p_name_id alias for $1; -- default null p_name alias for $2; - p_creation_date alias for $3; -- default now() - p_creation_user alias for $4; -- default null - p_creation_ip alias for $5; -- default null - p_package_id alias for $6; - p_context_id alias for $7; -- default null + p_general_description alias for $3; + p_creation_date alias for $4; -- default now() + p_creation_user alias for $5; -- default null + p_creation_ip alias for $6; -- default null + p_package_id alias for $7; + p_context_id alias for $8; -- default null v_name_id cc_uos_gradattr_name.name_id%TYPE; begin @@ -219,10 +222,10 @@ ); INSERT INTO cc_uos_gradattr_name ( - name_id, name, package_id + name_id, name, general_description, package_id ) VALUES ( - v_name_id, p_name, p_package_id + v_name_id, p_name, p_general_description, p_package_id ); return v_name_id; Index: openacs-4/packages/curriculum-central/sql/postgresql/uos-names-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/uos-names-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/sql/postgresql/uos-names-create.sql 2 Feb 2006 11:52:15 -0000 1.1 +++ openacs-4/packages/curriculum-central/sql/postgresql/uos-names-create.sql 9 Feb 2006 11:41:37 -0000 1.2 @@ -37,11 +37,9 @@ references acs_objects(object_id) constraint cc_uos_name_name_id_pk primary key, uos_code varchar(256) - constraint cc_uos_name_uos_code_nn not null - constraint cc_uos_name_uos_code_un unique, + constraint cc_uos_name_uos_code_nn not null, uos_name varchar(256) - constraint cc_uos_name_uos_name_nn not null - constraint cc_uos_name_uos_name_un unique, + constraint cc_uos_name_uos_name_nn not null, package_id integer constraint cc_uos_name_package_id_fk references apm_packages(package_id) on delete cascade Index: openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql,v diff -u -r1.20 -r1.21 --- openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql 2 Feb 2006 11:45:49 -0000 1.20 +++ openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql 9 Feb 2006 11:41:37 -0000 1.21 @@ -23,19 +23,22 @@ - + SELECT n.uos_code || ' ' || n.uos_name AS name, n.name_id FROM cc_uos_name n WHERE n.package_id = :package_id + AND n.name_id NOT IN ( + SELECT uos_name_id FROM cc_uos WHERE package_id = :package_id + ) - SELECT d.detail_id, dr.lecturer_id, dr.objectives, + SELECT d.detail_id, dr.lecturer_ids, dr.tutor_ids, dr.objectives, dr.learning_outcomes, dr.syllabus, dr.relevance, - dr.online_course_content + dr.online_course_content, dr.note FROM cc_uos u, cc_uos_revisions r, cr_items i, cc_uos_detail_revisions dr, cc_uos_detail d WHERE u.uos_id = :uos_id @@ -266,12 +269,14 @@ SELECT cc_uos_detail_revision__new ( null, :detail_id, - :lecturer_id, + :lecturer_ids, + :tutor_ids, :objectives, :learning_outcomes, :syllabus, :relevance, :online_course_content, + :note, now(), :user_id, :creation_ip 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.27 -r1.28 --- openacs-4/packages/curriculum-central/tcl/uos-procs.tcl 2 Feb 2006 11:45:49 -0000 1.27 +++ openacs-4/packages/curriculum-central/tcl/uos-procs.tcl 9 Feb 2006 11:41:37 -0000 1.28 @@ -133,12 +133,14 @@ } privileges { write } edit_fields { - lecturer_id + lecturer_ids + tutor_ids objectives learning_outcomes syllabus relevance online_course_content + note tl_approach_ids gradattr_ids textbook_ids @@ -624,26 +626,30 @@ ad_proc -public curriculum_central::uos::update_details { -detail_id:required - {-lecturer_id ""} + {-lecturer_ids ""} + {-tutor_ids ""} {-objectives ""} {-learning_outcomes ""} {-syllabus ""} {-relevance ""} {-online_course_content ""} + {-note ""} {-user_id ""} {-creation_ip ""} } { Updates the details for a Unit of Study. This update proc creates a new details revision of the given Unit of Study. @param detail_id The ID of the Unit of Study to update. - @param lecturer_id The ID of the selected lecturer. + @param lecturer_ids The ID of the selected lecturers. + @param tutor_ids The ID of the selected tutors. @param objectives Unit of Study objectives. @param learning_outcomes Unit of Study learning outcomes. @param syllabus Unit of Study syllabus. @param relevance Unit of Study relevance. @param online_course_content URL of the online course content for the associated Unit of Study. + @param note Note for the UoS. @param user_id The ID of the user that updated the Unit of Study. @param creation_ip The IP of the user that made the update. @@ -1003,10 +1009,11 @@ } -ad_proc curriculum_central::uos::uos_name_get_options { +ad_proc -private curriculum_central::uos::uos_available_name_get_options { {-package_id ""} } { - Returns a two-column list of registered UoS names. + Returns a two-column list of registered UoS names that cannot be found + in cc_uos. @param package_id ID of the current package instance. @@ -1031,8 +1038,8 @@ @param uos_id The ID of the Unit of Study for which we return detail fields for. @param array A predefined array for returning fields in. Values include - detail_id, lecturer_id, objectives, learning_outcomes, syllabus, - relevance, online_course_content. + detail_id, lecturer_ids, tutor_ids, objectives, learning_outcomes, + syllabus, relevance, online_course_content, note. @return Array containing all valid fields for the cc_uos_detail table. } { @@ -1042,12 +1049,14 @@ if { ![db_0or1row latest_details {} -column_array row] } { # Set default values set row(detail_id) "" - set row(lecturer_id) "" + set row(lecturer_ids) "" + set row(tutor_ids) "" set row(objectives) "" set row(learning_outcomes) "" set row(syllabus) "" set row(relevance) "" set row(online_course_content) "" + set row(note) "" } } Index: openacs-4/packages/curriculum-central/www/stream-map.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-map.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/stream-map.adp 2 Feb 2006 11:52:15 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/stream-map.adp 9 Feb 2006 11:41:37 -0000 1.2 @@ -10,13 +10,29 @@
 
-
-
    -
  • @stream.uos_code@
    • -
  • @stream.uos_name@
    • -
  • @stream.session_name@
    • +
+
 
Index: openacs-4/packages/curriculum-central/www/stream-map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-map.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/stream-map.tcl 2 Feb 2006 11:52:15 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/stream-map.tcl 9 Feb 2006 11:41:37 -0000 1.2 @@ -27,7 +27,8 @@ set units_of_study [db_list_of_lists units_of_study {}] template::multirow create stream map_id year_id year_name \ - session_id session_name core_or_not uos_id uos_code uos_name + session_id session_name core_or_not uos_id uos_code uos_name \ + year_session_group foreach uos $units_of_study { set map_id [lindex $uos 0] @@ -45,10 +46,16 @@ # Get name of session_id set session_name [db_string session_name {} -default ""] + set year_session_group "${year_id}${session_id}" + template::multirow append stream $map_id $year_id $year_name \ - $session_id $session_name $core_id $uos_id $uos_code $uos_name + $session_id $session_name $core_id $uos_id $uos_code $uos_name \ + $year_session_group } } +# Sort stream info by increasing year and session. +template::multirow sort stream -increasing year_id session_id + ad_return_template Index: openacs-4/packages/curriculum-central/www/admin/gradattr-ae-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/gradattr-ae-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/admin/gradattr-ae-postgresql.xql 12 Jan 2006 07:15:24 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/admin/gradattr-ae-postgresql.xql 9 Feb 2006 11:41:37 -0000 1.2 @@ -6,7 +6,8 @@ UPDATE cc_uos_gradattr_name - SET name = :name + SET name = :name, + general_description = :general_description WHERE name_id = :name_id Index: openacs-4/packages/curriculum-central/www/admin/gradattr-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/gradattr-ae.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/admin/gradattr-ae.tcl 12 Jan 2006 07:15:24 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/admin/gradattr-ae.tcl 9 Feb 2006 11:41:37 -0000 1.2 @@ -29,13 +29,22 @@ {label "[_ curriculum-central.name]" } {help_text "[_ curriculum-central.help_enter_graduate_attribute_name]"} } + {general_description:richtext(richtext),optional + {label "[_ curriculum-central.general_description]"} + {html {cols 50 rows 4}} + {htmlarea_p 0} + {nospell} + {help_text "[_ curriculum-central.help_enter_ga_general_description]"} + } } -select_query { - SELECT name FROM cc_uos_gradattr_name WHERE name_id = :name_id + SELECT name, general_description + FROM cc_uos_gradattr_name WHERE name_id = :name_id } -new_data { package_instantiate_object \ -var_list [list [list package_id $package_id] \ [list object_type cc_uos_gradattr_name] \ - [list name $name]] \ + [list name $name] \ + [list general_description $general_description]] \ -form_id gradattr cc_uos_gradattr_name } -edit_data { Index: openacs-4/packages/curriculum-central/www/admin/gradattrs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/gradattrs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/admin/gradattrs-postgresql.xql 12 Jan 2006 07:15:24 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/admin/gradattrs-postgresql.xql 9 Feb 2006 11:41:37 -0000 1.2 @@ -5,7 +5,7 @@ - SELECT g.name_id, g.name + SELECT g.name_id, g.name, g.general_description FROM cc_uos_gradattr_name g WHERE g.package_id = :package_id [template::list::orderby_clause -orderby -name "gradattrs"] Index: openacs-4/packages/curriculum-central/www/admin/gradattrs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/gradattrs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/admin/gradattrs.tcl 12 Jan 2006 07:15:24 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/admin/gradattrs.tcl 9 Feb 2006 11:41:37 -0000 1.2 @@ -27,6 +27,9 @@ name { label "#curriculum-central.name#" } + general_description { + label "#curriculum-central.general_description#" + } } template::list::create \ @@ -41,6 +44,9 @@ level {orderby level} } -db_multirow gradattrs get_gradattrs {} +db_multirow gradattrs get_gradattrs {} { + set general_description [template::util::richtext::get_property \ + contents $general_description] +} ad_return_template Index: openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql 2 Feb 2006 11:45:49 -0000 1.5 +++ openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae-postgresql.xql 9 Feb 2006 11:41:37 -0000 1.6 @@ -11,7 +11,7 @@ - SELECT map.uos_id, rev.year_id, rev.core_id + SELECT map.uos_id, rev.year_id, rev.core_id, rev.note FROM cc_stream_uos_map map, cc_stream_uos_map_rev rev WHERE map.map_id = :map_id AND rev.map_rev_id = map.latest_revision_id @@ -25,6 +25,7 @@ :map_id, :year_id, :core_id, + :note, now(), :modifying_user, :modifying_ip Index: openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl 2 Feb 2006 11:45:49 -0000 1.5 +++ openacs-4/packages/curriculum-central/www/coordinate/stream-map-ae.tcl 9 Feb 2006 11:41:37 -0000 1.6 @@ -49,6 +49,13 @@ {options "[curriculum_central::stream::stream_uos_relation_get_options]"} {help_text "[_ curriculum-central.help_select_core_recommended_or_elective]"} } + {note:richtext(richtext),optional + {label "[_ curriculum-central.note]"} + {html {cols 50 rows 4}} + {htmlarea_p 0} + {nospell} + {help_text "[_ curriculum-central.help_enter_note]"} + } } -select_query_name {form_info} -new_data { # Create new CR object set map_id [package_instantiate_object \ @@ -58,6 +65,7 @@ [list uos_id $uos_id] \ [list year_id $year_id] \ [list core_id $core_id] \ + [list note $note] \ [list object_type "cc_stream_uos_map"]] \ "cc_stream_uos_map"] Index: openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl 2 Feb 2006 11:45:49 -0000 1.8 +++ openacs-4/packages/curriculum-central/www/coordinate/uos-add.tcl 9 Feb 2006 11:41:37 -0000 1.9 @@ -45,7 +45,7 @@ {uos_name_id:integer(select) {label "#curriculum-central.uos_name#"} - {options [curriculum_central::uos::uos_name_get_options]} + {options [curriculum_central::uos::uos_available_name_get_options]} {help_text "[_ curriculum-central.help_select_uos_name]"} } {credit_value:integer Index: openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl 2 Feb 2006 11:45:49 -0000 1.17 +++ openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl 9 Feb 2006 11:41:37 -0000 1.18 @@ -167,13 +167,22 @@ {detail_id:integer(hidden),optional {value $uos_details(detail_id)} } - {lecturer_id:integer(select),optional - {label "[_ curriculum-central.lecturer]"} + {lecturer_ids:text(multiselect),multiple,optional + {label "[_ curriculum-central.lecturers]"} {options [curriculum_central::staff_get_options] } - {value $uos_details(lecturer_id)} + {values $uos_details(lecturer_ids)} + {html {size 5}} {mode display} - {help_text "[_ curriculum-central.help_lecturer_id]"} + {help_text "[_ curriculum-central.help_select_lecturer_ids]"} } + {tutor_ids:text(multiselect),multiple,optional + {label "[_ curriculum-central.tutors]"} + {options [curriculum_central::staff_get_options] } + {values $uos_details(tutor_ids)} + {html {size 5}} + {mode display} + {help_text "[_ curriculum-central.help_select_tutor_ids]"} + } {objectives:richtext(richtext),optional {label "[_ curriculum-central.aims_and_objectives]"} {html {cols 50 rows 4}} @@ -217,6 +226,15 @@ {mode display} {help_text "[_ curriculum-central.help_online_course_content]"} } + {note:richtext(richtext),optional + {label "[_ curriculum-central.note]"} + {html {cols 50 rows 4}} + {value $uos_details(note)} + {mode display} + {htmlarea_p 0} + {nospell} + {help_text "[_ curriculum-central.help_enter_note]"} + } } # Retrieve teaching and learning info for Unit of Study. @@ -501,12 +519,14 @@ curriculum_central::uos::update_details \ -detail_id $detail_id \ - -lecturer_id $lecturer_id \ + -lecturer_ids $lecturer_ids \ + -tutor_ids $tutor_ids \ -objectives $objectives \ -learning_outcomes $learning_outcomes \ -syllabus $syllabus \ -relevance $relevance \ - -online_course_content $online_course_content + -online_course_content $online_course_content \ + -note $note curriculum_central::uos::update_tl \ -tl_id $tl_id \ 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.8 -r1.9 --- openacs-4/packages/curriculum-central/www/resources/curriculum-central.css 2 Feb 2006 11:45:50 -0000 1.8 +++ openacs-4/packages/curriculum-central/www/resources/curriculum-central.css 9 Feb 2006 11:41:37 -0000 1.9 @@ -213,7 +213,7 @@ #cc-stream-map-container .float { float: left; width: 120px; - height: 80px; + height: 100px; padding: 10px; margin: 1em; border: 1px solid #000; @@ -226,22 +226,40 @@ } #cc-stream-map-container .float ul li.uos-code { - color: red; + color: #E88000; text-align: center; font-weight: bold; font-size: 12px; + padding: 0px; } #cc-stream-map-container .float ul li.uos-name { margin-top: 5px; - color: green; + color: #4B832E; font-size: 12px; text-align: center; + padding: 0px; } -#cc-stream-map-container .float ul li.session { +#cc-stream-map-container .float ul li.info { margin-top: 10px; color: blue; font-size: 12px; text-align: center; + padding: 0px; } + +#cc-stream-map-container ul.years li { + list-style-type: none; + color: #686868; + font-size: 18px; + font-weight: bold; +} + +#cc-stream-map-container ul.sessions li { + list-style-type: none; + color: #9B9B9B; + font-size: 16px; + padding-top: 10px; + padding-bottom: 6px; +}