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.18 -r1.19 --- openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml 3 Jan 2006 12:53:51 -0000 1.18 +++ openacs-4/packages/curriculum-central/catalog/curriculum-central.en_US.ISO-8859-1.xml 3 Jan 2006 13:26:48 -0000 1.19 @@ -2,6 +2,7 @@ UoS + Assumed Concepts Formal Contact Hours Total number of hours of attendance for lecture, tutorial, lab, etc. Informal Study Hours Index: openacs-4/packages/curriculum-central/sql/postgresql/uos-workload-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/sql/postgresql/uos-workload-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/sql/postgresql/uos-workload-create.sql 3 Jan 2006 12:53:52 -0000 1.1 +++ openacs-4/packages/curriculum-central/sql/postgresql/uos-workload-create.sql 3 Jan 2006 13:26:48 -0000 1.2 @@ -34,7 +34,7 @@ -- Register UoS workload as a child type of Uos. select content_type__register_child_type ( 'cc_uos', -- parent_type - 'cc_uos_workload', -- child_type + 'cc_uos_workload', -- child_type 'generic', -- relation_tag 0, -- min_n null -- max_n @@ -67,7 +67,8 @@ informal_study_hrs varchar(128), student_commitment text, expected_feedback text, - student_feedback text + student_feedback text, + assumed_concepts text ); -- Create the UoS revision content type. @@ -90,7 +91,7 @@ null -- max_n ); -select define_function_args('cc_uos_workload__new', 'workload_id,parent_uos_id,formal_contact_hrs,informal_study_hrs,student_commitment,expected_feedback,student_feedback,creation_user,creation_ip,context_id,item_subtype;cc_uos_workload,content_type;cc_uos_workload_revision,object_type,package_id'); +select define_function_args('cc_uos_workload__new', 'workload_id,parent_uos_id,formal_contact_hrs,informal_study_hrs,student_commitment,expected_feedback,student_feedback,assumed_concepts,creation_user,creation_ip,context_id,item_subtype;cc_uos_workload,content_type;cc_uos_workload_revision,object_type,package_id'); create function cc_uos_workload__new( integer, -- workload_id @@ -100,6 +101,7 @@ text, -- student_commitment text, -- expected_feedback text, -- student_feedback + text, -- assumed_concepts integer, -- creation_user varchar, -- creation_ip integer, -- context_id @@ -117,13 +119,14 @@ p_student_commitment alias for $5; p_expected_feedback alias for $6; p_student_feedback alias for $7; - p_creation_user alias for $8; - p_creation_ip alias for $9; - p_context_id alias for $10; - p_item_subtype alias for $11; - p_content_type alias for $12; - p_object_type alias for $13; - p_package_id alias for $14; + p_assumed_concepts 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; v_workload_id cc_uos_workload.workload_id%TYPE; v_folder_id integer; @@ -170,6 +173,7 @@ p_student_commitment, -- student_commitment p_expected_feedback, -- expected_feedback p_student_feedback, -- student_feedback + p_assumed_concepts, -- assumed_concepts now(), -- creation_date p_creation_user, -- creation_user p_creation_ip -- creation_ip @@ -227,6 +231,7 @@ text, -- student_commitment text, -- expected_feedback text, -- student_feedback + text, -- assumed_concepts timestamptz, -- creation_date integer, -- creation_user varchar -- creation_ip @@ -240,9 +245,10 @@ p_student_commitment alias for $5; p_expected_feedback alias for $6; p_student_feedback alias for $7; - p_creation_date alias for $8; - p_creation_user alias for $9; - p_creation_ip alias for $10; + p_assumed_concepts alias for $8; + p_creation_date alias for $9; + p_creation_user alias for $10; + p_creation_ip alias for $11; v_revision_id integer; v_title varchar; @@ -266,10 +272,12 @@ -- Insert into the uos-specific revision table INSERT into cc_uos_workload_revisions (workload_revision_id, formal_contact_hrs, informal_study_hrs, - student_commitment, expected_feedback, student_feedback) + student_commitment, expected_feedback, student_feedback, + assumed_concepts) VALUES (v_revision_id, p_formal_contact_hrs, p_informal_study_hrs, - p_student_commitment, p_expected_feedback, p_student_feedback); + p_student_commitment, p_expected_feedback, p_student_feedback, + p_assumed_concepts); -- Update the latest revision id in cc_uos_workload UPDATE cc_uos_workload SET latest_revision_id = v_revision_id 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 -N -r1.9 -r1.10 --- openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql 3 Jan 2006 12:53:52 -0000 1.9 +++ openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql 3 Jan 2006 13:26:48 -0000 1.10 @@ -42,7 +42,8 @@ SELECT w.workload_id, wr.formal_contact_hrs, wr.informal_study_hrs, - wr.student_commitment, wr.expected_feedback, wr.student_feedback + wr.student_commitment, wr.expected_feedback, wr.student_feedback, + wr.assumed_concepts FROM cc_uos u, cc_uos_revisions r, cr_items i, cc_uos_workload_revisions wr, cc_uos_workload w WHERE u.uos_id = :uos_id @@ -176,6 +177,7 @@ :student_commitment, :expected_feedback, :student_feedback, + :assumed_concepts, 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 -N -r1.13 -r1.14 --- openacs-4/packages/curriculum-central/tcl/uos-procs.tcl 3 Jan 2006 12:53:52 -0000 1.13 +++ openacs-4/packages/curriculum-central/tcl/uos-procs.tcl 3 Jan 2006 13:26:48 -0000 1.14 @@ -142,6 +142,7 @@ student_commitment expected_feedback student_feedback + assumed_concepts } assigned_states { open } } @@ -624,6 +625,7 @@ {-student_commitment ""} {-expected_feedback ""} {-student_feedback ""} + {-assumed_concepts ""} {-user_id ""} {-creation_ip ""} } { @@ -637,6 +639,7 @@ @param expected_feedback Students can expect feedback for this UoS in the nature of... @param student_feedback Students can provide feedback for this UoS by... + @param assumed_concepts Concepts that we assume that the student has a grasp of. @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. @@ -731,7 +734,7 @@ workload fields for. @param array A predefined array for returning fields in. Values include workload_id, formal_contact_hrs, informal_study_hrs, student_commitment, - expected_feedback, student_feedback. + expected_feedback, student_feedback, assumed_concepts. @return Array containing all valid fields for the cc_uos_workload table. } { @@ -746,6 +749,7 @@ set row(student_commitment) "" set row(expected_feedback) "" set row(student_feedback) "" + set row(assumed_concepts) "" } } 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 -N -r1.6 -r1.7 --- openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl 3 Jan 2006 12:53:52 -0000 1.6 +++ openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl 3 Jan 2006 13:26:49 -0000 1.7 @@ -224,6 +224,13 @@ {mode display} {help_text "[_ curriculum-central.help_student_feedback]"} } + {assumed_concepts:text(textarea),optional + {label "[_ curriculum-central.assumed_concepts]"} + {html {cols 50 rows 4}} + {value $uos_workload(assumed_concepts)} + {mode display} + {help_text "[_ curriculum-central.help_assumed_concepts]"} + } } @@ -309,7 +316,8 @@ -informal_study_hrs $informal_study_hrs \ -student_commitment $student_commitment \ -expected_feedback $expected_feedback \ - -student_feedback $student_feedback + -student_feedback $student_feedback \ + -assumed_concepts $assumed_concepts } # Do a general edit update.