Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v diff -u -r1.68 -r1.68.2.1 --- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 12 May 2005 00:50:40 -0000 1.68 +++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 31 May 2005 23:13:00 -0000 1.68.2.1 @@ -122,17 +122,13 @@ Below Beside-Left Beside-Right - You need to provide a valid character expression for this field - Boolean Reference Value Bottom - User input must be a number (real or integer) bounded by a comparator reference value Box Orientation Branch Branches Bulk Mail By user Cancel and Return to Assessment - The requested Item does not exist Combine categories by To deselect or select multiple categories use the Control-Key on your keyboard. Categorization @@ -152,9 +148,6 @@ Title Existing Choice Set Choose the action to perform - Comparator - You must set a Comparator for this Comparison Type - Comparison Type Condition Confirmation Consent Page @@ -228,14 +221,11 @@ End Time Enter Message Entry Page - equal to You must enter a tcl code to execute Need to be pairs of \"key value\". - Error Message Exit Page Export Extreme Actions: - False Feedback Feedback right Feedback given to the user if he correctly answered this question. @@ -247,28 +237,12 @@ A short label used when exporting question answers in CSV file Your file is too large. Files are limited to %pretty_max_size% bytes.\n Your file is zero-length. Either you attempted to upload a zero length file, a file which does not exists, or something went wrong during the transfer.\n - Filter - Add New Filter - There are several types of filters you can add:<p></p><ul><li><b>Datatype filters</b>: These test user input to check whether it is alphanumeric, alpha characters only, numeric, integer, or boolean.</li><li><b>Bounds filters</b>: These test user input (numeric which includes integers, boolean, or text) against a reference value using a comparator.</li></ul> <p>You should look through existing filters and re-use them rather than create duplicate filters, though we don't prevent you from doing so. - Edit Filter - If you edit this existing filter, you will create a new version of it. The original will still be available for use elsewhere. - Filter TCL Expression - Filter Description - Filter Preview - Filter Settings - Filters - Admin Filters - Filters Available - Filters Currently Mapped to This Item - There are no filters matching these criteria. Finish Time Finished Fixed Order Position This is required From: Goes to section - greater than - greater than or equal to Question name hidden Change History Horizontal @@ -282,7 +256,6 @@ Increasing (false) will either give 100%, if all correct answers are given, or 0% else. Instructions IP Mask - Item Upload File Upload a file Questions %section.cur_first_item% - %section.cur_last_item% out of %section.num_items% @@ -318,8 +291,6 @@ Last Week The section where the condition will lead you. Left - less than - less than or equal to - Lets you use this assessment as a template to create a new assessment. First Letter All @@ -340,8 +311,6 @@ Show item name Allow unsecure connection Manually - User input must match a boolean value - User input must match a specific text max. time allowed: A name for this set of choices (for reusability) Message @@ -355,11 +324,6 @@ Move Up Allow Multiple Answers Allo Multiple Answers? - User input must consist of letters only - User input must be an alphanumeric type - User input must be a boolean type - User input must be an integer type - User input must be a numeric type Name Assessment name of the new coppy The name of the trigger. @@ -373,12 +337,10 @@ None not answered Not Approved - not equal to not yet reviewed Notification Notified Users Notify User - User input should be null Total Number of displayed Choices If this number is smaller than the number of added choices, choices will be picked randomly. Number of choices for multiple-choice item @@ -387,9 +349,7 @@ Number of correct answers that have to be displayed Number of Items displayed Number of Items displayed - Numeric Reference Value Number of Tries allowed - You must provide a valid number for this field Numerical , on %creation_date% One Assessment: %assessment_data.title% @@ -436,9 +396,6 @@ Main Site Custom Registration Questionnaire: "%assessment_data.title%" Registrated respondents required regarding this survey - regexp of user input must return 1 against this pattern: - You must provide a regular expression against which user input will be matched - Regexp Pattern to Match Related Remove: Remove Assessment @@ -465,7 +422,6 @@ Right Rule-based Branching A title for this short answer feature set so it can be reused in the future. - Save Score Search Search for questions @@ -529,8 +485,6 @@ Subtext Summary Target Community - You need to provide a valid character expression for this field - Text Reference Value The condition to branch or execute the action There are no users to notify This question will be corrected by the teacher @@ -547,7 +501,6 @@ Delete Trigger Triggers Trigger - True Try again Two days ago Type of the trigger @@ -569,7 +522,6 @@ View Responses: View Results View results - Warning Message When this action will be executed (ie. At the end of this section) When this will be executed? Yes Index: openacs-4/packages/assessment/lib/item-show-mc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-mc.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/assessment/lib/item-show-mc.tcl 6 May 2005 15:46:12 -0000 1.7 +++ openacs-4/packages/assessment/lib/item-show-mc.tcl 31 May 2005 23:13:00 -0000 1.7.2.1 @@ -3,7 +3,7 @@ db_1row item_type_data {} set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] -set actions [list [list "[_ acs-kernel.common_Edit]" edit] [list "[_ assessment.add_item_type_mc_existing]" existing] [list "Add More Choices" more]] +set actions [list [list "[_ acs-kernel.common_Edit]" edit] [list "[_ assessment.add_item_type_mc_existing]" existing]] ad_form -name item_show_mc -mode display -action item-edit-mc -export { assessment_id section_id as_item_id } -actions $actions -form { @@ -24,12 +24,12 @@ incr count set options "" if {$count < $total} { - append options " \\\"[_" + append options " \\\"[_" } if {$count > 1} { append options " \\\"[_" } - append options " \\\"[_" + append options " \\\"[_" if {$correct_answer_p == "t"} { append ad_form_code "\{infotxt.$choice_id:text(inform) \{label \"[_ assessment.Choice] $count\"\} \{value \" $title$options\"\}\}\n" @@ -49,6 +49,3 @@ } append ad_form_code "\}" eval ad_form -extend -name item_show_mc $ad_form_code -# pass along number of choices -set num_choices $total -eval ad_form -extend -name item_show_mc -export {num_choices} Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.10d10-0.10d11.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/tcl/as-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-file-procs.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/assessment/tcl/as-file-procs.tcl 25 Jan 2005 12:46:57 -0000 1.7 +++ openacs-4/packages/assessment/tcl/as-file-procs.tcl 31 May 2005 23:13:00 -0000 1.7.2.1 @@ -26,7 +26,7 @@ set filename [file tail [template::util::file::get_property filename $file_pathname]] set file_mimetype [cr_filename_to_mime_type -create $filename] set content_length [file size $file_pathname] - set content_rev_id [cr_import_content -title $file_name $folder_id $file_pathname $content_length $file_mimetype [exec uuidgen]] + set content_rev_id [cr_import_content -title $file_name $folder_id $file_pathname $content_length $file_mimetype [as::item::generate_unique_name]] return $content_rev_id } Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v diff -u -r1.30 -r1.30.2.1 --- openacs-4/packages/assessment/tcl/as-install-procs.tcl 15 Apr 2005 17:26:45 -0000 1.30 +++ openacs-4/packages/assessment/tcl/as-install-procs.tcl 31 May 2005 23:13:00 -0000 1.30.2.1 @@ -100,6 +100,11 @@ content::type::attribute::new -content_type {as_item_type_sa} -attribute_name {increasing_p} -datatype {boolean} -pretty_name {Increasing} -column_spec {char(1)} content::type::attribute::new -content_type {as_item_type_sa} -attribute_name {allow_negative_p} -datatype {boolean} -pretty_name {Allow Negative} -column_spec {char(1)} +# Item type sitewide category +# uses checkbox, radio, and select box display types +content::type::new -content_type {as_item_type_swcat} -supertype {content_revision} -pretty_name {Assessment Item Type Sitewide Category} -pretty_plural {Assessment Item Type Sitewide Category} -table_name {as_item_type_swcat} -id_column {as_item_type_id} +content::type::attribute::new -content_type {as_item_type_swcat} -attribute_name {tree_id} -datatype {number} -pretty_name {Tree ID} -column_spec {integer constraint as_item_type_swcat_tree_id_fk references category_trees} + # Item answers content::type::attribute::new -content_type {as_item_sa_answers} -attribute_name {answer_id} -datatype {number} -pretty_name {Parent ID} -column_spec {integer} content::type::attribute::new -content_type {as_item_sa_answers} -attribute_name {data_type} -datatype {string} -pretty_name {Data Type} -column_spec {varchar(20)} Index: openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl 23 Feb 2005 14:47:38 -0000 1.5 +++ openacs-4/packages/assessment/tcl/as-item-answer-procs.tcl 31 May 2005 23:13:00 -0000 1.5.2.1 @@ -26,7 +26,7 @@ # Insert as_item_answer in the CR (and as_item_sa_answers table) getting the revision_id (as_item_answer_id) db_transaction { - set item_answer_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [exec uuidgen]] + set item_answer_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [as::item::generate_unique_name]] set as_item_answer_id [content::revision::new \ -item_id $item_answer_id \ -content_type {as_item_sa_answers} \ Index: openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl 19 Jan 2005 16:49:14 -0000 1.7 +++ openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl 31 May 2005 23:13:00 -0000 1.7.2.1 @@ -31,7 +31,7 @@ # Insert as_item_choice in the CR (and as_item_choices table) getting the revision_id (as_item_choice_id) db_transaction { - set item_choice_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [exec uuidgen]] + set item_choice_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name [as::item::generate_unique_name]] set as_item_choice_id [content::revision::new \ -item_id $item_choice_id \ -content_type {as_item_choices} \ Index: openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl 13 Apr 2005 18:51:54 -0000 1.12 +++ openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl 31 May 2005 23:13:00 -0000 1.12.2.1 @@ -24,7 +24,7 @@ # Insert as_item_display_cb in the CR (and as_item_display_cb table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_cb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_cb} -name [exec uuidgen]] + set item_item_display_cb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_cb} -name [as::item::generate_unique_name]] set as_item_display_cb_id [content::revision::new \ -item_id $item_item_display_cb_id \ -content_type {as_item_display_cb} \ Index: openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl 13 Apr 2005 18:51:54 -0000 1.12 +++ openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl 31 May 2005 23:13:00 -0000 1.12.2.1 @@ -24,7 +24,7 @@ # Insert as_item_display_rb in the CR (and as_item_display_rb table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_rb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_rb} -name [exec uuidgen]] + set item_item_display_rb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_rb} -name [as::item::generate_unique_name]] set as_item_display_rb_id [content::revision::new \ -item_id $item_item_display_rb_id \ -content_type {as_item_display_rb} \ Index: openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl 13 Apr 2005 18:51:54 -0000 1.8 +++ openacs-4/packages/assessment/tcl/as-item-display-sa-procs.tcl 31 May 2005 23:13:00 -0000 1.8.2.1 @@ -21,7 +21,7 @@ # Insert as_item_display_sa in the CR (and as_item_display_sa table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_display_sa} -name [exec uuidgen]] + set item_item_display_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_display_sa} -name [as::item::generate_unique_name]] set as_item_display_sa_id [content::revision::new \ -item_id $item_item_display_sa_id \ -content_type {as_item_display_sa} \ Index: openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl 13 Apr 2005 18:51:54 -0000 1.10 +++ openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl 31 May 2005 23:13:00 -0000 1.10.2.1 @@ -23,7 +23,7 @@ # Insert as_item_display_sb in the CR (and as_item_display_sb table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_sb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_sb} -name [exec uuidgen]] + set item_item_display_sb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_sb} -name [as::item::generate_unique_name]] set as_item_display_sb_id [content::revision::new \ -item_id $item_item_display_sb_id \ -content_type {as_item_display_sb} \ Index: openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl 13 Apr 2005 18:51:54 -0000 1.8 +++ openacs-4/packages/assessment/tcl/as-item-display-ta-procs.tcl 31 May 2005 23:13:00 -0000 1.8.2.1 @@ -22,7 +22,7 @@ # Insert as_item_display_ta in the CR (and as_item_display_ta table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_ta_id [content::item::new -parent_id $folder_id -content_type {as_item_display_ta} -name [exec uuidgen]] + set item_item_display_ta_id [content::item::new -parent_id $folder_id -content_type {as_item_display_ta} -name [as::item::generate_unique_name]] set as_item_display_ta_id [content::revision::new \ -item_id $item_item_display_ta_id \ -content_type {as_item_display_ta} \ Index: openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl 13 Apr 2005 18:51:54 -0000 1.8 +++ openacs-4/packages/assessment/tcl/as-item-display-tb-procs.tcl 31 May 2005 23:13:00 -0000 1.8.2.1 @@ -21,7 +21,7 @@ # Insert as_item_display_tb in the CR (and as_item_display_tb table) getting the revision_id (as_item_display_id) db_transaction { - set item_item_display_tb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_tb} -name [exec uuidgen]] + set item_item_display_tb_id [content::item::new -parent_id $folder_id -content_type {as_item_display_tb} -name [as::item::generate_unique_name]] set as_item_display_tb_id [content::revision::new \ -item_id $item_item_display_tb_id \ -content_type {as_item_display_tb} \ Index: openacs-4/packages/assessment/tcl/as-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-procs.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/assessment/tcl/as-item-procs.tcl 25 Apr 2005 13:00:25 -0000 1.14 +++ openacs-4/packages/assessment/tcl/as-item-procs.tcl 31 May 2005 23:13:00 -0000 1.14.2.1 @@ -234,8 +234,31 @@ } { db_1row item_properties {} -column_array item - set item(item_type) [string range $item(item_type) end-1 end] - set item(display_type) [string range $item(display_type) end-1 end] + set item(item_type) [lindex [split $item(item_type) "_"] end] + set item(display_type) [lindex [split $item(display_type) "_"] end] return [array get item] } + +ad_proc -private as::item::generate_unique_name { + args +} { + Generate a unique string to be used as item name + + @author Roel Canicula (roelmc@info.com.ph) + @creation-date 2005-05-06 + + @param args + + @return + + @error +} { + if { [llength $args] } { + return [join $args "-"] + } elseif { ! [catch {set uuid [exec uuidgen]}] } { + return $uuid + } else { + return "[clock seconds]-[expr round([ns_rand]*100000)]" + } +} Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl 9 Apr 2005 22:39:27 -0000 1.17 +++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl 31 May 2005 23:13:00 -0000 1.17.2.1 @@ -25,7 +25,7 @@ # Insert as_item_type_mc in the CR (and as_item_type_mc table) getting the revision_id (as_item_type_id) db_transaction { - set item_item_type_mc_id [content::item::new -parent_id $folder_id -content_type {as_item_type_mc} -name [exec uuidgen]] + set item_item_type_mc_id [content::item::new -parent_id $folder_id -content_type {as_item_type_mc} -name [as::item::generate_unique_name]] set as_item_type_mc_id [content::revision::new \ -item_id $item_item_type_mc_id \ -content_type {as_item_type_mc} \ Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql 5 May 2005 18:37:48 -0000 1.11 +++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql 31 May 2005 23:13:00 -0000 1.11.2.1 @@ -40,7 +40,7 @@ select choice_id from as_item_choices - where mc_id = :as_item_type_id + where mc_id = :type_id @@ -50,7 +50,7 @@ select choice_id from as_item_choices - where mc_id = :as_item_type_id + where mc_id = :type_id Index: openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl 9 Apr 2005 22:39:27 -0000 1.16 +++ openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl 31 May 2005 23:13:00 -0000 1.16.2.1 @@ -23,7 +23,7 @@ # Insert as_item_type_oq in the CR (and as_item_type_oq table) getting the revision_id (as_item_type_id) db_transaction { - set item_item_type_oq_id [content::item::new -parent_id $folder_id -content_type {as_item_type_oq} -name [exec uuidgen]] + set item_item_type_oq_id [content::item::new -parent_id $folder_id -content_type {as_item_type_oq} -name [as::item::generate_unique_name]] set as_item_type_oq_id [content::revision::new \ -item_id $item_item_type_oq_id \ -content_type {as_item_type_oq} \ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-type-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-type-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl 26 Jan 2005 11:06:45 -0000 1.13 +++ openacs-4/packages/assessment/tcl/as-item-type-sa-procs.tcl 31 May 2005 23:13:01 -0000 1.13.2.1 @@ -21,7 +21,7 @@ # Insert as_item_type_sa in the CR (and as_item_type_sa table) getting the revision_id (as_item_type_id) db_transaction { - set item_item_type_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_type_sa} -name [exec uuidgen]] + set item_item_type_sa_id [content::item::new -parent_id $folder_id -content_type {as_item_type_sa} -name [as::item::generate_unique_name]] set as_item_type_sa_id [content::revision::new \ -item_id $item_item_type_sa_id \ -content_type {as_item_type_sa} \ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-type-swcat-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-type-swcat-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/tcl/as-section-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-display-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/tcl/as-section-display-procs.tcl 19 Jan 2005 16:49:14 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-section-display-procs.tcl 31 May 2005 23:13:01 -0000 1.2.2.1 @@ -26,7 +26,7 @@ # Insert as_section_display_type in the CR (and as_section_display_types table) getting the revision_id (display_type_id) db_transaction { - set display_item_id [content::item::new -parent_id $folder_id -content_type {as_section_display_types} -name [exec uuidgen]] + set display_item_id [content::item::new -parent_id $folder_id -content_type {as_section_display_types} -name [as::item::generate_unique_name]] set display_id [content::revision::new \ -item_id $display_item_id \ Index: openacs-4/packages/assessment/tcl/as-session-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-session-procs.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/tcl/as-session-procs.tcl 22 Nov 2004 11:59:23 -0000 1.3 +++ openacs-4/packages/assessment/tcl/as-session-procs.tcl 31 May 2005 23:13:01 -0000 1.3.2.1 @@ -31,11 +31,11 @@ # db_0or1row as_session_last {SELECT session_id AS as_session_id FROM as_sessionsx WHERE subject_id = :subject_id AND assessment_id = :assessment_id} # if { ! [info exists as_session_id] } { # Insert as_session in the CR (and as_sessions table) getting the revision_id (session_id) - set session_id [content::item::new -parent_id $folder_id -content_type {as_sessions} -name "$subject_id-$assessment_id-[exec uuidgen]" -title "$subject_id-$assessment_id-[exec uuidgen]" ] + set session_id [content::item::new -parent_id $folder_id -content_type {as_sessions} -name "$subject_id-$assessment_id-[as::item::generate_unique_name]" -title "$subject_id-$assessment_id-[as::item::generate_unique_name]" ] set as_session_id [content::revision::new \ -item_id $session_id \ -content_type {as_sessions} \ - -title "$subject_id-$assessment_id-[exec uuidgen]" \ + -title "$subject_id-$assessment_id-[as::item::generate_unique_name]" \ -attributes [list [list assessment_id $assessment_id] \ [list subject_id $subject_id] \ [list staff_id $staff_id] \ Index: openacs-4/packages/assessment/tcl/as-session-results-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-session-results-procs.tcl,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/assessment/tcl/as-session-results-procs.tcl 21 Feb 2005 14:32:56 -0000 1.1 +++ openacs-4/packages/assessment/tcl/as-session-results-procs.tcl 31 May 2005 23:13:01 -0000 1.1.2.1 @@ -23,7 +23,7 @@ # Insert as_session_results in the CR (and as_session_results table) getting the revision_id db_transaction { if {![db_0or1row result_exists {}]} { - set result_item_id [content::item::new -parent_id $folder_id -content_type {as_session_results} -name [exec uuidgen]] + set result_item_id [content::item::new -parent_id $folder_id -content_type {as_session_results} -name [as::item::generate_unique_name]] } set result_id [content::revision::new \ -item_id $result_item_id \ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/test/as-item-type-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/test/as-item-type-swcat-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/www/assessment-consent.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-consent.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/assessment-consent.adp 6 May 2005 15:57:13 -0000 1.3 +++ openacs-4/packages/assessment/www/assessment-consent.adp 31 May 2005 23:13:01 -0000 1.3.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
@assessment_data.consent_page;noquote@ Index: openacs-4/packages/assessment/www/assessment-consent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-consent.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/www/assessment-consent.tcl 9 May 2005 21:58:24 -0000 1.5 +++ openacs-4/packages/assessment/www/assessment-consent.tcl 31 May 2005 23:13:01 -0000 1.5.2.1 @@ -8,14 +8,13 @@ session_id:integer,notnull assessment_id:integer,notnull {password:optional ""} - {next_asm:optional} } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } set page_title "[_ assessment.Confirm_Consent]" -set context [list $page_title] +set context_bar [ad_context_bar $page_title] # Get the assessment data as::assessment::data -assessment_id $assessment_id Index: openacs-4/packages/assessment/www/assessment-password.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-password.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/assessment-password.adp 6 May 2005 16:11:13 -0000 1.2 +++ openacs-4/packages/assessment/www/assessment-password.adp 31 May 2005 23:13:01 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/assessment-password.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-password.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/assessment-password.tcl 6 May 2005 16:11:13 -0000 1.2 +++ openacs-4/packages/assessment/www/assessment-password.tcl 31 May 2005 23:13:01 -0000 1.2.2.1 @@ -7,13 +7,13 @@ } -query { assessment_id:integer,notnull } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } set user_id [ad_conn user_id] set page_title "[_ assessment.Password_Enter]" -set context [list $page_title] +set context_bar [ad_context_bar $page_title] # Get the assessment data as::assessment::data -assessment_id $assessment_id Index: openacs-4/packages/assessment/www/assessment-section-submit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/www/assessment-section-submit.adp 6 May 2005 16:07:13 -0000 1.8 +++ openacs-4/packages/assessment/www/assessment-section-submit.adp 31 May 2005 23:13:01 -0000 1.8.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@ Index: openacs-4/packages/assessment/www/assessment-single-submit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-single-submit.adp,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/assessment/www/assessment-single-submit.adp 6 May 2005 16:07:13 -0000 1.6 +++ openacs-4/packages/assessment/www/assessment-single-submit.adp 31 May 2005 23:13:01 -0000 1.6.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
@assessment_data.title@
Index: openacs-4/packages/assessment/www/assessment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/Attic/assessment.tcl,v diff -u -r1.47 -r1.47.2.1 --- openacs-4/packages/assessment/www/assessment.tcl 9 May 2005 21:58:24 -0000 1.47 +++ openacs-4/packages/assessment/www/assessment.tcl 31 May 2005 23:13:01 -0000 1.47.2.1 @@ -14,29 +14,26 @@ {item_id ""} {return_url:optional} response_to_item:array,optional,multiple,html - {next_asm:optional} } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } set user_id [ad_conn user_id] set page_title "[_ assessment.Show_Items]" -set context [list $page_title] +set context_bar [ad_context_bar $page_title] set section_to "" set item_to "" set url "" if { [info exists return_url] } { - set url $return_url ns_log notice "$return_url" } set return_url "$url" - # Get the assessment data as::assessment::data -assessment_id $assessment_id permission::require_permission -object_id $assessment_id -privilege read @@ -65,13 +62,13 @@ # set the time when the subject initiated the Assessment db_dml session_start {} } else { - set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm}] + set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url}] } } else { # pick up old session db_1row unfinished_section_order {} if {[empty_string_p $section_order]} { - set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm}] + set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url}] } else { db_1row unfinished_section_id {} db_1row unfinished_item_order {} @@ -230,7 +227,7 @@ # go to next section set section_order $new_section_order set item_order $new_item_order - ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}] + ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url}] ad_script_abort } else { # calculate session points at end of session @@ -239,7 +236,7 @@ as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id if {[empty_string_p $assessment_data(return_url)]} { - ad_returnredirect [export_vars -base finish {session_id assessment_id return_url next_asm}] + ad_returnredirect [export_vars -base finish {session_id assessment_id return_url}] } else { ad_returnredirect $assessment_data(return_url) } @@ -249,7 +246,7 @@ # form for display an assessment with sections and items -ad_form -name show_item_form -action assessment -html {enctype multipart/form-data} -export { next_asm assessment_id section_id section_order item_order password return_url} -form { +ad_form -name show_item_form -action assessment -html {enctype multipart/form-data} -export {assessment_id section_id section_order item_order password return_url} -form { {session_id:text(hidden) {value $session_id}} } @@ -298,7 +295,7 @@ } # create seperate submit form for each item - ad_form -name show_item_form_$as_item_id -mode $mode -action assessment -html {enctype multipart/form-data} -export {assessment_id section_id section_order item_order password return_url next_asm} -form { + ad_form -name show_item_form_$as_item_id -mode $mode -action assessment -html {enctype multipart/form-data} -export {assessment_id section_id section_order item_order password return_url} -form { {session_id:text(hidden) {value $session_id}} {item_id:text(hidden) {value $as_item_id}} } @@ -312,7 +309,7 @@ # save answer set response_item_id \$item_id db_1row process_item_type {} - set item_type \[string range \$item_type end-1 end\] + set item_type \[lindex \[split \$item_type \"_\"\] end\] if {!\[info exists response_to_item(\$response_item_id)\]} { set response_to_item(\$response_item_id) \"\" } else { @@ -328,7 +325,7 @@ } }" set after_submit "{ - ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}\] + ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url}\] ad_script_abort }" @@ -377,7 +374,7 @@ foreach one_response \$item_list { util_unlist \$one_response response_item_id db_1row process_item_type {} - set item_type \[string range \$item_type end-1 end\] + set item_type \[lindex \[split \$item_type \"_\"\] end\] if {!\[info exists response_to_item(\$response_item_id)\]} { set response_to_item(\$response_item_id) \"\" } else { @@ -419,7 +416,7 @@ } set item_order \$new_item_order - ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}\] + ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url}\] ad_script_abort } else { # calculate session points at end of session @@ -428,7 +425,7 @@ as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id if {\[empty_string_p \$assessment_data(return_url)\]} { - ad_returnredirect \[export_vars -base finish {session_id assessment_id return_url next_asm}\] + ad_returnredirect \[export_vars -base finish {session_id assessment_id return_url}\] } else { ad_returnredirect \$assessment_data(return_url) } @@ -465,7 +462,7 @@ # go to next section set section_order $new_section_order set item_order $new_item_order - ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}] + ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url}] ad_script_abort } else { # calculate session points at end of session @@ -474,7 +471,7 @@ as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id if {[empty_string_p $assessment_data(return_url)]} { - ad_returnredirect [export_vars -base finish {session_id assessment_id return_url next_asm}] + ad_returnredirect [export_vars -base finish {session_id assessment_id return_url}] } else { ad_returnredirect $assessment_data(return_url) } Index: openacs-4/packages/assessment/www/finish.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/finish.adp 6 May 2005 16:07:13 -0000 1.4 +++ openacs-4/packages/assessment/www/finish.adp 31 May 2005 23:13:01 -0000 1.4.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@

#assessment.View_results#

Index: openacs-4/packages/assessment/www/finish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/assessment/www/finish.tcl 9 May 2005 21:58:24 -0000 1.6 +++ openacs-4/packages/assessment/www/finish.tcl 31 May 2005 23:13:01 -0000 1.6.2.1 @@ -8,16 +8,15 @@ session_id:integer,notnull assessment_id:integer,notnull return_url:optional - next_asm:optional } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } set user_id [ad_conn user_id] + if { $user_id != 0} { db_dml update_session {update as_sessions set subject_id=:user_id where session_id=:session_id} - } if {[info exists return_url]} { @@ -26,11 +25,7 @@ } } set page_title "[_ assessment.Response_Submitted]" -set context [list $page_title] +set context_bar [ad_context_bar $page_title] -if { [exists_and_not_null next_asm ] } { - ad_returnredirect "assessment?assessment_id=$next_asm" -} - ad_return_template Index: openacs-4/packages/assessment/www/session.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v diff -u -r1.27 -r1.27.2.1 --- openacs-4/packages/assessment/www/session.adp 6 May 2005 16:07:13 -0000 1.27 +++ openacs-4/packages/assessment/www/session.adp 31 May 2005 23:13:01 -0000 1.27.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
@assessment_data.title@
Index: openacs-4/packages/assessment/www/session.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.tcl,v diff -u -r1.34 -r1.34.2.1 --- openacs-4/packages/assessment/www/session.tcl 6 May 2005 16:07:13 -0000 1.34 +++ openacs-4/packages/assessment/www/session.tcl 31 May 2005 23:13:01 -0000 1.34.2.1 @@ -8,7 +8,7 @@ } { session_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -29,7 +29,7 @@ } set page_title "[_ assessment.View_Results]" -set context [list [list [export_vars -base sessions {assessment_id}] "[_ assessment.Show_Sessions]"] $page_title] +set context_bar [ad_context_bar [list [export_vars -base sessions {assessment_id}] "[_ assessment.Show_Sessions]"] $page_title] set format "[lc_get formbuilder_date_format], [lc_get formbuilder_time_format]" set session_user_url [acs_community_member_url -user_id $subject_id] Index: openacs-4/packages/assessment/www/sessions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/sessions.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/sessions.adp 6 May 2005 16:07:13 -0000 1.4 +++ openacs-4/packages/assessment/www/sessions.adp 31 May 2005 23:13:01 -0000 1.4.2.1 @@ -1,5 +1,5 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@ Index: openacs-4/packages/assessment/www/sessions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/sessions.tcl,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/assessment/www/sessions.tcl 6 May 2005 16:07:13 -0000 1.17 +++ openacs-4/packages/assessment/www/sessions.tcl 31 May 2005 23:13:01 -0000 1.17.2.1 @@ -10,12 +10,12 @@ assessment_id:notnull {subject_id:integer,optional ""} } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } set page_title "[_ assessment.Show_Sessions]" -set context [list $page_title] +set context_bar [ad_context_bar $page_title] set format "[lc_get formbuilder_date_format], [lc_get formbuilder_time_format]" set user_id [ad_conn user_id] permission::require_permission -object_id $assessment_id -privilege read Index: openacs-4/packages/assessment/www/admin/asm-action-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-delete.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-delete.adp 6 May 2005 17:05:16 -0000 1.4 +++ openacs-4/packages/assessment/www/admin/asm-action-delete.adp 31 May 2005 23:13:01 -0000 1.4.2.1 @@ -1,6 +1,6 @@ -@page_title;noquote@ -@context;noquote@ +Action Delete +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/admin/asm-action-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-delete.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-delete.tcl 6 May 2005 17:05:16 -0000 1.4 +++ openacs-4/packages/assessment/www/admin/asm-action-delete.tcl 31 May 2005 23:13:01 -0000 1.4.2.1 @@ -5,13 +5,10 @@ @cvs-id $Id: } { action_id:integer -} -properties { - page_title:onevalue - context:onevalue } set page_title [_ assessment.delete] -set context [list [list index [_ assessment.admin]] [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ] $page_title] +set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ] $page_title] db_1row select_action_info {select name,description,tcl_code from as_actions where action_id = :action_id} Index: openacs-4/packages/assessment/www/admin/asm-action-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-new.adp 6 May 2005 17:05:16 -0000 1.4 +++ openacs-4/packages/assessment/www/admin/asm-action-new.adp 31 May 2005 23:13:01 -0000 1.4.2.1 @@ -1,6 +1,6 @@ @page_title@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/admin/asm-action-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-new.tcl 6 May 2005 17:14:17 -0000 1.7 +++ openacs-4/packages/assessment/www/admin/asm-action-new.tcl 31 May 2005 23:13:01 -0000 1.7.2.1 @@ -5,9 +5,6 @@ @cvs-id $Id: } { action_id:optional -} -properties { - title:onevalue - context:onevalue } set package_id [ad_conn package_id] @@ -24,7 +21,7 @@ } set page_title "[_ assessment.add_new_action]" -set context [list [list [export_vars -base asm-action-admin ] [_ assessment.action_admin]] $page_title] +set context_bar [ad_context_bar [list [export_vars -base asm-action-admin ] [_ assessment.action_admin]] $page_title] ad_form -name action_admin -form { action_id:key Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp 6 May 2005 17:05:16 -0000 1.5 +++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp 31 May 2005 23:13:01 -0000 1.5.2.1 @@ -1,6 +1,6 @@ -@page_title;noquote@ -@context;noquote@ +@page_title@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl 6 May 2005 17:15:41 -0000 1.5 +++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl 31 May 2005 23:13:01 -0000 1.5.2.1 @@ -6,9 +6,6 @@ } { action_id parameter_id:optional -} -properties { - page_title:onevalue - context:onevalue } if { ![ad_form_new_p -key parameter_id] } { @@ -19,7 +16,7 @@ } -set context [list [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ] $page_title] +set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ] $page_title] set type_options [list [list "[_ assessment.query]" q] [list "[_ assessment.var ]" n]] Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp 6 May 2005 17:05:16 -0000 1.4 +++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp 31 May 2005 23:13:01 -0000 1.4.2.1 @@ -1,6 +1,6 @@ -@page_title;noquote@ -@context;noquote@ +Param Delete +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl 6 May 2005 17:17:11 -0000 1.5 +++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl 31 May 2005 23:13:01 -0000 1.5.2.1 @@ -6,13 +6,10 @@ } { parameter_id:integer action_id:integer -} -properties { - page_title:onevalue - context:onevalue } set page_title [_ assessment.delete_parameter] -set context [list [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ] $page_title] +set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ] $page_title] db_1row select_param_info {select type,varname,description,query from as_action_params where parameter_id = :parameter_id} Index: openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl 27 May 2005 16:16:26 -0000 1.7.2.1 +++ openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl 31 May 2005 23:13:02 -0000 1.7.2.2 @@ -173,7 +173,7 @@ -elements $elements \ -bulk_actions $bulk_actions \ -bulk_action_export_vars { assessment_id section_id after } \ - -page_size $page_size \ + -page_size_variable_p 1 \ -page_flush_p 1 \ -page_query_name $page_query Index: openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl 6 May 2005 16:46:54 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl 31 May 2005 23:13:02 -0000 1.5.2.1 @@ -8,9 +8,6 @@ assessment_id by_item_p:integer item_id_check:optional -} -properties { - title:onevalue - context:onevalue } set inter_item_check_id [split $inter_item_check_id " "] @@ -20,7 +17,7 @@ as::assessment::data -assessment_id $assessment_id set title "$assessment_data(title)" -set context [list [list index [_ assessment.admin]] [list "one-a?assessment_id=$assessment_id" $title] [list "checks-admin?assessment_id=$assessment_id§ion_id=$section_id" "$title [_ assessment.Administration]"] "[_ assessment.trigger_delete]"] +set context [list [list "one-a?assessment_id=$assessment_id" $title] [list "checks-admin?assessment_id=$assessment_id§ion_id=$section_id" "$title [_ assessment.Administration]"] "[_ assessment.trigger_delete]"] set title "[_ assessment.trigger_delete]" Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl 7 Apr 2005 22:42:48 -0000 1.8 +++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl 31 May 2005 23:13:02 -0000 1.8.2.1 @@ -109,7 +109,7 @@ ad_return_complaint 1 "[_ assessment.file_zero_size]" return } - set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [exec uuidgen]] + set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [as::item::generate_unique_name]] } else { set content_rev_id "" } Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp 6 May 2005 00:36:19 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.adp 31 May 2005 23:13:02 -0000 1.3.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.tcl 6 May 2005 00:36:13 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-existing.tcl 31 May 2005 23:13:02 -0000 1.3.2.1 @@ -9,7 +9,7 @@ as_item_id:integer after:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -26,7 +26,7 @@ } set page_title [_ assessment.add_item_type_mc_existing] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] set folder_id [as::assessment::folder_id -package_id $package_id] set choice_sets [db_list_of_lists existing_choice_sets {}] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-swcat.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-swcat.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-swcat.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-add.tcl 15 Apr 2005 17:26:46 -0000 1.7 +++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl 31 May 2005 23:13:02 -0000 1.7.2.1 @@ -141,7 +141,7 @@ } set folder_id [as::assessment::folder_id -package_id $package_id] - set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [exec uuidgen]] + set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [as::item::generate_unique_name]] as::item_rels::new -item_rev_id $as_item_id -target_rev_id $content_rev_id -type as_item_content_rel } } Index: openacs-4/packages/assessment/www/asm-admin/item-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-delete.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-delete.adp 4 May 2005 19:47:21 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-delete.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/item-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-delete.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-delete.tcl 4 May 2005 19:47:16 -0000 1.4 +++ openacs-4/packages/assessment/www/asm-admin/item-delete.tcl 31 May 2005 23:13:02 -0000 1.4.2.1 @@ -8,7 +8,7 @@ section_id:integer as_item_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -25,7 +25,7 @@ } set page_title "[_ assessment.remove_item]" -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] set confirm_options [list [list "[_ assessment.continue_with_remove]" t] [list "[_ assessment.cancel_and_return]" f]] Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp 6 May 2005 00:27:30 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl 6 May 2005 00:27:17 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl 31 May 2005 23:13:02 -0000 1.3.2.1 @@ -8,7 +8,7 @@ section_id:integer as_item_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -25,7 +25,7 @@ } set page_title [_ assessment.edit_item_display_sa] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] set orientation_types [list] foreach orientation_type [list horizontal vertical] { Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp 5 May 2005 18:55:30 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl 5 May 2005 18:55:52 -0000 1.4 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl 31 May 2005 23:13:02 -0000 1.4.2.1 @@ -8,7 +8,7 @@ section_id:integer as_item_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -25,7 +25,7 @@ } set page_title [_ assessment.edit_item_display_ta] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] set alignment_types [list] foreach alignment_type [list besideleft besideright below above] { Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 15 Apr 2005 17:26:46 -0000 1.7 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 31 May 2005 23:13:02 -0000 1.7.2.1 @@ -118,7 +118,7 @@ } set folder_id [as::assessment::folder_id -package_id $package_id] - set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [exec uuidgen]] + set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [as::item::generate_unique_name]] db_dml update_item_content {} } elseif {[info exists delete_content]} { db_dml delete_item_content {} Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl 6 May 2005 15:45:34 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl 31 May 2005 23:13:02 -0000 1.3.2.1 @@ -13,7 +13,6 @@ section_id:integer,notnull as_item_id:integer,notnull choice_id:integer,notnull - mc_id:integer,notnull } set package_id [ad_conn package_id] Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp 6 May 2005 00:30:14 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl 6 May 2005 00:30:08 -0000 1.6 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl 31 May 2005 23:13:02 -0000 1.6.2.1 @@ -15,7 +15,7 @@ percent:array,optional selected:array,optional } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -33,7 +33,7 @@ set package_id [ad_conn package_id] set page_title [_ assessment.edit_item_type_mc_choices] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] set selected_options [list [list "[_ assessment.yes]" t]] @@ -124,7 +124,7 @@ ad_return_complaint 1 "[_ assessment.file_zero_size]" return } - set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [exec uuidgen]] + set content_rev_id [cr_import_content -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [as::item::generate_unique_name]] db_dml update_choice_content {} } elseif {[info exists delete_content($choice_id)]} { db_dml delete_choice_content {} Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp 6 May 2005 00:39:30 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.tcl 6 May 2005 00:39:14 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-existing.tcl 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -8,7 +8,7 @@ section_id:integer as_item_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -25,7 +25,7 @@ } set page_title [_ assessment.add_item_type_mc_existing] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] set folder_id [as::assessment::folder_id -package_id $package_id] set choice_sets [db_list_of_lists existing_choice_sets {}] Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl 5 May 2005 19:25:08 -0000 1.8 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl 31 May 2005 23:13:02 -0000 1.8.2.1 @@ -10,7 +10,6 @@ choice:optional,array correct:optional,array {num_choices:integer,optional 5} - {old_choices:optional} } -properties { context:onevalue page_title:onevalue @@ -39,6 +38,7 @@ set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] set correct_options [list [list "[_ assessment.yes]" t]] + ad_form -name item_edit_mc -action item-edit-mc -export { assessment_id section_id num_choices } -form { {as_item_id:key} {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.mc_Title_help]"}} @@ -55,7 +55,6 @@ set count 0 set validate_list [list] set count_correct [array exists correct] -set old_choices [list] foreach one_choice $choices { util_unlist $one_choice choice_title choice_id choice_correct_p incr count @@ -73,34 +72,31 @@ append ad_form_code "\{correct.$choice_id:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{help_text \"[_ assessment.Correct_Answer_help]\"\}\}\n" } lappend validate_list "correct.$choice_id {\$count_correct > 0} \"\[_ assessment.one_correct_choice_req\]\"" - lappend old_choices $choice_id } -append ad_form_code "\{old_choices:text(hidden) \{value $old_choices\}\}\n" -if {[template::form get_action item_show_mc] == "more"} { - # add new empty form entries for new choices - for {set i 1} {$i <= $num_choices} {incr i} { - incr count - if {[info exists choice($i)]} { - append ad_form_code "\{choice.$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\} \{value \"\$choice($i)\"\} \{help_text \"[_ assessment.Choice_help]\"\}\}\n" - } else { - append ad_form_code "\{choice.$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\} \{help_text \"[_ assessment.Choice_help]\"\}\}\n" - } - if {[info exists correct($i)]} { - append ad_form_code "\{correct.$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{values t\} \{help_text \"[_ assessment.Correct_Answer_help]\"\}\}\n" - } else { - append ad_form_code "\{correct.$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{help_text \"[_ assessment.Correct_Answer_help]\"\}\}\n" - } +# add new empty form entries for new choices +for {set i 1} {$i <= $num_choices} {incr i} { + incr count + if {[info exists choice(-$i)]} { + append ad_form_code "\{choice.-$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\} \{value \"\$choice(-$i)\"\} \{help_text \"[_ assessment.Choice_help]\"\}\}\n" + } else { + append ad_form_code "\{choice.-$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\} \{help_text \"[_ assessment.Choice_help]\"\}\}\n" } + if {[info exists correct(-$i)]} { + append ad_form_code "\{correct.-$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{values t\} \{help_text \"[_ assessment.Correct_Answer_help]\"\}\}\n" + } else { + append ad_form_code "\{correct.-$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{help_text \"[_ assessment.Correct_Answer_help]\"\}\}\n" + } } append ad_form_code "\}" eval ad_form -extend -name item_edit_mc $ad_form_code + set edit_request "{ db_1row item_type_data {} }" -set on_submit "{ +set on_submit "{ if {\[template::form get_action item_add_mc\] == \"more\"} { # add 5 more choice entries and redirect to this form incr num_choices 5 @@ -110,7 +106,6 @@ }" set edit_data "{ - db_transaction { set new_item_id \[as::item::new_revision -as_item_id \$as_item_id\] set as_item_type_id \[db_string item_type_id {}\] @@ -132,30 +127,32 @@ db_dml update_item_in_section {} db_dml update_item_type {} - set count 0 - set new_count \[llength \$old_choices\] - foreach i \[array names choice\] { - if {\[lsearch \$old_choices \$i\] != -1 } { - # old_choices preserves the prior order - set count \[expr \[lsearch \$old_choices \$i\] + 1\] - # edit existing choices + # edit existing choices + set count 0 + foreach i \[lsort -integer \[array names choice\]\] { + if {\$i > 0 && !\[empty_string_p \$choice(\$i)\]} { + incr count set new_choice_id \[as::item_choice::new_revision -choice_id \$i -mc_id \$new_item_type_id\] set title \$choice(\$i) set correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] db_dml update_title {} db_dml update_correct_and_sort_order {} - } elseif { !\[empty_string_p \$choice(\$i)\] } { - # add new choices - incr new_count + } + } + + # add new choices + foreach i \[lsort -integer -decreasing \[array names choice\]\] { + if {\$i < 0 && !\[empty_string_p \$choice(\$i)\]} { + incr count set new_choice_id \[as::item_choice::new -mc_id \$new_item_type_id \\ -title \$choice(\$i) \\ -numeric_value \"\" \\ -text_value \"\" \\ -content_value \"\" \\ - -feedback_text \"\" \\ + -feedback_text \"\" -selected_p \"\" \\ -correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] \\ - -sort_order \$new_count \\ + -sort_order \$count \\ -percent_score \"\"\] } } @@ -171,7 +168,6 @@ ad_script_abort }" -#eval ad_form -extend -name item_edit_mc -validate "{$validate_list}" -edit_request $edit_request -on_submit $on_submit -edit_data $edit_data -after_submit $after_submit -eval ad_form -extend -name item_edit_mc -validate "{$validate_list}" -edit_request $edit_request -edit_data $edit_data -after_submit $after_submit +eval ad_form -extend -name item_edit_mc -validate "{$validate_list}" -edit_request $edit_request -on_submit $on_submit -edit_data $edit_data -after_submit $after_submit ad_return_template Index: openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp 6 May 2005 00:32:51 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-oq.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl 6 May 2005 00:32:45 -0000 1.4 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl 31 May 2005 23:13:02 -0000 1.4.2.1 @@ -8,7 +8,7 @@ section_id:integer as_item_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -25,7 +25,7 @@ } set page_title [_ assessment.edit_item_type_oq] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] ad_form -name item_edit_oq -action item-edit-oq -export { assessment_id section_id } -form { Index: openacs-4/packages/assessment/www/asm-admin/section-copy.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-copy.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/section-copy.adp 6 May 2005 00:42:29 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/section-copy.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/section-copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-copy.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/section-copy.tcl 6 May 2005 00:42:39 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/section-copy.tcl 31 May 2005 23:13:02 -0000 1.3.2.1 @@ -8,7 +8,7 @@ section_id:integer after:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -25,7 +25,7 @@ } set page_title "[_ assessment.copy_section]" -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] set confirm_options [list [list "[_ assessment.continue_with_copy]" t] [list "[_ assessment.cancel_and_return]" f]] Index: openacs-4/packages/assessment/www/asm-admin/section-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-delete.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/section-delete.adp 6 May 2005 00:41:55 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/section-delete.adp 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/section-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-delete.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/section-delete.tcl 6 May 2005 00:42:13 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/section-delete.tcl 31 May 2005 23:13:02 -0000 1.3.2.1 @@ -7,7 +7,7 @@ assessment_id:integer section_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -24,7 +24,7 @@ } set page_title "[_ assessment.remove_section]" -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] set confirm_options [list [list "[_ assessment.continue_with_remove]" t] [list "[_ assessment.cancel_and_return]" f]] Index: openacs-4/packages/assessment/www/asm-admin/section-preview.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-preview.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/section-preview.adp 7 Apr 2005 21:43:22 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/section-preview.adp 31 May 2005 23:13:02 -0000 1.3.2.1 @@ -1,6 +1,6 @@ @page_title;noquote@ -@context;noquote@ +@context_bar;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/section-preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-preview.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/www/asm-admin/section-preview.tcl 7 Apr 2005 22:55:30 -0000 1.4 +++ openacs-4/packages/assessment/www/asm-admin/section-preview.tcl 31 May 2005 23:13:02 -0000 1.4.2.1 @@ -8,7 +8,7 @@ assessment_id:integer section_id:integer } -properties { - context:onevalue + context_bar:onevalue page_title:onevalue } @@ -26,7 +26,7 @@ set assessment_rev_id $assessment_data(assessment_rev_id) set page_title "[_ assessment.section_preview]" -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] db_1row section_data {} -column_array section # get all items of section in correct order Index: openacs-4/packages/assessment/www/asm-admin/export/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/export/index-oracle.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/export/index-oracle.xql 12 Apr 2005 15:59:59 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/export/index-oracle.xql 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -7,7 +7,7 @@ SELECT aic.object_id as choice_id, aic.title as choice_title, aic.item_id as choice_item_id, aic.name as choice_name, aic.description as choice_description, aic.choice_id, aic.mc_id, aic.data_type as choice_data_type, aic.numeric_value as choice_numeric_value, aic.text_value as choice_text_value, aic.boolean_value as choice_boolean_value, aic.content_value as choice_content_value, aic.feedback_text as choice_feedback_text, aic.selected_p as choice_selected_p, aic.correct_answer_p as choice_correct_answer_p, aic.sort_order as choice_sort_order, aic.percent_score as choice_percent_score, r2.revision_id as content_rev_id, r2.title as content_filename, r2.mime_type, r2.content as cr_file_name, i.content_type, i.storage_area_key FROM cr_revisions r, cr_revisions r2, as_item_choicesx aic, cr_items i WHERE r2.revision_id(+) = aic.content_value - and i.item_id(+) = r2.item_id + and i.item_id = r2.item_id and aic.mc_id= :mc_id and r.revision_id = aic.choice_id ORDER BY aic.sort_order @@ -17,7 +17,7 @@ SELECT count(aic.correct_answer_p) as num_answers_correct - FROM cr_revisions r, cr_revisions r2, cr_items i, as_item_choicesx aic + FROM cr_revisions r, cr_revisions r2, cr_items, as_item_choicesx aic WHERE r2.revision_id(+) = aic.content_value and i.item_id(+) = r2.item_id and aic.mc_id= :mc_id Index: openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql 13 Apr 2005 11:14:49 -0000 1.2 +++ openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql 31 May 2005 23:13:02 -0000 1.2.2.1 @@ -3,24 +3,30 @@ oracle8.1.6 - - - select cri.item_id as assessment_id, - crr.title, - crr.description, - acs_object.name(apm_package.parent_id(crf.package_id)) as parent_name, - (select site_node.url(site_nodes.node_id) - from site_nodes - where site_nodes.object_id = crf.package_id) as url, - crf.package_id - from as_assessments asa, cr_items cri, cr_revisions crr, cr_folders crf - where crr.revision_id = asa.assessment_id - and crr.revision_id = cri.latest_revision - and cri.parent_id = crf.folder_id - and crf.package_id in ([join $list_of_package_ids ", "]) - and (asa.start_time < current_timestamp or asa.start_time is null) - order by package_id, lower(crr.title) - - - + + + select cr.item_id as assessment_id, cr.title, cr.description, a.password, + to_char(a.start_time, 'YYYY-MM-DD HH24:MI:SS') as start_time, + to_char(a.end_time, 'YYYY-MM-DD HH24:MI:SS') as end_time, + to_char(sysdate, 'YYYY-MM-DD HH24:MI:SS') as cur_time, + cf.package_id, p.instance_name as community_name, + sc.node_id as comm_node_id, sa.node_id as as_node_id + from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf, + site_nodes sa, site_nodes sc, apm_packages p + where a.assessment_id = cr.revision_id + and cr.revision_id = ci.latest_revision + and ci.parent_id = cf.folder_id + and cf.package_id in ([join $list_of_package_ids ", "]) + and sa.object_id = cf.package_id + and sc.node_id = sa.parent_id + and p.package_id = sc.object_id + and exists (select 1 + from as_assessment_section_map asm, as_item_section_map ism + where asm.assessment_id = a.assessment_id + and ism.section_id = asm.section_id) + and acs_permission.permission_p (a.assessment_id, :user_id, 'read') = 't' + order by lower(p.instance_name), lower(cr.title) + + + Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.123 -r1.123.2.1 --- openacs-4/packages/dotlrn/dotlrn.info 24 Feb 2005 13:33:06 -0000 1.123 +++ openacs-4/packages/dotlrn/dotlrn.info 31 May 2005 23:13:03 -0000 1.123.2.1 @@ -6,27 +6,26 @@ dotLRN f f - dotlrn - + OpenACS A Course Management System 2004-03-10 OpenACS Course Management - + + - - + @@ -49,8 +48,9 @@ + - + Index: openacs-4/packages/dotlrn/install.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/dotlrn/install.xml 15 Mar 2005 19:33:01 -0000 1.12 +++ openacs-4/packages/dotlrn/install.xml 31 May 2005 23:13:03 -0000 1.12.2.1 @@ -19,13 +19,13 @@ - + - - - - - + + + + + Index: openacs-4/packages/dotlrn/catalog/dotlrn.ar_LB.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.ar_LB.utf-8.xml,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.ar_LB.utf-8.xml 12 Mar 2005 20:54:13 -0000 1.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.ar_LB.utf-8.xml 31 May 2005 23:13:03 -0000 1.4.2.1 @@ -327,7 +327,7 @@ كلمات سركَ لا تَتطابك! من المفترض، أنت اقمت خطأ مطبعياً بينما تُدْخلْ أحدهمَ. بحثكَ ما أرجعَ أي نَتائِجِ، رجاءً وسّعْ معاييرَ بحثِك. أنت تَطْلبُ تَغيير مستوى وصولِ هذا المستخدم. هذا لَهُ نتائجُ قويةُ. هَلْ أنت مستخدم حول هذا؟ - <لا أحد أنشئ> + &lt;لا أحد أنشئ&gt; البريدُ فَشلَ أدرْ أدرْ البرامج المحدودةَ Index: openacs-4/packages/dotlrn/catalog/dotlrn.ca_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.ca_ES.ISO-8859-1.xml,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.ca_ES.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.3 +++ openacs-4/packages/dotlrn/catalog/dotlrn.ca_ES.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.3.2.1 @@ -330,7 +330,7 @@ Les contrasenyes no coincideixen. Potser heu com�s un error de tecleig. No s'han obtingut resultats per a la vostra recerca; per favor, reviseu els criteris de recerca. Heu sol�licitat canviar el nivell d'acc�s d'aquest usuari. Aix� tindr� conseq��ncies importants. �N'esteu segur? - <none set up> + &lt;none set up&gt; Enviament de correu fallit Administrar Administrar miniaplicacions @@ -477,7 +477,7 @@ propietats del per�ode. Per�odes Per�odes - El format d'aquest valor �s una llista de dominis separats per comes (normalment precedit per la cadena *@ que coincideix amb <anything>@<email-domain>). Per exemple, podeu emprar: + El format d'aquest valor �s una llista de dominis separats per comes (normalment precedit per la cadena *@ que coincideix amb &lt;anything&gt;@&lt;email-domain&gt;). Per exemple, podeu emprar: El nom No hi ha usuaris que coincidisquen amb %search_text%. aquest usuari ha sigut eliminat Index: openacs-4/packages/dotlrn/catalog/dotlrn.ch_zh.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.ch_zh.utf-8.xml,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.ch_zh.utf-8.xml 12 Mar 2005 20:54:13 -0000 1.8 +++ openacs-4/packages/dotlrn/catalog/dotlrn.ch_zh.utf-8.xml 31 May 2005 23:13:03 -0000 1.8.2.1 @@ -326,7 +326,7 @@ 密码错误！可能输入有误。 你的搜索没有结果，请放宽搜索标准。 正在请求更改此用户的访问级别。这一操作较大。确实要进行吗？ - <没有设置> + &lt;没有设置&gt; 邮件发送失败 管理 管理Java程序 @@ -466,7 +466,7 @@ 学期属性。 学期 学期 - 此数值的格式为各域逗号为间隔的列表（通常以*@字符串开头，与<anything>@<email-domain>匹配)。例如，你可以使用： + 此数值的格式为各域逗号为间隔的列表（通常以*@字符串开头，与&lt;anything&gt;@&lt;email-domain&gt;匹配)。例如，你可以使用： 名字 没有与%search_text%相匹配的用户。 此用户已删除 Index: openacs-4/packages/dotlrn/catalog/dotlrn.da_DK.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.da_DK.ISO-8859-1.xml,v diff -u -r1.25 -r1.25.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.da_DK.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.25 +++ openacs-4/packages/dotlrn/catalog/dotlrn.da_DK.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.25.2.1 @@ -339,7 +339,7 @@ Adgangskoderne er ikke ens! Sandsynligvis lavede du en fejl da du indtastede �n af dem. Din s�gning returnerede ingen resultater. Udvid venligst dine s�gekriterier. Du beder om at �ndre denne brugers adgangsniveau. Dette har s�rdeles omfattende f�lger. Er du helt sikker p� at du vil g�re det? - <ingen sat op> + &lt;ingen sat op&gt; Fejl ved afsendelse Administr�r Administrer Programmer @@ -496,7 +496,7 @@ egenskaber for termin. Terminer Terminer - Denne v�rdi skal formateres som en komma-separeret liste over dom�ner (s�dvanligvis med "*@"-strengen, som matcher <alt>@<mail-dom�ne>, foran). Du kunne eksempelvis bruge: + Denne v�rdi skal formateres som en komma-separeret liste over dom�ner (s�dvanligvis med "*@"-strengen, som matcher &lt;alt&gt;@&lt;mail-dom�ne&gt;, foran). Du kunne eksempelvis bruge: Navnet Der er ingen brugere der matcher s�geteksten %search_text%. denne bruger er slettet Index: openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.22 +++ openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.22.2.1 @@ -1,5 +1,5 @@ - + Eine Kopie von Zugriff @@ -10,7 +10,7 @@ Aktionen Aktive Anwendungen Hinzuf�gen - Neuen Teilnehmer hinzuf�gen + Neuen Teilnehmer aus der zentralen Userdatenbank hinzuf�gen Neuen Professor hinzuf�gen Neuen Professor hinzuf�gen: Neuen Benutzer hinzuf�gen @@ -155,6 +155,7 @@ Bearbeiten Einen Benutzer bearbeiten Vorgenehmigte E-Mail-Server bearbeiten + Community Parameter �ndern Bearbeiten Sie folgende Nachricht und klicken Sie auf auf 'E-Mail senden', um diesen Benutzer zu benachrichtigen. Parameter bearbeiten Eigenschaften bearbeiten @@ -337,7 +338,7 @@ Sie haben zwei unterschiedliche Passw�rter eingegeben. Ihre Suche ergab keine Treffer. Bitte lockern Sie die Suchkriterien. Wollen Sie wirklich die Zugriffsebene dieses Benutzers �ndern? Diese Aktion hat umfangreiche Auswirkungen. - < Nicht festgelegt > + &lt; Nicht festgelegt &gt; Die E-Mail(s) konnte(n) nicht gesendet werden. Verwalten Anwendungen verwalten @@ -438,6 +439,7 @@ Vielen Dank. Ihr Registrierungsantrag wurde an den Systemadministrator �bermittelt. Ablehnen Ablehnen + Entferne alle Zugang beantragen <img src=/resources/dotlrn/request.gif alt="%label%" border="0" title="Zugang beantragen"> Angabe erforderlich Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/catalog/dotlrn.en_AU.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v diff -u -r1.43 -r1.43.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 6 Apr 2005 21:31:56 -0000 1.43 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.43.2.1 @@ -1,6 +1,6 @@ + - A copy of Access Access Level @@ -29,6 +29,7 @@ You have been added to the "%community_name%" community at %package% Admin admin + Help for .LRN Administrators Control Panel The name of the administration page in the navbar on the MySpace page. @@ -228,6 +229,7 @@ Header Logo Alt Text Header Logo Item ID Help + Hide .LRN toolbar HTML ID: ID @@ -395,7 +397,7 @@ Your search returned no results, please broaden your search criteria. You're asking to change the level of access of this user. This has strong repercussions. Are you user about this? - <none set up> + &lt;none set up&gt; Mail Failed Manage Manage Applets @@ -487,6 +489,7 @@ The privacy policy must be either "yes" or "no". Public Web Log purple + Mi Account Recipient's Email Recipient's Last Name red @@ -563,7 +566,7 @@ Terms The format of this value is a comma-separated list of domains (usually preceded by the *@ string which match - <anything>@<email-domain>). For example, you might use: + &lt;anything&gt;@&lt;email-domain&gt;). For example, you might use: The name There are no users matching %search_text%. this user is deleted @@ -584,6 +587,7 @@ User %user_email% already exists... storing user_id User %user_email% created.... %first_names% %last_name% has been a member of %system_name% since %pretty_creation_date% + Help! User ID: User ID User Management @@ -612,14 +616,4 @@ Your icon is too large. The publisher of %system_name% has chosen to limit attachments to %max_attachments_bytes% bytes.\n You're editing You've chosen to add - New Community Type - Edit Community Type - No %Community_Types% - Parent Type - This community type already exists - You have been added to the "%community_name%" community at %package% - To visit the community's home page, point your browser at %package%, log in, and click on the %community_name% link in the "Groups" portlet. - <p>Email sent to %email%. - <p>Datafile must include at least the email, first_names, last_name fields.<p> - <p>Database error while trying to create the last user in the list above!<br> The transaction has been aborted, no users have been entered, and no e-mail notifications have been sent.<p> Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/catalog/dotlrn.es_CO.ISO-8859-1.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.16 +++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.16.2.1 @@ -1,5 +1,5 @@ - + Una copia de Acceso @@ -25,12 +25,16 @@ A�adir usuarios a A�adir usuarios al grupo Alta/baja en grupos + Para visitar el p�gina de la comunidad, accese con su explorador a %package%, ingrese, y haga click en %community_name% en el portlet de Grupos + Ha sido agregado a la comunidad "%community_name%" en %package% Admin admin + Ayuda para Administradores de .LRN Panel de control Admin Administrar <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administrar"> + Administraci�n del Cockpit Administrador Administradores Administradores de @@ -41,11 +45,14 @@ Applets a a�adir Aprobar aprobar + Aprobar a todos aqua + Archivo archivado %class_instances_pretty_plural% y %clubs_pretty_plural% archivados %groups_pretty_plural% archivados �Est� seguro? + Est� seguro de querer borrar esta Asignatura Desea realmente enviar lo siguiente Archivar el grupo %group_name% Consultas: @@ -55,11 +62,14 @@ negro Negro (Ninguno seleccionado) azul + Aprobar por lote + Aprobaci�n de lote en proceso. Subir en bloque Subiendo... no puede ser borrado Cambiar idioma Escoja a los miembros de %community_name% que recibir�n este mensaje: + Llave de la clase Cursos Curso Cursos @@ -82,6 +92,7 @@ Nombre de la %clubs_pretty_name% Comunidad Comunidades + Cockpit Comunidades Comunidad T�tulo de %clubs_pretty_name% @@ -111,12 +122,16 @@ Creado Formato CSV Personalizar este portal + <p> Error de Base de Datos mientras se creaba el �ltimo usuario en la lista anterior <br> La transacci�n se ha cancelado, ning�n usuario ha sido agregado, y ninguna notificaci�n ha sido enviada por correo electr�nico.<p> + <p>El archivo de datos debe de incluir al menos los campos "emails, first_names, last_name".<p> Desactivar... Desactivar usuarios Desactivado Borrar Borrar vac�o + Borrar %pretty_name% vac�a. Departamento + Llave del Departamento Error: el %departments_pretty_name% debe estar vac�o para poder ser borrado Nombre del %departments_pretty_name% El nombre <strong>%department_pretty_name%</strong> est� siendo utilizado. \n Por favor, introduzca otro nombre. @@ -151,6 +166,7 @@ Editar Editar usuario Editar dominios pre-aprobados + Editar par�metros de la comunidad Edite el mensaje a continuaci�n y pulse "Enviar correo" para notificar al usuario. Editar par�metros Editar propiedades @@ -164,6 +180,7 @@ Escribir a los miembros Mensaje Correo enviado + <p>Correo electr�nico enviado a %email%. Fecha fin Fecha fin: Error al enviar el correo @@ -200,6 +217,7 @@ Texto alternativo para el �cono del encabezado Identificador para el logo del encabezado Ayuda + Esconder la barra de .LRN HTML Identificador: Identificador @@ -234,10 +252,12 @@ Ha ocurrido un error al dar de baja el usuario de la comunidad. El error ha sido archivado. aprobar y a�adir a dotLRN Desea realmente borrar este departamento + Esta seguro de quere borrar estos usuarios completamente? Note que pueden ocurrir errores miestras se trata de borrar los mismos. Asegurese de que el usuario no tenga otra cuenta en SloanSpace con otra direcci�n de correo. El duplicar cuenta es un problema para todos. Para a�adir una persona que ya dispone de una cuenta, dir�jase a <a href=members>Administrar miembros</a>. Clave del curso (un nombre corto, sin espacios) Direcci�n web de la comunidad %clubs_pretty_plural% actuales + Borrar asignatura �Desea realmente borrar los miembros siguientes? �Desea realmente borrar estos %num_users% usuarios? Propiedades dotLRN para este usuario. @@ -266,6 +286,7 @@ Alta/baja de un curso o comunidad Alta/baja en cursos o comunidades Clave (un nombre corto, sin espacios) + El usuarios a�n no ha ingresado �ltima visita despu�s de (en d�as) �ltima visita en (en d�as) Convertir este usuario en administrador del sitio. @@ -317,6 +338,7 @@ Utilizar esta opci�n s�lo para los estudiantes oficialmente registrados en este curso que <b>no</b> sean alumnos del MIT o de Sloan. Weblog de %user_name% Se ha intentado borrar este usuario pero ha ocurrido un error. Lo m�s probable es que existan referencias a este usuario (user_id=%user_id%) en la base de datos. Es hora de llamar a sus programadores! + A�o (eje. 2003, 2003/2004) Va a borrar %num_users% usuarios. Va a a�adir <strong>%first_names% %last_name% (%email%)</strong> a %community_name%: No est� autorizado para realizar este proceso. @@ -330,7 +352,7 @@ Las contrase�as no coinciden. Puede que haya cometido un error de tecleo. No hay resultado alguno, por favor, revise los criterios de b�squeda. Ha solicitado cambiar el nivel de acceso de este usuario. Esto tendr� consecuencias importantes. �Est� seguro de ello? - $lt;ninguno> + $lt;ninguno&gt; Env�o de correo fallido Administrar Administrar Applets @@ -348,6 +370,7 @@ Miembros: Mensaje Tipo del mensaje + Minutos Los campos deben contener alguno de los siguientes valores: Debe especificar por lo menos un contenedor para su mensaje Mis comunidades @@ -356,6 +379,7 @@ Nombre / Correo azul marino Esperando aprobaci�n + Nunca ha ingresado A�adir nuevo Nuevo @@ -396,6 +420,7 @@ Borrar Borrar ... Borrar usuarios + N�mero de objetos en la base de datos creados por este usuario oliva Abierto opcional, configuraci�n por defecto @@ -419,6 +444,7 @@ La regla de privacidad debe ser "Si" o "No". Bit�cora Web p�blica p�rpura + Mi Account Direcci�n de correo del remitente Apellidos del remitente rojo @@ -428,6 +454,8 @@ Gracias. Su solicitud de registro ha sido enviada al administrador del sistema Rechazar rechazar + Rechazar a todos + Borrar todos Solicitar alta <img src="graphics/request.gif" alt="Solicitar alta" border="0" title="Solicitar alta"> requerido @@ -466,13 +494,15 @@ Subgrupos Miembros de %subcommunities_pretty_name% Asunto + Llave de Asignatura Profesor asociado Profesores asociados turquesa Plantilla Plantillas Per�odo Per�odo + Per�odo (eje. Verano) Identificador del per�odo propiedades del per�odo. Per�odos @@ -483,7 +513,10 @@ No hay usuarios que coincidan con %search_text%. este usuario ha sido borrado A + Cuenta total: Tipo + Desarchivar + desarchivar Per�odo desconocido Actualizar contrase�a subir @@ -494,6 +527,7 @@ El usuario %user_email% ya existe... guardando user_id Usuario %user_email% creado... %first_names% %last_name% es miembro de %system_name% desde el d�a %pretty_creation_date% + Ayuda! Identificador de usuario: Identificador de usuario Administraci�n de usuarios @@ -511,6 +545,7 @@ Usuarios: importar B�squedas de usuarios Ver + <strong>Cuidado!</strong> Esto podr�a tomar hasta %hours% horas con %minutes% minutos!! A�o: S� s� Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_GT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_GT.ISO-8859-1.xml,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.es_GT.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.es_GT.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.4.2.1 @@ -31,6 +31,7 @@ Admin Administrar <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administrar"> + Administraci�n Cockpit Administrador Administradores Administradores de @@ -41,7 +42,9 @@ Applets que Agregar Aprobar aprobar + Aprovar todos aqua + Archivar Archivado %class_instances_pretty_plural% y %clubs_pretty_plural% Archivados %groups_pretty_plural% Archivados @@ -55,6 +58,8 @@ negro Negro (Ninguno Seleccionado) azul + Aprobaci�n masiva + Aprobaci�n masiva en progreso Subir en Bloque Subiendo... no puede ser borrado @@ -81,6 +86,7 @@ T�tulo de la %clubs_pretty_name% Comunidad Comunidades + Cockpit Comunidades Comunidad T�tulo de %clubs_pretty_name% @@ -148,6 +154,7 @@ Editar Editar un Usuario Editar dominios Pre-aprobados + Editar los parametros de la comunidad Edite el mensaje a continuaci�n y pulse "Enviar correo" para notificar al usuario. Editar par�metros Editar Propiedades @@ -230,6 +237,7 @@ Ha ocurrido un error al dar de baja el usuario de la comunidad. El error ha sido archivado. aprobar y agregar a dotLRN �Desea realmente borrar este departamento? + Estas seguro que quieres eliminar estos usuarios? Note que solo tratamos de borrar estos usuarios y se pueden presentar errores para algunos de ellos. Asegurese de que el usuario no tenga otra cuenta en SloanSpace con otra direcci�n de correo. El duplicar cuenta es un problema para todos. Para agregar una persona que ya dispone de una cuenta, dir�jase a <a href=members>Administrar miembros</a>. Clave del Curso (un nombre corto, sin espacios) Direcci�n Web de la Comunidad @@ -262,6 +270,7 @@ Alta/baja de un Curso o Grupo de Comunidad Alta/baja en Cursos o Comunidades Clave (un nombre corto, sin espacios) + El usuario no ha visitado todav�a. �ltima Visita Despu�s de (en d�as) �ltima visita en (en d�as) Convertir este usuario en administrador del sitio. @@ -313,6 +322,7 @@ Utilizar esta opci�n s�lo para los estudiantes oficialmente registrados en este curso que <b>no</b> sean alumnos del MIT o de Sloan. Web Log de %user_name% Se ha intentado borrar este usuario pero ha ocurrido un error. Lo m�s probable es que existan referencias a este usuario (user_id=%user_id%) en la base de datos. Es hora de llamar a sus programadores! + A�o (ejemplo. 2003, 2003/2004) Va a borrar %num_users% usuarios. Va a agregar <strong>%first_names% %last_name% (%email%)</strong> a %community_name%: No est� autorizado para realizar este proceso. @@ -326,7 +336,7 @@ Las contrase�as no coinciden. Puede que haya cometido un error de tecleo. No hay resultado alguno, por favor, revise los criterios de b�squeda. Ha solicitado cambiar el nivel de acceso de este usuario. Esto tendr� consecuencias importantes. �Est� seguro de ello? - $lt;ninguno> + $lt;ninguno&gt; Env�o de correo fallido Administrar Administrar Applets @@ -343,6 +353,7 @@ Miembros Miembros: Mensaje + Minutos Los campos deben contener alguno de los siguientes valores: Mis comunidades n/a @@ -418,6 +429,7 @@ Gracias. Su solicitud de registro ha sido enviada al administrador del sistema Rechazar rechazar + Rechazar todos Solicitar Membresia <img src=/resources/dotlrn/request.gif alt="%label%" border="0" title="Solicitar membresia"> Requerido @@ -462,6 +474,7 @@ Plantillas Per�odo Per�odo + Per�odo (ejemplo. Primavera, Oto�o) Identificador del per�odo propiedades del per�odo. Per�odos @@ -472,7 +485,10 @@ No hay usuarios que coincidan con %search_text%. este usuario ha sido borrado A + Cuenta total: Tipo + Sin archivar + sin archivar Per�odo desconocido Actualizar contrase�a subir @@ -500,6 +516,7 @@ Usuarios: Subir Paquetes B�squeda de usuarios Ver + <strong>Advertencia!</strong> Esto puede tardar hasta %hours% horas, %minutes% minutos!! A�o: S� s� Index: openacs-4/packages/dotlrn/catalog/dotlrn.fi_FI.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.fi_FI.utf-8.xml,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.fi_FI.utf-8.xml 12 Mar 2005 20:54:13 -0000 1.10 +++ openacs-4/packages/dotlrn/catalog/dotlrn.fi_FI.utf-8.xml 31 May 2005 23:13:03 -0000 1.10.2.1 @@ -324,7 +324,7 @@ Antamasi salasanat eivät täsmää! Oletettavasti teit kirjoitusvirheen syöttäessäsi jompaakumpaa salasanaa. Hakusi ei tuottanut tuloksia, laajenna hakukriteerejäsi. Pyydät vaihtamaan käyttäjän käyttöoikeustasoa. Oletko varma, että haluat tehdä niin? - <tyhjä> + &lt;tyhjä&gt; Sähköpostin lähetys epäonnistui Hallinnoi Ylläpidä appletteja @@ -459,7 +459,7 @@ lukukauden ominaisuuksia. Lukukaudet Lukukaudet - Syötä lomakkeeseen pilkuilla erotettu lista domain-tunnuksia (jota edeltää yleensä merkkijono *@, eli <mitävain>@<email-domain>), esimerkiksi: + Syötä lomakkeeseen pilkuilla erotettu lista domain-tunnuksia (jota edeltää yleensä merkkijono *@, eli &lt;mitävain&gt;@&lt;email-domain&gt;), esimerkiksi: Nimi Yksikään käyttäjä ei vastaa hakuehtoa: %search_text%. käyttäjä on poistettu Index: openacs-4/packages/dotlrn/catalog/dotlrn.fr_FR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.fr_FR.ISO-8859-1.xml,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.fr_FR.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.13 +++ openacs-4/packages/dotlrn/catalog/dotlrn.fr_FR.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.13.2.1 @@ -316,7 +316,7 @@ Votre mot de passe sur %system_name% Vos mots de passe sont diff�rents ! Vous avez probablement fait une faute de frappe en en �crivant un des deux. Vous demandez � changer le niveau d'acc�s pour cet utilisateur. Ceci peut avoir de s�rieuses r�percussions. Etes-vous s�r de vouloir le faire ? - <aucun fix�> + &lt;aucun fix�&gt; La remise du courrier a �chou� G�rer G�rer les Applets Index: openacs-4/packages/dotlrn/catalog/dotlrn.gl_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.gl_ES.ISO-8859-1.xml,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.gl_ES.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.12 +++ openacs-4/packages/dotlrn/catalog/dotlrn.gl_ES.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.12.2.1 @@ -320,7 +320,7 @@ As t�as se�as non coinciden! Posibelmente cometiches un engano cando dixitabas unha delas. A tua pesquisa non produciu ning�n resultado, por favor expande o crit�rio de pesquisa. Est�s a pedir para mudar o n�vel de acceso deste usuario. Isto ten fortes repercusi�ns. Tes a certeza disto? - <ning�n configurado> + &lt;ning�n configurado&gt; O correo fallou Xerenciar Xerenciar applets @@ -454,7 +454,7 @@ propriedades do periodo. Periodos Periodos - O formato deste valor � unha lista de dominio separados por v�rgula (normalmente precedidos pola cadea *@ que coincide con <calquera cousa>@<dom�nio-de-correo>). Por exemplo, podes utilizar: + O formato deste valor � unha lista de dominio separados por v�rgula (normalmente precedidos pola cadea *@ que coincide con &lt;calquera cousa&gt;@&lt;dom�nio-de-correo&gt;). Por exemplo, podes utilizar: O nome Non hai usuarios coincidindo con %search_text%. este usuarioe enc�ntrase eliminado Index: openacs-4/packages/dotlrn/catalog/dotlrn.it_IT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.it_IT.ISO-8859-1.xml,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.it_IT.ISO-8859-1.xml 12 Mar 2005 20:54:13 -0000 1.16 +++ openacs-4/packages/dotlrn/catalog/dotlrn.it_IT.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.16.2.1 @@ -326,7 +326,7 @@ Le password non coincidono! Probabilmente hai sbagliato a digitarne una. La tua ricerca non ha fornito risultati, ripeti la ricerca con criteri pi� ampi. Stai chiedendo di modificare il livello di accesso di questo utente. Questo ha notevoli ripercussioni. Sei conscio di questo? - <nessuna scelta> + &lt;nessuna scelta&gt; Invio email fallito Controlla Controlla le Applet @@ -466,7 +466,7 @@ propriet� della sessione. Sessioni sessioni - Il formato di questo campo � una lista di domini separati da virgola (solitamente preceduti dalla stringa *@ che corrisponde a <anything>@<email-domain>). + Il formato di questo campo � una lista di domini separati da virgola (solitamente preceduti dalla stringa *@ che corrisponde a &lt;anything&gt;@&lt;email-domain&gt;). Per esempio, potresti usare: Il nome Non ci sono utenti che corrispondono alla stinga %search_text%. Index: openacs-4/packages/dotlrn/catalog/dotlrn.ko_KR.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.ko_KR.utf-8.xml,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.ko_KR.utf-8.xml 12 Mar 2005 20:54:13 -0000 1.8 +++ openacs-4/packages/dotlrn/catalog/dotlrn.ko_KR.utf-8.xml 31 May 2005 23:13:03 -0000 1.8.2.1 @@ -326,7 +326,7 @@ 비밀번호가 일치하지 않습니다. 비밀번호를 입력하는 동안 잘못 입력하여였습니다. 검색 결과가 없다면, 검색 기준을 확대하시오. 이 사용자의 접근 레벨 변경을 요청하였습니다. 이것은 강한 영향을 가지고 있습니다. 이것에 대한 사용자입니까? - <아무것도 설정하지 않음up> + &lt;아무것도 설정하지 않음up&gt; 메일 실패 관리하다 애플릿을 관리 @@ -476,7 +476,7 @@ 기간 속성 기간 기간 - 이 값의 형태는 콤마로 분리된 도메인의 리스트입니다.(보통 &lt xxxxx>@<email-domain>). 예를들면, 다음과 같이 쓸 수 있습니다. + 이 값의 형태는 콤마로 분리된 도메인의 리스트입니다.(보통 &lt xxxxx&gt;@&lt;email-domain&gt;). 예를들면, 다음과 같이 쓸 수 있습니다. 이름 %search_text%와 일치하는 사용자가 없습니다. 이 사용자는 삭제되었습니다. Index: openacs-4/packages/dotlrn/catalog/dotlrn.ms_MY.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.ms_MY.utf-8.xml,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.ms_MY.utf-8.xml 12 Mar 2005 20:54:13 -0000 1.3 +++ openacs-4/packages/dotlrn/catalog/dotlrn.ms_MY.utf-8.xml 31 May 2005 23:13:03 -0000 1.3.2.1 @@ -330,7 +330,7 @@ Kata-kata laluan anda tidak sama! Mungkin, anda telah tersilap menaip semasa mengisi salah satu daripadanya. Carian anda tidak mengembalikan sebarang keputusan, sila perluaskan kriteria carian anda. Anda meminta untuk mengubah tahap akses untuk pengguna ini. Ini mempunyai implikasi-implikasi yang serius. Adakah anda pasti tentang ini? - <tiada disetkan up> + &lt;tiada disetkan up&gt; Hantaran Emel Gagal Urus Urus Applets @@ -478,7 +478,7 @@ sifat-sifat terma. Terma-terma Terma-terma - Format untuk nilai ini adalah sekumpulan domain yang dipisahkan dengan aksara koma (,). Ia biasanya bermula dengan *@ iaitu menyamai <nama>@<nama-domain>. Sila lihat contoh di bawah: + Format untuk nilai ini adalah sekumpulan domain yang dipisahkan dengan aksara koma (,). Ia biasanya bermula dengan *@ iaitu menyamai &lt;nama&gt;@&lt;nama-domain&gt;. Sila lihat contoh di bawah: Nama Tiada ahli menyamai %search_text% ahli ini telah dihapuskan Fisheye: Tag 1.8.2.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/catalog/dotlrn.ms_my.utf-8.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml 12 Mar 2005 20:54:14 -0000 1.17 +++ openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.17.2.1 @@ -338,7 +338,7 @@ De wachtwoorden komen niet overeen! Waarschijnlijk is er een fout gemaakt bij het intypen van ��n van de wachtwoorden. De zoekopdracht leverde geen resultaten op. Pas de zoekcriteria aan. De toegangsrechten van deze gebruiker zullen worden gewijzigd. Is dit gewenst? Dit heeft belangrijke consequenties. - <geen beschikbaar> + &lt;geen beschikbaar&gt; E-mail verzending is mislukt Beheren Applets beheren @@ -492,7 +492,7 @@ Semester eigenschappen. Semesters Semesters - De opmaak van deze waarden is een door komma's gescheiden lijst van domeinen (normaal gesproken voorafgegaan door *@) gelijkend op <iets>@<e-maildomeinnaam>. Bij voorbeeld: + De opmaak van deze waarden is een door komma's gescheiden lijst van domeinen (normaal gesproken voorafgegaan door *@) gelijkend op &lt;iets&gt;@&lt;e-maildomeinnaam&gt;. Bij voorbeeld: De naam Geen gebruikers met zoektekst %search_text%. deze gebruiker is verwijderd Index: openacs-4/packages/dotlrn/catalog/dotlrn.nn_NO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.nn_NO.ISO-8859-1.xml,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.nn_NO.ISO-8859-1.xml 12 Mar 2005 20:54:14 -0000 1.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.nn_NO.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.4.2.1 @@ -326,7 +326,7 @@ Passorda er ikkje like. Du tasta sikkert feil n�r du skreiv eit av dei. S�ket gav ingen resultat, pr�v med breidare s�kekriteria. Du ber om � endre tilgangsniv� for denne brukaren. Dette har alvorlege f�lgjer. Er du sikker p� dette? - <ingen sett opp> + &lt;ingen sett opp&gt; E-postfeil Administrer Administrer modular (ruter) @@ -466,7 +466,7 @@ eigenskapar for semester Semester Semester - Formatet til denne verdien er ei komma-separert liste av omr�de (vanlegvis med *@-strengen f�rst som matchar <anything>@<email-domain>). For eksempel kunne du bruke: + Formatet til denne verdien er ei komma-separert liste av omr�de (vanlegvis med *@-strengen f�rst som matchar &lt;anything&gt;@&lt;email-domain&gt;). For eksempel kunne du bruke: Navnet Ingen brukarar matchar %search_text%. denne brukaren er sletta Index: openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml 12 Mar 2005 20:54:14 -0000 1.14 +++ openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.14.2.1 @@ -326,7 +326,7 @@ Passordene dine stemmer ikke overens. Sannsynligvis har du skrevet feil p� ett av dem. S�ket gav ingen treff. Vennligst bruk mer generelle s�kekriterier. Du ber om � endre aksessniv� for denne brukeren. Dette har omfattende f�lger. Er du sikker p� dette? - <ingen satt opp> + &lt;ingen satt opp&gt; E-post kom ikke fram Administrer Administrer applets @@ -466,7 +466,7 @@ semesteregenskaper Semestre Semestre - Formatet av denne verdien er en komma-separert liste av omr�der (vanligvis innledet med *@ strengen som matcher <hvasomhelst>@<e-postomr�de>). For eksempel kunne du bruke: + Formatet av denne verdien er en komma-separert liste av omr�der (vanligvis innledet med *@ strengen som matcher &lt;hvasomhelst&gt;@&lt;e-postomr�de&gt;). For eksempel kunne du bruke: navnet Ingen brukere passer til %search_text%. denne brukeren er slettet Index: openacs-4/packages/dotlrn/catalog/dotlrn.pl_PL.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.pl_PL.utf-8.xml,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.pl_PL.utf-8.xml 12 Mar 2005 20:54:14 -0000 1.8 +++ openacs-4/packages/dotlrn/catalog/dotlrn.pl_PL.utf-8.xml 31 May 2005 23:13:03 -0000 1.8.2.1 @@ -325,7 +325,7 @@ Twoje hasła nie pasują! Chyba literówka podczas pisania jednego z nich. Brak wyników wyszukiwania, proszę rozszerzyć warunki poszukiwania. Żądasz zmiany praw dostępu dla tego użytkownika, co spowoduje znaczące skutki. Czy dokonać tego NA PEWNO? - <żaden nie skonfigurowany> + &lt;żaden nie skonfigurowany&gt; Wysłanie poczty nie powiodło się Zarządzaj Zarządzaj Apletami @@ -459,7 +459,7 @@ własności terminu. Terminy Terminy - W tym polu powinny się znajdować domeny, oddzielone przecinkami (zwykle poprzedzone *@, co oznacza <cokolwiek>@<email-domain>). Na przykład: + W tym polu powinny się znajdować domeny, oddzielone przecinkami (zwykle poprzedzone *@, co oznacza &lt;cokolwiek&gt;@&lt;email-domain&gt;). Na przykład: Nazwa Nie ma użytkowników pasujących do %search_text%. Index: openacs-4/packages/dotlrn/catalog/dotlrn.pt_BR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.pt_BR.ISO-8859-1.xml,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.pt_BR.ISO-8859-1.xml 12 Mar 2005 20:54:14 -0000 1.14 +++ openacs-4/packages/dotlrn/catalog/dotlrn.pt_BR.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.14.2.1 @@ -330,7 +330,7 @@ Suas senhas n�o verificam! Presumidamente, voc� deve ter digitado uma letra sem querer enquanto digitava uma delas. Sua procura n�o retornou nenhum resultado, por favor amplie seu crit�rio de busca. Voc� est� pedindo para mudar o n�vel de acesso para este usu�rio. Isto tem repercuss�es s�rias. Voc� tem certeza disto? - <nenhuma configura��o> + &lt;nenhuma configura��o&gt; Falha ao Enviar Email Gerenciar Gerenciar Applets @@ -477,7 +477,7 @@ propriedades do per�odo. Per�odos Per�odos - O formato deste campo � uma lista de dom�nios separada por v�rgulas (usualmente precedido por *@ texto que confere <algo>@<email-dom�nio>). Por exemplo, voc� podia usar: + O formato deste campo � uma lista de dom�nios separada por v�rgulas (usualmente precedido por *@ texto que confere &lt;algo&gt;@&lt;email-dom�nio&gt;). Por exemplo, voc� podia usar: O nome N�o h� nenhum usu�rio que confere com %search_text%. este usu�rio � removido Index: openacs-4/packages/dotlrn/catalog/dotlrn.pt_PT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.pt_PT.ISO-8859-1.xml,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.pt_PT.ISO-8859-1.xml 12 Mar 2005 20:54:14 -0000 1.10 +++ openacs-4/packages/dotlrn/catalog/dotlrn.pt_PT.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.10.2.1 @@ -320,7 +320,7 @@ As suas senhas n�o coincidem! Possivelmente, cometeu um engano enquanto digitava uma delas. A sua pesquisa n�o produziu nenhum resultado, por favor expanda o seu crit�rio de pesquisa. Est� a pedir para mudar o n�vel de acesso deste utilizador. Isto tem fortes repercuss�es. Tem a certeza disto? - <nenhum configurado> + &lt;nenhum configurado&gt; O Correio Falhou Gerir Gerir Applets @@ -454,7 +454,7 @@ propriedades do periodo. Periodos Periodos - O formato deste valor � uma lista de dom�nios separados por v�rgula (geralmente precedidos pela string *@ que coincide com <qualquer coisa>@<dom�nio-email>). Por exemplo, pode utilizar: + O formato deste valor � uma lista de dom�nios separados por v�rgula (geralmente precedidos pela string *@ que coincide com &lt;qualquer coisa&gt;@&lt;dom�nio-email&gt;). Por exemplo, pode utilizar: O nome N�o h� utilizadores coincidindo com %search_text%. este utilizador encontra-se eliminado Index: openacs-4/packages/dotlrn/catalog/dotlrn.ru_RU.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.ru_RU.utf-8.xml,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.ru_RU.utf-8.xml 12 Mar 2005 20:54:14 -0000 1.8 +++ openacs-4/packages/dotlrn/catalog/dotlrn.ru_RU.utf-8.xml 31 May 2005 23:13:03 -0000 1.8.2.1 @@ -200,7 +200,7 @@ Ключ (короткое название, без пробелов) Авторизованный сервер электронной почты Изменить пароль пользователя - <не определен> + &lt;не определен&gt; малиновый Статус: Кол-во членов @@ -268,7 +268,7 @@ Семестр Семестры Семестры - Перечислите все желаемые шаблоны адресов через запятую. Как правило, вы можете исползовать *@ конструкцию, которая равносильна <кто угодно>@<email-domain>. Например, вы могли бы использовать: + Перечислите все желаемые шаблоны адресов через запятую. Как правило, вы можете исползовать *@ конструкцию, которая равносильна &lt;кто угодно&gt;@&lt;email-domain&gt;. Например, вы могли бы использовать: этот пользователь удален Семестр не орпеделен Пользователь Index: openacs-4/packages/dotlrn/catalog/dotlrn.sv_SE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.sv_SE.ISO-8859-1.xml,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.sv_SE.ISO-8859-1.xml 12 Mar 2005 20:54:14 -0000 1.15 +++ openacs-4/packages/dotlrn/catalog/dotlrn.sv_SE.ISO-8859-1.xml 31 May 2005 23:13:03 -0000 1.15.2.1 @@ -324,7 +324,7 @@ Dina l�senord st�mmer inte �verens! Troligtvis har du stavat ett av dem fel. Din s�kning gav inget resultat. F�rs�k att ut�ka dina s�kkriterier. Du �nskar �ndra beh�righetsniv�n f�r denna anv�ndare. Detta f�r stora konsekvenser. �r du s�ker p� detta? - <ingen uppsatt> + &lt;ingen uppsatt&gt; E-posten fungerade inte Hantera Hantera applets @@ -461,7 +461,7 @@ Egenskaper termin. Terminer terminer - E-postdom�nerna du kan ange ska vara i form av en kommaseparerad lista. Varje dom�n i listan f�reg�s vanligtvis av &quot;*@&quot;, som inneb�r <vad-som-helst>@<e-postdom�n>. H�r �r ett exempel: + E-postdom�nerna du kan ange ska vara i form av en kommaseparerad lista. Varje dom�n i listan f�reg�s vanligtvis av &quot;*@&quot;, som inneb�r &lt;vad-som-helst&gt;@&lt;e-postdom�n&gt;. H�r �r ett exempel: Namnet Det finns inga anv�ndare som matchar %search_text%. denna anv�ndare �r borttagen Index: openacs-4/packages/dotlrn/catalog/dotlrn.zh_CN.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.zh_CN.utf-8.xml,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/catalog/dotlrn.zh_CN.utf-8.xml 12 Mar 2005 20:54:14 -0000 1.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.zh_CN.utf-8.xml 31 May 2005 23:13:03 -0000 1.4.2.1 @@ -326,7 +326,7 @@ 密码错误！可能输入有误。 你的搜索没有结果，请放宽搜索标准。 正在请求更改此用户的访问级别。这一操作较大。确实要进行吗？ - <没有设置> + &lt;没有设置&gt; 邮件发送失败 管理 管理Java程序 @@ -466,7 +466,7 @@ 学期属性。 学期 学期 - 此数值的格式为各域逗号为间隔的列表（通常以*@字符串开头，与<anything>@<email-domain>匹配)。例如，你可以使用： + 此数值的格式为各域逗号为间隔的列表（通常以*@字符串开头，与&lt;anything&gt;@&lt;email-domain&gt;匹配)。例如，你可以使用： 名字 没有与%search_text%相匹配的用户。 此用户已删除 Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/facilitator-bio.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/facilitator-bio.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-july-25-2002.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-jun-07-2002.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-jun-12-2002.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-july-25-2002.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/tcl/applets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/applets-procs.tcl,v diff -u -r1.19 -r1.19.8.1 --- openacs-4/packages/dotlrn/tcl/applets-procs.tcl 3 Oct 2003 17:37:58 -0000 1.19 +++ openacs-4/packages/dotlrn/tcl/applets-procs.tcl 31 May 2005 23:13:05 -0000 1.19.8.1 @@ -126,7 +126,7 @@ } { is the applet specified mounted } { - if {[apm_package_id_from_key [get_package_key -applet_key $applet_key]] != 0} { + if { [llength [site_node::get_package_url -package_key [get_package_key -applet_key $applet_key]]] > 0 } { return 1 } else { return 0 Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v diff -u -r1.50 -r1.50.2.1 --- openacs-4/packages/dotlrn/tcl/class-procs.tcl 6 Apr 2005 21:21:37 -0000 1.50 +++ openacs-4/packages/dotlrn/tcl/class-procs.tcl 31 May 2005 23:13:05 -0000 1.50.2.1 @@ -97,11 +97,11 @@ too. } { + if [empty_string_p $community_type_key] { set community_type_key "$department_key.$class_key" } - if {[db_0or1row collision_check {}]} { # got a collision return 0 Index: openacs-4/packages/dotlrn/tcl/club-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/club-procs.tcl,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/dotlrn/tcl/club-procs.tcl 28 Jul 2004 07:12:37 -0000 1.22 +++ openacs-4/packages/dotlrn/tcl/club-procs.tcl 31 May 2005 23:13:05 -0000 1.22.2.1 @@ -79,24 +79,19 @@ {-description ""} {-join_policy "open"} {-parent_community_id ""} - {-community_type "dotlrn_club"} } { creates a new club and returns the club key } { set extra_vars [ns_set create] ns_set put $extra_vars join_policy $join_policy - if { [empty_string_p $community_type] } { - set community_type [community_type] - } - return [dotlrn_community::new \ - -community_type $community_type \ - -object_type [community_type] \ - -pretty_name $pretty_name \ - -description $description \ - -parent_community_id $parent_community_id \ - -extra_vars $extra_vars] + -community_type [community_type] \ + -object_type [community_type] \ + -pretty_name $pretty_name \ + -description $description \ + -parent_community_id $parent_community_id \ + -extra_vars $extra_vars] } ad_proc -public add_user { Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.191 -r1.191.2.1 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 5 Mar 2005 00:28:01 -0000 1.191 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 31 May 2005 23:13:05 -0000 1.191.2.1 @@ -82,22 +82,18 @@ } { Create a new community type. } { - if { [empty_string_p $parent_type] } { - set parent_type "dotlrn_community" - } - # Figure out parent_node_id set parent_node_id [get_type_node_id $parent_type] array set parent_node [site_node::get -node_id $parent_node_id] db_transaction { set community_type_key [db_exec_plsql create_community_type {}] - set package_id [site_node::instantiate_and_mount \ - -node_name [ad_decode $url_part "" $community_type_key $url_part] \ - -parent_node_id $parent_node_id \ + set package_id [site_node_apm_integration::new_site_node_and_package \ + -name [ad_decode $url_part "" $community_type_key $url_part] \ + -parent_id $parent_node_id \ -package_key [one_community_type_package_key] \ - -package_name $pretty_name \ + -instance_name $pretty_name \ -context_id $parent_node(object_id) \ ] @@ -110,25 +106,6 @@ dotlrn_community::set_type_package_id \ -community_type $community_type_key \ -package_id $package_id - - # FIXME - if there's a proc to get the admin user_id w/o - # a connection put it here. This needs to be a vaild - # grantee for the perms - # Taken from dotlrn-procs.tcl - set user_id -1 - - # Use the parent's portal as template - set template_id [dotlrn::get_portal_id_from_type -type $parent_type] - - set portal_id [portal::create \ - -template_id $template_id \ - -name "$pretty_name Portal" \ - $user_id \ - ] - - dotlrn::set_type_portal_id \ - -type $community_type_key \ - -portal_id $portal_id } return $community_type_key @@ -179,23 +156,6 @@ return [db_string select_node_id {}] } - ad_proc -public type_exists { - community_type - } { - Checks if the community type exists - - @author Roel Canicula (roelmc@aristoi.biz) - @creation-date 2004-06-26 - - @param community_type - - @return 1 if exists, 0 if not - - @error - } { - return [db_string type_exists { *SQL* } -default 0] - } - ad_proc -public get_community_node_id { community_id } { @@ -257,14 +217,8 @@ where object_id = :community_id } - # HACK - # With the advent of new community types, community_type - # is no longer equivalent to object_id - # community_type contains the newly created type while - # object_type is limited to the original types + set template_id [dotlrn::get_portal_id_from_type -type $object_type] - set template_id [dotlrn::get_portal_id_from_type -type $community_type] - # Create comm's portal page set portal_id [portal::create \ -template_id $template_id \ @@ -299,6 +253,7 @@ set parent_node_id [get_community_node_id $parent_community_id] } + set package_id [site_node::instantiate_and_mount \ -parent_node_id $parent_node_id \ -node_name $community_key \ @@ -320,10 +275,10 @@ # Add the default applets based on the community type # 2. the the list of default applets for this type - if {[string equal $community_type dotlrn_class_instance]} { + if {[string equal $community_type dotlrn_community]} { set default_applets [parameter::get \ -package_id $package_id \ - -parameter default_class_instance_applets \ + -parameter default_subcomm_applets \ ] } elseif {[string equal $community_type dotlrn_club]} { set default_applets [parameter::get \ @@ -338,21 +293,18 @@ } else { set default_applets [parameter::get \ -package_id $package_id \ - -parameter default_subcomm_applets \ + -parameter default_class_instance_applets \ ] } + set default_applets_list [string trim [split $default_applets {,}]] foreach applet_key $default_applets_list { if {[dotlrn_applet::applet_exists_p -applet_key $applet_key]} { dotlrn_community::add_applet_to_community $community_id $applet_key } } - - # Set community type - set_community_type -community_id $community_id \ - -community_type $community_type } # This new community should _not_ inherit it's permissions @@ -1046,47 +998,6 @@ return [util_memoize "dotlrn_community::get_community_type_not_cached -package_id $package_id"] } - ad_proc -public set_community_type { - {-community_id:required} - {-community_type:required} - } { - Set community type - - @author Roel Canicula (roelmc@aristoi.biz) - @creation-date 2004-06-26 - - @param community_id - - @param community_type - - @return - - @error - } { - set old_value [get_community_type_from_community_id $community_id] - - db_transaction { - db_1row get_portal_template { *SQL* } - - db_dml update_community_type { *SQL* } - - db_dml set_portal_template { *SQL* } - } - - # flush all procs related to community type - util_memoize_flush "dotlrn_community::get_community_type_from_community_id_not_cached -community_id $community_id" - util_memoize_flush "dotlrn_community::get_non_member_portal_id_not_cached -community_id $community_id" - util_memoize_flush "dotlrn_community::get_portal_id_not_cached -community_id $community_id" - util_memoize_flush "dotlrn_community::get_admin_portal_id_not_cached -community_id $community_id" - - # generate "rename" event - raise_change_event \ - -community_id $community_id \ - -event "change type" \ - -old_value $old_value \ - -new_value $community_type - } - ad_proc -private get_community_type_not_cached { {-package_id:required} } { @@ -1818,11 +1729,11 @@ set parent_node_id [get_type_node_id $community_type] } - set package_id [site_node::instantiate_and_mount \ - -node_name $key \ - -parent_node_id $parent_node_id \ + set package_id [site_node_apm_integration::new_site_node_and_package \ + -name $key \ + -parent_id $parent_node_id \ -package_key [one_community_package_key] \ - -package_name $pretty_name \ + -instance_name $pretty_name \ -context_id $clone_id \ ] Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.87 -r1.87.2.1 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 13 Jan 2005 13:57:20 -0000 1.87 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 31 May 2005 23:13:05 -0000 1.87.2.1 @@ -141,10 +141,9 @@ acs_users_all.first_names, acs_users_all.last_name, acs_users_all.email, - (select count(*) - from acs_rels - where rel_type = 'user_portrait_rel' - and object_id_one = dotlrn_member_rels_approved.user_id) as portrait_p, 0 as bio_p + (select count(*) from acs_rels where rel_type = 'user_portrait_rel' and object_id_one = dotlrn_member_rels_approved.user_id) as portrait_p, + (select count(*) from acs_attribute_values where object_id = dotlrn_member_rels_approved.user_id and attribute_id = +:bio_attribute_id and attr_value is not null) as bio_p from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id @@ -269,37 +268,6 @@ - - - update dotlrn_communities_all - set community_type = :community_type - where community_id = :community_id - - - - - - select - portal_id - from - dotlrn_portal_types_map - where - type = :community_type - - - - - - update portals - set template_id = :portal_id - where portal_id = ( - select portal_id - from dotlrn_communities - where community_id = :community_id - ) - - - select 1 @@ -315,7 +283,7 @@ select community_id as subcomm_id from dotlrn_communities where parent_community_id = :community_id - order by pretty_name + order by pretty_name @@ -641,11 +609,4 @@ - - - select 1 - from dotlrn_community_types - where community_type = :community_type - - Index: openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl,v diff -u -r1.37 -r1.37.2.1 --- openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl 29 Apr 2004 15:42:06 -0000 1.37 +++ openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl 31 May 2005 23:13:05 -0000 1.37.2.1 @@ -103,9 +103,6 @@ # redirect to pages inside dotlrn permission::grant -party_id [acs_magic_object "the_public"] -object_id $package_id -privilege read } - - # Set master template - parameter::set_value -parameter "DefaultMaster" -value "/packages/dotlrn/www/dotlrn-master" -package_id [subsite::main_site_id] } # Make sure that privacy is turned on Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/dotlrn-procs-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/dotlrn-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v diff -u -r1.58 -r1.58.2.1 --- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 13 Jan 2005 13:57:20 -0000 1.58 +++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 31 May 2005 23:13:05 -0000 1.58.2.1 @@ -191,28 +191,41 @@ ad_proc -public remove_user_completely { {-user_id:required} + {-on_fail soft_delete} } { - Remove the user from ACS as well + Remove the user from ACS as well. Chances are pretty good that + this will fail because it's hard to chase down every piece + of content the user has ever put into the system. The net result is + that there may be stray referential integrity contraints that + will throw errors when we try to remove the user record permanently. + + @param on_fail indicates what we do if the permanent removal fails. Setting to + soft_delete will result in a repeat call to acs_user::delete + but this time without the -permanent flag. Setting to error + (or anything else) will result in re-throwing the original error. } { - # DEDS: for now let us not remove users with historical data. - # we assume this by looking at last_visit which is lame but - # the safest for now. the consortium might want to decide on - # whether we also want nuking of users with data present - set last_visit [acs_user::get_element -user_id $user_id -element last_visit] - if {[empty_string_p $last_visit]} { - if {[user_p -user_id $user_id]} { - user_remove -user_id $user_id - } - - # cycle through the applets and invoke their RemoveUser procs - foreach applet_key [dotlrn_applet::list_mounted_applets] { - dotlrn_community::applet_call \ - $applet_key \ - RemoveUser \ - [list $user_id] - } - + if {[user_p -user_id $user_id]} { + user_remove -user_id $user_id + } + + # cycle through the applets and invoke their RemoveUser procs + foreach applet_key [dotlrn_applet::list_mounted_applets] { + ns_log Debug "dotlrn::remove_user_completely: invoking RemoveUser for applet $applet_key" + dotlrn_community::applet_call \ + $applet_key \ + RemoveUser \ + [list $user_id] + } + + if { [catch { acs_user::delete -user_id $user_id -permanent + } errMsg] } { + ns_log Notice "dotlrn::remove_user_completely: permanent removal failed for user $user_id. Invoking on_fail option '$on_fail'" + if { [string equal $on_fail soft_delete] } { + acs_user::delete -user_id $user_id + } else { + error $errMsg + } } } Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v diff -u -r1.25 -r1.25.2.1 --- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 13 Jan 2005 13:57:20 -0000 1.25 +++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 31 May 2005 23:13:05 -0000 1.25.2.1 @@ -226,7 +226,7 @@ set control_panel_url "$link/$control_panel_name" # add the my space tab, which isn't part of the class portal but is super useful for the end user - append navbar "
  • My Space
    • " + append navbar "
  • #dotlrn.user_portal_page_home_title#
    • " # figure out what this privs this user has on the community set admin_p [dotlrn::user_can_admin_community_p \ Index: openacs-4/packages/dotlrn/tcl/zz-dotlrn-postload-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/zz-dotlrn-postload-init.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/tcl/zz-dotlrn-postload-init.tcl 26 Feb 2005 17:52:21 -0000 1.3 +++ openacs-4/packages/dotlrn/tcl/zz-dotlrn-postload-init.tcl 31 May 2005 23:13:05 -0000 1.3.2.1 @@ -1,3 +1,3 @@ -#if { [security::https_available_p] } { +#if { [ad_ssl_available_p] } { # ad_register_filter preauth GET "[dotlrn::get_url]/admin/*" ad_restrict_to_https #} \ No newline at end of file Index: openacs-4/packages/dotlrn/www/approve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/approve.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/dotlrn/www/approve.tcl 1 Mar 2005 00:01:27 -0000 1.7 +++ openacs-4/packages/dotlrn/www/approve.tcl 31 May 2005 23:13:06 -0000 1.7.2.1 @@ -26,7 +26,7 @@ {referer "./"} } -auth::require_login +ad_maybe_redirect_for_registration if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/bio-update-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/bio-update.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/bio-update.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/bio-update.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/communities-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities-chunk.adp,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/dotlrn/www/communities-chunk.adp 12 Jul 2004 14:49:56 -0000 1.11 +++ openacs-4/packages/dotlrn/www/communities-chunk.adp 31 May 2005 23:13:06 -0000 1.11.2.1 @@ -29,7 +29,7 @@ - - - + - - + - + - - - +
    @assessment_data.title@
    @communities.pretty_name@ + Index: openacs-4/packages/dotlrn/www/community-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/dotlrn/www/community-edit.tcl 28 Jul 2004 07:22:41 -0000 1.12 +++ openacs-4/packages/dotlrn/www/community-edit.tcl 31 May 2005 23:13:06 -0000 1.12.2.1 @@ -31,7 +31,6 @@ dotlrn::require_user_admin_community -user_id $user_id -community_id $community_id set description [dotlrn_community::get_community_description -community_id $community_id] set pretty_name [dotlrn_community::get_community_name $community_id] -set community_type [dotlrn_community::get_community_type_from_community_id $community_id] form create edit_community_info @@ -50,16 +49,8 @@ -value $description \ -optional -element create edit_community_info community_type \ - -label "[_ dotlrn.Community_Type]" \ - -datatype text \ - -widget select \ - -options [linsert [db_list_of_lists community_types { *SQL* }] 0 {{} {}}] \ - -value $community_type \ - -optional - if {[form is_valid edit_community_info]} { - form get_values edit_community_info pretty_name description community_type + form get_values edit_community_info pretty_name description dotlrn_community::set_community_name \ -community_id $community_id \ @@ -69,10 +60,6 @@ -community_id $community_id \ -description $description - dotlrn_community::set_community_type \ - -community_id $community_id \ - -community_type $community_type - ad_returnredirect $referer ad_script_abort } Index: openacs-4/packages/dotlrn/www/community-member.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/dotlrn/www/community-member.adp 13 Jan 2005 13:57:21 -0000 1.22 +++ openacs-4/packages/dotlrn/www/community-member.adp 31 May 2005 23:13:06 -0000 1.22.2.1 @@ -20,8 +20,11 @@ @first_names@ @last_name@ -@context_bar;noquote@ +@context;noquote@ +

    +Go back +

    #dotlrn.user_has_been_a_member_since# @@ -36,8 +39,6 @@ - - - - -
    • #dotlrn.email#: @email@
      • @@ -50,7 +51,7 @@ -

      #dotlrn.Biography# @bio;noquote@ +

      #dotlrn.Biography# @bio@

    @@ -60,27 +61,11 @@ - -

    #dotlrn.Shared_Files#

    - - -     - - -

    @user_contributions.pretty_plural@

    -
      - -
    • @creation_date@: @user_contributions.object_name@ - -
    -     -    		 -
    +
    @@ -89,6 +74,5 @@     -
    + + Index: openacs-4/packages/dotlrn/www/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/dotlrn/www/community-member.tcl 1 Mar 2005 00:01:27 -0000 1.17 +++ openacs-4/packages/dotlrn/www/community-member.tcl 31 May 2005 23:13:06 -0000 1.17.2.1 @@ -23,6 +23,7 @@ } { user_id:integer,notnull {community_id ""} + {return_url ""} } -properties { context_bar:onevalue portal_id:onevalue @@ -45,9 +46,13 @@ user_contributions:multirow } +if {[dotlrn_community::get_community_id] != $community_id} { + ad_returnredirect [export_vars -base "[dotlrn_community::get_community_url $community_id]community-member" {user_id community_id}] +} + auth::require_login -set verified_user_id [ad_conn user_id] +set verified_user_id [ad_verify_and_get_user_id] set user_info_sql { select first_names, @@ -89,7 +94,7 @@ } set portrait_p 0 -if {[ad_parameter "show_portrait_p" dotlrn]} { +if {[ad_parameter "show_portrait_p" dotlrn] && 0} { set portrait_p 1 set inline_portrait_state "" set portrait_export_vars [export_vars user_id] @@ -121,22 +126,33 @@ } set show_email_p 0 -if { $priv_email <= [ad_privacy_threshold] } { - set show_email_p 1 -} +#if { $priv_email <= [ad_privacy_threshold] } { +# set show_email_p 1 +#} db_multirow user_contributions user_contributions {} set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id] set scope_fs_url "/packages/file-storage/www/folder-chunk" set n_past_days "" -set url "[site_node_object_map::get_url -object_id $folder_id]index?folder_id=$folder_id&n_past_days=99999" +#set url "[site_node_object_map::get_url -object_id $folder_id]index?folder_id=$folder_id&n_past_days=99999" set context_bar [ad_context_bar "[_ dotlrn.Community_member]"] +set context [list "Member Page"] set system_name [ad_system_name] set pretty_creation_date [lc_time_fmt $creation_date "%q"] set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]" +set return_url_2 [ad_return_url] +if {[empty_string_p $return_url]} { + set return_url [get_referrer] + if {[regexp {\?} $return_url_2]} { + append return_url_2 "&return_url=$return_url" + } else { + append return_url_2 "?return_url=$return_url" + } +} + ad_return_template Index: openacs-4/packages/dotlrn/www/configure-element-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element-2.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/configure-element-2.tcl 1 Mar 2005 00:01:27 -0000 1.10 +++ openacs-4/packages/dotlrn/www/configure-element-2.tcl 31 May 2005 23:13:06 -0000 1.10.2.1 @@ -33,7 +33,7 @@ } # Make sure user is logged in -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] portal::set_element_param $element_id $key $value Index: openacs-4/packages/dotlrn/www/configure-element.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element.tcl,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/dotlrn/www/configure-element.tcl 1 Mar 2005 00:01:27 -0000 1.16 +++ openacs-4/packages/dotlrn/www/configure-element.tcl 31 May 2005 23:13:06 -0000 1.16.2.1 @@ -30,7 +30,7 @@ ad_script_abort } -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] if {[parameter::get -parameter community_level_p] == 1} { Index: openacs-4/packages/dotlrn/www/control-panel.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/dotlrn/www/control-panel.adp 11 May 2005 13:51:47 -0000 1.15 +++ openacs-4/packages/dotlrn/www/control-panel.adp 31 May 2005 23:13:06 -0000 1.15.2.1 @@ -31,11 +31,9 @@
    #dotlrn.lt_Help_and_Personal_Con#
    @@ -47,7 +45,7 @@

    #dotlrn.Personal_Options#

    - - + - - + - + - - - +
    #dotlrn.lt_JoinDrop_Classes_or_C#
    Index: openacs-4/packages/dotlrn/www/control-panel.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/dotlrn/www/control-panel.tcl 1 Mar 2005 00:01:27 -0000 1.9 +++ openacs-4/packages/dotlrn/www/control-panel.tcl 31 May 2005 23:13:06 -0000 1.9.2.1 @@ -34,7 +34,7 @@ set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]] # Make sure user is logged in -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] set title [parameter::get -localize -parameter admin_page_name] set admin_p [dotlrn::admin_p] Index: openacs-4/packages/dotlrn/www/deregister-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-confirm.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/deregister-confirm.tcl 1 Mar 2005 00:01:27 -0000 1.3 +++ openacs-4/packages/dotlrn/www/deregister-confirm.tcl 31 May 2005 23:13:06 -0000 1.3.2.1 @@ -26,7 +26,7 @@ {referer ""} } -auth::require_login +ad_maybe_redirect_for_registration set time_per_user 15 set num_users_display_limit 99 Index: openacs-4/packages/dotlrn/www/deregister.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/www/deregister.tcl 1 Mar 2005 00:01:27 -0000 1.8 +++ openacs-4/packages/dotlrn/www/deregister.tcl 31 May 2005 23:13:06 -0000 1.8.2.1 @@ -36,7 +36,7 @@ # wouldn't break. This does have the unfortunate consequence that the name # user_id is not intuative when it is a list of many user_ids. (teadams@alum.mit.edu) -auth::require_login +ad_maybe_redirect_for_registration if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Index: openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp 11 May 2005 13:41:06 -0000 1.3 +++ openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp 31 May 2005 23:13:06 -0000 1.3.2.1 @@ -23,10 +23,14 @@

    +
    Group Administrator FAQ +

    +

    (For user information, please read the Help page in your Control Panel) +

    This FAQ contains these sections:

    Dealing with Members
    Managing Content
    Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v diff -u -r1.39 -r1.39.2.1 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 24 Jul 2004 08:34:10 -0000 1.39 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 31 May 2005 23:13:06 -0000 1.39.2.1 @@ -18,6 +18,7 @@ %> + [ #dotlrn.lt_JoinDrop_a_Class_or_C# ]

    @@ -26,47 +27,24 @@ +@communities.previous_type_ul_tags;noquote@ -<% - set old_level 0 - set new_level 0 - set depth 0 -%> - -

    +
    • +

      - <%= [parameter::get -localize -parameter class_instances_pretty_plural] %>: + <%= [parameter::get -localize -parameter class_instances_pretty_plural] %> - <%= [parameter::get -localize -parameter clubs_pretty_plural] %>: + <%= [parameter::get -localize -parameter clubs_pretty_plural] %> -

      +

    ( ++ | -- ) + +
    • -<% set new_level $communities(tree_level) %> +@communities.intra_type_ul_tags;noquote@ - - <% incr depth -1 %> -
    - - <% while {$depth > 1} { - append close_tags "" - incr depth -1 - } - %> - @close_tags;noquote@ - - - - -<% incr depth 1 %> - -<% - for {set i $depth} {$i > 0} {incr i -1} { - template::adp_puts "\n" - } -%> - +@final_ul_tags;noquote@ + Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 24 Jul 2004 08:34:10 -0000 1.13 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 31 May 2005 23:13:06 -0000 1.13.2.1 @@ -46,15 +46,59 @@ } set comm_type "" -db_multirow communities select_communities {} { - set tree_level [expr $tree_level - $community_type_level] +set old_depth 0 +set depth 0 +db_multirow -extend {intra_type_ul_tags previous_type_ul_tags} communities select_communities {} { + set intra_type_ul_tags "" + set previous_type_ul_tags "" + set new_type_p 0 if {![string equal $simple_community_type dotlrn_community]} { set comm_type $simple_community_type } else { set simple_community_type $comm_type } + #Checking for existence of old_simple_community_type gives us an + #easy way to detect the first row. Don't pre-define it! + if { ![info exists old_simple_community_type] || + ![string equal $old_simple_community_type $simple_community_type] } { + set base_level $tree_level + set new_type_p 1 + } + if { [info exists old_simple_community_type] && + ![string equal $old_simple_community_type $simple_community_type] } { + append previous_type_ul_tags [string repeat "" $old_depth] + set old_depth 0 + } + + set depth [expr $tree_level - $base_level] + if { $depth > $old_depth } { + append intra_type_ul_tags [string repeat "
    • " [expr $depth - $old_depth]] + } + if { $old_depth > $depth } { + append intra_type_ul_tags [string repeat "
    " [expr $old_depth - $depth]] + append intra_type_ul_tags "
  • " + } + if { $depth == $old_depth && !$new_type_p } { + append intra_type_ul_tags "
  • " + } + + set old_depth $depth + set old_simple_community_type $simple_community_type } +if { $old_depth > 0 } { + set final_ul_tags [string repeat "
    • " $old_depth] +} else { + set final_ul_tags "" +} + set dotlrn_url [dotlrn::get_url] +# Add the dhtml tree javascript to the HEAD. +global dotlrn_master__header_stuff +append dotlrn_master__header_stuff { + + +} + ad_return_template Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v diff -u -r1.38 -r1.38.2.1 --- openacs-4/packages/dotlrn/www/dotlrn-master.adp 13 Jan 2005 13:57:21 -0000 1.38 +++ openacs-4/packages/dotlrn/www/dotlrn-master.adp 31 May 2005 23:13:06 -0000 1.38.2.1 @@ -4,6 +4,7 @@ @header_stuff;noquote@ @header_customized_css;noquote@ + @dotlrn_master__header_stuff;noquote@ @context;noquote@ @context_bar;noquote@ Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v diff -u -r1.35 -r1.35.2.1 --- openacs-4/packages/dotlrn/www/dotlrn-master.tcl 11 May 2005 13:59:44 -0000 1.35 +++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl 31 May 2005 23:13:06 -0000 1.35.2.1 @@ -65,7 +65,7 @@ set header_img_file "[acs_root_dir]/packages/dotlrn/www/resources/logo" set header_img_alt_text "Header Logo" -set extra_spaces "\"\"" +set extra_spaces "" set td_align "align=\"center\" valign=\"top\"" @@ -575,3 +575,10 @@ " + +# Bring in header stuff from portlets, e.g. dhtml tree javascript +# from dotlrn-main-portlet. +global dotlrn_master__header_stuff +if { ![info exists dotlrn_master__header_stuff] } { + set dotlrn_master__header_stuff "" +} Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/element-list.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/element-list.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/facilitator-bio.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/facilitator-bio.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v diff -u -r1.42 -r1.42.2.1 --- openacs-4/packages/dotlrn/www/index.tcl 1 Mar 2005 00:01:27 -0000 1.42 +++ openacs-4/packages/dotlrn/www/index.tcl 31 May 2005 23:13:06 -0000 1.42.2.1 @@ -33,7 +33,7 @@ ad_script_abort } -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] if {![dotlrn::user_p -user_id $user_id]} { ad_returnredirect "index-not-a-user" Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/dotlrn/www/manage-memberships.tcl 22 Jul 2004 16:47:57 -0000 1.11 +++ openacs-4/packages/dotlrn/www/manage-memberships.tcl 31 May 2005 23:13:06 -0000 1.11.2.1 @@ -35,7 +35,6 @@ ad_page_contract { @author yon (yon@openforce.net) @creation-date 2002-03-08 - @version $Id$ } -query { {member_department_key ""} {non_member_department_key ""} @@ -179,6 +178,15 @@ db_multirow non_member_classes $non_member_query {} db_multirow non_member_clubs select_non_member_clubs {} +# hack for eabis +set non_member_club_ids [db_list non_member_club_ids { select f.club_id + from dotlrn_clubs_full f + where f.join_policy <> 'closed' + and f.club_id not in (select dotlrn_member_rels_full.community_id as club_id + from dotlrn_member_rels_full + where dotlrn_member_rels_full.user_id = :user_id) +}] + set referer [ns_urlencode "[ns_conn url]?[export_vars {member_department_key member_term_id non_member_department_key non_member_term_id}]"] # en_US messages make use of these configurable pretty names Index: openacs-4/packages/dotlrn/www/member-add-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-oracle.xql,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/dotlrn/www/member-add-oracle.xql 27 Feb 2005 17:07:18 -0000 1.6 +++ openacs-4/packages/dotlrn/www/member-add-oracle.xql 31 May 2005 23:13:06 -0000 1.6.2.1 @@ -1,7 +1,5 @@ -oracle8.1.6 - Index: openacs-4/packages/dotlrn/www/member-add-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/member-add-postgresql.xql 27 Feb 2005 17:07:18 -0000 1.3 +++ openacs-4/packages/dotlrn/www/member-add-postgresql.xql 31 May 2005 23:13:06 -0000 1.3.2.1 @@ -2,8 +2,6 @@ - postgresql7.2 - select user_id, Index: openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql 17 May 2004 15:15:02 -0000 1.5 +++ openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql 31 May 2005 23:13:06 -0000 1.5.2.1 @@ -13,7 +13,8 @@ acs_users_all.last_name, acs_users_all.email, (select count(*) from acs_rels where rel_type = 'user_portrait_rel' and object_id_one = dotlrn_member_rels_approved.user_id) as portrait_p, - (select count(*) from acs_attribute_values where object_id = dotlrn_member_rels_approved.user_id and attribute_id = :bio_attribute_id and attr_value != '') as bio_p + (select count(*) from acs_attribute_values where object_id = dotlrn_member_rels_approved.user_id and attribute_id = +:bio_attribute_id and attr_value is not null) as bio_p from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id Index: openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql 17 May 2004 15:15:02 -0000 1.4 +++ openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql 31 May 2005 23:13:06 -0000 1.4.2.1 @@ -13,7 +13,8 @@ acs_users_all.last_name, acs_users_all.email, (select count(*) from acs_rels where rel_type = 'user_portrait_rel' and object_id_one = dotlrn_member_rels_approved.user_id) as portrait_p, - (select count(*) from acs_attribute_values where object_id = dotlrn_member_rels_approved.user_id and attribute_id = :bio_attribute_id and attr_value != '') as bio_p + (select count(*) from acs_attribute_values where object_id = dotlrn_member_rels_approved.user_id and attribute_id = +:bio_attribute_id and attr_value is not null) as bio_p from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v diff -u -r1.18 -r1.18.2.1 --- openacs-4/packages/dotlrn/www/members-chunk-table.adp 13 Jan 2005 13:57:21 -0000 1.18 +++ openacs-4/packages/dotlrn/www/members-chunk-table.adp 31 May 2005 23:13:06 -0000 1.18.2.1 @@ -30,7 +30,6 @@
    - Index: openacs-4/packages/dotlrn/www/members-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.adp,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/dotlrn/www/members-chunk.adp 18 Jan 2005 21:57:41 -0000 1.22 +++ openacs-4/packages/dotlrn/www/members-chunk.adp 31 May 2005 23:13:06 -0000 1.22.2.1 @@ -25,7 +25,7 @@
  • <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %> - <%= [email_image::get_user_email -user_id $users(user_id) %> + (@users.email@)   @users.role@ @@ -73,7 +73,7 @@
  • <%= [acs_community_member_link -user_id $pending_users(user_id) -label "$pending_users(first_names) $pending_users(last_name)"] %> - <%= [email_image::get_user_email -user_id $pending_users(user_id) %> + (@pending_users.email@)   @pending_users.role@ Index: openacs-4/packages/dotlrn/www/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v diff -u -r1.23 -r1.23.2.1 --- openacs-4/packages/dotlrn/www/members.tcl 15 Jan 2005 22:08:09 -0000 1.23 +++ openacs-4/packages/dotlrn/www/members.tcl 31 May 2005 23:13:06 -0000 1.23.2.1 @@ -33,6 +33,7 @@ set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id] set referer [ns_conn url] set return_url "[ns_conn url]?[ns_conn query]" + set site_wide_admin_p [permission::permission_p -object_id [acs_magic_object security_context_root] -privilege admin] if {!$site_wide_admin_p} { @@ -84,6 +85,10 @@ #acs-subsite.Profile# + +
    Update bio +     + } } last_name { label "[_ acs-subsite.Last_name]" @@ -101,7 +106,7 @@ label "[_ dotlrn.Email_1]" html "align left" display_template { - @members.user_email;noquote@ + @members.email@ } } role { label "[_ dotlrn.Role]" @@ -129,10 +134,14 @@ set member_page [acs_community_member_page] -db_multirow -extend { member_url referer user_email } members select_current_members {} { + + +db_multirow -extend { update_bio_p member_url referer } members select_current_members {} { set member_url "$member_page?user_id=$user_id" - set user_email [email_image::get_user_email -user_id $user_id] set referer $referer + + + set update_bio_p $admin_p set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] } Index: openacs-4/packages/dotlrn/www/members.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.xql,v diff -u -r1.2 -r1.2.2.1 Binary files differ Index: openacs-4/packages/dotlrn/www/my-communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/dotlrn/www/my-communities.tcl 1 Mar 2005 00:01:27 -0000 1.9 +++ openacs-4/packages/dotlrn/www/my-communities.tcl 31 May 2005 23:13:06 -0000 1.9.2.1 @@ -25,7 +25,7 @@ communities:multirow } -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] set user_can_browse_p [dotlrn::user_can_browse_p -user_id $user_id] if {![info exists referer]} { Index: openacs-4/packages/dotlrn/www/one-community-type.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v diff -u -r1.25 -r1.25.2.1 --- openacs-4/packages/dotlrn/www/one-community-type.adp 29 Apr 2004 15:39:13 -0000 1.25 +++ openacs-4/packages/dotlrn/www/one-community-type.adp 31 May 2005 23:13:06 -0000 1.25.2.1 @@ -19,7 +19,7 @@ %> -@context@ +@context_bar@ @title@

    Index: openacs-4/packages/dotlrn/www/one-community-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.tcl,v diff -u -r1.23 -r1.23.2.1 --- openacs-4/packages/dotlrn/www/one-community-type.tcl 29 Apr 2004 15:39:13 -0000 1.23 +++ openacs-4/packages/dotlrn/www/one-community-type.tcl 31 May 2005 23:13:06 -0000 1.23.2.1 @@ -23,7 +23,7 @@ @version $Id$ } -query { } -properties { - context:onevalue + context_bar:onevalue pretty_name:onevalue description:onevalue supertype:onevalue @@ -42,7 +42,7 @@ set user_id [ad_conn user_id] -set context {} +set context_bar [_ dotlrn.View] # What community type are we at? set community_type [dotlrn_community::get_community_type] Index: openacs-4/packages/dotlrn/www/register.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/dotlrn/www/register.tcl 1 Mar 2005 00:01:27 -0000 1.13 +++ openacs-4/packages/dotlrn/www/register.tcl 31 May 2005 23:13:06 -0000 1.13.2.1 @@ -27,7 +27,7 @@ {referer "./"} } -auth::require_login +ad_maybe_redirect_for_registration if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Index: openacs-4/packages/dotlrn/www/reject.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/reject.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/dotlrn/www/reject.tcl 1 Mar 2005 00:01:27 -0000 1.7 +++ openacs-4/packages/dotlrn/www/reject.tcl 31 May 2005 23:13:06 -0000 1.7.2.1 @@ -26,7 +26,7 @@ {referer "./"} } -auth::require_login +ad_maybe_redirect_for_registration if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Index: openacs-4/packages/dotlrn/www/spam-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/dotlrn/www/spam-2.adp 13 Jan 2005 13:57:21 -0000 1.16 +++ openacs-4/packages/dotlrn/www/spam-2.adp 31 May 2005 23:13:06 -0000 1.16.2.1 @@ -53,4 +53,3 @@ @confirm_data;noquote@ - Index: openacs-4/packages/dotlrn/www/spam-recipients.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.adp,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/dotlrn/www/spam-recipients.adp 11 May 2005 13:41:06 -0000 1.6 +++ openacs-4/packages/dotlrn/www/spam-recipients.adp 31 May 2005 23:13:06 -0000 1.6.2.1 @@ -60,11 +60,13 @@
    •  <%=[acs_community_member_link -user_id @current_members.user_id@ -label @current_members.last_name@]%> - <%=[email_image::get_user_email -user_id @current_members.user_id@] %> + + @current_members.email@ - <%=[email_image::get_user_email -user_id @current_members.user_id@] %> + + @current_members.email@   @@ -76,9 +78,9 @@
    @exported_vars;noquote@ -
    +
    -
    +

    Index: openacs-4/packages/dotlrn/www/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v diff -u -r1.24 -r1.24.2.1 --- openacs-4/packages/dotlrn/www/spam.tcl 13 Jan 2005 13:57:21 -0000 1.24 +++ openacs-4/packages/dotlrn/www/spam.tcl 31 May 2005 23:13:06 -0000 1.24.2.1 @@ -53,10 +53,15 @@ set recipients_p 1 } elseif { [info exists recipients_str] && ![empty_string_p $recipients_str] } { set recipients_p 1 - } + } if { $recipients_p == 0} { - ad_complain "[_ dotlrn.Must_specify_recipients]" + if {[exists_and_not_null community_id]} { + # This is call using the old URL reference + ad_returnredirect "spam-recipients?referer=$referer" + } else { + ad_complain "[_ dotlrn.Must_specify_recipients]" + } } } if_bad_combination { Index: openacs-4/packages/dotlrn/www/user-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/dotlrn/www/user-add-2.tcl 1 Mar 2005 00:01:27 -0000 1.12 +++ openacs-4/packages/dotlrn/www/user-add-2.tcl 31 May 2005 23:13:06 -0000 1.12.2.1 @@ -85,7 +85,7 @@ set context_bar [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Add_User]] -set admin_user_id [ad_conn user_id] +set admin_user_id [ad_verify_and_get_user_id] set administration_name [db_string select_admin_name { select first_names || ' ' || last_name from persons Index: openacs-4/packages/dotlrn/www/user-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/www/user-add-3.tcl 1 Mar 2005 00:01:27 -0000 1.8 +++ openacs-4/packages/dotlrn/www/user-add-3.tcl 31 May 2005 23:13:06 -0000 1.8.2.1 @@ -31,7 +31,7 @@ dotlrn_portlet::is_allowed -parameter guestuser dotlrn_portlet::is_allowed -parameter limiteduser -set admin_user_id [ad_conn user_id] +set admin_user_id [ad_verify_and_get_user_id] set admin_email [db_string select_admin_email { select email from parties Index: openacs-4/packages/dotlrn/www/user-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v diff -u -r1.32 -r1.32.2.1 --- openacs-4/packages/dotlrn/www/user-add.tcl 1 Mar 2005 00:01:27 -0000 1.32 +++ openacs-4/packages/dotlrn/www/user-add.tcl 31 May 2005 23:13:06 -0000 1.32.2.1 @@ -40,7 +40,7 @@ # Set read_private_data_p and can_browse_p to me the most restrictive defaults. -set current_user_id [auth::require_login] +set current_user_id [ad_maybe_redirect_for_registration] set community_id [dotlrn_community::get_community_id] # If can_browse_p is 0, this means the new user would be able to join Index: openacs-4/packages/dotlrn/www/weblog-control-panel.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/weblog-control-panel.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/weblog-control-panel.tcl 1 Mar 2005 00:01:27 -0000 1.3 +++ openacs-4/packages/dotlrn/www/weblog-control-panel.tcl 31 May 2005 23:13:06 -0000 1.3.2.1 @@ -22,7 +22,7 @@ @version $Id$ } -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] set dotlrn_package_id [dotlrn::get_package_id] Index: openacs-4/packages/dotlrn/www/weblog-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/weblog-new.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/www/weblog-new.tcl 1 Mar 2005 00:01:27 -0000 1.4 +++ openacs-4/packages/dotlrn/www/weblog-new.tcl 31 May 2005 23:13:06 -0000 1.4.2.1 @@ -26,7 +26,7 @@ } -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] set weblog_package_id [site_node_apm_integration::get_child_package_id -package_key "forums"] set existing_forum_ids [db_list weblog_forum_id {select forum_id from forums_forums_enabled f, acs_objects o where o.object_id = forum_id and o.creation_user = :user_id and f.package_id = :weblog_package_id}] Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp 8 Mar 2004 14:13:28 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp 31 May 2005 23:13:07 -0000 1.10.2.1 @@ -24,15 +24,15 @@

    #dotlrn.lt_The_results_of_your_s#

    + + + + + Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql 8 Mar 2004 14:13:29 -0000 1.6 +++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql 31 May 2005 23:13:07 -0000 1.6.2.1 @@ -9,7 +9,8 @@ last_name, email from registered_users - where lower(first_names || ' ' || last_name || ' ' || email) like '%' || lower(:search_text) || '%' + where lower(last_name) like lower('%' || :search_text || '%') + or lower(email) like lower('%' || :search_text || '%') Index: openacs-4/packages/dotlrn/www/admin/admin-add-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/admin-add-oracle.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/admin-add-oracle.xql 27 Feb 2005 17:07:18 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/admin-add-oracle.xql 31 May 2005 23:13:07 -0000 1.3.2.1 @@ -2,8 +2,6 @@ - oracle8.1.6 - select user_id, Index: openacs-4/packages/dotlrn/www/admin/admin-add-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/admin-add-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/admin-add-postgresql.xql 27 Feb 2005 17:07:18 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/admin-add-postgresql.xql 31 May 2005 23:13:07 -0000 1.3.2.1 @@ -2,8 +2,6 @@ - postgresql7.2 - select user_id, Index: openacs-4/packages/dotlrn/www/admin/admin-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/admin-remove.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/www/admin/admin-remove.tcl 1 Mar 2005 00:01:28 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/admin-remove.tcl 31 May 2005 23:13:07 -0000 1.4.2.1 @@ -13,7 +13,7 @@ # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more # details. # -auth::require_login +ad_maybe_redirect_for_registration ad_page_contract { Remove dotLRN Administrators Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-delete.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-delete.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-delete.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/admin/class.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v diff -u -r1.32 -r1.32.2.1 --- openacs-4/packages/dotlrn/www/admin/class.adp 11 May 2005 13:40:25 -0000 1.32 +++ openacs-4/packages/dotlrn/www/admin/class.adp 31 May 2005 23:13:07 -0000 1.32.2.1 @@ -42,6 +42,8 @@ +
    + @@ -95,9 +97,9 @@
    +
    - Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v diff -u -r1.20 -r1.20.2.1 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 11 May 2005 13:40:25 -0000 1.20 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 31 May 2005 23:13:07 -0000 1.20.2.1 @@ -18,7 +18,7 @@ %> - +
    @@ -20,7 +20,7 @@

    @category_name@ > @subcategory_name@ > @subsubcategory_name@ products:

    @products@ - @prev_link@ @separator@ @next_link@ + @prev_link;noquote@ @separator@ @next_link;noquote@

    Add yourself to the @the_category_name@ mailing list!

    Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -41,7 +41,7 @@ # See if they're logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if { $user_id != 0 } { set user_name [db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/category-browse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/ecommerce/www/category-browse.tcl 1 Mar 2005 00:01:30 -0000 1.10 +++ openacs-4/packages/ecommerce/www/category-browse.tcl 31 May 2005 23:13:14 -0000 1.10.2.1 @@ -71,7 +71,7 @@ set user_session_id [ec_get_user_session_id] # see if they're logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if { $user_id != 0 } { set user_name [db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/checkout-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/ecommerce/www/checkout-2.tcl 1 Mar 2005 00:01:30 -0000 1.12 +++ openacs-4/packages/ecommerce/www/checkout-2.tcl 31 May 2005 23:13:14 -0000 1.12.2.1 @@ -17,7 +17,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/checkout-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-3.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/checkout-3.tcl 1 Mar 2005 00:01:30 -0000 1.9 +++ openacs-4/packages/ecommerce/www/checkout-3.tcl 31 May 2005 23:13:14 -0000 1.9.2.1 @@ -31,7 +31,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/checkout-one-form-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form-2-oracle.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/checkout-one-form-2-oracle.xql 26 Feb 2005 21:26:45 -0000 1.3 +++ openacs-4/packages/ecommerce/www/checkout-one-form-2-oracle.xql 31 May 2005 23:13:14 -0000 1.3.2.1 @@ -1,11 +1,6 @@ - + + - - - oracle - 8.1.6 - - insert into ec_problems_log Index: openacs-4/packages/ecommerce/www/checkout-one-form.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/ecommerce/www/checkout-one-form.adp 13 Jan 2005 13:57:58 -0000 1.2 +++ openacs-4/packages/ecommerce/www/checkout-one-form.adp 31 May 2005 23:13:14 -0000 1.2.2.1 @@ -19,7 +19,7 @@

    Order list

    @items_ul;noquote@
    -

    2. Complete this information below, or view other ways of ordering from King Solar.

    +

    2. Complete this information.

    @@ -58,4 +58,4 @@
    - + Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl 13 Jan 2005 13:57:21 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl 31 May 2005 23:13:07 -0000 1.10.2.1 @@ -123,6 +123,13 @@ \] + + + \[ + [_ dotlrn.lt_Delete_class] + \] + + } } } Index: openacs-4/packages/dotlrn/www/admin/club-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.tcl,v diff -u -r1.19 -r1.19.2.1 --- openacs-4/packages/dotlrn/www/admin/club-new.tcl 13 Jan 2005 13:57:21 -0000 1.19 +++ openacs-4/packages/dotlrn/www/admin/club-new.tcl 31 May 2005 23:13:07 -0000 1.19.2.1 @@ -57,23 +57,14 @@ -widget hidden \ -value $referer -element create add_club community_type \ - -label "[_ dotlrn.Community_Type]" \ - -datatype text \ - -widget select \ - -options [linsert [db_list_of_lists community_types { *SQL* }] 0 {{} {}}] \ - -optional - if {[form is_valid add_club]} { form get_values add_club \ - pretty_name description join_policy referer community_type + pretty_name description join_policy referer set key [dotlrn_club::new \ - -description $description \ - -pretty_name $pretty_name \ - -join_policy $join_policy \ - -community_type $community_type \ - ] + -description $description \ + -pretty_name $pretty_name \ + -join_policy $join_policy] ad_returnredirect $referer ad_script_abort Index: openacs-4/packages/dotlrn/www/admin/clubs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.adp,v diff -u -r1.26 -r1.26.2.1 --- openacs-4/packages/dotlrn/www/admin/clubs.adp 11 May 2005 13:40:25 -0000 1.26 +++ openacs-4/packages/dotlrn/www/admin/clubs.adp 31 May 2005 23:13:07 -0000 1.26.2.1 @@ -22,6 +22,7 @@ @title@ @context_bar@ +

    @@ -31,9 +32,9 @@ - +

    #dotlrn.new_community#

    - +
    @@ -43,4 +44,4 @@

    - +
    Index: openacs-4/packages/dotlrn/www/admin/clubs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.tcl,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/dotlrn/www/admin/clubs.tcl 11 May 2005 13:45:27 -0000 1.15 +++ openacs-4/packages/dotlrn/www/admin/clubs.tcl 31 May 2005 23:13:07 -0000 1.15.2.1 @@ -69,11 +69,13 @@ actions { label "[_ dotlrn.Actions]" display_template { +
    #dotlrn.administer_link# +
    } } Index: openacs-4/packages/dotlrn/www/admin/cockpit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/cockpit.tcl,v diff -u -r1.2 -r1.2.2.1 Binary files differ Index: openacs-4/packages/dotlrn/www/admin/departments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v diff -u -r1.21 -r1.21.2.1 --- openacs-4/packages/dotlrn/www/admin/departments.adp 11 May 2005 13:40:25 -0000 1.21 +++ openacs-4/packages/dotlrn/www/admin/departments.adp 31 May 2005 23:13:07 -0000 1.21.2.1 @@ -21,30 +21,30 @@ @title@ @context_bar@ - +
    Search departments with :
    - +
    - +
    - +

    #dotlrn.new_department#

    - +
    #dotlrn.no_departments#
    - +

    Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admins.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admins.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/dotlrn-admins.adp 11 May 2005 13:40:25 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/dotlrn-admins.adp 31 May 2005 23:13:07 -0000 1.3.2.1 @@ -34,7 +34,11 @@ +
    +
    +
    +
    Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 11 May 2005 13:45:27 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 31 May 2005 23:13:07 -0000 1.5.2.1 @@ -31,15 +31,15 @@ set dotlrn_admins_group [db_string group_id_from_name " select group_id from groups where group_name='dotlrn-admin'" -default ""] -set admin_id [ad_conn user_id] +set admin_id [ad_verify_and_get_user_id] set elements [list user \ [list label "User" \ link_url_col user_url ] \ remove \ [list label "Remove" \ link_url_col remove_url \ - display_template { } \ + display_template {
    } \ sub_class narrow ] \ ] Index: openacs-4/packages/dotlrn/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v diff -u -r1.27 -r1.27.2.1 --- openacs-4/packages/dotlrn/www/admin/index.adp 13 Jan 2005 13:57:21 -0000 1.27 +++ openacs-4/packages/dotlrn/www/admin/index.adp 31 May 2005 23:13:07 -0000 1.27.2.1 @@ -36,7 +36,6 @@
  • <%= [parameter::get -localize -parameter classes_pretty_plural] %>
  • <%= [parameter::get -localize -parameter class_instances_pretty_plural] %>
  • <%= [parameter::get -localize -parameter clubs_pretty_plural] %>
    • -
  • #dotlrn.Community_Types#
  • #dotlrn.portal_templates#
  • #dotlrn.archived_classes_and_communities#
  • #dotlrn.edit_approved_email_servers#
    • Index: openacs-4/packages/dotlrn/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.tcl,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/dotlrn/www/admin/index.tcl 13 Jan 2005 13:57:21 -0000 1.17 +++ openacs-4/packages/dotlrn/www/admin/index.tcl 31 May 2005 23:13:07 -0000 1.17.2.1 @@ -38,10 +38,10 @@ set parameters_d_url [export_vars -base /shared/parameters { { package_id {[apm_package_id_from_key dotlrn-portlet]} } { return_url [ad_return_url] } }] if { ![parameter::get -localize -package_id [dotlrn::get_package_id] -parameter dotlrn_toolbar_enabled_p -default 1] } { - set dotlrn_toolbar_action "Show .LRN toolbar" + set dotlrn_toolbar_action [_ dotlrn.show_lrn_toolbar] set action "show" } else { - set dotlrn_toolbar_action "Hide .LRN toolbar" + set dotlrn_toolbar_action [_ dotlrn.hide_lrn_toolbar] set action "hide" } Index: openacs-4/packages/dotlrn/www/admin/term-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-edit.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/admin/term-edit.tcl 13 Jan 2005 13:57:21 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/term-edit.tcl 31 May 2005 23:13:07 -0000 1.10.2.1 @@ -72,10 +72,6 @@ { [template::util::date::compare $start_date $end_date] <= 0 } "The term must start before it ends" } - {end_date - { [template::util::date::compare [template::util::date::from_ansi [clock format [clock seconds] -format "%Y-%m-%d"]] $end_date] <= 0 } - "The term must end in the future" - } } -edit_data { # Setting the rigth format to send to the procedures Index: openacs-4/packages/dotlrn/www/admin/term-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-new.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/dotlrn/www/admin/term-new.tcl 13 Jan 2005 13:57:21 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/term-new.tcl 31 May 2005 23:13:07 -0000 1.11.2.1 @@ -55,10 +55,6 @@ { [template::util::date::compare $start_date $end_date] <= 0 } "The term must start before it ends" } - {end_date - { [template::util::date::compare [template::util::date::from_ansi [clock format [clock seconds] -format "%Y-%m-%d"]] $end_date] <= 0 } - "The term must end in the future" - } } -on_submit { # Setting the rigth format to send to the procedures Index: openacs-4/packages/dotlrn/www/admin/term.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v diff -u -r1.24 -r1.24.2.1 --- openacs-4/packages/dotlrn/www/admin/term.adp 11 May 2005 13:40:25 -0000 1.24 +++ openacs-4/packages/dotlrn/www/admin/term.adp 31 May 2005 23:13:07 -0000 1.24.2.1 @@ -56,6 +56,8 @@
    +
    +
    @@ -100,3 +102,4 @@
    + Index: openacs-4/packages/dotlrn/www/admin/term.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/dotlrn/www/admin/term.tcl 11 May 2005 13:45:27 -0000 1.14 +++ openacs-4/packages/dotlrn/www/admin/term.tcl 31 May 2005 23:13:07 -0000 1.14.2.1 @@ -161,11 +161,13 @@ lappend elements action \ [list label "[_ dotlrn.Actions]" \ display_template { +
    [_ dotlrn.administer_link] +
    }] Index: openacs-4/packages/dotlrn/www/admin/term.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.xql,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/www/admin/term.xql 13 Jan 2005 13:57:21 -0000 1.8 +++ openacs-4/packages/dotlrn/www/admin/term.xql 31 May 2005 23:13:07 -0000 1.8.2.1 @@ -13,114 +13,6 @@ - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - and dotlrn_class_instances_full.term_id = :term_id - [template::list::page_where_clause -and -name "classes" -key "dotlrn_class_instances_full.class_instance_id"] - [template::list::orderby_clause -orderby -name "classes"] - - - - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - and dotlrn_class_instances_full.term_id = :term_id - [template::list::orderby_clause -orderby -name "classes"] - - - - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - and dotlrn_class_instances_full.term_id = :term_id - and dotlrn_class_instances_full.department_key = :department_key - [template::list::page_where_clause -and -name "classes" -key "dotlrn_class_instances_full.class_instance_id"] - [template::list::orderby_clause -orderby -name "classes"] - - - - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - and dotlrn_class_instances_full.term_id = :term_id - and dotlrn_class_instances_full.department_key = :department_key - [template::list::orderby_clause -orderby -name "classes"] - - - - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - [template::list::page_where_clause -and -name "classes" -key "dotlrn_class_instances_full.class_instance_id"] - [template::list::orderby_clause -orderby -name "classes"] - - - - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - [template::list::orderby_clause -orderby -name "classes"] - - - - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - and dotlrn_class_instances_full.department_key = :department_key - [template::list::page_where_clause -and -name "classes" -key "dotlrn_class_instances_full.class_instance_id"] - [template::list::orderby_clause -orderby -name "classes"] - - - - - - select dotlrn_class_instances_full.*, - (select count(*) - from dotlrn_member_rels_approved - where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members - from dotlrn_class_instances_full - $keyword_clause - and dotlrn_class_instances_full.department_key = :department_key - [template::list::orderby_clause -orderby -name "classes"] - - - where lower(dotlrn_class_instances_full.pretty_name) like '%'||lower(:keyword)||'%' Index: openacs-4/packages/dotlrn/www/admin/terms.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.adp,v diff -u -r1.19 -r1.19.2.1 --- openacs-4/packages/dotlrn/www/admin/terms.adp 11 May 2005 13:40:25 -0000 1.19 +++ openacs-4/packages/dotlrn/www/admin/terms.adp 31 May 2005 23:13:07 -0000 1.19.2.1 @@ -22,14 +22,16 @@ #dotlrn.Terms# @context_bar@ +
    + - +

    #dotlrn.New_Term#

    - +
    @@ -40,7 +42,7 @@
    + - Index: openacs-4/packages/dotlrn/www/admin/user-nuke.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-nuke.adp,v diff -u -r1.2 -r1.2.8.1 --- openacs-4/packages/dotlrn/www/admin/user-nuke.adp 4 Dec 2002 09:51:04 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/user-nuke.adp 31 May 2005 23:13:07 -0000 1.2.8.1 @@ -8,4 +8,13 @@ #dotlrn.lt_Please_confirm_that_y# +

    + +

    + +#dotlrn.Last_Visit# #dotlrn.Never_visited#@pretty_last_visit@
    +#dotlrn.Number_of_db_objects#: @n_objects@ + +

    + \ No newline at end of file Index: openacs-4/packages/dotlrn/www/admin/user-nuke.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-nuke.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/www/admin/user-nuke.tcl 13 Jan 2005 13:57:22 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/user-nuke.tcl 31 May 2005 23:13:07 -0000 1.4.2.1 @@ -13,14 +13,10 @@ #Pages in this directory are only runnable by dotlrn-wide admins. dotlrn::require_admin -db_1row select_user_info { - select email, - first_names, - last_name - from cc_users - where user_id = :user_id -} +db_1row select_user_info {} +set pretty_last_visit [lc_time_fmt $last_visit "%Q %T"] + form create confirm_delete element create confirm_delete user_id \ Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/user-nuke.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v diff -u -r1.20 -r1.20.2.1 --- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 8 Apr 2005 20:46:43 -0000 1.20 +++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 31 May 2005 23:13:07 -0000 1.20.2.1 @@ -31,7 +31,7 @@ # Prepare stuff set headers {first_names last_name email username} -set admin_user_id [ad_conn user_id] +set admin_user_id [ad_verify_and_get_user_id] set admin_email [db_string select_admin_email { select email from parties @@ -52,7 +52,7 @@ oacs_util::csv_foreach -file $file_location -array_name row { # First make sure the required data is there - if { ![info exists row(email)] || ![info exists row(first_names)] || ![info exists row(last_name)] || ![info exists row(username)] } { + if { ![info exists row(email)] || ![info exists row(first_names)] || ![info exists row(last_name)] } { doc_body_append [_ dotlrn.datafile_must] db_abort_transaction return @@ -109,10 +109,9 @@ if {![info exists row(notify)]} { set row(notify) f - } - - doc_body_append "Creating user $row(email)...." + } + ns_log Debug "%%% $row(username)...$row(access_level)...$row(type)" # Now we make them a dotLRN user switch -exact $row(access_level) { Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v diff -u -r1.25 -r1.25.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk.adp 11 May 2005 13:45:27 -0000 1.25 +++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp 31 May 2005 23:13:07 -0000 1.25.2.1 @@ -34,7 +34,7 @@ %> - +
    @@ -117,6 +117,7 @@
    #dotlrn.User#
    +
    Index: openacs-4/packages/dotlrn/www/resources/dotlrn-master.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/resources/dotlrn-master.css,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/www/resources/dotlrn-master.css 14 Mar 2005 01:51:15 -0000 1.4 +++ openacs-4/packages/dotlrn/www/resources/dotlrn-master.css 31 May 2005 23:13:08 -0000 1.4.2.1 @@ -178,7 +178,6 @@ #breadcrumbs { margin: 0; padding: 0; - font-size: 100%; float: left; padding-bottom: 5px; margin-left: 5px; Index: openacs-4/packages/dotlrn/www/resources/dotlrn-toolbar.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/resources/dotlrn-toolbar.css,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/dotlrn/www/resources/dotlrn-toolbar.css 13 Jan 2005 13:57:23 -0000 1.2 +++ openacs-4/packages/dotlrn/www/resources/dotlrn-toolbar.css 31 May 2005 23:13:08 -0000 1.2.2.1 @@ -7,7 +7,7 @@ background-color: #1958B7; color: white; font-family: tahoma, verdana; - font-size: 75%; + font-size: 100%; padding-left: 4px; padding-right: 8px; padding-top: 2px; Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-assessment/tcl/dotlrn-assessment-procs-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml 3 Mar 2005 22:32:16 -0000 1.9 +++ openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml 31 May 2005 23:13:08 -0000 1.9.2.1 @@ -1,5 +1,5 @@ - + Actions Add this course to one category. @@ -33,6 +33,7 @@ Courses Create Create a new version of + Add Section Delete Delete Course Delete This Course @@ -46,6 +47,7 @@ DotLRN List New Course Version Email: + End Date: Enroll Enroll Not Available Grant @@ -87,6 +89,7 @@ Search for user Email: Search Users To Grant Permissions On See All Versions + Start Date: Subject Name Term Name This course has Index: openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp 9 May 2005 21:59:07 -0000 1.9 +++ openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp 31 May 2005 23:13:08 -0000 1.9.2.1 @@ -82,7 +82,7 @@ - #dotlrn-catalog.enroll# + #dotlrn-catalog.enroll#
    Index: openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl 10 May 2005 14:14:52 -0000 1.8 +++ openacs-4/packages/dotlrn-catalog/lib/course-chunk.tcl 31 May 2005 23:13:08 -0000 1.8.2.1 @@ -31,12 +31,12 @@ } set category_p [db_string get_category { } -default -1] + set info [ad_html_text_convert -from text/enhanced -to text/plain $info] -set reg_asm_id [parameter::get -parameter AsmForRegisterId -package_id [ad_conn subsite_id]] + set cc_package_id [apm_package_id_from_key "dotlrn-catalog"] set tree_id [db_string get_tree_id { } -default "-1"] - # Get the category name set category_name "[category::get_name [category::get_mapped_categories $course_id]]" @@ -132,15 +132,8 @@ } } -#Send the registration assessment_id -set reg_chunck "assessment_id=$asmid" -if { ![string eq $reg_asm_id 0] } { - if { [ad_conn user_id] == 0} { - set reg_chunck "assessment_id=$reg_asm_id&next_asm=$asmid" - } -} @@ -154,5 +147,3 @@ - - Index: openacs-4/packages/dotlrn-catalog/lib/course-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/course-chunk.xql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/dotlrn-catalog/lib/course-chunk.xql 9 May 2005 21:59:07 -0000 1.5 +++ openacs-4/packages/dotlrn-catalog/lib/course-chunk.xql 31 May 2005 23:13:08 -0000 1.5.2.1 @@ -34,7 +34,5 @@ where community_id in $dotlrn_com order by pretty_name - - \ No newline at end of file Index: openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl 3 Mar 2005 22:33:36 -0000 1.4 +++ openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.tcl 31 May 2005 23:13:08 -0000 1.4.2.1 @@ -273,3 +273,13 @@ return $return_list } + +ad_proc -public dotlrn_catalog::get_course_data { + {-course_id:required} +} { + Returns the course information (name,key and description) in the array course_data + +} { + upvar course_data course_data + return [db_0or1row get_data {} -column_array course_data] +} \ No newline at end of file Index: openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql 22 Feb 2005 14:54:40 -0000 1.3 +++ openacs-4/packages/dotlrn-catalog/tcl/dotlrn-catalog-procs.xql 31 May 2005 23:13:08 -0000 1.3.2.1 @@ -141,5 +141,13 @@ + + + select course_name as name, course_key as key, course_info as description + from dotlrn_catalog + where course_id=:course_id + + + Index: openacs-4/packages/dotlrn-catalog/www/course-info.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/course-info.adp,v diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- openacs-4/packages/dotlrn-catalog/www/course-info.adp 14 Feb 2005 22:46:11 -0000 1.1.1.1 +++ openacs-4/packages/dotlrn-catalog/www/course-info.adp 31 May 2005 23:13:09 -0000 1.1.1.1.2.1 @@ -2,5 +2,5 @@ @page_title@ @context;noquote@
    - + Index: openacs-4/packages/dotlrn-catalog/www/course-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/course-info.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/dotlrn-catalog/www/course-info.tcl 22 Feb 2005 14:54:40 -0000 1.2 +++ openacs-4/packages/dotlrn-catalog/www/course-info.tcl 31 May 2005 23:13:09 -0000 1.2.2.1 @@ -12,6 +12,7 @@ set context [list "[_ dotlrn-catalog.one_course_info]"] set return_url "index" +dotlrn_catalog::get_course_data -course_id $course_id db_1row get_course_info { } Index: openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs-postgresql.xql,v diff -u -r1.2 -r1.2.4.1 --- openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs-postgresql.xql 8 Jul 2004 19:30:46 -0000 1.2 +++ openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs-postgresql.xql 31 May 2005 23:13:09 -0000 1.2.4.1 @@ -3,15 +3,38 @@ postgresql7.1 - + + + select eg.grade_name, eg.grade_plural_name, eg.comments, eg.weight, eg.grade_item_id + from acs_objects o, evaluation_grades eg,cr_items ci,cr_revisions cr + where o.object_id = ci.item_id + and cr.revision_id=eg.grade_id + and ci.item_id=cr.item_id + and cr.revision_id=ci.live_revision + and o.context_id =:old_package_id + + + - select evaluation__clone ( - :old_package_id, - :new_package_id - ); + select et.task_name,cr.description,et.weight, et.number_of_members, et.online_p, ci.storage_type, et.due_date, et.late_submit_p, et.requires_grade_p, cr.title, cr.mime_type, et.estimated_time, et.forums_related_p,et.points, et.relative_weight, et.perfect_score,(ci.live_revision = cr.revision_id) as live_p from evaluation_tasks et,cr_revisions cr,cr_items ci, acs_objects o where grade_item_id = :grade_item_id and cr.revision_id=task_id and cr.item_id=ci.item_id and object_id=ci.item_id order by task_item_id + + + + update evaluation_tasks set points=:points, relative_weight=:relative_weight, perfect_score= :perfect_score,forums_related_p=:forums_related_p where task_id=:task_revision_id; + + + + + + delete from evaluation_grades where grade_id in (select eg.grade_id from acs_objects o, evaluation_grades eg,cr_items ci,cr_revisions cr where o.object_id = ci.item_id and cr.revision_id=eg.grade_id and ci.item_id=cr.item_id and cr.revision_id=ci.live_revision and o.context_id = :new_package_id); + + + + + Index: openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs.tcl 26 Apr 2005 21:52:36 -0000 1.5 +++ openacs-4/packages/dotlrn-evaluation/tcl/dotlrn-evaluation-procs.tcl 31 May 2005 23:13:09 -0000 1.5.2.1 @@ -29,7 +29,7 @@ ad_proc -public dotlrn_evaluation::get_pretty_name {} { returns the pretty name } { - return "#dotlrn-evaluation.Evaluation_#" + return "[_ dotlrn-evaluation.Evaluation_]" } ad_proc -public dotlrn_evaluation::add_applet {} { @@ -196,8 +196,54 @@ -community_id $old_community_id \ -applet_key [applet_key] ] + + set grades [db_list_of_lists get_grades {}] + + db_dml delete_grades {} - db_exec_plsql call_evaluation_clone {} + foreach grade $grades { + set grade_id [db_nextval acs_object_id_seq] + set revision_id [evaluation::new_grade -new_item_p t -item_id $grade_id -content_type evaluation_grades -content_table evaluation_grades -content_id grade_id -name [lindex $grade 0] -plural_name [lindex $grade 1] -description [lindex $grade 2] -weight [lindex $grade 3] -package_id $new_package_id] + content::item::set_live_revision -revision_id $revision_id + + set grade_item_id [lindex $grade 4] + set tasks [db_list_of_lists get_tasks {}] + + + foreach task $tasks { + set forums_related_p [lindex $task 12] + set points [lindex $task 13] + set relative_weight [lindex $task 14] + set perfect_score [lindex $task 15] + set task_id [db_nextval acs_object_id_seq] + set task_revision_id [evaluation::new_task -new_item_p t -item_id $task_id \ + -content_type evaluation_tasks \ + -content_table evaluation_tasks \ + -content_id task_id \ + -name [lindex $task 0] \ + -description [lindex $task 1] \ + -weight [lindex $task 2] \ + -grade_item_id $grade_id \ + -number_of_members [lindex $task 3] \ + -online_p [lindex $task 4] \ + -storage_type [lindex $task 5] \ + -due_date [lindex $task 6] \ + -late_submit_p [lindex $task 7] \ + -requires_grade_p [lindex $task 8] \ + -title [lindex $task 9] \ + -mime_type [lindex $task 10] \ + -estimated_time [lindex $task 11] \ + -package_id $new_package_id] + + content::item::set_live_revision -revision_id $task_revision_id + + # by the moment, since I'm having a date problem with oracle10g, I have to do this in order + # to store the entire date + + db_dml update_tasks {} + } + } + return $new_package_id } Index: openacs-4/packages/ecommerce/ecommerce.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/ecommerce.info,v diff -u -r1.40 -r1.40.2.1 --- openacs-4/packages/ecommerce/ecommerce.info 24 Feb 2005 13:33:12 -0000 1.40 +++ openacs-4/packages/ecommerce/ecommerce.info 31 May 2005 23:13:13 -0000 1.40.2.1 @@ -12,7 +12,7 @@ Bart Teeuwisse Alfred Werner The ACS 3.x based e-commerce solution ported to OpenACS. - 2005-02-10 + 2005-03-12 furfly.net, LLC This module implements all that IT needs for a standard business-to-consumer Web service. You can find a feature summary in the documentaion. @@ -38,7 +38,7 @@ - + @@ -53,12 +53,13 @@ - + + - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/tcl/callback-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl,v diff -u -r1.7 -r1.7.4.1 --- openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl 15 Mar 2004 04:28:00 -0000 1.7 +++ openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl 31 May 2005 23:13:13 -0000 1.7.4.1 @@ -333,7 +333,7 @@ } append audit_entry "
    " if { ![empty_string_p $restore_url] } { - set exports [export_vars id id_column \ + set exports [export_url_vars id id_column \ main_table_name audit_table_name rowid] append audit_entry " Restore this record @@ -439,7 +439,7 @@ # Set the HTML link tags to a page which displays the full # audit history. if { ![empty_string_p $audit_url] } { - set exports [export_vars id id_column \ + set exports [export_url_vars id id_column \ main_table_name audit_table_name] set id_href "" set id_href_close "" @@ -484,7 +484,7 @@ # Set the HTML link tags to a page which displays the full # audit history. if { ![empty_string_p $audit_url] } { - set exports [export_vars id id_column main_table_name \ + set exports [export_url_vars id id_column main_table_name \ audit_table_name] set id_href "" set id_href_close "" Index: openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl 24 Feb 2005 13:33:13 -0000 1.8 +++ openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl 31 May 2005 23:13:13 -0000 1.8.2.1 @@ -128,7 +128,7 @@ append to_return " ([join $issue_type_list ", "])" set issue_type_list [list] } - append to_return "
  • $issue_id: opened [util_AnsiDatetoPrettyDate $open_date]" + append to_return "
  • $issue_id: opened [util_AnsiDatetoPrettyDate $open_date]" if { ![empty_string_p $close_date] } { append to_return ", closed [util_AnsiDatetoPrettyDate $close_date]" } Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl 24 Feb 2005 13:33:13 -0000 1.11 +++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl 31 May 2005 23:13:13 -0000 1.11.2.1 @@ -134,7 +134,7 @@ require it. } { - set order_link [ec_securelink "[ad_url][ec_url]admin/orders/one?[export_vars order_id]"] + set order_link [ec_securelink "[ad_url][ec_url]admin/orders/one?[export_url_vars order_id]"] db_foreach notification_select { select ep.email_on_purchase_list, ep.product_name Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v diff -u -r1.26 -r1.26.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 24 Feb 2005 13:33:13 -0000 1.26 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 31 May 2005 23:13:13 -0000 1.26.2.1 @@ -1241,7 +1241,7 @@ } if { ![empty_string_p $tracking_number] } { if { ([string tolower $carrier] == "fedex" || [string range [string tolower $carrier] 0 2] == "ups") } { - append to_append_to_shipment_list " (track)" + append to_append_to_shipment_list " (track)" } else { append to_append_to_shipment_list " (tracking # $tracking_number)" } Index: openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl 1 Mar 2005 00:01:29 -0000 1.10 +++ openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl 31 May 2005 23:13:14 -0000 1.10.2.1 @@ -70,12 +70,12 @@ } ad_proc ec_secure_location {} { - @return the secure location https://host:port, favoring the https module specified as an ecommerce parameter. + @returns the secure location https://host:port, favoring the https module specified as an ecommerce parameter. } { - # set loc [ad_parameter -package_id [ec_id] SecureLocation] + set loc [ad_parameter -package_id [ec_id] SecureLocation] if {[empty_string_p $loc] || [string equal -nocase $loc "No Value"]} { - # set sdriver [ad_parameter -package_id [ec_id] httpsModule] + set sdriver [ad_parameter -package_id [ec_id] httpsModule] if {[empty_string_p $sdriver]} { array set drivers [ec_preferred_drivers] @@ -88,8 +88,7 @@ set secure_port [ns_config -int "ns/server/[ns_info server]/module/$sdriver" ServerPort 443] } ### nsopenssl 3 has variable locations for the secure port - # This next check might best be handled by creating another - # parameter value for users/inboundssl (custom driver name) + # this is matched to the aolserver config.tcl if { [empty_string_p $secure_port] || [string match $secure_port 443] } { set secure_port [ns_config -int "ns/server/[ns_info server]/module/$sdriver/ssldriver/users" port 443] } @@ -156,10 +155,10 @@ } { uplevel { # wtem@olywa.net, 2001-03-22 - # made this simpler by relying on security::secure_conn_p - if {![security::secure_conn_p]} { + # made this simpler by relying on ad_secure_conn_p + if {![ad_secure_conn_p]} { # see if ssl is installed - # replaced security::https_available_p with ec_ssl_available_p + # replaced ad_ssl_available_p with ec_ssl_available_p # which detects nsopenssl if { ![ec_ssl_available_p] } { # there's no ssl @@ -180,7 +179,7 @@ # grab the user_id # 0 if user is not logged in - set user_id [ad_conn user_id] + set user_id [ad_verify_and_get_user_id] # grab the current user_session_id # otherwise we lose the session @@ -194,7 +193,7 @@ # so that links from both /ecommerce-instance/ and # and /ecommerce-instance/admin work - set register_url "[ec_secure_location][ad_conn package_url]register/index?return_url=[ns_urlencode $secure_url]&http_id=$user_id&user_session_id=$user_session_id" + set register_url "[ec_securelink [ad_get_login_url]]?return_url=[ns_urlencode $secure_url]&http_id=$user_id&user_session_id=$user_session_id" ad_returnredirect $register_url template::adp_abort } @@ -227,8 +226,8 @@ return 0 } else { array set drivers [ec_preferred_drivers] - set secure_url "https://[ns_config ns/server/[ns_info server]/module/$drivers(sdriver) Hostname]" - set secure_port [ns_config ns/server/[ns_info server]/module/$drivers(sdriver) Port] + set secure_url "https://[ns_info hostname]" + set secure_port [ns_config ns/server/[ns_info server]/module/$drivers(sdriver) ServerPort] if ![empty_string_p $secure_port] { append secure_url ":$secure_port" } @@ -249,7 +248,7 @@ If the current url is secure, will redirect the user to the insecure version of this page. One disadvantage of this is the Netscape throws up a "the document you requested was - supposed to be secure" window. ec_insecureurl might be a + supposed to be secure" window. ec_insecurelink might be a better choice. } { @@ -275,26 +274,21 @@ ad_proc ec_securelink {new_page} { - Allows you to create a relative link to a secure page + Creates a url to a secure page from a relative url that may or may not be secure } { - if {![security::https_available_p]} { + if {![ad_ssl_available_p]} { # we don't have ssl installed, so return the original URL return $new_page } - if { [string match "nsssl" [ns_conn driver]] || - [string match "nsopenssl" [ns_conn driver]] } { - # we don't need to do anything + if { [string match "nsssl" [ns_conn driver]] || [string match "nsopenssl" [ns_conn driver]] } { + # we are already connected via ssl, no need to do anything return $new_page } else { - array set drivers [ec_preferred_drivers] - set new_url "https://[ns_config ns/server/[ns_info server]/module/$drivers(sdriver) Hostname]" - set port [ns_config ns/server/[ns_info server]/module/$drivers(sdriver) Port] - if {![empty_string_p $port] && ($port != 443)} { - append new_url ":$port" - } + + set new_url [ec_secure_location] if [string match /* $new_page] { append new_url $new_page @@ -309,17 +303,15 @@ ad_proc ec_insecurelink {new_page} { - Allows you to create a relative link from a secure page to an - insecure page + Creates a url from a possible secure page to an insecure page } { - if {![security::https_available_p]} { + if {![ad_ssl_available_p]} { # we don't have ssl installed, so return the original URL return $new_page } - if {(![string match "nsssl" [ns_conn driver]] && - ![string match "nsopenssl" [ns_conn driver]])} { + if {(![string match "nsssl" [ns_conn driver]] && ![string match "nsopenssl" [ns_conn driver]])} { # We're not on a secure page, so this relative link is already # doing the right thing. return $new_page Index: openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs.tcl 24 Feb 2005 13:33:13 -0000 1.8 +++ openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -134,6 +134,15 @@ update ec_orders set order_state = 'confirmed', confirmed_date = sysdate where order_id = :order_id" + + # Call after-checkout callback + db_foreach products { + select product_id, price_charged + from ec_items + where order_id = :order_id + } { + callback -- ecommerce::after-checkout -user_id $user_id -product_id $product_id -price $price_charged + } } ad_proc ec_apply_gift_certificate_balance { Index: openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl,v diff -u -r1.5 -r1.5.4.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl 15 Mar 2004 04:28:01 -0000 1.5 +++ openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl 31 May 2005 23:13:14 -0000 1.5.4.1 @@ -66,7 +66,7 @@ where c.product_id = p.product_id and user_id = :user_id" { - append moby_string "
  • [util_AnsiDatetoPrettyDate $comment_date] : $product_name\n" + append moby_string "
  • [util_AnsiDatetoPrettyDate $comment_date] : $product_name\n" } append moby_string " Index: openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl 13 Jan 2005 13:57:56 -0000 1.15 +++ openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl 31 May 2005 23:13:14 -0000 1.15.2.1 @@ -338,7 +338,7 @@ } } else { set linked_thumbnail " - \"Product" + \"Product" } } return $linked_thumbnail Index: openacs-4/packages/ecommerce/tcl/qmail-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/qmail-procs.tcl,v diff -u -r1.5 -r1.5.6.1 --- openacs-4/packages/ecommerce/tcl/qmail-procs.tcl 8 Mar 2004 19:46:11 -0000 1.5 +++ openacs-4/packages/ecommerce/tcl/qmail-procs.tcl 31 May 2005 23:13:14 -0000 1.5.6.1 @@ -12,5 +12,9 @@ @author jsc @creation-date 1999-01-15 } { - ns_sendmail $to $from $subject $body $extraheaders + if { ![empty_string_p $to] } { + ns_sendmail $to $from $subject $body $extraheaders + } else { + ns_log Notice "qmail-procs.tcl: Warning, requested to send an email without an email address. subject=$subject" + } } Index: openacs-4/packages/ecommerce/www/account.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/account.tcl 1 Mar 2005 00:01:30 -0000 1.8 +++ openacs-4/packages/ecommerce/www/account.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -11,7 +11,7 @@ usca_p:optional } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/address-international-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international-2.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/address-international-2.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/address-international-2.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -53,7 +53,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/billing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/billing.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/billing.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -15,7 +15,7 @@ # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/category-browse-subcategory.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subcategory.adp,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/category-browse-subcategory.adp 13 Jan 2005 13:57:58 -0000 1.6 +++ openacs-4/packages/ecommerce/www/category-browse-subcategory.adp 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -13,23 +13,23 @@

    • Browse:

      - @subcategories@ + @subcategories;noquote@

    We recommend:

    - @recommendations@ + @recommendations;noquote@
    -

    @category_name@ > @subcategory_name@ products:

    +

    @category_name@ > @subcategory_name@ products:

    @products;noquote@ - @prev_link@ @separator@ @next_link@ + @prev_link;noquote@ @separator@ @next_link;noquote@

    Add yourself to the @the_category_name@ mailing list!

    Index: openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl 1 Mar 2005 00:01:30 -0000 1.8 +++ openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -40,7 +40,7 @@ set user_session_id [ec_get_user_session_id] # see if they're logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if { $user_id != 0 } { set user_name [db_string get_user_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp,v diff -u -r1.4 -r1.4.6.1 --- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp 8 Mar 2004 19:46:11 -0000 1.4 +++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp 31 May 2005 23:13:14 -0000 1.4.6.1 @@ -11,7 +11,7 @@

    We recommend:

    - @recommendations@ + @recommendations;noquote@
    @hidden_vars;noquote@ Index: openacs-4/packages/ecommerce/www/checkout-one-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/ecommerce/www/checkout-one-form.tcl 13 Jan 2005 13:57:58 -0000 1.2 +++ openacs-4/packages/ecommerce/www/checkout-one-form.tcl 31 May 2005 23:13:14 -0000 1.2.2.1 @@ -296,20 +296,25 @@ and i.order_id=:order_id order by i.product_id" { # ordering by i.product_id so loop can identify first instance of a quantity - if { $product_id == $last_product_id } { - set first_instance 0 - } else { + + if { $product_id != $last_product_id } { set first_instance 1 db_1row get_shipping_info " - select shipping, shipping_additional, weight - from ec_products - where product_id=:product_id" + select shipping, shipping_additional, weight, no_shipping_avail_p + from ec_products + where product_id=:product_id" + } else { + set first_instance 0 } - set shipping_prices_for_one_item [ec_shipping_prices_for_one_item_by_rate $product_id $shipping $shipping_additional $default_shipping_per_item $weight $weight_shipping_cost $first_instance $add_exp_amount_per_item $add_exp_amount_by_weight] + # if no_shipping_avail_p, skip calculating shipping for this item + if { [string equal $no_shipping_avail_p "f"] } { - set total_reg_shipping_price [expr $total_reg_shipping_price + [lindex $shipping_prices_for_one_item 0]] - set total_exp_shipping_price [expr $total_exp_shipping_price + [lindex $shipping_prices_for_one_item 1]] - set last_product_id $product_id + set shipping_prices_for_one_item [ec_shipping_prices_for_one_item_by_rate $product_id $shipping $shipping_additional $default_shipping_per_item $weight $weight_shipping_cost $first_instance $add_exp_amount_per_item $add_exp_amount_by_weight] + + set total_reg_shipping_price [expr $total_reg_shipping_price + [lindex $shipping_prices_for_one_item 0]] + set total_exp_shipping_price [expr $total_exp_shipping_price + [lindex $shipping_prices_for_one_item 1]] + set last_product_id $product_id + } } @@ -438,7 +443,7 @@ # if we want to bias users to use their billing addresses. set shipping_address_ids [db_list get_shipping_address_ids " select address_id -` from ec_addresses + from ec_addresses where user_id=:user_id and address_type = 'shipping'" ] Index: openacs-4/packages/ecommerce/www/checkout-one-form.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/ecommerce/www/checkout-one-form.xql 13 Jan 2005 13:57:58 -0000 1.2 +++ openacs-4/packages/ecommerce/www/checkout-one-form.xql 31 May 2005 23:13:14 -0000 1.2.2.1 @@ -132,6 +132,14 @@ + + + select shipping, shipping_additional, weight, no_shipping_avail_p + from ec_products + where product_id=:product_id + + + select c.creditcard_id, c.creditcard_type, c.creditcard_last_four, c.creditcard_expire Index: openacs-4/packages/ecommerce/www/checkout.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/ecommerce/www/checkout.tcl 13 Jan 2005 13:57:59 -0000 1.14 +++ openacs-4/packages/ecommerce/www/checkout.tcl 31 May 2005 23:13:14 -0000 1.14.2.1 @@ -94,7 +94,7 @@ if { $shipping_required == "false" } { set address_id "" - ad_returnredirect "checkout-2?[export_vars address_id address_type]" + ad_returnredirect "checkout-2?[export_url_vars address_id address_type]" ad_script_abort } Index: openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -71,7 +71,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_url_vars creditcard_number creditcard_type creditcard_expire_1 creditcard_expire_2]." ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/credit-card-correction.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/credit-card-correction.tcl 1 Mar 2005 00:01:30 -0000 1.8 +++ openacs-4/packages/ecommerce/www/credit-card-correction.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -32,7 +32,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" # this page gets referred from numerous locations where user should already be logged in. Index: openacs-4/packages/ecommerce/www/finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/finalize-order.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/finalize-order.tcl 1 Mar 2005 00:01:30 -0000 1.9 +++ openacs-4/packages/ecommerce/www/finalize-order.tcl 31 May 2005 23:13:14 -0000 1.9.2.1 @@ -36,7 +36,7 @@ # or cookie surgery to get here # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 1 Mar 2005 00:01:30 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -21,7 +21,7 @@ # User must be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -13,7 +13,7 @@ } # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" Index: openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -11,7 +11,7 @@ } # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 1 Mar 2005 00:01:30 -0000 1.9 +++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 31 May 2005 23:13:14 -0000 1.9.2.1 @@ -58,7 +58,7 @@ # User must be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl 1 Mar 2005 00:01:30 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -15,7 +15,7 @@ # User must be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] set email "" set mightbe "" Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -28,7 +28,7 @@ # User must be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -30,7 +30,7 @@ # User must be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] # Error checking Index: openacs-4/packages/ecommerce/www/gift-certificate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/gift-certificate.tcl 1 Mar 2005 00:01:30 -0000 1.7 +++ openacs-4/packages/ecommerce/www/gift-certificate.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -15,7 +15,7 @@ # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.adp,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/index.adp 24 Feb 2005 13:33:14 -0000 1.8 +++ openacs-4/packages/ecommerce/www/index.adp 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -16,7 +16,7 @@

    We recommend:

    - @recommendations_if_there_are_any@ + @recommendations_if_there_are_any;noquote@     Index: openacs-4/packages/ecommerce/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/index.tcl 1 Mar 2005 00:01:30 -0000 1.8 +++ openacs-4/packages/ecommerce/www/index.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -20,7 +20,7 @@ # see if they're logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if { $user_id != 0 } { set user_name [db_string get_user_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl 1 Mar 2005 00:01:31 -0000 1.7 +++ openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -21,7 +21,7 @@ usca_p:optional } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_form_vars category_id subcategory_id subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/mailing-list-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/mailing-list-add.tcl 1 Mar 2005 00:01:31 -0000 1.6 +++ openacs-4/packages/ecommerce/www/mailing-list-add.tcl 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -21,7 +21,7 @@ usca_p:optional } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] set return_url "[ec_url]mailing-list-add-2?[export_url_vars category_id subcategory_id subsubcategory_id]" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/mailing-list-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-remove.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/mailing-list-remove.tcl 1 Mar 2005 00:01:31 -0000 1.7 +++ openacs-4/packages/ecommerce/www/mailing-list-remove.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -17,7 +17,7 @@ usca_p:optional } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_form_vars category_id subcategory_id subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/order.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/order.tcl 1 Mar 2005 00:01:31 -0000 1.6 +++ openacs-4/packages/ecommerce/www/order.tcl 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -18,7 +18,7 @@ # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/ecommerce/www/payment.tcl 1 Mar 2005 00:01:31 -0000 1.12 +++ openacs-4/packages/ecommerce/www/payment.tcl 31 May 2005 23:13:14 -0000 1.12.2.1 @@ -18,7 +18,7 @@ # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 1 Mar 2005 00:01:31 -0000 1.10 +++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 31 May 2005 23:13:14 -0000 1.10.2.1 @@ -47,7 +47,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set form [ns_conn form] if { ![empty_string_p $form] } { Index: openacs-4/packages/ecommerce/www/process-payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-payment.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/process-payment.tcl 1 Mar 2005 00:01:31 -0000 1.7 +++ openacs-4/packages/ecommerce/www/process-payment.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -43,7 +43,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/product-search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.adp,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/product-search.adp 13 Jan 2005 13:58:00 -0000 1.6 +++ openacs-4/packages/ecommerce/www/product-search.adp 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -2,7 +2,9 @@ @category_name@ @context_bar;noquote@ @ec_system_owner;noquote@ - + @search_text@ + @category_id@ + @subcategory_id@ t
    Index: openacs-4/packages/ecommerce/www/product-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/product-search.tcl 1 Mar 2005 00:01:31 -0000 1.9 +++ openacs-4/packages/ecommerce/www/product-search.tcl 31 May 2005 23:13:14 -0000 1.9.2.1 @@ -1,6 +1,11 @@ ad_page_contract { @param search_text @param combocategory_id:optional + @param category_id:optional + @param subcategory_id:optional + @param combocategory_id:optional + @param rows_per_page:optional How many products to display on the page + @param start_row:optional Where to begin from @param usca_p:optional This page searches for products either within a category (if specified) or @@ -11,16 +16,17 @@ @author ported by Jerry Asher (jerry@theashergroup.com) @author Bart Teeuwisse (bart.teeuwisse@thecodemill.biz) @revision-date April 2002 - } { search_text {combocategory_id ""} {category_id ""} {subcategory_id ""} + {rows_per_page:naturalnum {[ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce]}} + {start_row:naturalnum "0"} usca_p:optional } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] # Is search request originating from a page from this site? # if not, cookies are created for each image, so consider skiping presenting images @@ -49,7 +55,7 @@ # filter overflow attempts from really long search strings set search_text "[string range $search_text 0 100 ]" -ec_create_new_session_if_necessary [export_url_vars category_id search_text] cookies_are_not_required +ec_create_new_session_if_necessary [export_url_vars category_id subcategory_id subsubcategory_id rows_per_page start_row search_text] cookies_are_not_required if { [string compare $user_session_id "0"] != 0 } { db_dml insert_search_text_to_session_info "insert into ec_user_session_info (user_session_id, category_id, search_text) values (:user_session_id, :category_id, :search_text)" } @@ -92,8 +98,12 @@ set search_string "" set search_count 0 +set have_how_many_more_p "f" +set end_row_of_next_page [expr $start_row + (2 * $rows_per_page)] db_foreach get_product_listing_from_search $query_string { - incr search_count + + if { $search_count >= $start_row && [expr $search_count - $start_row] < $rows_per_page } { + append search_string "
    @@ -107,12 +117,50 @@
    [ec_linked_thumbnail_if_it_exists $dirname "t" "t"]
    " + set last_row_this_page [expr $search_count + 1] + } + incr search_count + if { $search_count > $end_row_of_next_page } { + # we know there are at least how_many more items to display next time + set have_how_many_more_p "t" + } } +if { $start_row >= $rows_per_page } { + set prev_link "Previous $rows_per_page" +} else { + set prev_link "" +} + +if { [string equal $have_how_many_more_p "t"] } { + set next_link "Next $rows_per_page" +} else { + set number_of_remaining_products [expr $search_count - $start_row - $rows_per_page] + if { $number_of_remaining_products > 0 } { + set next_link "Next $number_of_remaining_products" + } else { + set next_link "" + } +} + +if { [empty_string_p $next_link] || [empty_string_p $prev_link] } { + set separator "" +} else { + set separator " | " +} + if { $search_count == 0 } { set search_results "No products found." } else { - set search_results "

    $search_count [ec_decode $search_count "1" "item found." "items found, most relevant first."]

    $search_string" + set search_results "

    $search_count [ec_decode $search_count "1" "item found." "items found, most relevant first."]

    " + if { $start_row != 0 || $search_count > $rows_per_page } { + if { [info exists last_row_this_page] } { + append search_results "

    Showing items [expr $start_row + 1] to $last_row_this_page.

    " + } else { + append search_results "

    Display scope out of range of search results.

    " + } + } + append search_results "${search_string}${prev_link}${separator}${next_link}" } set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "[ec_system_name] search results"]]] set ec_system_owner [ec_system_owner] Index: openacs-4/packages/ecommerce/www/product.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/ecommerce/www/product.tcl 1 Mar 2005 00:01:31 -0000 1.10 +++ openacs-4/packages/ecommerce/www/product.tcl 31 May 2005 23:13:14 -0000 1.10.2.1 @@ -39,7 +39,7 @@ # Users don't need to be logged in but if they are the could get a # lower price -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] # user sessions: # 1. get user_session_id from cookie @@ -55,7 +55,7 @@ # 4. Log this product_id into the user session set user_session_id [ec_get_user_session_id] -ec_create_new_session_if_necessary [export_url_vars product_id offer_code] cookies_are_not_required +ec_create_new_session_if_necessary [export_url_vars product_id offer_code] cookies_are_not_required # Valid offer codes must be <= 20 characters, so if it's more than 20 # characters, pretend it isn't there Index: openacs-4/packages/ecommerce/www/review-submit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-2.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/review-submit-2.tcl 1 Mar 2005 00:01:31 -0000 1.7 +++ openacs-4/packages/ecommerce/www/review-submit-2.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -21,7 +21,7 @@ } # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/review-submit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-3.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/review-submit-3.tcl 1 Mar 2005 00:01:31 -0000 1.8 +++ openacs-4/packages/ecommerce/www/review-submit-3.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -23,7 +23,7 @@ # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { if [info exists usca_p] { set return_url "[ad_conn url]?[export_url_vars product_id rating one_line_summary user_comment comment_id usca_p]" Index: openacs-4/packages/ecommerce/www/review-submit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/review-submit.tcl 1 Mar 2005 00:01:31 -0000 1.8 +++ openacs-4/packages/ecommerce/www/review-submit.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -16,7 +16,7 @@ # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_url_vars product_id usca_p]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/select-shipping.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/ecommerce/www/select-shipping.tcl 1 Mar 2005 00:01:31 -0000 1.11 +++ openacs-4/packages/ecommerce/www/select-shipping.tcl 31 May 2005 23:13:14 -0000 1.11.2.1 @@ -20,7 +20,7 @@ # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql,v diff -u -r1.3 -r1.3.12.1 --- openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql 19 Sep 2002 03:24:55 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql 31 May 2005 23:13:14 -0000 1.3.12.1 @@ -6,17 +6,41 @@ 8.1.6 + + + select nvl(base_shipping_cost,0) as base_shipping_cost, + nvl(default_shipping_per_item,0) as default_shipping_per_item, + nvl(weight_shipping_cost,0) as weight_shipping_cost, + nvl(add_exp_base_shipping_cost,0) as add_exp_base_shipping_cost, + nvl(add_exp_amount_per_item,0) as add_exp_amount_per_item, + nvl(add_exp_amount_by_weight,0) as add_exp_amount_by_weight + from ec_admin_settings + + + - select p.product_name, p.one_line_description, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price + select p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additonal, p.weight, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price from ec_orders o, ec_items i, ec_products p, (select product_id, offer_code from ec_user_session_offer_codes usoc where usoc.user_session_id=:user_session_id) u where i.product_id=p.product_id and o.order_id=i.order_id and p.product_id=u.product_id(+) and o.user_session_id=:user_session_id and o.order_state='in_basket' - group by p.product_name, p.one_line_description, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice + group by p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additonal, p.weight, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice + + + select i.product_id, i.color_choice, i.size_choice, i.style_choice, count(*) as item_count, u.offer_code + from ec_products p, ec_items i, ec_user_session_offer_codes u + where u.product_id(+)=i.product_id and (u.user_session_id is null or u.user_session_id=:user_session_id) + and i.product_id = p.product_id + and p.no_shipping_avail_p = 'f' + and i.order_id = :order_id + group by i.product_id, i.color_choice, i.size_choice, i.style_choice, u.offer_code + + + Index: openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql,v diff -u -r1.3 -r1.3.12.1 --- openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql 19 Sep 2002 03:24:55 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-postgresql.xql 31 May 2005 23:13:14 -0000 1.3.12.1 @@ -6,9 +6,21 @@ 7.1 + + + select coalesce(base_shipping_cost,0) as base_shipping_cost, + coalesce(default_shipping_per_item,0) as default_shipping_per_item, + coalesce(weight_shipping_cost,0) as weight_shipping_cost, + coalesce(add_exp_base_shipping_cost,0) as add_exp_base_shipping_cost, + coalesce(add_exp_amount_per_item,0) as add_exp_amount_per_item, + coalesce(add_exp_amount_by_weight,0) as add_exp_amount_by_weight + from ec_admin_settings + + + - select p.product_name, p.one_line_description, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price + select p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additional, p.weight, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price from ec_orders o join ec_items i on (o.order_id=i.order_id) join ec_products p on (i.product_id=p.product_id) @@ -17,8 +29,20 @@ where usoc.user_session_id=:user_session_id) u on (p.product_id=u.product_id) where o.user_session_id=:user_session_id and o.order_state='in_basket' - group by p.product_name, p.one_line_description, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice + group by p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additional, p.weight, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice + + + select i.product_id, i.color_choice, i.size_choice, i.style_choice, count(*) as item_count, u.offer_code + from ec_products p, ec_items i + left join ec_user_session_offer_codes u on (u.product_id = i.product_id and u.user_session_id = :user_session_id) + where i.product_id = p.product_id + and p.no_shipping_avail_p = 'f' + and i.order_id = :order_id + group by i.product_id, i.color_choice, i.size_choice, i.style_choice, u.offer_code + + + Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl 1 Mar 2005 00:01:31 -0000 1.8 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -15,7 +15,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 1 Mar 2005 00:01:31 -0000 1.9 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 31 May 2005 23:13:14 -0000 1.9.2.1 @@ -25,7 +25,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl 1 Mar 2005 00:01:31 -0000 1.6 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -14,7 +14,7 @@ } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] set return_url "[ec_url]shopping-cart-retrieve-2" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl 1 Mar 2005 00:01:31 -0000 1.6 +++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -9,7 +9,7 @@ } { } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-save.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/shopping-cart-save.tcl 1 Mar 2005 00:01:31 -0000 1.6 +++ openacs-4/packages/ecommerce/www/shopping-cart-save.tcl 31 May 2005 23:13:14 -0000 1.6.2.1 @@ -12,7 +12,7 @@ } { } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] set return_url "[ec_url]shopping-cart-save-2" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.adp,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/ecommerce/www/shopping-cart.adp 24 Feb 2005 13:33:14 -0000 1.11 +++ openacs-4/packages/ecommerce/www/shopping-cart.adp 31 May 2005 23:13:14 -0000 1.11.2.1 @@ -64,6 +64,49 @@ @pretty_total_price@ + + + + + + + + + + @shipping_options@ + @total_reg_shipping_price@standard + + + + + + + + + + +   + @total_exp_shipping_price@express + + + + + + + + + + + +   + + @shipping_method_pickup@pickup + + + + + + @@ -73,6 +116,9 @@ + + @shipping_options;noquote@ +
    Index: openacs-4/packages/ecommerce/www/shopping-cart.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.tcl,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/ecommerce/www/shopping-cart.tcl 1 Mar 2005 00:01:31 -0000 1.15 +++ openacs-4/packages/ecommerce/www/shopping-cart.tcl 31 May 2005 23:13:14 -0000 1.15.2.1 @@ -6,7 +6,7 @@ @author ported by Jerry Asher (jerry@theashergroup.com) @author revised by Bart Teeuwisse (bart.teeuwisse@thecodemill.biz) @revision-date April 2002 - + } { usca_p:optional product_id:optional @@ -33,7 +33,7 @@ set last_name "" set email "" -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if { $user_id != 0 } { ad_get_user_info } @@ -55,14 +55,84 @@ # where o.order_id=i.order_id # and o.user_session_id=:user_session_id and o.order_state='in_basket'"] +# calculate shipping charge options when not using shipping-gateway, +# and then include the value with each option (for an informed choice) + +# mainly from process-order-quantity-shipping.tcl + +# set initial values for itemization loop +db_1row get_ec_admin_settings " + select nvl(base_shipping_cost,0) as base_shipping_cost, + nvl(default_shipping_per_item,0) as default_shipping_per_item, + nvl(weight_shipping_cost,0) as weight_shipping_cost, + nvl(add_exp_base_shipping_cost,0) as add_exp_base_shipping_cost, + nvl(add_exp_amount_per_item,0) as add_exp_amount_per_item, + nvl(add_exp_amount_by_weight,0) as add_exp_amount_by_weight + from ec_admin_settings" + +set last_product_id 0 set product_counter 0 set total_price 0 set currency [parameter::get -parameter Currency] -set max_quantity_length [string length [parameter::get -parameter CartMaxToAdd]] +set max_add_quantity_length [string length [parameter::get -parameter CartMaxToAdd]] +set offer_express_shipping_p [parameter::get -parameter ExpressShippingP] +set offer_pickup_option_p [parameter::get -parameter PickupP] +set total_reg_shipping_price 0 +set total_exp_shipping_price 0 +set no_shipping_options "t" +# Check if a shipping gateway has been selected. +set shipping_gateway [parameter::get -parameter ShippingGateway] +set shipping_gateway_in_use [acs_sc_binding_exists_p ShippingGateway $shipping_gateway] +set shipping_address_id 0 +if { $shipping_gateway_in_use} { + #this section mainly from select-shipping.tcl + # Replace the default ecommerce shipping calculations with the + # charges from the shipping gateway, which contains + # both the shipping service level and the associated total + # charges. Requries zipcode and country, so + # user needs to be logged in too. + + if { $user_id != 0 } { + set shipping_address_ids [db_list get_shipping_address_ids " + select address_id + from ec_addresses + where user_id=:user_id + and address_type = 'shipping'" ] + + if { [llength $shipping_address_ids] > 1 } { + # the max valued id is most likely the newest id (no last used date field available) + set shipping_address_id [ec_max_of_list $shipping_address_ids] + } elseif { $shipping_address_ids > 0 } { + set shipping_address_id $shipping_address_ids + } else { + set shipping_address_id 0 + set shipping_options "

    We need your shipping address before we can quote a shipping price. You are able to review your order and any shipping charges before confirming an order.

    " + } + if { $shipping_address_id > 0 } { + # we have a zipcode and country + db_1row select_shipping_area " + select country_code, zip_code + from ec_addresses + where address_id = :shipping_address_id" + + # Calculate the total value of the shipment. + set shipment_value 0 + } + } else { + # user_id == 0 + set shipping_options "

    If you were logged in, we could show you any associated shipping charges

    " + } +} + + +# adding some fields to handle calculating shipping prices +# p.no_shipping_avail_p, p.shipping, p.shipping_additional, p.weight +# basically collect shipping information for any items where ec_products.no_shipping_avail_p = 't' + db_multirow -extend { line_subtotal } in_cart get_products_in_cart " - select p.product_name, p.one_line_description, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price + select p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additonal, p.weight, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price from ec_orders o join ec_items i on (o.order_id=i.order_id) join ec_products p on (i.product_id=p.product_id) @@ -71,21 +141,26 @@ where usoc.user_session_id=:user_session_id) u on (p.product_id=u.product_id) where o.user_session_id=:user_session_id and o.order_state='in_basket' - group by p.product_name, p.one_line_description, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice" { + group by p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additional, p.weight, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice" { set line_subtotal "$quantity" } -for {set i 1} {$i <= [multirow size in_cart]} {incr i} { +for {set i 1} {$i <= [template::multirow size in_cart]} {incr i} { - set product_name [multirow get in_cart $i product_name] - set one_line_description [multirow get in_cart $i one_line_description] - set product_id [multirow get in_cart $i product_id] - set quantity [multirow get in_cart $i quantity] - set offer_code [multirow get in_cart $i offer_code] - set color_choice [multirow get in_cart $i color_choice] - set size_choice [multirow get in_cart $i size_choice] - set style_choice [multirow get in_cart $i style_choice] + set product_name [template::multirow get in_cart $i product_name] + set one_line_description [template::multirow get in_cart $i one_line_description] + set product_id [template::multirow get in_cart $i product_id] + set no_shipping_avail_p [template::multirow get in_cart $i no_shipping_avail_p] + set shipping [template::multirow get in_cart $i shipping] + set shipping_additional [template::multirow get in_cart $i shipping_additional] + set weight [template::multirow get in_cart $i weight] + set quantity [template::multirow get in_cart $i quantity] + set offer_code [template::multirow get in_cart $i offer_code] + set color_choice [template::multirow get in_cart $i color_choice] + set size_choice [template::multirow get in_cart $i size_choice] + set style_choice [template::multirow get in_cart $i style_choice] + set max_quantity_length [max $max_add_quantity_length [string length $quantity]] # Deletions are done by product_id, color_choice, size_choice, # style_choice, not by item_id because we want to delete the # entire quantity of that product. Also print the price for a @@ -104,24 +179,111 @@ # Calculate line subtotal for end users set line_subtotal [ec_pretty_price [expr $quantity * $lowest_price] $currency] - multirow set in_cart $i line_subtotal $line_subtotal + template::multirow set in_cart $i line_subtotal $line_subtotal + if { [string equal $no_shipping_avail_p "f"] && !$shipping_gateway_in_use} { + # at least one thing is shippable, begin calculating ship value(s) + set no_shipping_options "f" + + # Calculate shipping for line item + set first_instance 1 + set shipping_prices_for_first_line_item [ec_shipping_prices_for_one_item_by_rate $product_id $shipping $shipping_additional $default_shipping_per_item $weight $weight_shipping_cost $first_instance $add_exp_amount_per_item $add_exp_amount_by_weight] + set total_reg_shipping_price [expr $total_reg_shipping_price + [lindex $shipping_prices_for_first_line_item 0]] + set total_exp_shipping_price [expr $total_exp_shipping_price + [lindex $shipping_prices_for_first_line_item 1]] + + if { $quantity > 1 } { + set first_instance 0 + set shipping_prices_for_more_line_items [ec_shipping_prices_for_one_item_by_rate $product_id $shipping $shipping_additional $default_shipping_per_item $weight $weight_shipping_cost $first_instance $add_exp_amount_per_item $add_exp_amount_by_weight] + set total_reg_shipping_price [expr $total_reg_shipping_price + ( [lindex $shipping_prices_for_more_line_items 0] * ( $quantity - 1 ) ) ] + set total_exp_shipping_price [expr $total_exp_shipping_price + ( [lindex $shipping_prices_for_more_line_items 1] * ( $quantity - 1 ) ) ] + + } + } elseif { $shipping_gateway_in_use && $shipping_address_id > 0 && [string equal $no_shipping_avail_p "f"] } { + set shipment_value [expr $shipment_value + [lindex [ec_lowest_price_and_price_name_for_an_item $product_id $user_id $offer_code] 0]] + } + # Add the price of the item to the total price set total_price [expr $total_price + ($quantity * $lowest_price)] incr product_counter $quantity - # following line added according to bug 643 at openacs.org - # http://openacs.org/bugtracker/openacs/com/ecommerce/bug?bug%5fnumber=643 - multirow set in_cart $i delete_export_vars $delete_export_vars + template::multirow set in_cart $i delete_export_vars $delete_export_vars + template::multirow set in_cart $i price "[lindex $lowest_price_and_price_name 1]:  [ec_pretty_price [lindex $lowest_price_and_price_name 0] $currency]" - multirow set in_cart $i price "[lindex $lowest_price_and_price_name 1]:  [ec_pretty_price [lindex $lowest_price_and_price_name 0] $currency]" - } # Add adjust quantities line if there are products in the cart. set pretty_total_price [ec_pretty_price $total_price $currency] +if { $shipping_gateway_in_use && $shipping_address_id > 0} { + + set weight_unit_of_measure [parameter::get -parameter WeightUnits] + + set shipping_options "" + + # Get the list of services and their charges + + set rates_and_services [lsort -index 1 -real \ + [acs_sc_call "ShippingGateway" "RatesAndServicesSelection" \ + [list "" "" "$country_code" "$zip_code" "$shipment_value" "$currency" "" "$weight_unit_of_measure"] "$shipping_gateway"]] + + # Present the available shipping services to the user + + foreach service $rates_and_services { + array set rate_and_service $service + set total_charges $rate_and_service(total_charges) + set service_code $rate_and_service(service_code) + set service_description [acs_sc_call "ShippingGateway" "ServiceDescription" "$service_code" "$shipping_gateway"] + set gateway_shipping_default_price $total_charges + append shipping_options " + " + } + append shipping_options "
    Shipping method:

    + $service_description + + [string map {USD $} $currency] + + $total_charges +
    " +} + +if { !$shipping_gateway_in_use } { + # Rate based shipping calculations + # 3. Determine base shipping costs that are separate from items + + # set base shipping charges + set order_shipping_cost $base_shipping_cost + set shipping_method_standard $order_shipping_cost + + # Add on the extra base cost for express shipping + set shipping_method_express [expr $order_shipping_cost + $add_exp_base_shipping_cost] + + # 4. set total costs for each shipping option + set total_shipping_price_default $total_reg_shipping_price + set total_reg_shipping_price [ec_pretty_price [expr $total_reg_shipping_price + $shipping_method_standard] $currency "t"] + set total_exp_shipping_price [ec_pretty_price [expr $total_exp_shipping_price + $shipping_method_express] $currency "t"] + set shipping_method_pickup [ec_pretty_price 0 $currency "t"] + set shipping_method_no_shipping 0 + + # 5 prepare shipping options to present to user + if { [string equal $no_shipping_options "f" ] } { + + # standard shipping is total_reg_shipping_price + set shipping_options "Shipping is addtional:" + if { $offer_express_shipping_p } { + # express shipping is total_exp_shipping_price + set shipping_options "Shipping is additional, choices are:" + } + if { $offer_pickup_option_p } { + # pickup instead of shipping is shipping_method_pickup + set shipping_options "Shipping is additional, choices are:" + } + } else { + set shipping_options "No shipping options available." + } +} + # List the states that get charged tax. Although not 100% accurate # as shipping might be taxed too this is better than nothing. Index: openacs-4/packages/ecommerce/www/shopping-cart.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.xql,v diff -u -r1.5 -r1.5.12.1 --- openacs-4/packages/ecommerce/www/shopping-cart.xql 19 Sep 2002 03:24:55 -0000 1.5 +++ openacs-4/packages/ecommerce/www/shopping-cart.xql 31 May 2005 23:13:14 -0000 1.5.12.1 @@ -11,6 +11,24 @@ + + + + select address_id + from ec_addresses + where user_id=:user_id + and address_type = 'shipping' + + + + + + select country_code, zip_code + from ec_addresses + where address_id = :shipping_address_id + + + select tax_rate, initcap(state_name) as state Index: openacs-4/packages/ecommerce/www/thank-you.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/thank-you.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/thank-you.tcl 1 Mar 2005 00:01:31 -0000 1.7 +++ openacs-4/packages/ecommerce/www/thank-you.tcl 31 May 2005 23:13:14 -0000 1.7.2.1 @@ -16,7 +16,7 @@ # We need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "[ad_conn package_url]register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/toolbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/toolbar.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/ecommerce/www/toolbar.tcl 24 Feb 2005 13:33:14 -0000 1.5 +++ openacs-4/packages/ecommerce/www/toolbar.tcl 31 May 2005 23:13:14 -0000 1.5.2.1 @@ -11,17 +11,17 @@ # @cvs-id $Id$ # @creation-date September 2002 -# we'll show a search widget at the top if there are categories to search in -if { ![empty_string_p [db_string get_check_of_categories "select 1 from dual where exists (select 1 from ec_categories)" -default ""]] } { - # Create a context aware search widget to search for products. - # Create empty values for each optional parameter that has not been passed from a master template. foreach parameter {combocategory_id category_id subcategory_id search_text current_location} { if {![info exists $parameter]} { set $parameter {} } } - + +# we'll show a search widget at the top if there are categories to search in +if { ![empty_string_p [db_string get_check_of_categories "select 1 from dual where exists (select 1 from ec_categories)" -default ""]] } { + # Create a context aware search widget to search for products. + # Decode the combo of category and subcategory ids if { ![empty_string_p $combocategory_id] } { set category_id [lindex [split $combocategory_id "|"] 0] @@ -37,7 +37,7 @@ set ecommerce_base_url [ec_url] set ec_cart_link [ec_insecurelink [file join $ecommerce_base_url "shopping-cart"]] -set ec_account_link [ec_insecurelink [file join $ecommerce_base_url "account"]] +set ec_account_link [file join $ecommerce_base_url "account"] set ec_gift_cert_order_link [ec_insecurelink [file join $ecommerce_base_url "gift-certificate-order"]] # Get the name of the ecommerce package Index: openacs-4/packages/ecommerce/www/track.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/track.tcl 1 Mar 2005 00:01:31 -0000 1.9 +++ openacs-4/packages/ecommerce/www/track.tcl 31 May 2005 23:13:14 -0000 1.9.2.1 @@ -13,7 +13,7 @@ ucsa_p:optional } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/update-user-classes-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes-2.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 1 Mar 2005 00:01:31 -0000 1.8 +++ openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 31 May 2005 23:13:14 -0000 1.8.2.1 @@ -14,7 +14,7 @@ } set user_class_id_list $user_class_id -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] set ip_address [ns_conn peeraddr] if {$user_id == 0} { set return_url "[ad_conn url]" Index: openacs-4/packages/ecommerce/www/update-user-classes.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.adp,v diff -u -r1.5 -r1.5.6.1 --- openacs-4/packages/ecommerce/www/update-user-classes.adp 8 Mar 2004 19:46:11 -0000 1.5 +++ openacs-4/packages/ecommerce/www/update-user-classes.adp 31 May 2005 23:13:14 -0000 1.5.6.1 @@ -16,7 +16,7 @@

    Select the user classes you belong in:

    - @user_class_select_list@ + @user_class_select_list;noquote@
    Index: openacs-4/packages/ecommerce/www/update-user-classes.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/update-user-classes.tcl 1 Mar 2005 00:01:31 -0000 1.9 +++ openacs-4/packages/ecommerce/www/update-user-classes.tcl 31 May 2005 23:13:14 -0000 1.9.2.1 @@ -11,7 +11,7 @@ usca_p:optional } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/ecommerce/www/admin/index.tcl 24 Feb 2005 13:33:14 -0000 1.7 +++ openacs-4/packages/ecommerce/www/admin/index.tcl 31 May 2005 23:13:15 -0000 1.7.2.1 @@ -99,7 +99,6 @@ doc_body_append "
  • Mailing Lists
  • Email Templates
    • -
  • User Search Terms
  • Audit [ec_system_name]
    • " doc_body_append " Index: openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl 31 May 2005 23:13:15 -0000 1.4.2.1 @@ -26,7 +26,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.8 +++ openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl 31 May 2005 23:13:15 -0000 1.8.2.1 @@ -20,7 +20,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl 31 May 2005 23:13:15 -0000 1.4.2.1 @@ -16,7 +16,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl 31 May 2005 23:13:15 -0000 1.4.2.1 @@ -14,7 +14,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/category.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category.tcl,v diff -u -r1.5 -r1.5.6.1 --- openacs-4/packages/ecommerce/www/admin/cat/category.tcl 9 Mar 2004 00:59:46 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/cat/category.tcl 31 May 2005 23:13:15 -0000 1.5.6.1 @@ -85,10 +85,10 @@ } if { $subcategory_counter != 0 } { - append page_html "   insert after + append page_html "   insert after " } else { - append page_html "You haven't set up any subcategories. Add a subcategory.\n" + append page_html "You haven't set up any subcategories. Add a subcategory.\n" } append page_html " Index: openacs-4/packages/ecommerce/www/admin/cat/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/index.tcl,v diff -u -r1.5 -r1.5.6.1 --- openacs-4/packages/ecommerce/www/admin/cat/index.tcl 9 Mar 2004 00:59:46 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/cat/index.tcl 31 May 2005 23:13:15 -0000 1.5.6.1 @@ -36,7 +36,7 @@ } if { $category_counter != 0 } { - append page_html "   insert after + append page_html "   insert after " } else { append page_html "You haven't set up any categories. Add a category.\n" Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.8 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl 31 May 2005 23:13:15 -0000 1.8.2.1 @@ -25,7 +25,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl 31 May 2005 23:13:15 -0000 1.4.2.1 @@ -13,7 +13,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl 31 May 2005 23:13:15 -0000 1.4.2.1 @@ -20,7 +20,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl,v diff -u -r1.5 -r1.5.6.1 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl 9 Mar 2004 00:59:46 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl 31 May 2005 23:13:15 -0000 1.5.6.1 @@ -79,10 +79,10 @@ } if { $subsubcategory_counter != 0 } { - append page_html "   insert after + append page_html "   insert after " } else { - append page_html "You haven't set up any subsubcategories. Add a subsubcategory.\n" + append page_html "You haven't set up any subsubcategories. Add a subsubcategory.\n" } append page_html " Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.8 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl 31 May 2005 23:13:15 -0000 1.8.2.1 @@ -28,7 +28,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl 31 May 2005 23:13:15 -0000 1.4.2.1 @@ -23,7 +23,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl 31 May 2005 23:13:15 -0000 1.4.2.1 @@ -24,7 +24,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/customer-service/customer-history-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/customer-service/customer-history-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/customer-service/customer-history.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/customer-service/customer-history.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl,v diff -u -r1.5 -r1.5.12.1 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl 18 Sep 2002 21:33:49 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl 31 May 2005 23:13:16 -0000 1.5.12.1 @@ -19,7 +19,7 @@ action_id issue_id customer_service_rep - email_to_use + email_to_use:notnull cc_to bcc_to subject Index: openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl 24 Feb 2005 13:33:14 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl 31 May 2005 23:13:16 -0000 1.5.2.1 @@ -92,7 +92,7 @@ append doc_body "

    add New Interaction

    " if { [llength $issue_type_list] == 0 } { - append doc_body "

    If you want to see issues separated out by commonly used issue types, then add those issue types to the issue type in Picklist Management.

    " + append doc_body "

    If you want to see issues separated out by commonly used issue types, then add those issue types to the issue type in Picklist Management.

    " } append doc_body "

    Search for customer

    Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl 31 May 2005 23:13:16 -0000 1.5.2.1 @@ -22,7 +22,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl,v diff -u -r1.3 -r1.3.6.1 --- openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl 9 Mar 2004 00:59:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl 31 May 2005 23:13:16 -0000 1.3.6.1 @@ -64,10 +64,10 @@ } if { $picklist_item_counter != 0 } { - append doc_body "   insert after + append doc_body "   insert after " } else { - append doc_body "You haven't added any items. Add a picklist item.\n" + append doc_body "You haven't added any items. Add a picklist item.\n" } incr picklist_counter Index: openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 31 May 2005 23:13:16 -0000 1.4.2.1 @@ -19,7 +19,7 @@ # # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 31 May 2005 23:13:16 -0000 1.4.2.1 @@ -25,7 +25,7 @@ ad_require_permission [ad_conn package_id] admin -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl 31 May 2005 23:13:16 -0000 1.4.2.1 @@ -20,7 +20,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set admin_user_id [ad_conn user_id] +set admin_user_id [ad_verify_and_get_user_id] if {$admin_user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl 1 Mar 2005 00:01:33 -0000 1.9 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl 31 May 2005 23:13:17 -0000 1.9.2.1 @@ -26,7 +26,7 @@ # The customer service rep must be logged on. -auth::require_login +ad_maybe_redirect_for_registration set customer_service_rep [ad_get_user_id] if { ![empty_string_p $carrier_other] } { Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 1 Mar 2005 00:01:34 -0000 1.12 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 31 May 2005 23:13:17 -0000 1.12.2.1 @@ -43,8 +43,8 @@ # The customer service rep must be logged on -auth::require_login -set customer_service_rep [ad_conn user_id] +ad_maybe_redirect_for_registration +set customer_service_rep [ad_verify_and_get_user_id] # Doubleclick protection Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl 31 May 2005 23:13:17 -0000 1.4.2.1 @@ -12,7 +12,7 @@ ad_require_permission [ad_conn package_id] admin -auth::require_login +ad_maybe_redirect_for_registration set user_id [db_string user_id_select " select user_id Index: openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql 27 Feb 2005 17:07:19 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql 31 May 2005 23:13:17 -0000 1.5.2.1 @@ -1,8 +1,6 @@ - postgresql7.2 - select o.order_state, o.creditcard_id, o.confirmed_date, o.cs_comments, Index: openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl 31 May 2005 23:13:17 -0000 1.4.2.1 @@ -12,7 +12,7 @@ ad_require_permission [ad_conn package_id] admin -auth::require_login +ad_maybe_redirect_for_registration set customer_service_rep [ad_get_user_id] db_transaction { Index: openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl 31 May 2005 23:13:17 -0000 1.4.2.1 @@ -13,7 +13,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/products/add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add-4.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/admin/products/add-4.tcl 1 Mar 2005 00:01:34 -0000 1.6 +++ openacs-4/packages/ecommerce/www/admin/products/add-4.tcl 31 May 2005 23:13:17 -0000 1.6.2.1 @@ -48,7 +48,7 @@ # being added) # we need them to be logged in -auth::require_login +ad_maybe_redirect_for_registration set user_id [ad_get_user_id] set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/extras-upload-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/extras-upload-2-oracle.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/admin/products/extras-upload-2-oracle.xql 27 Feb 2005 17:07:19 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/products/extras-upload-2-oracle.xql 31 May 2005 23:13:17 -0000 1.3.2.1 @@ -1,7 +1,7 @@ - oracle8.1.6 + postgresql7.1 Index: openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl 24 Feb 2005 13:33:15 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/import-images-2.tcl 31 May 2005 23:13:17 -0000 1.2.2.1 @@ -62,6 +62,7 @@ set count 0 set errors 0 +set line_errors 0 set success_count 0 # Get the values that we use repeatedly in the main process loop(s) @@ -129,40 +130,42 @@ # Assign the values in the datafile row to the required field names. foreach required_field_name $required_field_names { - set $required_field_name [lindex ${required_field_name}_column] + set $required_field_name [lindex $elements [expr $${required_field_name}_column]] if { [empty_string_p $required_field_name] } { - incr errors + incr line_errors } } # copy the product image and create the thumbnail if all the required fields were # given values. - if {!$errors} { + if {!$line_errors} { # Check if there is a product with the give sku. # otherwise, there is no place to copy the product image to. set product_id [db_string product_check {select product_id from ec_products where sku = :sku;} -default ""] if { $product_id != ""} { # We found a product_id for the given sku # get the product directory - regsub - all {[a-zA-z]} $dirname "" product_id + set dirname [db_string dirname_select "select dirname from ec_products where product_id=:product_id"] + set subdirectory [ec_product_file_directory $product_id] set full_dir_path [file join ${products_root_path} ${subdirectory} ${dirname}] set file_suffix [string range $image_fullpathname end-3 end] set product_image_location [file join $full_dir_path "product${file_suffix}" ] # update the product image if { [catch {file copy $image_fullpathname $product_image_location} ] } { - doc_body_append "

    Error!Image update of $sku failed with error:<\p>

    $errmsg

    " + doc_body_append "

    Error! (ref: 157) Image update of $sku failed with error:<\p>

    $errmsg

    " + incr line_errors } else { doc_body_append "

    Imported images for product: $sku

    " # A product row has been successfully processed, increase counter incr success_count } # create a thumbnail - if { $use_both_param_dimensions } { + if { $use_both_param_dimensions && !$line_errors } { set convert_dimensions "${thumbnail_width}x${thumbnail_height}>" - } else { + } elseif { !$line_errors } { if { $thumbnail_width_is_blank } { if { $thumbnail_height_is_blank } { set convert_dimensions "100x10000" @@ -177,15 +180,17 @@ set perm_thumbnail_filename [file join $full_dir_path "product-thumbnail.jpg"] if [catch {exec $convert -geometry $convert_dimensions -comment \"$image_comment\" $product_image_location $perm_thumbnail_filename} errmsg ] { - doc_body_append "

    Error! Could not create thumbnail for product: $sku Error is: $errmsg

    " + doc_body_append "

    Error! (ref:182) Could not create thumbnail for product: $sku Error is: $errmsg

    " + incr line_errors } } else { # Let them know this sku is not in the catalog - doc_body_append "FAILURE!Could not import image for sku: $sku, because sku was not found in catalog.

    " + doc_body_append "Error! (ref:189) Could not import image for sku: $sku, because sku was not found in catalog.

    " } - } + } + } # read next line of data file, depending on file type, or end read loop if error. @@ -199,7 +204,7 @@ # no valid filetype chosen set line_status -1 } - + set line_errors 0 } if { $success_count == 1 } { Index: openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl 1 Mar 2005 00:01:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl 31 May 2005 23:13:17 -0000 1.3.2.1 @@ -15,7 +15,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl 1 Mar 2005 00:01:34 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl 31 May 2005 23:13:17 -0000 1.5.2.1 @@ -33,7 +33,7 @@ # We need them to be logged in -auth::require_login +ad_maybe_redirect_for_registration set user_id [ad_get_user_id] set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl 24 Feb 2005 13:33:15 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl 31 May 2005 23:13:17 -0000 1.5.2.1 @@ -55,7 +55,7 @@ products, and creates thumbnails for them. Place product images in a set of directories accessible by this server. Then use this utility to upload a file that maps product sku to the location of the product images - full_imagepathname. This option is untested and therefore buggy, but will be tested over the next day or so + full_imagepathname.

    Index: openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 31 May 2005 23:13:18 -0000 1.4.2.1 @@ -36,7 +36,7 @@ # # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 31 May 2005 23:13:18 -0000 1.4.2.1 @@ -60,7 +60,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl 31 May 2005 23:13:18 -0000 1.4.2.1 @@ -14,7 +14,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 31 May 2005 23:13:19 -0000 1.4.2.1 @@ -19,7 +19,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 31 May 2005 23:13:19 -0000 1.4.2.1 @@ -30,7 +30,7 @@ ad_script_abort } -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/form-custom.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl 31 May 2005 23:13:19 -0000 1.4.2.1 @@ -11,8 +11,8 @@ ad_page_variables {item item_group return_url {item_original {}} {delete_the_set 0}} set db [ns_db gethandle] -set user_id [ad_conn user_id] -auth::require_login +set user_id [ad_verify_and_get_user_id] +ad_maybe_redirect_for_registration set item_type {slider_custom} set value_type {keyval} Index: openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/sort-custom.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl 31 May 2005 23:13:19 -0000 1.4.2.1 @@ -10,8 +10,8 @@ ad_page_variables {item item_group return_url {delete_the_sort 0} {col -multiple-list} {dir -multiple-list} {item_original {}}} set db [ns_db gethandle] -set user_id [ad_conn user_id] -auth::require_login +set user_id [ad_verify_and_get_user_id] +ad_maybe_redirect_for_registration set item_type {table_sort} set value_type {list} Index: openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/table-custom.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl 31 May 2005 23:13:19 -0000 1.4.2.1 @@ -9,8 +9,8 @@ ad_page_variables {item item_group return_url {delete_the_view 0} {col -multiple-list} {item_original {}}} set db [ns_db gethandle] -set user_id [ad_conn user_id] -auth::require_login +set user_id [ad_verify_and_get_user_id] +ad_maybe_redirect_for_registration set item_type {table_view} set value_type {list} Index: openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -15,7 +15,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -17,7 +17,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set admin_user_id [ad_conn user_id] +set admin_user_id [ad_verify_and_get_user_id] if {$admin_user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -12,7 +12,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -16,7 +16,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set admin_user_id [ad_conn user_id] +set admin_user_id [ad_verify_and_get_user_id] if {$admin_user_id == 0} { Index: openacs-4/packages/ecommerce/www/doc/audit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/audit.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/doc/audit.tcl 1 Mar 2005 00:01:35 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/audit.tcl 31 May 2005 23:13:20 -0000 1.3.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -15,7 +15,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp 22 May 2003 14:49:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp 31 May 2005 23:13:20 -0000 1.4.8.1 @@ -19,7 +19,7 @@

    High-level features

    If your imagination is limited, you can think of this as - "Amazon.com in a box". Is is it impressive to do everything that + "Amazon.com(2002) in a box". Is is it impressive to do everything that Amazon does? Not really. Ecommerce is a fast-moving field. Packaged software always embodies last year's business ideas. The interesting thing is how quickly one can extend an open-source @@ -28,7 +28,7 @@

    Feature List

    - +
    @@ -78,18 +78,23 @@ fax, email, and Web) + table by call center staff who sit at + Web browsers and use the @package_name@ admin pages; It is possible that + inbound emails can be supported, but this has not been recently confirmed. + See http://www.arsdigita.com/doc/email-handler + (via archive.org) an ACS 3.4.8 email handling perl script. Note that incoming emails may be better + handled by a method used in the OpenACS forums package that imports email. No + support is available for incoming email to this package. + - + + href="http://web.archive.org/web/20020228064957/http://www.arsdigita.com/doc/crm">http://www.arsdigita.com/doc/crm + (via archive.org) a standard ACS 3.4.8 CRM module (to be ported...) @@ -146,25 +151,24 @@ - +
    in MBA-speak All interactions logged into same Database - table; inbound ACS 3.4.8 - email handler (Perl script); call center staff sit at - Web browsers and use the @package_name@ admin pages
    CRMCustomer Relationship Managemement (CRM) Write custom rules for standard ACS 3.4.8 - CRM module (to be ported...)
    XML-enabledUse the nsxml module for AOLServerUse the XML features supported by OpenACS.

    Bottom line

    -

    If a closed-source ecommerce package doesn't do exactly what you - want, you're out of business. If the company behind a closed-source +

    If a closed-source ecommerce package does not do exactly what you + want, you are out of business. If the company behind a closed-source ecommerce package goes out of business, so will you. If the company behind a closed-source ecommerce adopts a different "business - model", you're screwed.

    + model", you are screwed.

    -

    If you're even tempted to adopt a commercial ecommerce system +

    If you are ever tempted to adopt a commercial ecommerce system from a company other than IBM, Oracle or SAP (three enterprise software vendors that seem likely to be around for awhile), read the - iCat story towards the end of Using the - ArsDigita Community System + iCat story; See http://www.arsdigita.com/asj/using-the-acs (via archive.org) toward the end, a section entitled "ACS versus Commercial Packaged Closed-Source Systems." +

    - Index: openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl 1 Mar 2005 00:01:35 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl 31 May 2005 23:13:20 -0000 1.3.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp,v diff -u -r1.5 -r1.5.8.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp 22 May 2003 14:49:34 -0000 1.5 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp 31 May 2005 23:13:20 -0000 1.5.8.1 @@ -43,7 +43,7 @@

    An order is IN_BASKET when the customer has put items into their shopping cart on the site but has not indicated an intent to buy (if they stay there too long they go into the EXPIRED state; "too - long" is defined in the parameters/yourservername.ini file; + long" is defined by the ecommerce parameter CartDuration; default is 30 days). When the customer submits their order, the state becomes CONFIRMED. Only then do we try to authorize their credit card. If the authorization succeeds, the order state will Index: openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp 24 Feb 2005 13:33:16 -0000 1.6 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp 31 May 2005 23:13:20 -0000 1.6.2.1 @@ -164,7 +164,7 @@ email address

  • -

    Make sure to replace yourservername in +

    Make sure to replace service0 in EcommerceDataDirectory with the correct path! This parameter should also have a trailing slash!

    • Index: openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl 1 Mar 2005 00:01:35 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl 31 May 2005 23:13:20 -0000 1.3.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/froogle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/froogle.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/doc/froogle.tcl 1 Mar 2005 00:01:35 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/froogle.tcl 31 May 2005 23:13:20 -0000 1.3.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/index.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/ecommerce/www/doc/index.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/doc/index.tcl 31 May 2005 23:13:20 -0000 1.4.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] set package_name "Ecommerce" set title "$package_name Documentation" Index: openacs-4/packages/ecommerce/www/doc/license.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/license.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/doc/license.tcl 1 Mar 2005 00:01:35 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/license.tcl 31 May 2005 23:13:20 -0000 1.3.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] set package_name "Ecommerce" set title "$package_name License" Index: openacs-4/packages/ecommerce/www/doc/porting-diary.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/porting-diary.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/doc/porting-diary.tcl 1 Mar 2005 00:01:35 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/porting-diary.tcl 31 May 2005 23:13:20 -0000 1.3.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/release.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/release.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/www/doc/release.tcl 1 Mar 2005 00:01:35 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/release.tcl 31 May 2005 23:13:20 -0000 1.3.2.1 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [auth::require_login] +set user_id [ad_maybe_redirect_for_registration] # Check for read privileges Index: openacs-4/packages/evaluation/evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/evaluation/evaluation.info 8 Apr 2005 08:10:29 -0000 1.22 +++ openacs-4/packages/evaluation/evaluation.info 31 May 2005 23:13:09 -0000 1.22.2.1 @@ -7,22 +7,22 @@ f f - + Jose Pablo Escobedo Del Cid This package allows the users (professors and students) to use the system to submit and grade the tasks. - 2005-04-08 + 2005-05-24 This package allows the professors and TAs to assign tasks to the students and to grade them, and to the students to upload their answers and see their grades. - + - - + + @@ -31,6 +31,7 @@ + - + 1 = Individual + Activities + Activities for students + + Activity Add Assignment Add Assignment Type Add assignment type @@ -14,10 +18,14 @@ Add/edit solution again Already answered - Answer + ANSWER + SUBMISSION Answer + Answer OK - Answer Date + How will the task be answered? + Answer Date <br> (24 hr format) + ANSWERS Assignment Group Assignment Groups Assignment Type @@ -31,66 +39,134 @@ Audit info Audit Info Audit info for task + #>" onClick="history.go(-1)"> + </form> +</if> + +<if %evaluations_na:rowcount% gt 0> + <form action="evaluate-students-2" method+"post"> + @export_vars;noquote@ + <input type=hidden name=task_id value="%task_id%"> + <input type=hidden name=max_grade value="%max_grade%"> + <blockquote> + <table> + <multiple name="evaluations_na"> + <if %evaluations_na.rownum% odd><table bgcolor="#EAF2FF"></if><else><table bgcolor="white"></else> + <tr><th align="right">#evaluation.Name#</th><td>%evaluations_na.party_name%</td></tr> + <tr><th align="right">#evaluation.Grade#</th><td>%evaluations_na.grade% / %max_grade%</td></tr> + <tr><th align="right">#evaluation.Comments#</th><td>%evaluations_na.comment%</td></tr> + <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>%evaluations_na.show_student%</td></tr> + </tr> + </table> + </multiple> + </table> + </blockquote> + <input type=submit value="<# Grade Students + #>" onClick="history.go(-1)"> + </form> +</if> +<if %evaluations_na:rowcount% gt 0> + <form action="evaluate-students-2" method+"post"> + @export_vars;noquote@ + <input type=hidden name=task_id value="%task_id%"> + <input type=hidden name=max_grade value="%max_grade%"> + <blockquote> + <table> + <multiple name="evaluations_na"> + <if %evaluations_na.rownum% odd> <table bgcolor="#EAF2FF"> </if> + <else><table bgcolor="white"></else> + <tr><th align="right">#evaluation.Name#</th><td>%evaluations_na.party_name%</td></tr> + <tr><th align="right">#evaluation.Grade#</th><td>%evaluations_na.grade% / %max_grade%</td></tr> + <tr><th align="right">#evaluation.Comments#</th><td>%evaluations_na.comment%</td></tr> + <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>%evaluations_na.show_student%</td></tr> </tr> + </table> + </multiple> + </table> + </blockquote> + <input type=submit value="<# Grade Students Bad input Change Answer + NOT EVALUATED STUDENTS + 'Not Evaluated Students' Click click on this link: - Comments: + Comment + COMMENTS Comments Comments Comments/Edit reason: Comments/Edit reason Confirm Confirm Evaluation - Continue Group Create Group + CREATION DATE + Delete Delete Evaluation Delete evaluation Delete Group Delete Task Delete task Description + DESCRIPTION Description - Due Date: + Discussion + Discussions + Download + DUE DATE + Due Date: Due Date - Due date + Due Date Due Date + Leave blank for no due date. Due date: %task_name% Edit Grades + Edit + Edit All Evaluations Edit evaluation - Edit Evaluations + Edit All Evaluations Edit %grade_name% Edit Reason: Edit Reason Edit Task Edit task Email: + Equal value Evaluated - Evaluation Date + Evaluation Date <br>(24 hr format) Evaluation Index Evaluation Modified + Evaluation Parameter Class Material Evaluations Evaluations Evaluations Admin + Gradebook Evaluations List Exam Exams Exams for students File File/url associated + Final Project + Final Project + Associate with Forums + Associate with forums? + You can associate this task to a forum Generate file - Go Back + Back Go Back - Grade: + GRADE Grade - Grade Students + Submit Grades Grade Grade Distribution - Grade in Net value - Grade over - Grade over 100 + Net Value + %max_grade% max. + GRADE OVER + GRADE %<br> +(OF 100%) + The %grade_plural_name% weight is 0% of total grade and will not impact the total grade. Grader Grader Grades @@ -99,6 +175,25 @@ Grades Reports Grades Sheet Name Grades Sheets + #> %current_groups_plus_one%" size=20></td> +</tr> +<tr> + <input type=hidden name=task_id value="%task_id%"> + <input type=hidden name=evaluation_group_id value="%evaluation_group_id%"> + <blockquote> + <td></td> + <td> + <table> + <multiple name="students"> + <if %students.rownum% odd><tr class="list-odd"></if><else><tr class="list-even"></else> + <td>%students.rownum%.</td><td>%students.student_name%</td></tr> + </tr> + </multiple> + </table> + </td> + </tr> + <tr> + <td><input type=submit value="<# Create Group Group Members Group Name Group name @@ -110,7 +205,43 @@ you want to see the group members, click on the name of the group Individual Insert Failed + Instructions + <br><br> + +<ul> +<li><text class="blue"><b>Option 1.</b> If you want each %grade_name% to count the same toward the total +for %grade_plural_name% just click on <b>"Set to Default"</b>.</text> +<br> +<li><text class="blue"><b>Option 2.</b> You can tell the system what percentage each %grade_name% +should be towards the total for %grade_plural_name%. To do this put numbers in +the first column, the total will need to add up to 100%. Then click on +<b>"Submit"</b>.</text> +<br> +</ul> + + <h1 class="blue">How to set up grading:</h1> +<br> +<text class="blue"> +<b>Step 1:</b> Set the percentage you want each assignment type to count towards +the total grade. Currently you have <b>%grade_plural_name% as %grade_weight%%</b> of the +total grade.<a href="%link_1%">Change that here</a>. +</text> +<br> +<br> +<text class="blue"> +<b>Step 2:</b> Add specific tasks to the assignment type. Currently you have +%counter% %grade_plural_name% as shown in the table above.<a href=%link_2%>Click here to add another</a>. +</text> +<br><br> + +<text class="blue"> +<b>Step 3:</b> Determine how much each task contributes to the total grade. This +is referred to as the weight. You have three choices. +%options%</text> Is live? + Journal + Journals + Journals for students Last Modified late (late) @@ -119,7 +250,7 @@ Add a member to a group Add Assignment to Communities Add this %grade_name% to other class(es) - Admin Assignment Types + Modify an Assignment Type Admin my Assignment Types Allow the students <br> to see the grade? Already created groups @@ -132,15 +263,15 @@ Assignment Attachment Assignment Edited (%grade_name% %community_name%) Assignment Groups for %task_name% - Assignment Plural Type Name + Assignment Type Name (Plural) Assignment Type Name - Assignment Type's Comments + Comments Assignment Types Distribution %grade_name%'s Description Associate to this group Audit info for task "%task_name%" Can the student submit the answer <br> after the due date? - Change Answer for "%task_name%" + Change Answer for \"%task_name%\" Check the rest of communities where you want to upload the assignment too Check this if you want to unattach the file Check this if you want to go to the groups admin page after submitting the task @@ -153,14 +284,13 @@ Currently %content% is associated to this task solution, but you can associate a different url/file just by adding it here Currently %content% is associated to this task, but you can associate a different url/file just by adding it here Currently %title% is attached to this task solution, but you can attach a different file/url just by adding it here - Currently %title% is attached to this task, but you can attach a different file/url just by adding it here - Currently %title% is attached to this task, but you can attach a different file/url just by adding it here + Currently $title is attached to this task, but you can attach a different file/url just by adding it here Delete Assignment Type Delete assignment type Distribution for grade "%grade_plural_name%" Do NOT change the "party id" field because with this file we associate the grade with the student or group. Due date must be in the future - Due Date of "%task_name%" + Due Date of %task_name% <br> (24 hr format) Edit Assignment Type Edit assignment type Edit grades distribution of $grade_plural_name @@ -170,35 +300,38 @@ Error deleting the grade Error deleting the task Error while storing file - Evaluated Students (%total_evaluated%) + GRADED (%total_evaluated%) Evaluation Modified %community_name% + Final Projects for students First unattach the file/url, then submit another one or just upload a new file/url and leave this in blank First, you will see the list of students without group (if there are students without group) and you can create a group by selecting the members of the group and then clicking on the "Create Group" botton. Generate the csv file from the system. This file has the proper structure so the system can parse it and obtain the information about the grades. This file is generated by clicking on the "Generate File" link. Grade %grade% does not seem to be a real number. - Grade over 100 points - %grade_plural_name% represents the %grade_weight%% of the 100% of the class + Grade (%) + %grade_plural_name% represent %grade_weight%% of the course grade + + %grade_plural_name% represents the %grade_weight%% of the 100% of the grade of the class. Grade students using generated file: Grade students using generated file: Grade students with 0 Grades Report for $student_name - Grades report of "%student_name%" + Grade report for "%student_name%" Grades Sheet Explanation Grades sheet for assighment "%task_name%" Group administration Groups administration Groups for task %task_name% If you administer more than one community and you want to upload an assigment in more than one community, you must set the same name for each of the assignment types in each community so the system can identify where to store the assignment. - If you click on the student name, you will see the grades report for that student. + Click on a student's name to see their detailed grade report. If you do not want to grade or edit the grade of a student/group, just leave intact the fields of that row, or you can delete the whole row. if you do not want to see the portraits of the students If you enter the net value, it must be less than %grade_weight%, which is the net value of %grade_plural_name% over the 100 points of the class. <br /> After uploading the %grade_name%, the system will do the convertion and the net value will be represented as a percentage. - if you want to download all the answers in one file + to download all submissions in one file. if you want to see the portraits of the students In order to generate this file there must be some parties assigned to this task. In this page you can administer the groups for the assignment. - Input "Will the student be able to see the grade" must be 1 (one) for YES or 0 (zero) for NO, please don't leave it blank. + Input \"Will the student be able to see the grade\" must be 1 (one) for YES or 0 (zero) for NO, please don't leave it blank. Is the task submitted online? Max Grade does not seem to be a real number. Please don't leave it in blank. New Assignment (%grade_name% %community_name%) @@ -221,43 +354,77 @@ Projects for students Reuse groups from another assignment Save the csv file and KEEP THE CSV FORMAT. The CSV file can be edited with any text editor (and MS Excell) but you have to save it keeping the CSV format. If you do not keep the format, the system will not be able to parse the file. - See grades sheets associated with this task + See grade sheets associated with this task Send the file using the "Send file" botton. The system will parse the file and you will be asked for a confirmation (if everything is ok with the file) for the grades. - <small>Total points in this category: %total_grade%/%max_grade% <br /> - %grade_plural_name% represents the %grade_weight%% of the 100% of the class</small> - Students List for "%task_name%" - Students who have not submitted answers and have not been evaluated (%not_evaluated_with_no_answer%) - Students with answers that have not been evaluated (%not_evaluated_with_answer%) + <small>Total points in this category: ${total_grade}/${max_grade} <br /> + $grade_plural_name represents the ${grade_weight}% of the 100% of the class</small> + Student Scores for "%task_name%" + NOT YET SUBMITTED (%not_evaluated_with_no_answer%) + NOT YET GRADED (%not_evaluated_with_answer%) %submission_date_pretty% (late) %submission_date_pretty% <span style=\"color:red;\">(late answer)</span> - Submit answer again (<span style=color:red;>late</span>) - Submit answer (<span style=color:red;>late</span>) %task_name% administration "%task_name%" is in groups, may be there are no groups, click this link if you want to go to the Groups Admin page: %groups_admin;noquote% The assignment "%task_name%" has been uploaded in this community. The comments/edit reason is a string with no more than 4,000 characters. The edit reason must be less than 4000 characteras long The estimated time must be grather than 0 - The file extension of the file is "%file_extension%" and it should be .CSV, we can't process it + The file extension of the file is "%file_extension" and it should be .CSV. Sorry, we can't process it" + } + } +} + +set page_title "<#_ Confirm Evaluation + The file extension of the file is \"$file_extension\" and it should be .CSV, we can't process it + The file is too large. (The maximun file size is %pretty_maxnbytes% bytes)" + return 0 + } + + set errors 0 + set errors_text "" + set counter 0 + set line_number 0 + + set file_handler [open $tmp_filename {RDWR}] + + while { ![eof $file_handler] } { + incr line_number + set one_line [gets $file_handler] + + # jump first two lines + if { $line_number <= 2 } { + continue + } + + # replace enters (<-|) with semicolons (;) + regsub -all {(,[\r\n])} $one_line "" clean_line + regsub -all {[\r\n]} $clean_line "" clean_line + + set evaluation [split $clean_line ","] + + if { $line_number == 3 } { + set max_grade [string trim [lindex $evaluation 1]] + if { ![ad_var_type_check_number_p $max_grade] } { + ad_return_error "<#_ Invalid Max Grade The file is too large. (The maximun file size is %pretty_maxnbytes% bytes) The file should have a pre-defined format so the system can parse it and obtain the information. If you want to use this functionallity you must follow the following steps: The grade most be a valid number: %wrong_grade% The grade must be a REAL NUMBER. The grade must be a valid number: %wrong_grade% The grade must be a valid number - The net value must be grather than 0 and less than %grade_weight%, and you can not enter Net Value AND Weight. + The net value must be grather than 0 and less than $grade_weight, and you can not enter Net Value AND Weight. The number of members must be grather than 1. The sum of the weight of all the assignment types is %total_weight% and it should be 100 by the end of the term(supposedly). The system assumes that the grades start at the 7th line of the file. The weight must be grather than 0, and you can not enter Net Value AND Weight. - There are no grades to edit + There are no grades to edit. There are no files associated with this task There are no grades for this group. There are no groups for this task yet. There are no more communities where you can add the task. There are no studens associated with this group. - There are no students to eval that already answered - There are no students to eval with no answer + There are no students to evaluate. + There are no students to evaluate. There are no tasks associated with this assignment type There are no tasks for this package. There are no tasks for this grade type. @@ -285,7 +452,7 @@ These are the students that have already answered but have not been evaluated yet. These are the students that have not answered yet (if the task is online) and have not been evaluated yet. This funcionallity allows you to upload a CSV (Comma Separated Value) file with the grades of the students. This CSV file can be edited with MS Excell and many other text editors. - This is the grades report of the students acording to the assignments/evaluations that you have made. + The following is a summary of student grades for this course. This is the grades report of the students acording to one assignment type and the evaluations that you have made in this assignment type. This task can not be submitted after the due date This task is not in groups @@ -300,19 +467,19 @@ to submit their answers after due date? To unassociate a member of the group, click on the "Unassociate member" link. TOTAL GRADE: %total_class_grade% - Total points in this category: %total_grade% / %max_grade%<br /> - This grade category represents the %grade_weight%% of the 100% of the class + Total points in this category: %total_grade% / $max_grade<br /> + This grade category represents the ${grade_weight}% of the 100% of the class Total points in this category: %total_grade% / %max_grade%<br /> This grade category represents the %grade_weight%% of the 100% of the class - Total points in this category: %total_grade%/%max_grade% + Total points in this category: %total_grade%/%max_grade% Unassociate student for this group Unrecognized value for notif type: $notif_type. Possible values are one_assignment_notif and one_evaluation_notif. Upload a file OR a url, and not both Upload a file OR a url, not both Upload a file OR a valid url, and not both Upload a solution for this assignment so the students can see it and learn from it. - Upload Answer for "%task_name%" - %user_name% has modified the grade of %party_name%. \n The edit reason given by %user_name% was: %edit_reason% \n The current grade is: %current_grade% \n\n Click on this link to see the evaluation details: %url_link% \n + Upload Answer for \"%task_name%\" + $user_name has modified the grade of %party_name%. \n The edit reason given by %user_name% was: %edit_reason% \n The current grade is: %current_grade% \n\n Click on this link to see the evaluation details: %url_link% \n View evaluation details \ View/Edit Task Solution We got the following error while trying to remove the evaluation: <pre>%errmsg%</pre> @@ -321,11 +488,15 @@ Weight must be a real number and between 0 and 100 Weight of %grade_plural_name% over 100% of the class Weight of this %grade_name% over %grade_plural_name% - Weight over 100% <br /> of the Course + WEIGHT <br>(out of 100% ) + WEIGHT OVER %grade_weight%% <br /> OF %grade_plural_name_up% Weight over %grade_weight%% <br /> of %grade_plural_name% + Weight over %grade_weight%% of %grade_plural_name%"} + {html {size 5}} + {help_text "<#_ You can enter the weight over %grade_weight%% of %grade_plural_name% or you can enter the net value of it in the field below. Weight over %grade_weight%% of %grade_plural_name% - Weight used in %grade_plural_name%: %category_weight%% (of 100% of $grade_plural_name) <br /> - %grade_plural_name% represents %grade_weight%% of the 100% of the class + <small>Weight used in %low_name%: %category_weight%% (over 100% of %low_name%) <br /> + %low_name% represents %grade_weight%% of the 100% of the class</small> Weight used in %grade_plural_name%: ${category_weight}% (of 100% of $grade_plural_name) <br /> $grade_plural_name represents ${grade_weight}% of the 100% of the class Weight used in %grade_plural_name%: %category_weight%% (of 100% of %grade_plural_name%) <br /> @@ -343,66 +514,92 @@ You can also add a student to an existing group by clicking on the "Associate to group..." link. Here you will be asked to select the group to wich you want to add the user. You can associate a link to this task by entering the absolute url here (also optional) You can enter the weight over %grade_weight%% of %grade_plural_name% or you can enter the net value of it in the field below. - You can order the grade report by the name of the student, by the total grade, or by any of the assignment types, or see the assignment type details by clicking on the view icon at the left of the assignment type name. + To sort by student name, total grade, or any of the assignment types, click on the column headers.<br> +To see the assignment type details, click on the view icon at the left of the assignment type name. You can order the grade report by the name of the student, by the total grade, or by any of the assignments of this assignment type. You can see the csv files associated with the task by clicking on the "See grades sheets associated with this task" botton. You can upload a file associated to this task by using the browse button (optional) You can upload a file associated to this task by using the browse button and select the file from your computer (optional) You must give an edit reason (%old_grade% --> %grade_wo_reason% - Your answer has been submited successfully. Your total grade in this class is: Max Grade: Maximun Grade: + File Upload Size Members Modifying User n/a Name: + NAME Name Name: %student_name% Net Grade Net Value Net value + Net value over (NEW answer) New Assignment New Group No No + NO No assignments (No data) No group for task + You can't enter more than one relative weight No. of Members No. of members No parties to grade No response - Not answered + Not submitted Not available + The sum of the Weight over %grade_plural_name% should be 100. + The sum of the Weight over Total must be %grade_weight%. Not evaluated + No submission that if you unassociate ALL the members or the group, THE GROUP WILL BE DELETED. Number of Integrants Number of Members One Assignment One Evaluation One Grade Type One Group + SUBMITTED ONLINE? Online Submit + Over %grade_plural_name% + Over total + PERFECT SCORE + Perfect Score: + This is the score used to evaluate the students. y entonces + POINTS + Grade in %base_grade% Project Projects + RELATIVE WEIGHT + Relative Weights Remove Grade - Rename Group + Group + REQUIRES GRADE? Requires Grade? Reuse Groups + DISPLAY TO STUDENTS? Send file Solution Attachment + for spreadsheet grading. Studen List Student List Student Name Students List Student's Portrait + "Not Yet Graded" file + "Not Yet Submitted" file + SUBMISSION Submission Date submit answer submit answer again + SUBMITTED Submitted by + Submit online Sumission Date Task Task Groups @@ -416,27 +613,39 @@ Tasks List are the evaluated students. Note that if you evaluated them over a grad different from 100, the system automatically did the conversion so the grade will be shown over 100 points. are no groups for this assignment yet. + %grade_plural_name_up% TOTAL: Total Total current grade: + <div align=right>Total:</div> Total Grade + Total Grade over %base_grade% + <div align=left><text class="blue">(out of a possible 100% of the course)</text></div> Total of Members + Percentage of Total Grade + Unassociate member Unassociate url? Unattach file? Upload Answer Upload Date + Upload graded spreadsheet to Upload Solution Uploaded by (URL) URL pues, esto esta interesante - View answer + View + View submission + View my Answers View comments View Evaluation View evaluation View grades sheet View my answer - View NEW answer + View submission + VIEW STUDENT PORTRAITS? + VIEW STUDENT PORTRAITS: + View Post View Task View task View/Edit Evaluation @@ -448,5 +657,6 @@ upi , pero no yupin Yes Yes - answer has been submited successfully. Click <a href="%return_url;noquote%"> here </a> to continue. + YES + Your answer has been submitted successfully. Click <a href="%return_url%"> here </a> to continue. Index: openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/evaluations-chunk-postgresql.xql,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql 31 Mar 2005 11:09:27 -0000 1.7 +++ openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql 31 May 2005 23:13:09 -0000 1.7.2.1 @@ -3,6 +3,7 @@ postgresql7.3 + @@ -48,7 +49,6 @@ from evaluation_tasks et3 where et3.task_id = :task_id ) - -- evaluation__party_id(:user_id,:task_id) @@ -59,7 +59,7 @@ select ea.data as answer_data, ea.title as answer_title, - ea.answer_id + ea.answer_id,to_char(ea.creation_date,'MM/DD/YYYY HH24:MI') as creation_date from evaluation_answersi ea, cr_items cri where ea.task_item_id = :task_item_id and cri.live_revision = ea.answer_id @@ -84,5 +84,41 @@     + + + select 1 from dual where :due_date > now() + + + + + + + select ea.answer_id + from evaluation_answers ea, cr_items cri + where ea.task_item_id = :task_item_id + and cri.live_revision = ea.answer_id + and ea.party_id = + ( select + CASE + WHEN et3.number_of_members = 1 THEN :user_id + ELSE + (select etg2.group_id from evaluation_task_groups etg2, + evaluation_tasks et2, + acs_rels map + where map.object_id_one = etg2.group_id + and map.object_id_two = :user_id + and etg2.task_item_id = et2.task_item_id + and et2.task_id = :task_id) + END as nom + from evaluation_tasks et3 + where et3.task_id = :task_id + ) + + --evaluation__party_id(:user_id,:task_id) + + + + +     Index: openacs-4/packages/evaluation/lib/evaluations-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.adp,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/evaluation/lib/evaluations-chunk.adp 11 Sep 2004 00:49:20 -0000 1.3 +++ openacs-4/packages/evaluation/lib/evaluations-chunk.adp 31 May 2005 23:13:09 -0000 1.3.4.1 @@ -1,4 +1,26 @@ - + + +
    + +
    + + + +
    @grade_plural_name@ (@grade_weight@% #evaluation-portlet.total_grade#) + +@actions;noquote@ +
    +
    +     +
    -@bottom_line;noquote@ + + + #evaluation.lt_Weight_used_in_grade_# + + + #evaluation-portlet.lt_smallTotal_points_in_# + + + Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 7 Apr 2005 11:26:58 -0000 1.16 +++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 31 May 2005 23:13:09 -0000 1.16.2.1 @@ -1,114 +1,246 @@ ad_page_contract { - - evaluations chunk to be displayed in the index page - + + evaluations chunk to be displayed in the index page + } set package_id [ad_conn package_id] -set user_id [ad_conn user_id] +set evaluation_id [evaluation_evaluations_portlet::get_package_id_from_key -package_key "evaluation"] +set user_id [ad_verify_and_get_user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] +set simple_p [parameter::get -parameter "SimpleVersion" -package_id $evaluation_id] +set base_url "[ad_conn package_url]/" +set return_url "[ad_conn url]?[ns_conn query]" +set class "list" +set bulk_actions "" +db_1row get_grade_info { *SQL* } -set base_url [ad_conn package_url] +set submitted_label "
    [_ evaluation-portlet.lt_smallTotal_points_in__1]
    " -db_1row get_grade_info { *SQL* } +if { $admin_p } { + if { $simple_p } { + set bottom_line "[_ evaluation-portlet.lt_smallWeight_used_in_g]" + } else { + set bottom_line "" + + } +} else { + set bottom_line "" +} + +if { $simple_p } { + set class "pbs_list" + set grade_of_label "[_ evaluation-portlet.maximum]" +} else { + set grade_of_label "" +} set elements [list task_name \ [list label "[_ evaluation-portlet.Name_]" \ link_url_col task_url \ orderby_asc {task_name asc} \ - orderby_desc {task_name desc}] \ - ] + aggregate "" \ + aggregate_label "@bottom_line;noquote@"\ + orderby_desc {task_name desc}]] if { $admin_p } { - #admin - lappend elements task_weight \ - [list label "[_ evaluation-portlet.Weight_]" \ - display_template {
    @grade_tasks_admin.task_weight@%
    } \ - orderby_asc {task_weight asc} \ - orderby_desc {task_weight desc}] + #admin + if { $simple_p } { + lappend elements perfect_score \ + [list label "[_ evaluation-portlet.points_value]" \ + display_template {
    @grade_tasks_admin.perfect_score@
    } \ + orderby_asc {perfect_score asc} \ + aggregate "" \ + aggregate_label "@max_grade_label;noquote@" \ + orderby_desc {perfect_score desc}] + } + lappend elements task_weight \ + [list label "[_ evaluation-portlet.Weight_]" \ + display_template {
    @grade_tasks_admin.task_weight@%
    } \ + orderby_asc {task_weight asc} \ + orderby_desc {task_weight desc} \ + aggregate "" \ + aggregate_label "@max_weight_label;noquote@"] + if { $simple_p } { + lappend elements solution \ + [list label "
    [_ evaluation-portlet.solution]
    " \ + display_template "
    @grade_tasks_admin.solution@
    " \ + link_url_col solution_url \ + aggregate "" \ + aggregate_label "@solution_label;noquote@"] + lappend elements grade \ + [list label "[_ evaluation-portlet.grade]" \ + link_url_col grade_url \ + display_template {
    [_ evaluation-portlet.evaluate]
    } ] + lappend elements edit \ + [list label "" \ + sub_class narrow \ + display_template {
    [_ evaluation-portlet.edit]
    [_ evaluation-portlet.delete]
    }] + } else { lappend elements audit_info \ - [list label "" \ - link_url_col audit_info_url \ - link_html { title "[_ evaluation-portlet.Audit_info_]" }] - set multirow_name grade_tasks_admin - set actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]] + [list label "" \ + link_url_col audit_info_url \ + link_html { title "[_ evaluation-portlet.Audit_info_]" }] + set bulk_actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]] + + } + set multirow_name grade_tasks_admin + set actions "\#evaluation-portlet.Add_grade_name_\#\#evaluation-portlet.edit_grade_scale\#" + } else { - #student - lappend elements grade \ - [list label "[_ evaluation-portlet.Grade_over_100_]" \ - display_template {
    @grade_tasks.grade@
    }] - lappend elements comments \ - [list label "[_ evaluation-portlet.Comments_]" \ - link_url_col comments_url \ - link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }] + #student + if { $simple_p } { + lappend elements submitted \ + [list label "
    [_ evaluation-portlet.Submitted]
    " \ + display_template {
    @grade_tasks.submitted_date;noquote@
    } \ + aggregate "" \ + link_url_col submitted_date_url \ + aggregate_label "@submitted_label;noquote@" ] + + lappend elements task_grade \ + [list label "[_ evaluation-portlet.Points]" \ + display_template {
    @grade_tasks.task_grade@
    } \ + aggregate "" \ + aggregate_label "@max_grade_label;noquote@" ] lappend elements task_weight \ - [list label "[_ evaluation-portlet.Net_Value_]" \ - display_template {
    @grade_tasks.task_weight@
    } \ - orderby_asc {task_weight asc} \ - orderby_desc {task_weight desc}] - lappend elements answer \ - [list label "" \ - link_url_col answer_url \ - link_html { title "[_ evaluation-portlet.View_my_answer_]" }] - set multirow_name grade_tasks - set actions "" + [list label "[_ evaluation-portlet.Total_Points]" \ + display_template {
    @grade_tasks.perfect_score@
    } \ + orderby_asc {task_weight asc} \ + orderby_desc {task_weight desc} \ + aggregate "" \ + aggregate_label "@max_weight_label;noquote@"] + } + lappend elements grade \ + [list label "[_ evaluation-portlet.Grade_over_100_]" \ + display_template {
    @grade_tasks.grade@
    } \ + aggregate "" \ + aggregate_label "@grade_of_label;noquote@"] + + lappend elements comments \ + [list label "[_ evaluation-portlet.Comments_]" \ + link_url_col comments_url \ + link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }] + + if {!$simple_p} { + lappend elements task_weight \ + [list label "[_ evaluation-portlet.Net_Value_]" \ + display_template {
    @grade_tasks.task_weight@
    } \ + orderby_asc {task_weight asc} \ + orderby_desc {task_weight desc}] + + } + lappend elements answer \ + [list label "" \ + display_template {@grade_tasks.answer;noquote@} \ + link_html { title "[_ evaluation-portlet.View_my_answer_]" }] + + set multirow_name grade_tasks + set actions "" } set total_grade 0.00 set max_grade 0.00 +set max_weight 0.00 set category_weight 0 +set max_grade_label "" +set max_weight_label "" +set solution_label "" + template::list::create \ -name grade_tasks \ -multirow $multirow_name \ - -actions $actions \ -key task_id \ - -pass_properties { return_url mode base_url } \ - -filters { grade_id } \ + -pass_properties { return_url mode base_url bottom_line max_grade_label max_weight_label solution_label submitted_label grade_of_label} \ + -filters { grade_id {} page_num {} } \ + -actions $bulk_actions \ + -no_data "[_ evaluation-portlet.No_assignments_]" \ -elements $elements \ - -no_data "[_ evaluation.No_assignments_]" \ -orderby_name evaluations_orderby \ + -main_class $class \ + -sub_class narrow \ -orderby { default_value task_name } - + set evaluations_orderby [template::list::orderby_clause -orderby -name grade_tasks] - + if { [string equal $evaluations_orderby ""] } { - set evaluations_orderby " order by task_name asc" + set evaluations_orderby " order by task_name asc" } if { $admin_p } { - #admin - db_multirow -extend { task_url audit_info audit_info_url } grade_tasks_admin get_tasks_admin { *SQL* } { - set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { task_id grade_id }] + #admin + db_multirow -extend { task_url grade_url audit_info audit_info_url task_points solution solution_url} grade_tasks_admin get_tasks_admin { *SQL* } { + if { $simple_p } { + set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }] + } else { + set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] + } set category_weight [expr $category_weight + $task_weight] + set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] + set max_weight [format %0.2f [expr $max_weight + $task_weight]] set task_weight [lc_numeric $task_weight] - - set audit_info_url "[export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }]" + set max_grade [expr $max_grade + $perfect_score] + set max_grade_label "
    $max_grade pts.
    " + set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] $low_name )" + + if { $simple_p } { + set max_weight_label "
    $max_weight %
    " + } + if { [db_0or1row solution_info { *SQL* }] } { + set solution_mode display + set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id solution_id return_url solution_mode }]" + set solution "[_ evaluation-portlet.ViewEdit_Solution_]" + } else { + set solution_mode edit + set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id return_url solution_mode }]" + if { $online_p } { + set solution "[_ evaluation-portlet.Upload_Solution_]" + } + } + + set task_points [format %0.2f [expr ($task_weight*$grade_weight)/100.0]] + set audit_info_url [export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }] + set audit_info "[_ evaluation-portlet.Audit_Info_]" + } } else { - - db_multirow -extend { comments comments_url answer answer_url grade } grade_tasks get_grade_tasks { *SQL* } { - + + db_multirow -extend { task_url submitted_date submitted_date_url comments comments_url grade_url answer answer_url grade task_grade} grade_tasks get_grade_tasks { *SQL* } { + if { $simple_p } { + set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }] + } else { + set task_url "" + } + set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] if { [db_0or1row get_evaluation_info { *SQL* }] } { if { ![empty_string_p $comments] } { set comments "[_ evaluation-portlet.View_comments_]" - set comments_url "[export_vars -base "evaluation-view" { evaluation_id { return_url ${base_url} }}]" + set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]" } else { - set comments "[_ evaluation.lt_View_evaluation_detai]" + set comments "[_ evaluation-portlet.lt_View_evaluation_detai]" set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]" } - set over_weight "" - if { ![empty_string_p $show_student_p] && $show_student_p } { - set max_grade [expr $task_weight + $max_grade] + + set over_weight "" + if { [string eq $show_student_p "t"] } { if { ![empty_string_p $grade] } { set grade [lc_numeric $grade] set over_weight "[lc_numeric $task_grade]/" + if { $simple_p } { + set task_grade [format %0.2f [expr ($grade*$perfect_score/100.0)]] + } set total_grade [expr $total_grade + $task_grade] + if { $simple_p } { + set max_grade [expr $task_grade + $max_grade] + } else { + set max_grade [expr $task_weight + $max_grade] + } } else { set grade "[_ evaluation-portlet.Not_evaluated_]" + set task_grade "[_ evaluation-portlet.Not_evaluated_]" } set task_weight "${over_weight}[lc_numeric $task_weight]" @@ -118,22 +250,26 @@ } } else { set grade "[_ evaluation-portlet.Not_evaluated_]" - set max_grade [expr $task_weight + $max_grade] - set task_weight [lc_numeric $task_weight] - } + if { $simple_p } { + set task_weight [lc_numeric $task_weight] + } else { + set task_weight "[_ evaluation-portlet.Not_evaluated_]" + } + set task_grade "[_ evaluation-portlet.Not_evaluated_]" + } - if { [db_0or1row get_answer_info { *SQL* }] } { + set submitted_date $creation_date # working with answer stuff (if it has a file/url attached) if { [string eq $answer_title "link"] } { - # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute, - # so we have to deal with this case - array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"] - if { ![regexp ([join [split [parameter::get -parameter urlProtocols -package_id $community_info(package_id)] ","] "|"]) "$answer_data"] } { - set answer_data "http://$answer_data" - } - set answer_url "[export_vars -base "$answer_data" { }]" - set answer "[_ evaluation-portlet.View_my_answer_]" + # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute, + # so we have to deal with this case + array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"] + if { ![regexp ([join [split [parameter::get -parameter urlProtocols -package_id $community_info(package_id)] ","] "|"]) "$answer_data"] } { + set answer_data "http://$answer_data" + } + set answer_url "[export_vars -base "$answer_data" { }]" + set answer "[_ evaluation-portlet.View_my_answer_]" } else { # we assume it's a file set answer_url "[export_vars -base "${base_url}view/$answer_title" { {revision_id $answer_id} }]" @@ -149,12 +285,47 @@ set answer_url "" set answer "" } - - } + set max_weight [expr $max_weight + $perfect_score] + set max_grade_label "
    $max_grade pts.
    " + set max_weight_label "
    $max_weight %
    " + if { [empty_string_p $submitted_date]} { + + if { [string eq $online_p "t"] } { + if { [db_string compare_due_date { *SQL* } -default 0] } { + if { ![db_0or1row answer_info { *SQL* }] } { + set submitted_date "[_ evaluation-portlet.submit_answer_]" + set submitted_date_mode edit + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" + } else { + set submitted_date "[_ evaluation-portlet.submit_answer_again_]" + set submitted_date_mode display + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" + } + } elseif { [string eq $late_submit_p "t"] } { + if { ![db_0or1row answer_info { *SQL* }] } { + set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f]" + set submitted_date_mode edit + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" + } else { + set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f_1]" + set submitted_date_mode display + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" + } + } + if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } { + set submitted_date "[_ evaluation-portlet.No_group_for_task_]" + set submitted_date_url "" + } + } + } else { + set submitted_date_url "[export_vars -base "${base_url}answer-view" { grade_id task_id return_url answer_mode {answer_id}}]" + if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } { + + set submitted_date "[_ evaluation-portlet.No_group_for_task_]" + set submitted_date_url "" + } + + } + } } -if { $admin_p } { - set bottom_line "[_ evaluation-portlet.lt_smallWeight_used_in_g]" -} else { - set bottom_line "[_ evaluation-portlet.lt_smallTotal_points_in__1]" -} Index: openacs-4/packages/evaluation/lib/evaluations-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.xql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/evaluation/lib/evaluations-chunk.xql 31 Mar 2005 11:09:27 -0000 1.5 +++ openacs-4/packages/evaluation/lib/evaluations-chunk.xql 31 May 2005 23:13:09 -0000 1.5.2.1 @@ -1,42 +1,63 @@ + postgresql7.3 + - select grade_plural_name, weight as grade_weight from evaluation_grades where grade_id = :grade_id + + select upper(grade_plural_name) as grade_plural_name, grade_plural_name as low_name,grade_name,weight as grade_weight,weight as category_weight from evaluation_grades where grade_id = :grade_id + + select et.task_name, round(et.weight,2) as task_weight, - et.task_id + et.task_id, (select perfect_score from evaluation_tasks where task_id=et.task_id) as perfect_score, online_p from evaluation_tasksi et, cr_items cri where grade_item_id = :grade_item_id and cri.live_revision = et.task_id $evaluations_orderby + + + + select ets.solution_id + from evaluation_tasks_sols ets, cr_items cri + where ets.task_item_id = (select task_item_id from evaluation_tasks where task_id=:task_id) + and cri.live_revision = ets.solution_id + + + + + + select et.task_name, et.task_item_id, et.weight as t_weight, eg.weight as g_weight, round((et.weight*eg.weight)/100,2) as task_weight, - et.number_of_members, - et.task_id + et.number_of_members, + et.online_p, + et.due_date, + et.late_submit_p, + et.task_id, (select perfect_score from evaluation_tasks where task_id=et.task_id) as perfect_score from evaluation_grades eg, evaluation_tasksi et, cr_items cri where eg.grade_id = :grade_id and eg.grade_item_id = et.grade_item_id and cri.live_revision = et.task_id $evaluations_orderby + - Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql,v diff -u -r1.24 -r1.24.2.1 --- openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql 7 Apr 2005 11:26:58 -0000 1.24 +++ openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql 31 May 2005 23:13:09 -0000 1.24.2.1 @@ -11,6 +11,7 @@ references cr_items(item_id), grade_name varchar(100), grade_plural_name varchar(100), + comments text, -- percentage of this grade type in the class weight numeric constraint evaluation_grades_w_ck @@ -55,7 +56,13 @@ constraint evaluations_tasks_rgp_ck check(late_submit_p in ('t','f')), -- estimated time to complete the assigment - estimated_time decimal + estimated_time decimal, + points numeric, + perfect_score numeric, + relative_weight numeric, + forums_related_p char(1) constraint evaluation_tasks_frp_ck + check(forums_related_p in ('t','f')) + ); create index evalutaion_tasks_gid_index on evaluation_tasks(grade_item_id); @@ -90,7 +97,8 @@ references parties(party_id), task_item_id integer constraint evaluation_sans_tid_fk - references cr_items(item_id) + references cr_items(item_id), + comment text ); create index evaluation_answers_tid_index on evaluation_answers(party_id,task_item_id); Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-package-create.sql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/evaluation/sql/postgresql/evaluation-package-create.sql 7 Apr 2005 18:57:01 -0000 1.4 +++ openacs-4/packages/evaluation/sql/postgresql/evaluation-package-create.sql 31 May 2005 23:13:09 -0000 1.4.2.1 @@ -307,3 +307,128 @@ END LOOP; return 0; end;' language 'plpgsql'; + +create function evaluation__clone (integer,integer) +returns integer as ' +declare + p_new_package_id alias for $1; --default null, + p_old_package_id alias for $2; --default null + v_grade_id evaluation_grades.grade_id%TYPE; + v_item_id acs_objects.object_id%TYPE; + v_revision_id acs_objects.object_id%TYPE; + v_task_item_id acs_objects.object_id%TYPE; + v_task_revision_id acs_objects.object_id%TYPE; + one_grade record; + entry record; + +begin + -- get all the grades belonging to the old package, + -- and create new grades for the new package + delete from evaluation_grades where grade_id in (select eg.grade_id from acs_objects o, evaluation_grades eg,cr_items ci,cr_revisions cr where o.object_id = ci.item_id and cr.revision_id=eg.grade_id and ci.item_id=cr.item_id and cr.revision_id=ci.live_revision and o.context_id = p_new_package_id); + + for one_grade in select * + from acs_objects o, evaluation_grades eg,cr_items ci,cr_revisions cr + where o.object_id = ci.item_id + and cr.revision_id=eg.grade_id + and ci.item_id=cr.item_id + and cr.revision_id=ci.live_revision + and o.context_id = p_old_package_id + + loop + + v_item_id := evaluation__new_item (null, + one_grade.name, + null, + one_grade.creation_user, + p_new_package_id, + one_grade.creation_date, + one_grade.creation_ip, + one_grade.title, + one_grade.description, + one_grade.mime_type, + null, + null, + ''text'', + ''content_item'', + ''evaluation_grades'' + ); + + v_revision_id := nextval(''t_acs_object_id_seq''); + v_grade_id := evaluation__new_grade ( v_item_id, + v_revision_id, + one_grade.grade_name, + one_grade.grade_plural_name, + one_grade.weight, + ''evaluation_grades'', + one_grade.creation_date, + one_grade.creation_user, + one_grade.creation_ip, + one_grade.title, + one_grade.description, + one_grade.publish_date, + null, + ''text/plain'' + ); + + for entry in select *, (ci.live_revision = cr.revision_id) as live_p from evaluation_tasks et,cr_revisions cr,cr_items ci, acs_objects o where grade_item_id = one_grade.grade_item_id and cr.revision_id=task_id and cr.item_id=ci.item_id and object_id=ci.item_id order by task_item_id + + loop + + v_task_item_id := evaluation__new_item ( + null, + entry.name, + null, + entry.creation_user, + p_new_package_id, + now(), + entry.creation_ip, + entry.task_name, + entry.description, + entry.mime_type, + null, + null, + entry.storage_type, --storage_type + ''content_item'', -- item_subtype + ''evaluation_tasks'' -- content_type + ); + + + v_task_revision_id := nextval(''t_acs_object_id_seq''); + perform evaluation__new_task ( v_task_item_id, + v_task_revision_id, + entry.task_name, + entry.number_of_members, + v_item_id, + entry.description, + entry.weight, + entry.due_date, + entry.late_submit_p, + entry.online_p, + entry.requires_grade_p, + entry.estimated_time, + entry.object_type, + entry.creation_date, + entry.creation_user, + entry.creation_ip, + entry.title, + entry.publish_date, + entry.nls_language, + entry.mime_type + ); + + update evaluation_tasks set points=entry.points, relative_weight=entry.relative_weight, perfect_score= entry.perfect_score,forums_related_p=entry.forums_related_p where task_id=v_task_revision_id; + + perform content_item__set_live_revision ( + v_task_revision_id + ); + + + end loop; + perform content_item__set_live_revision ( + v_revision_id + ); + + end loop; + return 0; + end; +' language 'plpgsql'; Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-package-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-package-drop.sql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/evaluation/sql/postgresql/evaluation-package-drop.sql 31 Mar 2005 11:09:27 -0000 1.1 +++ openacs-4/packages/evaluation/sql/postgresql/evaluation-package-drop.sql 31 May 2005 23:13:09 -0000 1.1.2.1 @@ -26,6 +26,8 @@ drop function evaluation__class_total_grade (integer, integer); +drop function evaluation__clone_task(integer,integer); + --------------------------------------- -- OTHER FUNCIONS --------------------------------------- Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/t.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/upgrade-0.4d2-0.4d3.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/upgrade-0.4d3-0.4d4.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/upgrade-0.4d4-0.4d5.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/upgrade-0.4d5-0.4d6.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/upgrade-0.4d6-0.4d7.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/upgrade-0.4d7-0.4d8.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/sql/postgresql/upgrade/upgrade-2.0-2.0.1.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl 7 Apr 2005 18:57:01 -0000 1.22 +++ openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl 31 May 2005 23:13:10 -0000 1.22.2.1 @@ -75,7 +75,15 @@ content::type::attribute::new -content_type evaluation_tasks -attribute_name online_p -datatype string -pretty_name online_p -column_spec "varchar(1)" content::type::attribute::new -content_type evaluation_tasks -attribute_name late_submit_p -datatype string -pretty_name late_submit_p -column_spec "varchar(1)" content::type::attribute::new -content_type evaluation_tasks -attribute_name requires_grade_p -datatype string -pretty_name requires_grade_p -column_spec "varchar(1)" + content::type::attribute::new -content_type evaluation_tasks -attribute_name points -datatype number -pretty_name points -column_spec "numeric" + content::type::attribute::new -content_type evaluation_tasks -attribute_name perfect_score -datatype number -pretty_name perfect_score -column_spec "numeric" + content::type::attribute::new -content_type evaluation_tasks -attribute_name relative_weight -datatype number -pretty_name relative_weight -column_spec "numeric" + content::type::attribute::new -content_type evaluation_tasks -attribute_name forums_related_p -datatype string -pretty_name forums_related_p -column_spec "varchar(1)" + + + + #Create content type attributes for content type evaluation_tasks_sols content::type::attribute::new -content_type evaluation_tasks_sols -attribute_name solution_item_id -datatype number -pretty_name solution_item_id -column_spec integer content::type::attribute::new -content_type evaluation_tasks_sols -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer @@ -84,7 +92,9 @@ content::type::attribute::new -content_type evaluation_answers -attribute_name answer_item_id -datatype number -pretty_name answer_item_id -column_spec integer content::type::attribute::new -content_type evaluation_answers -attribute_name party_id -datatype number -pretty_name party_id -column_spec integer content::type::attribute::new -content_type evaluation_answers -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer + content::type::attribute::new -content_type evaluation_answers -attribute_name comment -datatype string -pretty_name comment -column_spec text + #Create content type attributes for content type evaluation_student_evals content::type::attribute::new -content_type evaluation_student_evals -attribute_name evaluation_item_id -datatype number -pretty_name evaluation_item_id -column_spec integer content::type::attribute::new -content_type evaluation_student_evals -attribute_name task_item_id -datatype number -pretty_name task_item_id -column_spec integer @@ -407,3 +417,25 @@ relation_remove $rel_id } } + +ad_proc -public evaluation::apm_callback::after_upgrade { + {-from_version_name:required} + {-to_version_name:required} +} { + + +} { + apm_upgrade_logic \ + -from_version_name $from_version_name \ + -to_version_name $to_version_name \ + -spec { + 2.0 2.0.1 { + evaluation::set_points + evaluation::set_perfect_score + evaluation::set_relative_weight + evaluation::set_forums_related + } + + + } +} Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v diff -u -r1.31 -r1.31.2.1 --- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 7 Apr 2005 18:57:01 -0000 1.31 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 31 May 2005 23:13:10 -0000 1.31.2.1 @@ -408,6 +408,7 @@ -storage_type $storage_type] } + set revision_id [content::revision::new \ -item_id $item_id \ -content_type $content_type \ @@ -526,6 +527,7 @@ {-mime_type "text/plain"} {-publish_date ""} {-creation_date ""} + {-comment ""} } { Build a new content revision of an answer. If new_item_p is @@ -660,6 +662,7 @@ -storage_type $storage_type \ -creation_user $creation_user \ -creation_ip $creation_ip \ + -description $description \ -creation_date $creation_date] } set revision_id [content::revision::new \ @@ -670,6 +673,7 @@ -creation_user $creation_user \ -creation_ip $creation_ip \ -creation_date $creation_date \ + -description $description \ -attributes [list [list evaluation_item_id $item_id] \ [list party_id $party_id] \ [list grade $grade] \ @@ -1041,7 +1045,7 @@ close $fp } } - + return $dir db_foreach get_answers_for_task} @@ -1052,5 +1056,139 @@ return [parameter::get -parameter ArchiveExtension -default "txt"] } + +ad_proc -public evaluation::set_points { +} { + Proc called in after upgrade callback from version 0.4d3 to 0.4d4 + Sets points field in table evaluation_tasks + +} { + + set grades [db_list_of_lists get_grades {}] + foreach grade $grades { + set grade_id [lindex $grade 0] + set tasks [db_list_of_lists get_grade_tasks {}] + set grade_weight [lindex $grade 1] + + foreach task $tasks { + set task_id [lindex $task 0] + set task_weight [lindex $task 1] + set points [format %0.2f [expr ($task_weight*$grade_weight)/100.00]] + db_dml update_task {} + } + } +} + + +ad_proc -public evaluation::enable_due_date { + {-task_id} +} { +} { + set enable_p 0 + set enable_p [db_string enable {} -default 1] + + if {$enable_p > 1} { + set enable_p 0 + } + return $enable_p +} + +ad_proc -public evaluation::set_perfect_score { +} { + Proc called in after upgrade callback from version 0.4d4 to 0.4d5 + Sets perfect_score field in table evaluation_tasks + +} { + set tasks [db_list_of_lists get_tasks {}] + set perfect_score 100 + + foreach task_id $tasks { + db_transaction { + db_dml update_task {} + } + } + +} + +ad_proc -public evaluation::clone_grade { + -item_id:required + -content_type:required + -content_table:required + -content_id:required + -new_item_p:required + -description:required + -weight:required + -name:required + -plural_name:required + -package_id:required +} { + + Build a new content revision of a evaluation subtype. If new_item_p is + set true then a new item is first created, otherwise a new revision is created for + the item indicated by item_id. + + @param item_id The item to update or create. + @param content_type The type to make + @param content_table + @param new_item_p If true make a new item using item_id + +} { + + set creation_user [ad_verify_and_get_user_id] + set creation_ip [ad_conn peeraddr] + + set item_name "${content_type}_${item_id}" + + set revision_id [db_nextval acs_object_id_seq] + set revision_name "${content_type}_${revision_id}" + + if { $new_item_p } { + db_exec_plsql content_item_new { *SQL* } + + } + + db_exec_plsql content_revision_new { *SQL* } + + return $revision_id +} + + +ad_proc -public evaluation::set_relative_weight { +} { + Proc called in after upgrade callback from version 0.4d5 to 0.4d6 + Sets relative_weight field in table evaluation_tasks + +} { + set tasks [db_list_of_lists get_tasks {}] + set relative_weight 1 + + foreach task_id $tasks { + db_transaction { + db_dml update_task {} + } + } + +} + +ad_proc -public evaluation::set_forums_related { +} { + Proc called in after upgrade callback from version 0.4d7 to 0.4d8 + Sets forums_related_p field in table evaluation_tasks + +} { + set tasks [db_list_of_lists get_tasks {}] + set forums_related_p "f" + + foreach task_id $tasks { + db_transaction { + db_dml update_task {} + } + } + +} + + + + ad_register_proc GET /grades-sheet-csv* evaluation::generate_grades_sheet ad_register_proc POST /grades-sheet-csv* evaluation::generate_grades_sheet Index: openacs-4/packages/evaluation/tcl/evaluation-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/evaluation/tcl/evaluation-procs.xql 4 Apr 2005 18:22:36 -0000 1.3 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.xql 31 May 2005 23:13:10 -0000 1.3.2.1 @@ -101,5 +101,80 @@     + + + + + select et.task_id, + et.weight as task_weight + from evaluation_tasksi et + where et.grade_item_id = (select item_id from cr_revisions where revision_id=:grade_id) + and content_revision__is_live(et.task_id) = true + + + + + + + + select grade_id, weight + from evaluation_grades + + + + + + update evaluation_tasks set points=:points + where task_id=:task_id + + + + + + + select task_id from evaluation_tasks + + + + + + + + update evaluation_tasks set perfect_score=:perfect_score + where task_id=:task_id + + + + + + select task_id from evaluation_tasks + + + + + + + + update evaluation_tasks set relative_weight=:relative_weight + where task_id=:task_id + + + + + + select task_id from evaluation_tasks + + + + + + + + update evaluation_tasks set forums_related_p=:forums_related_p + where task_id=:task_id + + + +     Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/evaluation-list-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/evaluation-list.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.9.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/evaluation-list.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/task-list-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/task-list.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/task-list.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/index-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 7 Apr 2005 11:26:59 -0000 1.14 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 31 May 2005 23:13:11 -0000 1.14.2.1 @@ -187,7 +187,7 @@ } if { [info exists grades_gs($party_id)] && ![empty_string_p $grades_gs($party_id)] } { - set grades_gs($party_id) [expr ($grades_gs($party_id)*100)/$max_grade.0] + set grades_gs($party_id) [expr ($grades_gs($party_id)*$perfect_score)/[format %0.3f $max_grade]] set revision_id [evaluation::new_evaluation -new_item_p $new_p_gs($party_id) \ -item_id $item_ids($party_id) \ -content_type evaluation_student_evals \ @@ -226,7 +226,7 @@ } else { set new_item_p 1 } - set grades_wa($party_id) [expr ($grades_wa($party_id)*100)/$max_grade.0] + set grades_wa($party_id) [expr ($grades_wa($party_id)*100)/[format %0.3f $max_grade]] set revision_id [evaluation::new_evaluation -new_item_p $new_item_p -item_id $item_ids($party_id) -content_type evaluation_student_evals \ -content_table evaluation_student_evals -content_id evaluation_id -description $comments_wa($party_id) \ -show_student_p $show_student_wa($party_id) -grade $grades_wa($party_id) -task_item_id $task_item_id -party_id $party_id] @@ -250,7 +250,7 @@ } else { set new_item_p 1 } - set grades_na($party_id) [expr ($grades_na($party_id)*100)/$max_grade.0] + set grades_na($party_id) [expr ($grades_na($party_id)*100)/[format %0.3f $max_grade]] set revision_id [evaluation::new_evaluation -new_item_p $new_item_p -item_id $item_ids($party_id) -content_type evaluation_student_evals \ -content_table evaluation_student_evals -content_id evaluation_id -description $comments_na($party_id) \ -show_student_p $show_student_na($party_id) -grade $grades_na($party_id) -task_item_id $task_item_id -party_id $party_id] @@ -263,7 +263,7 @@ db_transaction { foreach party_id [array names grades_to_edit] { if { [info exists grades_to_edit($party_id)] && ![empty_string_p $grades_to_edit($party_id)] } { - set grades_to_edit($party_id) [expr ($grades_to_edit($party_id)*100)/$max_grade.0] + set grades_to_edit($party_id) [expr ($grades_to_edit($party_id)*100)/[format %0.3f $max_grade]] set revision_id [evaluation::new_evaluation -new_item_p 0 -item_id $item_to_edit_ids($party_id) -content_type evaluation_student_evals \ -content_table evaluation_student_evals -content_id evaluation_id -description $reasons_to_edit($party_id) \ -show_student_p $show_student_to_edit($party_id) -grade $grades_to_edit($party_id) -task_item_id $task_item_id -party_id $party_id] Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql 7 Apr 2005 11:26:59 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.xql 31 May 2005 23:13:11 -0000 1.4.2.1 @@ -15,7 +15,7 @@ - select task_item_id + select task_item_id,perfect_score from evaluation_tasks where task_id = :task_id Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 22 Dec 2004 22:06:40 -0000 1.11 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 31 May 2005 23:13:11 -0000 1.11.2.1 @@ -9,11 +9,15 @@ } { task_id:integer,notnull {return_url "student-list?[export_vars -url { task_id }]"} + grade_id:optional } set page_title "[_ evaluation.Edit_Evaluations_]" set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Edit_Evaluations_]"] +set simple_p [parameter::get -parameter "SimpleVersion"] +set max_grade [db_string get_task_weight {}] + set elements [list party_name \ [list label "[_ evaluation.Name_]" \ orderby_asc {party_name asc} \ @@ -28,8 +32,9 @@ orderby_asc {submission_date asc} \ orderby_desc {submission_date desc}] \ grade \ - [list label "[_ evaluation.Maximun_Grade_] " \ - display_template { } ] \ + [list label "[_ evaluation.Maximun_Grade_] $max_grade" \ + display_template { + } ] \ edit_reason \ [list label "[_ evaluation.Edit_Reason_]" \ display_template { } \ @@ -54,8 +59,9 @@ } db_multirow -extend { answer answer_url radio_yes_checked radio_no_checked submission_date_pretty } evaluated_students get_evaluated_students { *SQL* } { - - set grade [lc_numeric $grade] + + set grade [format %0.2f [expr $grade*$max_grade/100]] + if { [string eq $online_p "t"] } { if { [db_0or1row get_answer_info { *SQL* }] } { Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.xql 7 Apr 2005 11:26:59 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.xql 31 May 2005 23:13:11 -0000 1.1.2.1 @@ -18,4 +18,13 @@ + + + + select perfect_score from evaluation_tasks where task_id=:task_id + + + + + Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql 18 Apr 2005 07:47:34 -0000 1.15 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql 31 May 2005 23:13:11 -0000 1.15.2.1 @@ -17,7 +17,9 @@ to_char(ev.last_modified, 'YYYY-MM-DD HH24:MI:SS') as evaluation_date_ansi, et.online_p, et.due_date, - ev.evaluation_id + ev.evaluation_id, + et.forums_related_p, + (select description from evaluation_student_evalsx where evaluation_id=ev.evaluation_id) as comments from evaluation_tasks et, evaluation_student_evalsi ev, $roles_table @@ -38,7 +40,8 @@ ea.title as answer_title, ea.revision_id, to_char(ea.creation_date, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi, - ea.last_modified as submission_date + ea.last_modified as submission_date, + (select comment from evaluation_answers where answer_id=ea.revision_id) as s_comment from evaluation_answersi ea, cr_items cri where ea.party_id = :party_id and ea.task_item_id = :task_item_id @@ -62,7 +65,8 @@ ev.revision_id, to_char(ev.last_modified, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi, et.due_date, - ev.last_modified as submission_date + ev.last_modified as submission_date, + et.forums_related_p from evaluation_answersi ev, evaluation_tasks et, $roles_table Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 7 Apr 2005 11:26:59 -0000 1.10 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 31 May 2005 23:13:11 -0000 1.10.2.1 @@ -2,6 +2,67 @@ @page_title;noquote@ @context;noquote@ + + +

    @page_title;noquote@

    +
    +
    + + + + + + + + + + + + + + + + + + + + + < if @show_portrait_p@ eq "f"> + +< /if> + + < /else > + + + + + + +
    #evaluation.name#:@task_name@ (#evaluation.edit#)
    #evaluation.Due_Date#:@due_date_pretty@
    #evaluation.online#: + + + #evaluation.Yes# + + #evaluation.No# + + +
    #evaluation.Perfect_Score#:@perfect_score@
    #evaluation.view_portraits#(#evaluation.yes_#/#evaluation.no_#)#evaluation.view_portraits#(#evaluation.yes_#/#evaluation.no_#)
    @groups_admin;noquote@
    +
    +
    + +
    + + + + + +
    #evaluation.lt_Evaluated_Students_to# +@actions;noquote@ +
    +
    +     + + @@ -28,16 +89,29 @@
    #evaluation.Task_Name#@task_admin;noquote@
    - +

    #evaluation.lt_Evaluated_Students_to#

    #evaluation.Theese#

    +

    + + +
    + + + + +
    #evaluation.lt_Students_with_answers#
    +
    +     +

    #evaluation.lt_Students_with_answers#

    #evaluation.lt_These_are_the_student#

    - +     +

    #evaluation.Click# #evaluation.here# #evaluation.lt_if_you_want_to_downlo#

    @@ -48,15 +122,25 @@

    #evaluation.If#

     +
    + +
    + +     + + + +
    +
    @@ -73,16 +157,54 @@
    +     + + + + +

    #evaluation.lt_There_are_no_students#
    + +
    + + + + +
    #evaluation.lt_Students_who_have_not#
    +
    +     +

    #evaluation.lt_Students_who_have_not#

    #evaluation.lt_These_are_the_student_1#

    +     + +

    #evaluation.Click# #evaluation.here# #evaluation.lt_if_you_do_not_want_to#

    @@ -92,20 +214,25 @@

    #evaluation.If#

     - +
    - +
    #evaluation.lt_Grade_students_with_0# + +
    + +     		#evaluation.lt_Grade_students_with_0#

    +
    @@ -122,13 +249,126 @@
    +     + + +
    +
    + +
    + + + + + + + + +
    #evaluation.lt_Grade_students_using_#
    +
    +
  • #evaluation.lt_See_grades_sheets_ass# +
  • #evaluation.How_does_this_work# + +

    • #evaluation.lt_There_are_no_students_1#

    #evaluation.lt_task_name_is_in_group#

    + + + +
    + + + + +
    #evaluation.Class_Students#
    +
    +     + +
    +

    #evaluation.Class_Students#

    +     + +< if @number_of_members@ eq "1"> +< /if> +

    #evaluation.If#

    +     +
    + + +
    + + +
    + + + + +
    + #evaluation.lt_Grade_students_with_0#
    +     + + + #evaluation.lt_Grade_students_with_0# + +
    +
    + +
    + + + + + + + + + + + + + + +
    #evaluation.lt_Grade_students_using_#
    #evaluation.Generate_file##evaluation.lt_See_grades_sheets_ass##evaluation.How_does_this_work#
    +
    +     + + + +     +

    #evaluation.lt_There_are_no_students#

    +     +
    +     + Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v diff -u -r1.21 -r1.21.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 7 Apr 2005 11:26:59 -0000 1.21 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 31 May 2005 23:13:11 -0000 1.21.2.1 @@ -8,21 +8,31 @@ @author jopez@galileo.edu @creation-date Mar 2004 @cvs-id $Id$ + } { task_id:integer,notnull {show_portrait_p ""} {return_url "[ad_conn url]?[export_vars -url { task_id }]"} {orderby_wa:optional} {orderby_na:optional} {orderby:optional} + {grade_id ""} + {class "list"} + {bulk_actions ""} } +set simple_p [parameter::get -parameter "SimpleVersion" ] +if { $simple_p } { + set class "pbs_list" +} + set user_id [ad_conn user_id] -db_1row get_task_info { *SQL* } +db_1row get_task_info { *SQL* } +set community_id [dotlrn_community::get_community_id] +set max_grade $perfect_score set page_title "[_ evaluation.lt_Students_List_for_tas]" set context [list "[_ evaluation.lt_Students_List_for_tas]"] -set community_id [dotlrn_community::get_community_id] if { [string eq $show_portrait_p "t"] } { set this_url "student-list?[export_vars -entire_form -url { { show_portrait_p f } }]" @@ -38,6 +48,8 @@ } else { set groups_admin "" } +set task_admin_url "[export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]" + set task_admin "[_ evaluation.lt_task_name_administrat]" set done_students [list] @@ -54,66 +66,86 @@ # working with already evaluated parties # -set actions [list "[_ evaluation.Edit_Evaluations_]" [export_vars -base "evaluations-edit" { task_id }]] -set elements [list count \ - [list label "" \ - display_template { @evaluated_students.rownum@. } \ - ] \ - party_name \ - [list label "[_ evaluation.Name_]" \ - orderby_asc {party_name asc} \ - orderby_desc {party_name desc} \ - link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id evaluation_mode }]} \ - link_html { title "[_ evaluation.View_evaluation_]" } \ - ] \ - grade \ - [list label "[_ evaluation.Grade_over_100_]" \ - orderby_asc {grade asc} \ - orderby_desc {grade desc} \ - ] \ - action \ - [list label "" \ - display_template { @evaluated_students.action;noquote@ } \ - link_url_col action_url \ - ] \ - ] +set actions "[_ evaluation.Edit_Evaluations_]" +if { !$simple_p } { + set bulk_actions [list "[_ evaluation.Edit_Evaluations_]" [export_vars -base "evaluations-edit" { task_id }]] +} + +set elements [list count \ + [list label "" \ + display_template { @evaluated_students.rownum@. } \ + ] \ + party_name \ + [list label "[_ evaluation.name]" \ + orderby_asc {party_name asc} \ + orderby_desc {party_name desc} \ + link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id grade_id evaluation_mode }]} \ + link_html { title "[_ evaluation.View_evaluation_]" } \ + ] \ + ] if { [string eq $online_p "t"] } { - lappend elements submission_date_pretty \ - [list label "[_ evaluation.Submission_Date_]" \ - display_template { @evaluated_students.submission_date_pretty;noquote@ }] + lappend elements submitted \ + [list label "[_ evaluation.submitted]" \ + display_template { @evaluated_students.submission_date_pretty;noquote@ }] } -lappend elements view \ - [list label "" \ - sub_class narrow \ - display_template {} \ - link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id evaluation_mode }]} \ - link_html { title "[_ evaluation.View_evaluation_]" } \ - ] + + + +lappend elements grade \ + [list label "[_ evaluation.Grade_over_100_]" \ + orderby_asc {grade asc} \ + orderby_desc {grade desc} \ + ]\ + points \ + [list label "[_ evaluation.points]" \ + display_template {
    @evaluated_students.points@
    } \ + orderby_asc {grade asc} \ + orderby_desc {grade desc} \ + ] \ + action \ + [list label "[_ evaluation.Submission] " \ + display_template { @evaluated_students.action;noquote@} \ + ] \ + comments \ + [list label "[_ evaluation.Comments]" \ + display_template {
    @evaluated_students.comments@
    } \ + ]\ + +if { !$simple_p } { + lappend elements view \ + [list label "" \ + sub_class narrow \ + display_template {} \ + link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id evaluation_mode }]} \ + link_html { title "[_ evaluation.View_evaluation_]" } \ + ] +} lappend elements edit \ [list label "" \ - sub_class narrow \ - display_template {} \ - link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id }]} \ - link_html { title "[_ evaluation.Edit_evaluation_]" } \ - ] + sub_class narrow \ + display_template {#evaluation.edit#} \ + link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id }]} \ + link_html { title "[_ evaluation.Edit_evaluation_]" } \ + ] lappend elements delete \ [list label {} \ - sub_class narrow \ - display_template {} \ - link_url_eval {[export_vars -base "evaluation-delete" { evaluation_id return_url task_id }]} \ - link_html { title "[_ evaluation.Delete_evaluation_]" } \ - ] + sub_class narrow \ + display_template {#evaluation.delete# } \ + link_url_eval {[export_vars -base "evaluation-delete" { evaluation_id return_url task_id }]} \ + link_html { title "[_ evaluation.Delete_evaluation_]" } \ + ] - template::list::create \ -name evaluated_students \ -multirow evaluated_students \ - -actions $actions \ -key task_id \ - -pass_properties { return_url task_id evaluation_mode } \ + -actions $bulk_actions \ + -main_class $class \ + -sub_class narrow \ + -pass_properties { return_url task_id evaluation_mode simple_p} \ -filters { task_id {} } \ -orderby { default_value party_name } \ -elements $elements @@ -125,36 +157,50 @@ } set total_evaluated 0 -db_multirow -extend { action action_url submission_date_pretty count } evaluated_students evaluated_students { *SQL* } { +db_multirow -extend { action action_url submission_date_pretty count points} evaluated_students evaluated_students { *SQL* } { + incr total_evaluated lappend done_students $party_id - set grade [lc_numeric $grade] + + + set grade [format %0.2f $grade] + set points [format %0.2f [expr ([format %0.2f $grade]*[format %0.2f $perfect_score])/100.00]] + + if { [string eq $online_p "t"] } { - if { [db_0or1row get_answer_info { *SQL* }] } { - # working with answer stuff (if it has a file/url attached) - if { [empty_string_p $answer_data] } { - set action "[_ evaluation.No_response_]" - } elseif { [string eq $answer_title "link"] } { - set action_url "[export_vars -base "$answer_data" { }]" - set action "[_ evaluation.View_answer_]" - } else { - # we assume it's a file - set action_url "[export_vars -base "../../view/$answer_title" { revision_id }]" - set action "[_ evaluation.View_answer_]" - } - if { [string eq $action "[_ evaluation.View_answer_]"] && ([db_string compare_evaluation_date { *SQL* } -default 0] ) } { - set action " [_ evaluation.View_NEW_answer_]" - } - set submission_date_pretty [lc_time_fmt $submission_date_ansi "%q %r"] - if { [db_string compare_submission_date { *SQL* } -default 0] } { - set submission_date_pretty "[_ evaluation.lt_submission_date_prett]" - } - } else { - set action "[_ evaluation.No_response_]" - } + if { [db_0or1row get_answer_info { *SQL* }] } { + # working with answer stuff (if it has a file/url attached) + if { [empty_string_p $answer_data] } { + set action "[_ evaluation.No_response_]" + } elseif { [string eq $answer_title "link"] } { + set action_url "[export_vars -base "$answer_data" { }]" + set action "[_ evaluation.View_answer_]" + } else { + # we assume it's a file + set action_url "[export_vars -base "../../view/$answer_title" { revision_id }]" + set action "[_ evaluation.View_answer_]" + } + + if { [string eq $action "[_ evaluation.View_answer_]"] && ([db_string compare_evaluation_date { *SQL* } -default 0] ) } { + set action " [_ evaluation.View_NEW_answer_]" + } + set submission_date_pretty [lc_time_fmt $submission_date_ansi "%q %r"] + if { [db_string compare_submission_date { *SQL* } -default 0] } { + set submission_date_pretty "[_ evaluation.lt_submission_date_prett]" + } + } else { + set action "[_ evaluation.No_response_]" + + } } + if {[string eq $forums_related_p "t"]} { + + set action_url [export_vars -base "../../../forums/user-history" {{user_id $party_id} {view "forum"}}] + set action "[_ evaluation.view_post]" + } + } if { [llength $done_students] > 0 } { @@ -170,46 +216,48 @@ # set elements [list party_name \ - [list label "[_ evaluation.Name_]" \ - orderby_asc {party_name asc} \ - orderby_desc {party_name desc} \ - link_url_col party_url \ - ] \ - ] + [list label "[_ evaluation.name]" \ + orderby_asc {party_name asc} \ + orderby_desc {party_name desc} \ + link_url_col party_url \ + ] \ + ] if { [string eq $show_portrait_p "t"] && [string eq $number_of_members "1"] } { lappend elements portrait \ - [list label "[_ evaluation.Students_Portrait_]" \ - display_template { @not_evaluated_wa.portrait;noquote@ } - ] + [list label "[_ evaluation.Students_Portrait_]" \ + display_template { @not_evaluated_wa.portrait;noquote@ } + ] } lappend elements submission_date_pretty \ - [list label "[_ evaluation.Submission_Date_]" \ - display_template { @not_evaluated_wa.submission_date_pretty;noquote@ } \ - orderby_asc {submission_date_ansi asc} \ - orderby_desc {submission_date_ansi desc}] + [list label "[_ evaluation.submitted]" \ + display_template { @not_evaluated_wa.submission_date_pretty;noquote@ } \ + orderby_asc {submission_date_ansi asc} \ + orderby_desc {submission_date_ansi desc}] lappend elements answer \ - [list label "[_ evaluation.Answer_]" \ - link_url_col answer_url \ - link_html { title "[_ evaluation.View_answer_]" }] + [list label "[_ evaluation.answer]" \ + display_template {@not_evaluated_wa.answer@} \ + link_html { title "[_ evaluation.View_answer_]"}] lappend elements grade \ - [list label "[_ evaluation.Maximun_Grade_] " \ - display_template { } ] + [list label "[_ evaluation.Grade] <\/if>" \ + display_template {

    $max_grade max
    } ] lappend elements comments \ - [list label "[_ evaluation.Comments_]" \ - display_template { } \ - ] + [list label "[_ evaluation.Comments]" \ + display_template { } \ + ] lappend elements show_answer \ - [list label "[_ evaluation.lt_Allow_the_students_br]" \ - display_template { 
    [_ evaluation.Yes_] [_ evaluation.No_]
    } \ - ] + [list label "[_ evaluation.see_grades]" \ + display_template { 
    [_ evaluation.Yes_] [_ evaluation.No_]
    } \ + ] template::list::create \ -name not_evaluated_wa \ -multirow not_evaluated_wa \ -key party_id \ - -pass_properties { task_id return_url } \ + -main_class $class \ + -sub_class narrow \ + -pass_properties { task_id return_url simple_p} \ -filters { task_id {} } \ -orderby_name orderby_wa \ -elements $elements @@ -225,66 +273,81 @@ incr not_evaluated_with_answer if { $number_of_members == 1 } { - set tag_attributes [ns_set create] - ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]" - ns_set put $tag_attributes width 98 - ns_set put $tag_attributes height 104 - set portrait "[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]" + set tag_attributes [ns_set create] + ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]" + ns_set put $tag_attributes width 98 + ns_set put $tag_attributes height 104 + set portrait "[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]" } else { - set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups" + set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups" } lappend done_students $party_id set submission_date_pretty "[lc_time_fmt $submission_date_ansi "%q %r"]" if { [db_string compare_submission_date { *SQL* } -default 0] } { - set submission_date_pretty "[_ evaluation.lt_submission_date_prett_1]" + set submission_date_pretty "[_ evaluation.lt_submission_date_prett_1]" } + if { $online_p } { set answer "[_ evaluation.View_answer_]" + } # working with answer stuff (if it has a file/url attached) if { [string eq $answer_title "link"] } { - set answer_url [export_vars -base "$answer_data" { }] + set answer_url [export_vars -base "$answer_data" { }] } else { - # we assume it's a file - set answer_url [export_vars -base "../../view/$answer_title" { revision_id }] + # we assume it's a file + set answer_url [export_vars -base "../../view/$answer_title" { revision_id }] } + if {[string eq $forums_related_p "t"]} { + set answer "[_ evaluation.view_post]" + set answer_url [export_vars -base "../../../forums/user-history" {{user_id $party_id} {view "forum"}}] + } + } # # working with students that have not answered and have not been yet evaluated and do not have submited their answers # set elements [list party_name \ - [list label "[_ evaluation.Name_]" \ - orderby_asc {party_name asc} \ - orderby_desc {party_name desc} \ - link_url_col party_url \ - ] \ - ] + [list label "[_ evaluation.name]" \ + orderby_asc {party_name asc} \ + orderby_desc {party_name desc} \ + link_url_col party_url \ + ] \ + ] if { [string eq $show_portrait_p "t"] && [string eq $number_of_members "1"] } { lappend elements portrait \ - [list label "[_ evaluation.Students_Portrait_]" \ - display_template { @not_evaluated_na.portrait;noquote@ } - ] + [list label "[_ evaluation.Students_Portrait_]" \ + display_template { @not_evaluated_na.portrait;noquote@ } + ] } +if {[string eq $forums_related_p "t"] && $number_of_members <= 1} { + lappend elements answer \ + [list label "[_ evaluation.answer]" \ + display_template {[_ evaluation.view_post]} + ] +} lappend elements grade \ - [list label "[_ evaluation.Grade_over_] " \ - display_template { } ] + [list label "[_ evaluation.Grade] <\/if>" \ + display_template {

    $max_grade max.
    }] lappend elements comments \ - [list label "[_ evaluation.Comments_]" \ - display_template { } \ - ] + [list label "[_ evaluation.Comments]" \ + display_template { } \ + ] lappend elements show_answer \ - [list label "[_ evaluation.lt_Allow_the_students_br]" \ - display_template { 
    [_ evaluation.Yes_] [_ evaluation.No_]
    } \ - ] + [list label "[_ evaluation.see_grades]" \ + display_template { 
    [_ evaluation.Yes_] [_ evaluation.No_]
    } \ + ] template::list::create \ -name not_evaluated_na \ -multirow not_evaluated_na \ -key party_id \ - -pass_properties { task_id return_url } \ + -main_class $class \ + -sub_class narrow \ + -pass_properties { task_id return_url simple_p} \ -filters { task_id {} } \ -orderby_name orderby_na \ -elements $elements @@ -297,48 +360,145 @@ if { $number_of_members > 1 } { if { [llength $done_students] > 0 } { - set not_in_clause [db_map not_in_clause] + set not_in_clause [db_map not_in_clause] } else { - set not_in_clause "" + set not_in_clause "" } set sql_query [db_map sql_query_groups] } else { if { [llength $done_students] > 0 } { - set not_in_clause [db_map not_yet_in_clause_non_empty] + set not_in_clause [db_map not_yet_in_clause_non_empty] } else { - set not_in_clause [db_map not_yet_in_clause_empty] + set not_in_clause [db_map not_yet_in_clause_empty] } # if this page is called from within a community (dotlrn) we have to show only the students if { [empty_string_p $community_id] } { - set sql_query [db_map sql_query_individual] + set sql_query [db_map sql_query_individual] } else { - set sql_query [db_map sql_query_community_individual] + set sql_query [db_map sql_query_community_individual] } } set not_evaluated_with_no_answer 0 db_multirow -extend { party_url portrait } not_evaluated_na get_not_evaluated_na_students { *SQL* } { - + + incr not_evaluated_with_no_answer if { $number_of_members == 1 } { - set tag_attributes [ns_set create] - ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]" - ns_set put $tag_attributes width 98 - ns_set put $tag_attributes height 104 - set portrait "[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]" + set tag_attributes [ns_set create] + ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]" + ns_set put $tag_attributes width 98 + ns_set put $tag_attributes height 104 + set portrait "[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]" } else { - set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups" + set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups" } } set total_processed [llength $done_students] set grades_sheet_item_id [db_nextval acs_object_id_seq] +# +# Working with all student when forum_related_p eq t +# +set elements [list party_name \ + [list label "[_ evaluation.name]" \ + orderby_asc {party_name asc} \ + orderby_desc {party_name desc} \ + link_url_col party_url \ + ] \ + ] +if { [string eq $show_portrait_p "t"] && [string eq $number_of_members "1"] } { + lappend elements portrait \ + [list label "[_ evaluation.Students_Portrait_]" \ + display_template { @class_students.portrait;noquote@ } + ] +} +if {[string eq $forums_related_p "t"] && $number_of_members <= 1} { + lappend elements answer \ + [list label "[_ evaluation.answer]" \ + display_template {[_ evaluation.view_post]} + ] +} + +lappend elements grade \ + [list label "[_ evaluation.Grade] <\/if>" \ + display_template {

    $max_grade max.
    }] +lappend elements comments \ + [list label "[_ evaluation.Comments]" \ + display_template { } \ + ] +lappend elements show_answer \ + [list label "[_ evaluation.see_grades]" \ + display_template { 
    [_ evaluation.Yes_] [_ evaluation.No_]
    } \ + ] + +template::list::create \ + -name class_students \ + -multirow class_students \ + -key party_id \ + -main_class $class \ + -sub_class narrow \ + -pass_properties { task_id return_url simple_p} \ + -filters { task_id {} } \ + -orderby_name orderby_cs \ + -elements $elements + +set orderby_cs [template::list::orderby_clause -orderby -name class_students] + +if { [string equal $orderby_cs ""] } { + set orderby_cs " order by party_name asc" +} + +if { $number_of_members > 1 } { + if { [llength $done_students] > 0 } { + set not_in_clause [db_map not_in_clause] + } else { + set not_in_clause "" + } + set sql_query [db_map sql_query_groups] +} else { + if { [llength $done_students] > 0 } { + set not_in_clause [db_map not_yet_in_clause_non_empty] + } else { + set not_in_clause [db_map not_yet_in_clause_empty] + } + + # if this page is called from within a community (dotlrn) we have to show only the students + + if { [empty_string_p $community_id] } { + set sql_query [db_map sql_query_individual] + } else { + set sql_query [db_map sql_query_community_individual] + } + +} + +set students 0 + +db_multirow -extend { party_url portrait } class_students class_students { *SQL* } { + + + incr students + if { $number_of_members == 1 } { + set tag_attributes [ns_set create] + ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]" + ns_set put $tag_attributes width 98 + ns_set put $tag_attributes height 104 + set portrait "[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]" + } else { + set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups" + } +} + +set total_processed [llength $done_students] + +set grades_sheet_item_id [db_nextval acs_object_id_seq] Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql 7 Apr 2005 11:26:59 -0000 1.11 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql 31 May 2005 23:13:11 -0000 1.11.2.1 @@ -112,15 +112,40 @@ et.weight as task_weight, to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, et.number_of_members, - et.online_p + et.online_p, + et.points, + et.perfect_score, + et.forums_related_p from evaluation_grades eg, evaluation_tasks et, cr_items cri where et.task_id = :task_id and et.grade_item_id = eg.grade_item_id and cri.live_revision = eg.grade_id + + + select ev.party_id, + case when et.number_of_members = 1 then + (select last_name||', '||first_names from persons where person_id = ev.party_id) + else + (select group_name from groups where group_id = ev.party_id) + end as party_name + from evaluation_answersi ev, + evaluation_tasks et, + $roles_table + cr_items cri + where ev.task_item_id = et.task_item_id + and et.task_id = :task_id + and ev.data is not null + $roles_clause + and cri.live_revision = ev.answer_id + $processed_clause + union $sql_query + + + Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl,v diff -u -r1.1.1.1 -r1.1.1.1.4.1 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl 28 Apr 2004 11:06:41 -0000 1.1.1.1 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl 31 May 2005 23:13:11 -0000 1.1.1.1.4.1 @@ -6,44 +6,75 @@ grade_id:integer,notnull no_grade:array weights:array + {weight_sum "0"} + {points_p "0"} + {info ""} + {relative_p 0} } -validate { valid_weights { - foreach id [array names weights] { - if { ![info exists weights($id)] } { - ad_complain "The task weight can't be null" - } else { - if { ![ad_var_type_check_number_p $weights($id)] } { - ad_complain "The task weight $weights($id) must be a valid number" - } - } + db_1row grade_info { *SQL* } + foreach id [array names weights] { + if { ![info exists weights($id)] } { + ad_complain "The task weight can't be null" + } else { + if { ![ad_var_type_check_number_p $weights($id)] } { + ad_complain "The task weight $weights($id) must be a valid number" } + + + } + } + } + weights_sum { + set count 0 + foreach id [array names weights] { + set count [expr $count+$weights($id)] + } + if { $count > 100} { + ad_complain "[_ evaluation.not_equal_100]" + } + } } - + +if {[string equal $info "[_ evaluation.Over_total_grade]"]} { + set points_p 1 +} + +if {[string equal $info "[_ evaluation.rel_weight]"]} { + set relative_p 1 +} + set without_grade [list] set with_grade [list] +set counter 0 + foreach id [array names weights] { + incr counter +} +foreach id [array names weights] { # create a list of tasks that requieres/not requires grade - if { [string eq $no_grade($id) "t"] } { - lappend with_grade $id + if { [string eq $no_grade($id) "t"] } { + lappend with_grade $id } else { lappend without_grade $id - } - - set aweight $weights($id) + } + set aweight [lc_numeric %.2f $weights($id)] + set apoints [format %0.2f [expr ($weights($id)*$grade_weight)/100.00]] + set rel_weight [format %0.2f [expr ($counter*$aweight/100.00)]] - db_dml update_task { *SQL* } - - if { [llength $with_grade] } { - db_dml update_tasks_with_grade { *SQL* } - } - if { [llength $without_grade] } { - db_dml update_tasks_without_grade { *SQL* } - } + db_dml update_task { *SQL* } + + if { [llength $with_grade] } { + db_dml update_tasks_with_grade { *SQL* } + } + if { [llength $without_grade] } { + db_dml update_tasks_without_grade { *SQL* } + } } -ad_returnredirect "grades" +ad_returnredirect "distribution-edit?grade_id=$grade_id" ad_script_abort Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql 28 Dec 2004 15:43:26 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.xql 31 May 2005 23:13:11 -0000 1.3.2.1 @@ -1,12 +1,13 @@ + postgresql7.3 update evaluation_tasks - set weight = :aweight + set weight = :aweight,points=:apoints,relative_weight=:rel_weight where task_id = :id @@ -28,4 +29,18 @@ + + + + select eg.grade_plural_name, + eg.weight as grade_weight, + eg.grade_item_id, + eg.comments as grade_comments + from evaluation_gradesi eg + where grade_id = :grade_id + + + + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/distribution-edit-3-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/distribution-edit-3.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/distribution-edit-3.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/Attic/distribution-edit-postgresql.xql,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-postgresql.xql 30 Jul 2004 22:50:10 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-postgresql.xql 31 May 2005 23:13:11 -0000 1.3.4.1 @@ -6,13 +6,15 @@ - select task_name, - weight as task_weight, - requires_grade_p, - task_id - from evaluation_tasksi - where grade_item_id = :grade_item_id - and content_revision__is_live(task_id) = true + select et.task_name, + et.weight as task_weight, + et.requires_grade_p, + et.task_id, + (select points from evaluation_tasks where task_id=et.task_id) as points, + (select relative_weight from evaluation_tasks where task_id=et.task_id) as relative_weight + from evaluation_tasksi et + where et.grade_item_id = :grade_item_id + and content_revision__is_live(et.task_id) = true order by task_name Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp,v diff -u -r1.5 -r1.5.4.1 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp 17 Aug 2004 03:07:41 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp 31 May 2005 23:13:11 -0000 1.5.4.1 @@ -1,23 +1,71 @@ @page_title@ @context@ - + + +

    #evaluation.lt_Distribution_for_grad#

    +
    +
    +
    + +
    + + + +
    @grade_plural_name_up@ (@grade_weight@% #evaluation-portlet.total_grade#)
    +
    +     +

    #evaluation.lt_Distribution_for_grad#

    @grade_comments@ - + +
    + +

    #evaluation.lt_grade_plural_name_rep_1#

    +
    - + + + + + + + + + + + + +
    + + + + + + +

    #evaluation.lt_There_are_no_tasks_as#

    + + +
    + #evaluation.grade_weight_zero# +
    +     +
    +
    + + + Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 22 Dec 2004 22:06:40 -0000 1.9 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 31 May 2005 23:13:11 -0000 1.9.2.1 @@ -6,37 +6,57 @@ @author jopez@galileo.edu @creation-date Mar 2004 @cvs-id $Id$ + } { grade_id:integer,notnull } set user_id [ad_conn user_id] +set simple_p [parameter::get -parameter "SimpleVersion"] set page_title "[_ evaluation.lt_Assignment_Types_Dist]" set context [list [list "grades" "[_ evaluation.Assignment_Types_]"] "[_ evaluation.lt_Assignment_Types_Dist]"] - +set class "list" +if { $simple_p } { +set class "pbs_list" +} db_1row grade_info { *SQL* } - set elements [list task_name \ - [list label "[_ evaluation.Name_]" \ + [list label "[_ evaluation.name]" \ + display_template {@grades.task_name@}\ orderby_asc {task_name asc} \ orderby_desc {task_name desc}] \ task_weight \ - [list label "[_ evaluation.lt_Weight_over_grade_wei]" \ - display_template { % } \ + [list label "[_ evaluation.lt_Weight_over_grade]" \ + display_template {
    } \ aggregate sum \ - aggregate_label { Total } + aggregate_label { [_ evaluation.total]} ] \ + relative_weight \ + [list label "[_ evaluation.rel_weight]" \ + display_template {
    @grades.relative_weight@
    } \ + aggregate sum \ + ]\ requires_grade \ - [list label "[_ evaluation.Requires_Grade_]" \ + [list label "[_ evaluation.requires_grade]" \ display_template { [_ evaluation.Yes_] [_ evaluation.No_] } \ ] \ - ] - + + ] + + +# points \ + [list label "Weight over Total" \ + display_template { } \ + aggregate sum \ + aggregate_label { Total } ] + template::list::create \ -name grades \ -multirow grades \ -key task_id \ + -main_class $class \ + -sub_class narrow\ -filters { grade_id {} } \ -elements $elements @@ -49,7 +69,8 @@ db_multirow -extend { radio_yes_checked radio_no_checked } grades get_grade_tasks { *SQL* } { - set task_weight [lc_numeric %.2f $task_weight] + set task_weight [format %0.2f $task_weight] + if { [string eq $requires_grade_p "t"] } { set radio_yes_checked "checked" set radio_no_checked "" Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql 28 Dec 2004 15:47:52 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql 31 May 2005 23:13:11 -0000 1.5.2.1 @@ -1,10 +1,12 @@ + postgresql7.3 + - select eg.grade_plural_name, + select eg.grade_plural_name,upper(eg.grade_plural_name) as grade_plural_name_up, eg.weight as grade_weight, eg.grade_item_id, eg.comments as grade_comments Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/grades-delete-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl 7 Apr 2005 11:26:59 -0000 1.12 +++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl 31 May 2005 23:13:11 -0000 1.12.2.1 @@ -8,6 +8,7 @@ @author jopez@galileo.edu @cvs-id $Id$ + } { {orderby ""} } -validate { @@ -21,11 +22,15 @@ set page_title "[_ evaluation.Grades_Report_]" set context "[_ evaluation.Grades_Report_]" set package_id [ad_conn package_id] - +set simple_p [parameter::get -parameter "SimpleVersion"] # we have to decide if we are going to show all the users in the system # or only the students of a given class (community in dotrln) # in order to create the groups +set class "list" +if { $simple_p } { + set class "pbs_list" +} set community_id [dotlrn_community::get_community_id] if { [empty_string_p $community_id] } { set query_name grades_report @@ -53,18 +58,22 @@ append sql_query [db_map grade_total_grade] } + lappend elements total_grade \ [list label "[_ evaluation.Total_Grade_]" \ orderby_asc {total_grade asc} \ orderby_desc {total_grade desc} \ ] + append sql_query [db_map class_total_grade] template::list::create \ -name grades_report \ -multirow grades_report \ -key grade_id \ + -main_class $class \ + -sub_class narrow \ -elements $elements \ -pass_properties " $pass_grades " \ -orderby { default_value student_name } @@ -75,6 +84,8 @@ set orderby " order by student_name asc" } + + db_multirow -extend { student_url } grades_report $query_name { *SQL* } { set student_url [export_vars -base "student-grades-report" -url { {student_id $user_id} }] } Index: openacs-4/packages/evaluation/www/admin/grades/grades.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.adp,v diff -u -r1.1.1.1 -r1.1.1.1.4.1 --- openacs-4/packages/evaluation/www/admin/grades/grades.adp 28 Apr 2004 11:06:42 -0000 1.1.1.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades.adp 31 May 2005 23:13:11 -0000 1.1.1.1.4.1 @@ -1,8 +1,24 @@ @page_title;noquote@ @context;noquote@ + + +

    @page_title;noquote@

    +
    +
    + +
    + + -
    + + +
    ALL ASIGNMENT TYPES + @actions;noquote@ +
    +
    +     +

    @notice;noquote@

    Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/evaluation/www/admin/grades/grades.tcl 21 Mar 2005 15:42:00 -0000 1.14 +++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl 31 May 2005 23:13:11 -0000 1.14.2.1 @@ -1,72 +1,94 @@ # /packages/evaluation/www/admin/grades/grades.tcl ad_page_contract { - + List of grades and options to admin grades - + @author jopez@galileo.edu @creation-date Feb 2004 @cvs-id $Id$ - + + } -query { {orderby:optional} } set context [list "[_ evaluation.Grades_]"] set package_id [ad_conn package_id] +set simple_p [parameter::get -parameter "SimpleVersion"] +set class "list" +set aggregate "" +set bulk_actions [list "[_ evaluation.Add_assignment_type_]" [export_vars -base "grades-add-edit" { }]] set page_title "[_ evaluation.lt_Admin_Assignment_Type]" set return_url [ad_conn url] +set total 0 +set a_label [_ evaluation.total_of_course] +set actions "[_ evaluation.Add_assignment_type_]" -set actions [list "[_ evaluation.Add_assignment_type_]" [export_vars -base "grades-add-edit" { }]] - if { [lc_numeric %2.f [db_string sum_grades { *SQL* }]] > 100.00} { - set aggregate_label "[_ evaluation.Total_]" + set aggregate_label "[_ evaluation.Total_d]" } else { - set aggregate_label "[_ evaluation.Total_]" + set aggregate_label "[_ evaluation.Total_d]" } +if { !$simple_p } { + set aggregate_label "" + set aggregate "sum" + set total "Total" + set a_label "" +} else { + set class "pbs_list" + set bulk_actions "" +} + + template::list::create \ -name grades \ -multirow grades \ - -actions $actions \ -key grade_id \ - -pass_properties { return_url aggregate_label } \ + -actions $bulk_actions \ + -main_class $class \ + -sub_class narrow \ + -pass_properties { return_url aggregate_label total a_label aggregate} \ -elements { grade_plural_name { - label "[_ evaluation.Name_]" + label "[_ evaluation.name]" orderby_asc {grade_plural_name asc} orderby_desc {grade_plural_name desc} link_url_eval {[export_vars -base "distribution-edit" { grade_id }]} link_html { title "View assignment type distribution" } + aggregate "" + aggregate_label {@aggregate_label;noquote@} } weight { label "[_ evaluation.lt_Weight_over_100_br__o]" orderby_asc {weight asc} orderby_desc {weight desc} display_template { @grades.weight@% } - aggregate sum - aggregate_label { @aggregate_label;noquote@ } + aggregate "$aggregate" + aggregate_label {@total;noquote@} } comments { - label "[_ evaluation.Description_]" + label "[_ evaluation.description]" orderby_asc {comments asc} orderby_desc {comments desc} + aggregate "" + aggregate_label {@a_label;noquote@} + } edit { label {} sub_class narrow - display_template { - + display_template {[_ evaluation-portlet.edit] } link_url_eval {[export_vars -base "grades-add-edit" { item_id grade_id }]} link_html { title "[_ evaluation.lt_Edit_assignment_type_]" } } delete { label {} sub_class narrow - display_template { - + display_template {[_ evaluation-portlet.delete] } link_url_eval {[export_vars -base "grades-delete" { grade_id return_url }]} link_html { title "[_ evaluation.lt_Delete_assignment_typ]" } @@ -79,16 +101,19 @@ set orderby " order by grade_plural_name asc" } -db_multirow grades get_class_grades { *SQL* } { - set weight [lc_numeric %.2f $weight] + +db_multirow -extend {} grades get_class_grades { *SQL* } { + if { $simple_p } { + set total [expr $total + $weight] + } } db_1row get_total_weight { *SQL* } -set total_weight [format %.2f $total_weight] +set total_weight [lc_numeric %.2f $total_weight] -if { ![string eq $total_weight "100.00"] && ![string eq $total_weight "0"] } { - set notice "es $total_weight [_ evaluation.lt_The_sum_of_the_weight]" +if { ($total_weight < 100 && $total_weight > 0) || $total_weight > 100} { + set notice "[_ evaluation.lt_The_sum_of_the_weight]" } else { set notice "" } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/instructions-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/instructions.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/instructions.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/instructions.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/index-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/index.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/index.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/index.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v diff -u -r1.25 -r1.25.2.1 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 7 Apr 2005 18:57:01 -0000 1.25 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 31 May 2005 23:13:12 -0000 1.25.2.1 @@ -17,14 +17,20 @@ admin_groups_p:optional {add_to_more_classes_p ""} {attached_p "f"} + {enable 1} + {return_p ""} + {simple_p ""} + } set package_id [ad_conn package_id] set user_id [ad_conn user_id] set community_id [dotlrn_community::get_community_id] set new_p [ad_form_new_p -key task_id] +set simple_p [parameter::get -parameter SimpleVersion ] + set more_communities_option 0 if { $new_p && ![empty_string_p $community_id] && [db_string get_user_comunities { *SQL* }] } { set more_communities_option 1 @@ -191,54 +197,103 @@ {format "MONTH DD YYYY HH24 MI SS"} {today} {help} - {value {[evaluation::now_plus_days -ndays 15]}} } - - {number_of_members:naturalnum - {label "[_ evaluation.Number_of_Members_]"} - {value "1"} - {html {size 5 onChange TaskInGroups()}} - {help_text "[_ evaluation.1__Individual_]"} - {after_html {
    [_ evaluation.lt_Check_this_if_you_wan_1]
    }} + {relative_weight:float(hidden) + {value 0} } +} - {weight:float,optional - {label "[_ evaluation.lt_Weight_over_grade_wei_2]"} - {html {size 5}} - {help_text "[_ evaluation.lt_You_can_enter_the_wei]"} - {value "0"} - } +if { $simple_p } { + ad_form -extend -name task -form { + {number_of_members:naturalnum(hidden) + {value "1"} + } + {weight:float(hidden) + {value "0"} + } + {net_value:float(hidden) + {value "0"} + } - {net_value:float,optional - {label "[_ evaluation.Net_Value_]"} - {html {size 5}} - {help_text "[_ evaluation.lt_If_you_enter_the_net_]"} - {value "0"} + } - {online_p:text(radio) - {label "[_ evaluation.lt_Will_the_task_be_subm]"} - {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} - {value t} +} else { + ad_form -extend -name task -form { + {number_of_members:naturalnum + {label "[_ evaluation.Number_of_Members_]"} + {value "1"} + {html {size 5 onChange TaskInGroups()}} + {help_text "[_ evaluation.1__Individual_]"} + {after_html {
    [_ evaluation.lt_Check_this_if_you_wan_1]
    }} + } + + {weight:float,optional + {label "[_ evaluation.lt_Weight_over_grade_wei_2]"} + {html {size 5}} + {help_text "[_ evaluation.lt_You_can_enter_the_wei]"} + {value "0"} + } + + {net_value:float,optional + {label "[_ evaluation.Net_Value_]"} + {html {size 5}} + {help_text "[_ evaluation.lt_If_you_enter_the_net_]"} + {value "0"} + } } - - {late_submit_p:text(radio) - {label "[_ evaluation.lt_Can_the_student_submi]"} - {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} - {value t} +} +ad_form -extend -name task -form { + {perfect_score:float(text) + {label "[_ evaluation.perfect_score]"} + {html {size 5}} + {help_text "[_ evaluation.perfect_score_help]"} + {value 0.00} } + {answer_choice:text(radio) + {label "[_ evaluation.answer_choice_]"} + {options {{"[_ evaluation.submitted_online_]" ol} {"[_ evaluation.forum_r_]" fr} {"[_ evaluation.not_submited_]" ns}}} + {value "ol"} + } +} +if { $simple_p } { + ad_form -extend -name task -form { + {late_submit_p:text(hidden) + {value t} + } + } +} else { + ad_form -extend -name task -form { + {late_submit_p:text(radio) + {label "[_ evaluation.lt_Can_the_student_submi]"} + {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} + {value t} + } + } +} +ad_form -extend -name task -form { {requires_grade_p:text(radio) {label "[_ evaluation.lt_Will_this_task_requir]"} {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} {value t} } - - {estimated_time:float,optional - {label "[_ evaluation.lt_Time_estimated_to_com]"} - {html {size 5}} - {value "0"} +} +if { $simple_p } { + ad_form -extend -name task -form { + {estimated_time:float(hidden) + {value "0"} + } } + +} else { + ad_form -extend -name task -form { + {estimated_time:float,optional + {label "[_ evaluation.lt_Time_estimated_to_com]"} + {html {size 5}} + {value "0"} + } + } } if { $more_communities_option } { @@ -256,10 +311,20 @@ } -edit_request { db_1row task_info { *SQL* } + if {[string eq $online_p t]} { + set answer_choice "ol" + } else { + set answer_choice "ns" + } + if {[string eq $forums_related_p t]} { + set answer_choice "fr" + } set due_date [template::util::date::from_ansi $due_date_ansi "YYYY-MM-DD HH24:MI:SS"] - set weight [lc_numeric %.2f $weight] + set weight [format %0.2f $weight] + + } -validate { {url { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || ([string eq $url "http://"] && [empty_string_p $upload_file]) || (![string eq $url "http://"] && [util_url_valid_p $url]) } @@ -285,10 +350,6 @@ { $number_of_members >= 1 } { [_ evaluation.lt_The_number_of_members]} } - {online_p - { ([empty_string_p $due_date] && [string eq $online_p "f"]) || (![empty_string_p $due_date] && [string eq $online_p "t"]) } - { "You can't leave the due date empty if the students have to submit their answers online." } - } {estimated_time { $estimated_time >= 0 } { [_ evaluation.lt_The_estimated_time_mu] } @@ -309,7 +370,20 @@ } } else { set weight 0 + set points 0 } + set points [format %0.2f [expr ($weight*$grade_weight)/100.00]] + set forums_related_p "f" + set online_p "f" + + if {[string eq $answer_choice "ol"]} { + set online_p "t" + } + + if {[string eq $answer_choice "fr"]} { + set forums_related_p "t" + } + db_transaction { @@ -337,11 +411,18 @@ set mime_type "text/plain" set title "" } + set due_date_p 1 set title [evaluation::safe_url_name -name $title] set cal_due_date [calendar::to_sql_datetime -date $due_date -time $due_date -time_p 1] set due_date_ansi [db_string set_date " *SQL* "] + + if { [string equal $cal_due_date "-- :"]} { + set due_date_p 0 + set due_date "" + } + if { [ad_form_new_p -key task_id] } { set item_id $task_id } @@ -419,14 +500,39 @@ if { ![db_0or1row calendar_mappings { *SQL* }] } { # create cal_item + if { $due_date_p } { set cal_item_id [calendar::item::new -start_date $cal_due_date -end_date $cal_due_date -name "[_ evaluation.Due_date_task_name]" -description $desc_url -calendar_id $calendar_id] - db_dml insert_cal_mapping { *SQL* } + + db_dml insert_cal_mapping { *SQL* } + } } else { - # edit previous cal_item + # edit previous cal_item + if { $due_date_p } { calendar::item::edit -cal_item_id $cal_item_id -start_date $due_date_ansi -end_date $due_date_ansi -name "[_ evaluation.Due_date_task_name]" -description $desc_url -calendar_id $calendar_id + } } - } + db_transaction { + + + if {!$simple_p } { + + set relative_weight [format %0.2f [expr (($tasks_counter)*$weight)/100.00]] + set update_p [db_dml update_points { *SQL* }] + if { $new_p } { + db_foreach get_grade_tasks {} { + set relative_weight [format %0.2f [expr (($tasks_counter)*$weight)/100.00]] + db_dml update_tasks {*SQL*} + } + } + + } + + } + + + } } -after_submit { + set redirect_to_groups_p 0 if { [info exists admin_groups_p] && $number_of_members > 1 } { set redirect_to_groups_p 1 @@ -437,8 +543,14 @@ ad_returnredirect [export_vars -base "../groups/one-task" { {task_id $revision_id} }] ad_script_abort } else { - ad_returnredirect "$return_url" - ad_script_abort + if { $simple_p } { + set return_url "../grades/distribution-edit?task_id=$revision_id&grade_id=$grade_id" + ad_returnredirect $return_url + ad_script_abort + } else { + ad_returnredirect $return_url + } + } } Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.xql 4 Apr 2005 18:22:36 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.xql 31 May 2005 23:13:12 -0000 1.2.2.1 @@ -1,24 +1,44 @@ - - select grade_plural_name, - grade_name, - weight as grade_weight, - grade_item_id - from evaluation_grades where grade_id = :grade_id + select eg.grade_plural_name, (select count(et.task_id) from evaluation_tasks et where + et.grade_item_id = eg.grade_item_id and et.task_id=(select live_revision from cr_items where item_id=et.task_item_id)) as tasks_counter , + eg.grade_name, + eg.weight as grade_weight, + eg.grade_item_id + from evaluation_grades eg + where eg.grade_id = :grade_id + + + + + + update evaluation_tasks set points=:points,perfect_score=:perfect_score,relative_weight=:relative_weight,forums_related_p=:forums_related_p where task_id=:revision_id + + + + select * from evaluation_tasks et where + et.grade_item_id = :grade_item_id and et.task_id=(select live_revision from cr_items where item_id=et.task_item_id) + + + + + update evaluation_tasks set relative_weight=:relative_weight where task_id=:task_id + + + select et.task_name, et.description, to_char(et.due_date,'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, - et.weight, et.number_of_members, et.online_p, et.late_submit_p, et.requires_grade_p + et.weight, et.number_of_members, et.online_p, et.late_submit_p, et.requires_grade_p,(select points from evaluation_tasks where task_id=:task_id) as points,(select perfect_score from evaluation_tasks where task_id=:task_id) as perfect_score,(select forums_related_p from evaluation_tasks where task_id=:task_id) as forums_related_p from evaluation_tasksi et where task_id = :task_id Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/task-delete-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/task-delete-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/version-select.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/tasks/version-select.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/resources/arrow.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/resources/arrow.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/evaluation/www/resources/browse.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/resources/browse.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/evaluation/www/resources/cross.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/resources/cross.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/evaluation/www/resources/default.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/resources/default.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/resources/evaluation.css'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/resources/submit.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/resources/submit.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/evaluation/www/resources/upload.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/resources/upload.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-add-edit.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-add-edit.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-add-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-ok.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-ok.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-view.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-view.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/answer-view.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/evaluation-list-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/evaluation-list.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/evaluation-list.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/evaluation-view-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/evaluation-view-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/evaluation-view.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/evaluation-view.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/index-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/view/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/index-postgresql.xql,v diff -u -r1.1.1.1 -r1.1.1.1.4.1 --- openacs-4/packages/evaluation/www/view/index-postgresql.xql 28 Apr 2004 11:09:54 -0000 1.1.1.1 +++ openacs-4/packages/evaluation/www/view/index-postgresql.xql 31 May 2005 23:13:12 -0000 1.1.1.1.4.1 @@ -1,15 +1,44 @@ - postgresql7.1 + postgresql7.3 - + - select content_template__get_root_folder() + select coalesce(sum(round((ese.grade*et.weight*eg.weight)/10000,2)),0) as grade + from evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese, acs_objects ao, cr_items cri1, cr_items cri2, cr_items cri3 + where et.task_item_id = ese.task_item_id + and et.grade_item_id = eg.grade_item_id + and eg.grade_item_id = ao.object_id + and ao.context_id = :package_id + and ese.party_id = + ( select + CASE + WHEN et3.number_of_members = 1 THEN $user_id + ELSE + (select etg2.group_id from evaluation_task_groups etg2, + evaluation_tasks et2, + acs_rels map + where map.object_id_one = etg2.group_id + and map.object_id_two = $user_id + and etg2.task_item_id = et2.task_item_id + and et2.task_id = et.task_id) + + END as nom + from evaluation_tasks et3 + where et3.task_id = et.task_id + ) + + and cri1.live_revision = eg.grade_id + and cri2.live_revision = et.task_id + and cri3.live_revision = ese.evaluation_id + +-- select evaluation__class_total_grade(:user_id,:package_id) + - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/index.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/index.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/view/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/index.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/evaluation/www/view/index.xql 22 Dec 2004 22:06:41 -0000 1.3 +++ openacs-4/packages/evaluation/www/view/index.xql 31 May 2005 23:13:12 -0000 1.3.2.1 @@ -2,12 +2,39 @@ - + - select cri.content_type, cri.name - from cr_items cri, cr_revisions crr - where cri.item_id = crr.item_id - and crr.revision_id = :revision_id + + select eg.grade_plural_name, + eg.grade_id, + eg.grade_item_id + from evaluation_grades eg, acs_objects ao, cr_items cri + where cri.live_revision = eg.grade_id + and eg.grade_item_id = ao.object_id + and ao.context_id = :package_id + order by grade_plural_name desc + + + + + + select sum(round(et.weight*eg.weight/100,2)) + from evaluation_tasks et, + evaluation_grades eg, + cr_items cri1, + cr_items cri2, + acs_objects ao + where et.grade_item_id = eg.grade_item_id + and cri1.live_revision = eg.grade_id + and cri2.live_revision = et.task_id + and et.requires_grade_p = 't' + and ao.object_id = eg.grade_item_id + and ao.context_id = :package_id + + + + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-list-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-list.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-list.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-view-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-view-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-view.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-view.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/view/task-view.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation-portlet/evaluation-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/evaluation-portlet.info,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/evaluation-portlet/evaluation-portlet.info 8 Apr 2005 08:12:30 -0000 1.6 +++ openacs-4/packages/evaluation-portlet/evaluation-portlet.info 31 May 2005 23:13:20 -0000 1.6.2.1 @@ -7,16 +7,16 @@ f t - + Jose Pablo Escobedo Del Cid - 2005-04-08 + 2004-06-12 - + - + Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml 7 Apr 2005 11:26:30 -0000 1.7 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml 31 May 2005 23:13:20 -0000 1.7.2.1 @@ -4,54 +4,80 @@ Add %grade_name% Add/edit answer Add/edit solution - Assignments + Create, change or delete a course assignment type. + Assignments + Gradebook Audit Info. Audit info - Comments + <center><text class="blue">Your total grade in this class is: <b>%total_class_grade%/%max_possible_grade% </b></text></center> + <center>COMMENTS +</center> + Delete Delete task - Due date + <center>DUE DATE</center> + Edit + Edit Grading Scale Edit task - Evaluations - Grade over 100 + <text class="blue">Email Notification?</text> + Evaluate + Evaluations + Full Version: Assignments and Evaluations Portlet + GRADE + <center>GRADE % <br>(OF 100%) </center> Report Groups Admin. - Admin my Assignment Types + Modify Assignment Types Administer Evaluation - Edit grades distribution of %grade_plural_name% + Edit grades distribution of %low_name% Evaluation Admin Portlet Evaluation Administration Evaluation Assignments Portlet Evaluation Evaluations Portlet Groups administration <small>Total points in this category: %total_grade%/%max_grade%<br /> - This grade category represents the %grade_weight%% of the 100% of the class</small> - Total points in this category: %total_grade%/%max_grade% - <small>Weight used in %grade_plural_name%: %category_weight%% (over 100% of %grade_plural_name%) <br /> - %grade_plural_name% represents %grade_weight%% of the 100% of the class</small> - Submit answer again (<span style=color:red;>late</span>) - Submit answer (<span style=color:red;>late</span>) + This grade category represents the %grade_weight%% of the 100% of the class +<small> + <text class="blue">%grade_plural_name% TOTAL:</text> + <text class="blue"><b>%grade_plural_name% TOTALS:</text> submit answer <style font-color:red>late</style> submit answer <style font-color:red>late</style> again There are no tasks for this package. There are no tasks to evaluate for this package. There should be only one instance of evaluation for admin purposes View evaluation comments - View evaluation details + View comments Your total grade in this class is: - Name + (maximum) + NAME Net Value No assignments No group for task Not available Not evaluated + Text for notifications + POINT VALUE + <center>POINTS MADE</center> + POINTS VALUE + Select Portlet Version + Simple Version: Evaluations Portlet + SOLUTION submit answer submit answer again + SUBMITTED %task_name% (No data) %task_name% (URL) + of Total Grade + <center>TOTAL POINTS +</center> Upload Solution + Choose your portlet version: View comments + View students grades across all assignments and evaluations. View my answer + View Students Grades View task View/Edit Solution - Weight + ITEM WEIGHT + <text class="blue">(of a possible 100% of </text> + <text class="blue">(of a possible 100% of %grade_plural_name%) Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-postgresql.xql,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-postgresql.xql 4 Apr 2005 18:23:47 -0000 1.6 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-postgresql.xql 31 May 2005 23:13:20 -0000 1.6.2.1 @@ -3,8 +3,58 @@ postgresql7.3 + + + + select et.task_name, + round(et.weight,2) as task_weight, + et.task_id, (select perfect_score from evaluation_tasks where task_id=et.task_id) as perfect_score, online_p + from evaluation_tasksi et, cr_items cri + where grade_item_id = :grade_item_id + and cri.live_revision = et.task_id + $evaluations_orderby + + + + + + + select ets.solution_id + from evaluation_tasks_sols ets, cr_items cri + where ets.task_item_id = (select task_item_id from evaluation_tasks where task_id=:task_id) + and cri.live_revision = ets.solution_id + + + + + + + + + select et.task_name, + et.task_item_id, + et.weight as t_weight, + eg.weight as g_weight, + round((et.weight*eg.weight)/100,2) as task_weight, + et.number_of_members, + et.online_p, + et.due_date, + et.late_submit_p, + et.task_id, (select perfect_score from evaluation_tasks where task_id=et.task_id) as perfect_score + from evaluation_grades eg, + evaluation_tasksi et, + cr_items cri + where eg.grade_id = :grade_id + and eg.grade_item_id = et.grade_item_id + and cri.live_revision = et.task_id + $evaluations_orderby + + + + + select coalesce((select etg2.group_id from evaluation_task_groups etg2, evaluation_tasks et2, acs_rels map @@ -16,11 +66,13 @@ where et3.task_id = :task_id -- select evaluation__party_id(:user_id,:task_id) + + select round(ese.grade,2) as grade, ese.evaluation_id, ese.description as comments, @@ -46,14 +98,16 @@ where et3.task_id = :task_id ) -- evaluation__party_id(:user_id,:task_id) + + select ea.data as answer_data, ea.title as answer_title, - ea.answer_id + ea.answer_id,to_char(ea.creation_date,'MM/DD/YYYY HH24:MI') as creation_date from evaluation_answersi ea, cr_items cri where ea.task_item_id = :task_item_id and cri.live_revision = ea.answer_id @@ -73,9 +127,46 @@ from evaluation_tasks et3 where et3.task_id = :task_id ) + -- evaluation__party_id(:user_id,:task_id) + + + + select 1 from dual where :due_date > now() + + + + + + select ea.answer_id + from evaluation_answers ea, cr_items cri + where ea.task_item_id = :task_item_id + and cri.live_revision = ea.answer_id + and ea.party_id = + ( select + CASE + WHEN et3.number_of_members = 1 THEN :user_id + ELSE + (select etg2.group_id from evaluation_task_groups etg2, + evaluation_tasks et2, + acs_rels map + where map.object_id_one = etg2.group_id + and map.object_id_two = :user_id + and etg2.task_item_id = et2.task_item_id + and et2.task_id = :task_id) + END as nom + from evaluation_tasks et3 + where et3.task_id = :task_id + ) + + --evaluation__party_id(:user_id,:task_id) + + + + + Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.adp,v diff -u -r1.2 -r1.2.4.1 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.adp 11 Sep 2004 00:41:09 -0000 1.2 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.adp 31 May 2005 23:13:20 -0000 1.2.4.1 @@ -1,3 +1,23 @@ - + + +
    + + + + +
    @grade_plural_name@ (@grade_weight@% #evaluation-portlet.total_grade#) + +@actions;noquote@ +
    +
    +     +
    -@bottom_line;noquote@ + + + #evaluation.lt_Weight_used_in_grade_# + + + #evaluation-portlet.lt_smallTotal_points_in_# + + Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 1 Mar 2005 00:01:36 -0000 1.12 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 31 May 2005 23:13:21 -0000 1.12.2.1 @@ -1,94 +1,217 @@ ad_page_contract { - - evaluations chunk to be displayed in the index page - + + evaluations chunk to be displayed in the index page + } set package_id [ad_conn package_id] -set user_id [ad_conn user_id] +set evaluation_id [evaluation_evaluations_portlet::get_package_id_from_key -package_key "evaluation"] +set user_id [ad_verify_and_get_user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] - +set simple_p [parameter::get -parameter "SimpleVersion" -package_id $evaluation_id] set base_url "[ad_conn package_url][evaluation::package_key]/" set return_url "[ad_conn url]?[ns_conn query]" - +set class "list" +set bulk_actions "" db_1row get_grade_info { *SQL* } +set submitted_label "
    [_ evaluation-portlet.lt_smallTotal_points_in__1]
    " + +if { $admin_p } { + if { $simple_p } { + set bottom_line "[_ evaluation-portlet.lt_smallWeight_used_in_g]" + } else { + set bottom_line "" + + } +} else { + set bottom_line "" +} + + +if { $simple_p } { + set class "pbs_list" + set grade_of_label "[_ evaluation-portlet.maximum]" +} else { + set grade_of_label "" +} set elements [list task_name \ [list label "[_ evaluation-portlet.Name_]" \ link_url_col task_url \ orderby_asc {task_name asc} \ - orderby_desc {task_name desc}] \ - ] + aggregate "" \ + aggregate_label "@bottom_line;noquote@"\ + orderby_desc {task_name desc}]] if { $admin_p } { - #admin - lappend elements task_weight \ - [list label "[_ evaluation-portlet.Weight_]" \ - display_template {
    @grade_tasks_admin.task_weight@%
    } \ - orderby_asc {task_weight asc} \ - orderby_desc {task_weight desc}] + #admin + if { $simple_p } { + lappend elements perfect_score \ + [list label "[_ evaluation-portlet.points_value]" \ + display_template {
    @grade_tasks_admin.perfect_score@
    } \ + orderby_asc {perfect_score asc} \ + aggregate "" \ + aggregate_label "@max_grade_label;noquote@" \ + orderby_desc {perfect_score desc}] + } + lappend elements task_weight \ + [list label "[_ evaluation-portlet.Weight_]" \ + display_template {
    @grade_tasks_admin.task_weight@%
    } \ + orderby_asc {task_weight asc} \ + orderby_desc {task_weight desc} \ + aggregate "" \ + aggregate_label "@max_weight_label;noquote@"] + if { $simple_p } { + lappend elements solution \ + [list label "
    [_ evaluation-portlet.solution]
    " \ + display_template "
    @grade_tasks_admin.solution@
    " \ + link_url_col solution_url \ + aggregate "" \ + aggregate_label "@solution_label;noquote@"] + lappend elements grade \ + [list label "[_ evaluation-portlet.grade]" \ + link_url_col grade_url \ + display_template {
    [_ evaluation-portlet.evaluate]
    } ] + lappend elements edit \ + [list label "" \ + sub_class narrow \ + display_template {
    [_ evaluation-portlet.edit]
    [_ evaluation-portlet.delete]
    }] + } else { lappend elements audit_info \ - [list label "" \ - link_url_col audit_info_url \ - link_html { title "[_ evaluation-portlet.Audit_info_]" }] - set multirow_name grade_tasks_admin - set actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]] + [list label "" \ + link_url_col audit_info_url \ + link_html { title "[_ evaluation-portlet.Audit_info_]" }] + set bulk_actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]] + + } + set multirow_name grade_tasks_admin + set actions "\#evaluation-portlet.Add_grade_name_\#\#evaluation-portlet.edit_grade_scale\#" + } else { - #student - lappend elements grade \ - [list label "[_ evaluation-portlet.Grade_over_100_]" \ - display_template {
    @grade_tasks.grade@
    } ] - lappend elements comments \ - [list label "[_ evaluation-portlet.Comments_]" \ - link_url_col comments_url \ - link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }] + #student + if { $simple_p } { + lappend elements submitted \ + [list label "
    [_ evaluation-portlet.Submitted]
    " \ + display_template {
    @grade_tasks.submitted_date;noquote@
    } \ + aggregate "" \ + link_url_col submitted_date_url \ + aggregate_label "@submitted_label;noquote@" ] + + lappend elements task_grade \ + [list label "[_ evaluation-portlet.Points]" \ + display_template {
    @grade_tasks.task_grade@
    } \ + aggregate "" \ + aggregate_label "@max_grade_label;noquote@" ] lappend elements task_weight \ - [list label "[_ evaluation-portlet.Net_Value_]" \ - display_template {
    @grade_tasks.task_weight@
    } \ - orderby_asc {task_weight asc} \ - orderby_desc {task_weight desc}] - lappend elements answer \ - [list label "" \ - link_url_col answer_url \ - link_html { title "[_ evaluation-portlet.View_my_answer_]" }] - set multirow_name grade_tasks - set actions "" + [list label "[_ evaluation-portlet.Total_Points]" \ + display_template {
    @grade_tasks.perfect_score@
    } \ + orderby_asc {task_weight asc} \ + orderby_desc {task_weight desc} \ + aggregate "" \ + aggregate_label "@max_weight_label;noquote@"] + } + lappend elements grade \ + [list label "[_ evaluation-portlet.Grade_over_100_]" \ + display_template {
    @grade_tasks.grade@
    } \ + aggregate "" \ + aggregate_label "@grade_of_label;noquote@"] + + lappend elements comments \ + [list label "[_ evaluation-portlet.Comments_]" \ + link_url_col comments_url \ + link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }] + + if {!$simple_p} { + lappend elements task_weight \ + [list label "[_ evaluation-portlet.Net_Value]" \ + display_template {
    @grade_tasks.task_weight@
    } \ + orderby_asc {task_weight asc} \ + orderby_desc {task_weight desc}] + + } + lappend elements answer \ + [list label "" \ + display_template {@grade_tasks.answer;noquote@} \ + link_html { title "[_ evaluation-portlet.View_my_answer_]" }] + + set multirow_name grade_tasks + set actions "" } set total_grade 0.00 set max_grade 0.00 +set max_weight 0.00 set category_weight 0 +set max_grade_label "" +set max_weight_label "" +set solution_label "" + template::list::create \ -name grade_tasks \ -multirow $multirow_name \ - -actions $actions \ -key task_id \ - -pass_properties { return_url mode base_url } \ + -pass_properties { return_url mode base_url bottom_line max_grade_label max_weight_label solution_label submitted_label grade_of_label} \ -filters { grade_id {} page_num {} } \ + -actions $bulk_actions \ -no_data "[_ evaluation-portlet.No_assignments_]" \ -elements $elements \ -orderby_name evaluations_orderby \ + -main_class $class \ + -sub_class narrow \ -orderby { default_value task_name } - + set evaluations_orderby [template::list::orderby_clause -orderby -name grade_tasks] - + if { [string equal $evaluations_orderby ""] } { - set evaluations_orderby " order by task_name asc" + set evaluations_orderby " order by task_name asc" } if { $admin_p } { - #admin - db_multirow -extend { task_url audit_info audit_info_url } grade_tasks_admin get_tasks_admin { *SQL* } { - set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { task_id grade_id }] + #admin + db_multirow -extend { task_url grade_url audit_info audit_info_url task_points solution solution_url} grade_tasks_admin get_tasks_admin { *SQL* } { + if { $simple_p } { + set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }] + } else { + set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] + } set category_weight [expr $category_weight + $task_weight] + set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] + set max_weight [format %0.2f [expr $max_weight + $task_weight]] set task_weight [lc_numeric $task_weight] - - set audit_info_url "[export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }]" + set max_grade [expr $max_grade + $perfect_score] + set max_grade_label "
    $max_grade pts.
    " + set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] $low_name )" + + if { $simple_p } { + set max_weight_label "
    $max_weight %
    " + } + if { [db_0or1row solution_info { *SQL* }] } { + set solution_mode display + set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id solution_id return_url solution_mode }]" + set solution "[_ evaluation-portlet.ViewEdit_Solution_]" + } else { + set solution_mode edit + set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id return_url solution_mode }]" + if { $online_p } { + set solution "[_ evaluation-portlet.Upload_Solution_]" + } + } + + set task_points [format %0.2f [expr ($task_weight*$grade_weight)/100.0]] + set audit_info_url [export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }] + set audit_info "[_ evaluation-portlet.Audit_Info_]" + } } else { - - db_multirow -extend { comments comments_url answer answer_url grade } grade_tasks get_grade_tasks { *SQL* } { + + db_multirow -extend { task_url submitted_date submitted_date_url comments comments_url grade_url answer answer_url grade task_grade} grade_tasks get_grade_tasks { *SQL* } { + if { $simple_p } { + set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }] + } else { + set task_url "" + } + set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] if { [db_0or1row get_evaluation_info { *SQL* }] } { if { ![empty_string_p $comments] } { @@ -99,16 +222,25 @@ set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]" } + + set over_weight "" if { [string eq $show_student_p "t"] } { - set max_grade [expr $task_weight + $max_grade] - if { ![empty_string_p $grade] } { set grade [lc_numeric $grade] set over_weight "[lc_numeric $task_grade]/" + if { $simple_p } { + set task_grade [format %0.2f [expr ($grade*$perfect_score/100.0)]] + } set total_grade [expr $total_grade + $task_grade] + if { $simple_p } { + set max_grade [expr $task_grade + $max_grade] + } else { + set max_grade [expr $task_weight + $max_grade] + } } else { set grade "[_ evaluation-portlet.Not_evaluated_]" + set task_grade "[_ evaluation-portlet.Not_evaluated_]" } set task_weight "${over_weight}[lc_numeric $task_weight]" @@ -118,11 +250,16 @@ } } else { set grade "[_ evaluation-portlet.Not_evaluated_]" - set max_grade [expr $task_weight + $max_grade] - set task_weight [lc_numeric $task_weight] + if { $simple_p } { + set task_weight [lc_numeric $task_weight] + } else { + set task_weight "[_ evaluation-portlet.Not_evaluated_]" + } + set task_grade "[_ evaluation-portlet.Not_evaluated_]" } - + if { [db_0or1row get_answer_info { *SQL* }] } { + set submitted_date $creation_date # working with answer stuff (if it has a file/url attached) if { [string eq $answer_title "link"] } { # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute, @@ -148,12 +285,47 @@ set answer_url "" set answer "" } - - } + set max_weight [expr $max_weight + $perfect_score] + set max_grade_label "
    $max_grade pts.
    " + set max_weight_label "
    $max_weight %
    " + if { [empty_string_p $submitted_date]} { + + if { [string eq $online_p "t"] } { + if { [db_string compare_due_date { *SQL* } -default 0] } { + if { ![db_0or1row answer_info { *SQL* }] } { + set submitted_date "[_ evaluation-portlet.submit_answer_]" + set submitted_date_mode edit + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" + } else { + set submitted_date "[_ evaluation-portlet.submit_answer_again_]" + set submitted_date_mode display + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" + } + } elseif { [string eq $late_submit_p "t"] } { + if { ![db_0or1row answer_info { *SQL* }] } { + set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f]" + set submitted_date_mode edit + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" + } else { + set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f_1]" + set submitted_date_mode display + set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" + } + } + if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } { + set submitted_date "[_ evaluation-portlet.No_group_for_task_]" + set submitted_date_url "" + } + } + } else { + set submitted_date_url "[export_vars -base "${base_url}answer-view" { grade_id task_id return_url answer_mode {answer_id}}]" + if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } { + + set submitted_date "[_ evaluation-portlet.No_group_for_task_]" + set submitted_date_url "" + } + + } + } } -if { $admin_p } { - set bottom_line "[_ evaluation-portlet.lt_smallWeight_used_in_g]" -} else { - set bottom_line "[_ evaluation-portlet.lt_smallTotal_points_in__1]" -} Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql 4 Apr 2005 18:23:47 -0000 1.3 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql 31 May 2005 23:13:21 -0000 1.3.2.1 @@ -1,42 +1,14 @@ + postgresql7.3 - select grade_plural_name, weight as grade_weight from evaluation_grades where grade_id = :grade_id - - - - - select et.task_name, - round(et.weight,2) as task_weight, - et.task_id - from evaluation_tasksi et, cr_items cri - where grade_item_id = :grade_item_id - and cri.live_revision = et.task_id - $evaluations_orderby + select upper(grade_plural_name) as grade_plural_name, grade_plural_name as low_name,grade_name,weight as grade_weight,weight as category_weight from evaluation_grades where grade_id = :grade_id + - - - select et.task_name, - et.task_item_id, - et.weight as t_weight, - eg.weight as g_weight, - round((et.weight*eg.weight)/100,2) as task_weight, - et.number_of_members, - et.task_id - from evaluation_grades eg, - evaluation_tasksi et, - cr_items cri - where eg.grade_id = :grade_id - and eg.grade_item_id = et.grade_item_id - and cri.live_revision = et.task_id - $evaluations_orderby - - - Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql 7 Apr 2005 18:57:34 -0000 1.12 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql 31 May 2005 23:13:21 -0000 1.12.2.1 @@ -87,6 +87,28 @@     + + + + select eg.grade_name, eg.grade_plural_name + from evaluation_grades eg, cr_items cri + where eg.grade_item_id = :grade_item_id + and cri.live_revision = eg.grade_id + + + + + + + + select ets.solution_id + from evaluation_tasks_sols ets, cr_items cri + where ets.task_item_id = :task_item_id + and cri.live_revision = ets.solution_id + + + + Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 7 Apr 2005 11:26:30 -0000 1.12 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 31 May 2005 23:13:21 -0000 1.12.2.1 @@ -5,7 +5,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_conn user_id] +set user_id [ad_verify_and_get_user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] db_1row grade_names { *SQL* } @@ -162,29 +162,29 @@ if { [string eq $online_p "t"] } { if { [db_string compare_due_date { *SQL* } -default 0] } { - if { ![db_0or1row answer_info { *SQL* }] } { - set answer "[_ evaluation-portlet.submit_answer_]" - set answer_mode edit - set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" - } else { - set answer "[_ evaluation-portlet.submit_answer_again_]" - set answer_mode display - set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" - } + if { ![db_0or1row answer_info { *SQL* }] } { + set answer "[_ evaluation-portlet.submit_answer_]" + set answer_mode edit + set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" + } else { + set answer "[_ evaluation-portlet.submit_answer_again_]" + set answer_mode display + set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" + } } elseif { [string eq $late_submit_p "t"] } { - if { ![db_0or1row answer_info { *SQL* }] } { - set answer "[_ evaluation-portlet.lt_Submit_answer_span_st]" - set answer_mode edit - set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" - } else { - set answer "[_ evaluation-portlet.lt_Submit_answer_again_s]" - set answer_mode display - set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" - } + if { ![db_0or1row answer_info { *SQL* }] } { + set answer "[_ evaluation-portlet.lt_submit_answer_style_f]" + set answer_mode edit + set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" + } else { + set answer "[_ evaluation-portlet.lt_submit_answer_style_f_1]" + set answer_mode display + set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" + } } if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } { - set answer "[_ evaluation-portlet.No_group_for_task_]" - set answer_url "" + set answer "[_ evaluation-portlet.No_group_for_task_]" + set answer_url "" } } Index: openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl 7 Apr 2005 18:57:35 -0000 1.7 +++ openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl 31 May 2005 23:13:21 -0000 1.7.2.1 @@ -33,171 +33,3 @@ } -ad_proc -private evaluation_assignments_portlet::after_install {} { - Create the datasources needed by the evaluation assignments portlet. -} { - - db_transaction { - set ds_id [portal::datasource::new \ - -name "evaluation_assignments_portlet" \ - -description "[_ evaluation-portlet.lt_Evaluation_Assignment]"] - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key shadeable_p \ - -value t - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key hideable_p \ - -value t - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key user_editable_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key shaded_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key link_hideable_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p f \ - -key package_id \ - -value "" - - register_portal_datasource_impl - - } -} - -ad_proc -private evaluation_evaluations_portlet::after_install {} { - Create the datasources needed by the evaluation evaluations portlet. -} { - - db_transaction { - set ds_id [portal::datasource::new \ - -name "evaluation_evaluations_portlet" \ - -description "[_ evaluation-portlet.lt_Evaluation_Evaluation]"] - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key shadeable_p \ - -value t - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key hideable_p \ - -value t - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key user_editable_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key shaded_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key link_hideable_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p f \ - -key package_id \ - -value "" - - register_portal_datasource_impl - - } -} - -ad_proc -private evaluation_admin_portlet::after_install {} { - Create the datasources needed by the evaluation portlet. -} { - - db_transaction { - set ds_id [portal::datasource::new \ - -name "evaluation_admin_portlet" \ - -description "[_ evaluation-portlet.lt_Evaluation_Admin_Port]"] - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key shadeable_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key hideable_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key user_editable_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key shaded_p \ - -value f - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p t \ - -key link_hideable_p \ - -value t - - portal::datasource::set_def_param \ - -datasource_id $ds_id \ - -config_required_p t \ - -configured_p f \ - -key package_id \ - -value "" - - register_portal_datasource_impl - } -} - - Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql 26 Jul 2004 17:57:34 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql 31 May 2005 23:13:21 -0000 1.1.4.1 @@ -26,5 +26,16 @@ + + + + select dca.package_id + from dotlrn_community_applets dca,apm_packages ap + where community_id=:community_id + and ap.package_id=dca.package_id and ap.package_key=:package_key + + + +     Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl 26 Apr 2005 21:47:05 -0000 1.9 +++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl 31 May 2005 23:13:21 -0000 1.9.2.1 @@ -33,7 +33,7 @@ ad_proc -public evaluation_assignments_portlet::get_pretty_name { } { - return "#evaluation-portlet.Assignments_#" + return "[_ evaluation-portlet.Assignments_]" } @@ -99,35 +99,7 @@ -template_src "evaluation-assignments-portlet" } -ad_proc -private evaluation_assignments_portlet::register_portal_datasource_impl {} { - Create the service contracts needed by the evaluation assignments portlet. -} { - set spec { - name "evaluation_assignments_portlet" - contract_name "portal_datasource" - owner "evaluation-portlet" - aliases { - GetMyName evaluation_assignments_portlet::get_my_name - GetPrettyName evaluation_assignments_portlet::get_pretty_name - Link evaluation_assignments_portlet::link - AddSelfToPage evaluation_assignments_portlet::add_self_to_page - Show evaluation_assignments_portlet::show - Edit evaluation_assignments_portlet::edit - RemoveSelfFromPage evaluation_assignments_portlet::remove_self_from_page - } - } - - acs_sc::impl::new_from_spec -spec $spec -} -ad_proc -private evaluation_assignments_portlet::unregister_implementations {} { - Unregister service contract implementations -} { - acs_sc::impl::delete \ - -contract_name "portal_datasource" \ - -impl_name "evaluation_assignments_portlet" -} - # # evaluation evaluations namespace # @@ -148,7 +120,7 @@ ad_proc -public evaluation_evaluations_portlet::get_pretty_name { } { - return "#evaluation-portlet.Evaluations_#" + return "[_ evaluation-portlet.Evaluations_]" } @@ -174,6 +146,7 @@ @return element_id The new element's id } { + return [portal::add_element_parameters \ -portal_id $portal_id \ -portlet_name [get_my_name] \ @@ -203,6 +176,8 @@ -value $package_id } + + ad_proc -public evaluation_evaluations_portlet::show { cf } { @@ -212,46 +187,13 @@ -template_src "evaluation-evaluations-portlet" } -ad_proc -private evaluation_evaluations_portlet::register_portal_datasource_impl {} { - Create the service contracts needed by the evaluation evaluations portlet. -} { - set spec { - name "evaluation_evaluations_portlet" - contract_name "portal_datasource" - owner "evaluation-portlet" - aliases { - GetMyName evaluation_evaluations_portlet::get_my_name - GetPrettyName evaluation_evaluations_portlet::get_pretty_name - Link evaluation_evaluations_portlet::link - AddSelfToPage evaluation_evaluations_portlet::add_self_to_page - Show evaluation_evaluations_portlet::show - Edit evaluation_evaluations_portlet::edit - RemoveSelfFromPage evaluation_evaluations_portlet::remove_self_from_page - } - } - - acs_sc::impl::new_from_spec -spec $spec -} - -ad_proc -private evaluation_evaluations_portlet::unregister_implementations {} { - Unregister service contract implementations -} { - acs_sc::impl::delete \ - -contract_name "portal_datasource" \ - -impl_name "evaluation_evaluations_portlet" -} - -# -# evaluation admin namespace -# - ad_proc -private evaluation_admin_portlet::get_my_name {} { return "evaluation_admin_portlet" } ad_proc -public evaluation_admin_portlet::get_pretty_name {} { - return "#evaluation-portlet.lt_Evaluation_Administra#" + return "[_ evaluation-portlet.lt_Evaluation_Administra]" } @@ -313,13 +255,19 @@ } + + +# +# evaluation assignments namespace +# + ad_proc -private evaluation_admin_portlet::get_my_name {} { return "evaluation_admin_portlet" } ad_proc -public evaluation_admin_portlet::get_pretty_name {} { - return "#evaluation-portlet.lt_Evaluation_Administra#" + return "[_ evaluation-portlet.lt_Evaluation_Administra]" } @@ -381,6 +329,218 @@ } +ad_proc -private evaluation_assignments_portlet::after_install {} { + Create the datasources needed by the evaluation assignments portlet. +} { + + db_transaction { + set ds_id [portal::datasource::new \ + -name "evaluation_assignments_portlet" \ + -description "[_ evaluation-portlet.lt_Evaluation_Assignment]"] + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key shadeable_p \ + -value t + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key hideable_p \ + -value t + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key user_editable_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key shaded_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key link_hideable_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p f \ + -key package_id \ + -value "" + + register_portal_datasource_impl + + } +} + +ad_proc -private evaluation_assignments_portlet::register_portal_datasource_impl {} { + Create the service contracts needed by the evaluation assignments portlet. +} { + set spec { + name "evaluation_assignments_portlet" + contract_name "portal_datasource" + owner "evaluation-portlet" + aliases { + GetMyName evaluation_assignments_portlet::get_my_name + GetPrettyName evaluation_assignments_portlet::get_pretty_name + Link evaluation_assignments_portlet::link + AddSelfToPage evaluation_assignments_portlet::add_self_to_page + Show evaluation_assignments_portlet::show + Edit evaluation_assignments_portlet::edit + RemoveSelfFromPage evaluation_assignments_portlet::remove_self_from_page + } + } + + acs_sc::impl::new_from_spec -spec $spec +} + +ad_proc -private evaluation_evaluations_portlet::after_install {} { + Create the datasources needed by the evaluation evaluations portlet. +} { + + db_transaction { + set ds_id [portal::datasource::new \ + -name "evaluation_evaluations_portlet" \ + -description "[_ evaluation-portlet.lt_Evaluation_Evaluation]"] + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key shadeable_p \ + -value t + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key hideable_p \ + -value t + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key user_editable_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key shaded_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key link_hideable_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p f \ + -key package_id \ + -value "" + + register_portal_datasource_impl + + } +} + +ad_proc -private evaluation_evaluations_portlet::register_portal_datasource_impl {} { + Create the service contracts needed by the evaluation evaluations portlet. +} { + set spec { + name "evaluation_evaluations_portlet" + contract_name "portal_datasource" + owner "evaluation-portlet" + aliases { + GetMyName evaluation_evaluations_portlet::get_my_name + GetPrettyName evaluation_evaluations_portlet::get_pretty_name + Link evaluation_evaluations_portlet::link + AddSelfToPage evaluation_evaluations_portlet::add_self_to_page + Show evaluation_evaluations_portlet::show + Edit evaluation_evaluations_portlet::edit + RemoveSelfFromPage evaluation_evaluations_portlet::remove_self_from_page + } + } + + acs_sc::impl::new_from_spec -spec $spec +} + + +ad_proc -private evaluation_admin_portlet::after_install {} { + Create the datasources needed by the evaluation portlet. +} { + + db_transaction { + set ds_id [portal::datasource::new \ + -name "evaluation_admin_portlet" \ + -description "[_ evaluation-portlet.lt_Evaluation_Admin_Port]"] + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key shadeable_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key hideable_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key user_editable_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key shaded_p \ + -value f + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p t \ + -key link_hideable_p \ + -value t + + portal::datasource::set_def_param \ + -datasource_id $ds_id \ + -config_required_p t \ + -configured_p f \ + -key package_id \ + -value "" + + register_portal_datasource_impl + } +} + + + ad_proc -private evaluation_admin_portlet::register_portal_datasource_impl {} { Create the service contracts needed by the evaluation admin portlet. } { @@ -402,16 +562,6 @@ acs_sc::impl::new_from_spec -spec $spec } -ad_proc -private evaluation_admin_portlet::unregister_implementations {} { - Unregister service contract implementations -} { - acs_sc::impl::delete \ - -contract_name "portal_datasource" \ - -impl_name "evaluation_admin_portlet" -} - -# unistall procs - ad_proc -private evaluation_assignments_portlet::uninstall {} { Evaluation Portlet package uninstall proc } { @@ -435,3 +585,39 @@ set ds_id [portal::get_datasource_id evaluation_admin_portlet] db_exec_plsql delete_admin_ds { *SQL* } } + +ad_proc -private evaluation_assignments_portlet::unregister_implementations {} { + Unregister service contract implementations +} { + acs_sc::impl::delete \ + -contract_name "portal_datasource" \ + -impl_name "evaluation_assignments_portlet" +} + +ad_proc -private evaluation_evaluations_portlet::unregister_implementations {} { + Unregister service contract implementations +} { + acs_sc::impl::delete \ + -contract_name "portal_datasource" \ + -impl_name "evaluation_evaluations_portlet" +} + +ad_proc -private evaluation_admin_portlet::unregister_implementations {} { + Unregister service contract implementations +} { + acs_sc::impl::delete \ + -contract_name "portal_datasource" \ + -impl_name "evaluation_admin_portlet" +} +ad_proc -private evaluation_evaluations_portlet::get_package_id_from_key { + {-package_key:required} +} { + Gets the package_id of the evaluation instance related to the evaluation portlet for this community +} { + set community_id [dotlrn_community::get_community_id] + set package_id [db_string get_package_id {} -default 0] + return $package_id +} + + + Index: openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp 26 Jul 2004 17:57:34 -0000 1.4 +++ openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp 31 May 2005 23:13:21 -0000 1.4.4.1 @@ -1,5 +1,6 @@ Index: openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl 11 Sep 2004 00:41:10 -0000 1.3 +++ openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl 31 May 2005 23:13:21 -0000 1.3.4.1 @@ -9,7 +9,7 @@ } -properties { } - +set return_url [get_referrer] array set config $cf set user_id [ad_conn user_id] set list_of_package_ids $config(package_id) Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql 7 Apr 2005 11:26:30 -0000 1.9 +++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql 31 May 2005 23:13:21 -0000 1.9.2.1 @@ -3,6 +3,22 @@ postgresql7.3 + + + + select eg.grade_plural_name, + eg.grade_id, + eg.grade_item_id + from evaluation_grades eg, acs_objects ao + where exists (select 1 from cr_items + where live_revision = eg.grade_id) + and eg.grade_item_id = ao.object_id + and ao.context_id in ([join $list_of_package_ids ,]) + order by grade_plural_name desc + + + + @@ -39,4 +55,23 @@ + + + + select sum(round(et.weight*eg.weight/100,2)) + from evaluation_tasks et, + evaluation_grades eg, + cr_items cri1, + cr_items cri2, + acs_objects ao + where et.grade_item_id = eg.grade_item_id + and cri1.live_revision = eg.grade_id + and cri2.live_revision = et.task_id + and et.requires_grade_p = 't' + and ao.object_id = eg.grade_item_id + and ao.context_id = :package_id + + + + Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp,v diff -u -r1.5 -r1.5.4.1 --- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp 11 Sep 2004 00:41:10 -0000 1.5 +++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp 31 May 2005 23:13:21 -0000 1.5.4.1 @@ -2,16 +2,36 @@
      + +
    • #evaluation-portlet.lt_Admin_my_Assignment_T#
      + #evaluation-portlet.admin_help#

      • +
    • #evaluation-portlet.view_students_grades#
      + #evaluation-portlet.view_grades_help#

      • +
    • Notifications + +
    • #evaluation-portlet.lt_Admin_my_Assignment_T#
      • +       -
    • @notification_chunk;noquote@
      • - + +
      @notification_chunk;noquote@ +
      +
      + +       +
    • @notification_chunk;noquote@
      • +       +
    • #evaluation-portlet.lt_There_are_no_tasks_to#
      • +       +
    • @grades.grade_plural_name;noquote@
      - + + +

      • Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl,v diff -u -r1.6 -r1.6.4.1 --- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl 11 Sep 2004 00:41:10 -0000 1.6 +++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl 31 May 2005 23:13:21 -0000 1.6.4.1 @@ -18,7 +18,8 @@ array set config $cf set shaded_p $config(shaded_p) - +set evaluation_id [evaluation_evaluations_portlet::get_package_id_from_key -package_key "evaluation"] +set simple_p [parameter::get -parameter "SimpleVersion" -package_id $evaluation_id] set list_of_package_ids $config(package_id) set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]