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.28 -r1.29
--- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl 26 Jul 2018 14:53:25 -0000 1.28
+++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl 26 Jul 2018 15:12:22 -0000 1.29
@@ -28,14 +28,14 @@
db_transaction {
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} \
- -title $title \
- -attributes [list [list increasing_p $increasing_p] \
- [list allow_negative_p $allow_negative_p] \
- [list num_correct_answers $num_correct_answers] \
- [list num_answers $num_answers] \
- [list allow_other_p $allow_other_p] ] ]
+ -item_id $item_item_type_mc_id \
+ -content_type {as_item_type_mc} \
+ -title $title \
+ -attributes [list [list increasing_p $increasing_p] \
+ [list allow_negative_p $allow_negative_p] \
+ [list num_correct_answers $num_correct_answers] \
+ [list num_answers $num_answers] \
+ [list allow_other_p $allow_other_p] ] ]
}
return $as_item_type_mc_id
@@ -57,16 +57,16 @@
} {
# Update as_item_type_mc in the CR (and as_item_type_mc table) getting the revision_id (as_item_type_id)
db_transaction {
- set type_item_id [db_string type_item_id {}]
+ set type_item_id [db_string type_item_id {}]
set new_item_type_id [content::revision::new \
- -item_id $type_item_id \
- -content_type {as_item_type_mc} \
- -title $title \
- -attributes [list [list increasing_p $increasing_p] \
- [list allow_negative_p $allow_negative_p] \
- [list num_correct_answers $num_correct_answers] \
- [list num_answers $num_answers] \
- [list allow_other_p $allow_other_p] ] ]
+ -item_id $type_item_id \
+ -content_type {as_item_type_mc} \
+ -title $title \
+ -attributes [list [list increasing_p $increasing_p] \
+ [list allow_negative_p $allow_negative_p] \
+ [list num_correct_answers $num_correct_answers] \
+ [list num_answers $num_answers] \
+ [list allow_other_p $allow_other_p] ] ]
}
return $new_item_type_id
@@ -83,23 +83,23 @@
} {
# Update as_item_type_mc in the CR (and as_item_type_mc table) getting the revision_id (as_item_type_id)
db_transaction {
- db_1row item_type_data {}
+ db_1row item_type_data {}
set new_item_type_id [content::revision::new \
- -item_id $type_item_id \
- -content_type {as_item_type_mc} \
- -title $title \
- -attributes [list [list increasing_p $increasing_p] \
- [list allow_negative_p $allow_negative_p] \
- [list num_correct_answers $num_correct_answers] \
- [list num_answers $num_answers] \
- [list allow_other_p $allow_other_p] ] ]
+ -item_id $type_item_id \
+ -content_type {as_item_type_mc} \
+ -title $title \
+ -attributes [list [list increasing_p $increasing_p] \
+ [list allow_negative_p $allow_negative_p] \
+ [list num_correct_answers $num_correct_answers] \
+ [list num_answers $num_answers] \
+ [list allow_other_p $allow_other_p] ] ]
- if {$with_choices_p == "t"} {
- set choices [db_list get_choices {}]
- foreach choice_id $choices {
- set new_choice_id [as::item_choice::new_revision -choice_id $choice_id -mc_id $new_item_type_id]
- }
- }
+ if {$with_choices_p == "t"} {
+ set choices [db_list get_choices {}]
+ foreach choice_id $choices {
+ set new_choice_id [as::item_choice::new_revision -choice_id $choice_id -mc_id $new_item_type_id]
+ }
+ }
}
return $new_item_type_id
@@ -120,24 +120,24 @@
# Insert as_item_type_mc in the CR (and as_item_type_mc table) getting the revision_id (as_item_type_id)
db_transaction {
- db_1row item_type_data {}
+ db_1row item_type_data {}
if {[info exists new_title]} {
- set title $new_title
- }
- if {[string is false $copy_correct_answer_p]} {
- set num_correct_answers 0
- }
- set new_item_type_id [new -title $title \
- -increasing_p $increasing_p \
- -allow_negative_p $allow_negative_p \
- -num_correct_answers $num_correct_answers \
- -num_answers $num_answers \
+ set title $new_title
+ }
+ if {[string is false $copy_correct_answer_p]} {
+ set num_correct_answers 0
+ }
+ set new_item_type_id [new -title $title \
+ -increasing_p $increasing_p \
+ -allow_negative_p $allow_negative_p \
+ -num_correct_answers $num_correct_answers \
+ -num_answers $num_answers \
-allow_other_p $allow_other_p]
- set choices [db_list get_choices {}]
- foreach choice_id $choices {
- set new_choice_id [as::item_choice::copy -choice_id $choice_id -mc_id $new_item_type_id -copy_correct_answer_p $copy_correct_answer_p]
- }
+ set choices [db_list get_choices {}]
+ foreach choice_id $choices {
+ set new_choice_id [as::item_choice::copy -choice_id $choice_id -mc_id $new_item_type_id -copy_correct_answer_p $copy_correct_answer_p]
+ }
}
return $new_item_type_id
@@ -157,52 +157,52 @@
Render a Multiple Choice Type
} {
set allow_other_p [as::item_type_mc::allow_other_p -item_type_id $type_id]
-
+
set defaults ""
if {$default_value ne ""} {
array set values $default_value
- set defaults $values(choice_answer)
+ set defaults $values(choice_answer)
if {$allow_other_p} {
set defaults [list $defaults $values(clob_answer)]
}
}
if {$session_id ne ""} {
- if {$show_feedback eq "" || $show_feedback eq "none"} {
- set choice_list ""
- db_foreach get_sorted_choices {} {
- if {$content_value ne ""} {
- db_1row get_content_value ""
- set title [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type -title $title]
- }
- lappend choice_list [list $title $choice_id]
- }
- } else {
- # incorrect correct
- set choice_list ""
+ if {$show_feedback eq "" || $show_feedback eq "none"} {
+ set choice_list ""
+ db_foreach get_sorted_choices {} {
+ if {$content_value ne ""} {
+ db_1row get_content_value ""
+ set title [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type -title $title]
+ }
+ lappend choice_list [list $title $choice_id]
+ }
+ } else {
+ # incorrect correct
+ set choice_list ""
- db_foreach get_sorted_choices_with_feedback {} {
- if {$content_value ne ""} {
- db_1row get_content_value ""
- set title [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type -title $title]
- }
- set pos [lsearch -exact $defaults $choice_id]
- if {$pos>-1 && $correct_answer_p == "t" && $show_feedback ne "incorrect"} {
- lappend choice_list [list "$title <img src=/resources/assessment/correct.gif> <i>$feedback_text</i>" $choice_id]
- } elseif {$pos>-1 && $correct_answer_p == "f" && $show_feedback ne "correct"} {
- lappend choice_list [list "$title <img src=/resources/assessment/wrong.gif> <i>$feedback_text</i>" $choice_id]
- } else {
- if {[llength $defaults] && $correct_answer_p == "t" && $show_feedback ne "incorrect" && $show_feedback ne "correct"} {
- lappend choice_list [list "$title <img src=/resources/assessment/correct.gif>" $choice_id]
- } else {
- lappend choice_list [list $title $choice_id]
- }
- }
- }
- }
-
- if {[llength $choice_list] > 0} {
- return [list $defaults $choice_list]
- }
+ db_foreach get_sorted_choices_with_feedback {} {
+ if {$content_value ne ""} {
+ db_1row get_content_value ""
+ set title [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type -title $title]
+ }
+ set pos [lsearch -exact $defaults $choice_id]
+ if {$pos>-1 && $correct_answer_p == "t" && $show_feedback ne "incorrect"} {
+ lappend choice_list [list "$title <img src=/resources/assessment/correct.gif> <i>$feedback_text</i>" $choice_id]
+ } elseif {$pos>-1 && $correct_answer_p == "f" && $show_feedback ne "correct"} {
+ lappend choice_list [list "$title <img src=/resources/assessment/wrong.gif> <i>$feedback_text</i>" $choice_id]
+ } else {
+ if {[llength $defaults] && $correct_answer_p == "t" && $show_feedback ne "incorrect" && $show_feedback ne "correct"} {
+ lappend choice_list [list "$title <img src=/resources/assessment/correct.gif>" $choice_id]
+ } else {
+ lappend choice_list [list $title $choice_id]
+ }
+ }
+ }
+ }
+
+ if {[llength $choice_list] > 0} {
+ return [list $defaults $choice_list]
+ }
}
db_1row item_type_data {}
@@ -212,108 +212,108 @@
set wrong_choices [list]
set total 0
db_foreach choices {} {
- incr total
- if {$content_value ne ""} {
- db_1row get_content_value ""
- set title [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type -title $title]
- }
- if {$show_feedback ne "" && $show_feedback ne "none"} {
- set pos [lsearch -exact $defaults $choice_id]
- if {$pos > -1 && $correct_answer_p == "t" && $show_feedback ne "incorrect"} {
- lappend display_choices [list "$title <img src=/resources/assessment/correct.gif> <i>$feedback_text</i>" $choice_id]
- } elseif {$pos>-1 && $correct_answer_p == "f" && $show_feedback ne "correct"} {
- lappend display_choices [list "$title <img src=/resources/assessment/wrong.gif> <i>$feedback_text</i>" $choice_id]
- } else {
- if {$correct_answer_p == "t" && $show_feedback ne "incorrect" && $show_feedback ne "correct"} {
- lappend display_choices [list "$title <img src=/resources/assessment/correct.gif>" $choice_id]
- } else {
- lappend display_choices [list $title $choice_id]
- }
- }
- } else {
- lappend display_choices [list $title $choice_id]
- }
-
-# lappend display_choices [list $title $choice_id]
- if {$selected_p == "t"} {
- lappend defaults $choice_id
- }
- if {$fixed_position ne ""} {
- set fixed_pos($fixed_position) [list $title $choice_id]
- if {$num_answers ne ""} {
- incr num_answers -1
- }
- if {$correct_answer_p == "t" && $num_correct_answers ne ""} {
- incr num_correct_answers -1
- }
- } else {
- if {$correct_answer_p == "t"} {
- lappend correct_choices [list $title $choice_id]
- } else {
- lappend wrong_choices [list $title $choice_id]
- }
- }
+ incr total
+ if {$content_value ne ""} {
+ db_1row get_content_value ""
+ set title [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type -title $title]
+ }
+ if {$show_feedback ne "" && $show_feedback ne "none"} {
+ set pos [lsearch -exact $defaults $choice_id]
+ if {$pos > -1 && $correct_answer_p == "t" && $show_feedback ne "incorrect"} {
+ lappend display_choices [list "$title <img src=/resources/assessment/correct.gif> <i>$feedback_text</i>" $choice_id]
+ } elseif {$pos>-1 && $correct_answer_p == "f" && $show_feedback ne "correct"} {
+ lappend display_choices [list "$title <img src=/resources/assessment/wrong.gif> <i>$feedback_text</i>" $choice_id]
+ } else {
+ if {$correct_answer_p == "t" && $show_feedback ne "incorrect" && $show_feedback ne "correct"} {
+ lappend display_choices [list "$title <img src=/resources/assessment/correct.gif>" $choice_id]
+ } else {
+ lappend display_choices [list $title $choice_id]
+ }
+ }
+ } else {
+ lappend display_choices [list $title $choice_id]
+ }
+
+ # lappend display_choices [list $title $choice_id]
+ if {$selected_p == "t"} {
+ lappend defaults $choice_id
+ }
+ if {$fixed_position ne ""} {
+ set fixed_pos($fixed_position) [list $title $choice_id]
+ if {$num_answers ne ""} {
+ incr num_answers -1
+ }
+ if {$correct_answer_p == "t" && $num_correct_answers ne ""} {
+ incr num_correct_answers -1
+ }
+ } else {
+ if {$correct_answer_p == "t"} {
+ lappend correct_choices [list $title $choice_id]
+ } else {
+ lappend wrong_choices [list $title $choice_id]
+ }
+ }
}
if {[array exists fixed_pos]} {
- if {$num_answers eq ""} {
- set num_answers [expr {[llength $correct_choices] + [llength $wrong_choices]}]
- }
- if {$num_correct_answers eq ""} {
- set num_correct_answers [llength $correct_choices]
- }
+ if {$num_answers eq ""} {
+ set num_answers [expr {[llength $correct_choices] + [llength $wrong_choices]}]
+ }
+ if {$num_correct_answers eq ""} {
+ set num_correct_answers [llength $correct_choices]
+ }
}
if {$num_answers ne "" && $num_answers < $total} {
- # display fewer choices, select random
- set correct_choices [util::randomize_list $correct_choices]
- set wrong_choices [util::randomize_list $wrong_choices]
+ # display fewer choices, select random
+ set correct_choices [util::randomize_list $correct_choices]
+ set wrong_choices [util::randomize_list $wrong_choices]
- if {$num_correct_answers ne "" && $num_correct_answers > 0 && $num_correct_answers < [llength $correct_choices]} {
- # display fewer correct answers than there are
- set display_choices [lrange $correct_choices 1 $num_correct_answers]
- } else {
- # display all correct answers
- set display_choices $correct_choices
- }
+ if {$num_correct_answers ne "" && $num_correct_answers > 0 && $num_correct_answers < [llength $correct_choices]} {
+ # display fewer correct answers than there are
+ set display_choices [lrange $correct_choices 1 $num_correct_answers]
+ } else {
+ # display all correct answers
+ set display_choices $correct_choices
+ }
- # now fill up with wrong answers
- set display_choices [concat $display_choices [lrange $wrong_choices 0 [expr $num_answers - [llength $display_choices] -1]]]
- set display_choices [util::randomize_list $display_choices]
+ # now fill up with wrong answers
+ set display_choices [concat $display_choices [lrange $wrong_choices 0 [expr $num_answers - [llength $display_choices] -1]]]
+ set display_choices [util::randomize_list $display_choices]
}
# now add fixed positions in result list
if {[array exists fixed_pos]} {
- set max_pos [expr {$num_answers + [array size fixed_pos]}]
- set open_positions $display_choices
- set display_choices [list]
+ set max_pos [expr {$num_answers + [array size fixed_pos]}]
+ set open_positions $display_choices
+ set display_choices [list]
- for {set position 1} {$position <= $max_pos} {incr position} {
- if {[info exists fixed_pos($position)]} {
- lappend display_choices $fixed_pos($position)
- array unset fixed_pos $position
- } elseif {[llength $open_positions] > 0} {
- lappend display_choices [lindex $open_positions 0]
- set open_positions [lreplace $open_positions 0 0]
- }
- }
- # set negative fixed positions relative to the end of the choice list
- if {[array exists fixed_pos]} {
- foreach position [lsort -integer [array names fixed_pos]] {
- if {$position < 0} {
- lappend display_choices $fixed_pos($position)
- }
- }
- }
+ for {set position 1} {$position <= $max_pos} {incr position} {
+ if {[info exists fixed_pos($position)]} {
+ lappend display_choices $fixed_pos($position)
+ array unset fixed_pos $position
+ } elseif {[llength $open_positions] > 0} {
+ lappend display_choices [lindex $open_positions 0]
+ set open_positions [lreplace $open_positions 0 0]
+ }
+ }
+ # set negative fixed positions relative to the end of the choice list
+ if {[array exists fixed_pos]} {
+ foreach position [lsort -integer [array names fixed_pos]] {
+ if {$position < 0} {
+ lappend display_choices $fixed_pos($position)
+ }
+ }
+ }
}
# save choice order
if {$session_id ne ""} {
- set count 0
- foreach one_choice $display_choices {
- lassign $one_choice title choice_id
- incr count
- db_dml save_order {}
- }
+ set count 0
+ foreach one_choice $display_choices {
+ lassign $one_choice title choice_id
+ incr count
+ db_dml save_order {}
+ }
}
return [list $defaults $display_choices]
@@ -339,36 +339,36 @@
array set type [util_memoize [list as::item_type_mc::data -type_id $type_id]]
array set choices $type(choices)
if {[info exists type(correct_choices)]} {
- array set correct_choices $type(correct_choices)
+ array set correct_choices $type(correct_choices)
}
if {$type(increasing_p) == "t"} {
- # if not all correct answers are given, award fraction of the points
- set percent 0
- foreach choice_id $response {
- incr percent $choices($choice_id)
- }
+ # if not all correct answers are given, award fraction of the points
+ set percent 0
+ foreach choice_id $response {
+ incr percent $choices($choice_id)
+ }
} else {
- # award 100% points if and only if all correct answers are given
- set count_correct 0
- if {[array exists correct_choices] && [lsort -integer $response] == [lsort -integer [array names correct_choices]]} {
- set points $max_points
- } elseif {[array size correct_choices] > 0} {
- # FIXME !! create setting for partial credit or use existing one
- foreach elm $response {
- if {[lsearch [array names correct_choices] $elm] > -1} {
- incr count_correct
- }
- }
- set points [expr {$count_correct / (0.0 + [array size correct_choices]) * $max_points}]
- } else {
- set points 0
- }
+ # award 100% points if and only if all correct answers are given
+ set count_correct 0
+ if {[array exists correct_choices] && [lsort -integer $response] == [lsort -integer [array names correct_choices]]} {
+ set points $max_points
+ } elseif {[array size correct_choices] > 0} {
+ # FIXME !! create setting for partial credit or use existing one
+ foreach elm $response {
+ if {[lsearch [array names correct_choices] $elm] > -1} {
+ incr count_correct
+ }
+ }
+ set points [expr {$count_correct / (0.0 + [array size correct_choices]) * $max_points}]
+ } else {
+ set points 0
+ }
}
if {$type(allow_negative_p) == "f" && $points < 0} {
- # don't allow negative percentage
- set points 0
+ # don't allow negative percentage
+ set points 0
}
if {$type(allow_other_p)} {
@@ -394,15 +394,15 @@
db_1row item_type_data {} -column_array type
db_foreach check_choices {} {
- if {$correct_answer_p == "t"} {
- set correct_choices($choice_id) $percent_score
- }
- set choices($choice_id) $percent_score
+ if {$correct_answer_p == "t"} {
+ set correct_choices($choice_id) $percent_score
+ }
+ set choices($choice_id) $percent_score
}
set type(choices) [array get choices]
if {[array exists correct_choices]} {
- set type(correct_choices) [array get correct_choices]
+ set type(correct_choices) [array get correct_choices]
}
return [array get type]
@@ -419,28 +419,28 @@
Return the results of a given item in a given list of sessions as an array
} {
-
+
db_foreach get_results {} {
- if {$text_value eq ""} {
- lappend results($session_id) [as::assessment::quote_export -text $title]
- } else {
- lappend results($session_id) [as::assessment::quote_export -text $text_value]
- }
+ if {$text_value eq ""} {
+ lappend results($session_id) [as::assessment::quote_export -text $title]
+ } else {
+ lappend results($session_id) [as::assessment::quote_export -text $text_value]
+ }
}
foreach session_id [array names results] {
- set results($session_id) [join $results($session_id) ","]
+ set results($session_id) [join $results($session_id) ","]
}
if {[array exists results]} {
- return [array get results]
+ return [array get results]
} else {
- return
+ return
}
}
ad_proc -private as::item_type_mc::add_choices_to_form {
- -form_id
+ -form_id
-num_choices
-choice_array_name
-correct_choice_array_name
@@ -469,7 +469,7 @@
} else {
ad_form -extend -name $form_id -form [list [list choice.$i:text,optional,nospell {label "[_ assessment.Choice] $i"} {html {style {width: 80%;} maxlength 1000}}]]
}
-
+
if {[info exists correct($i)]} {
ad_form -extend -name $form_id -form [list [list correct.$i:text(checkbox),optional {label "[_ assessment.Correct_Answer_Choice] $i"} {options $correct_options} {values t }]]
} else {
@@ -491,7 +491,7 @@
{-allow_negative_p "f"}
{-allow_other_p "f"}
} {
- Add the multiple choice item to an assessment. The creates the
+ Add the multiple choice item to an assessment. The creates the
as_item_type_mc object and all the choices and associates the as_item_id
with an assessment, or updates the assessment with the latest version
@@ -519,23 +519,23 @@
}
foreach c [array names correct] {
if {$correct($c) == "t"} {
- incr num_correct_answers
+ incr num_correct_answers
}
}
-
+
if {![as::item::get_item_type_info -as_item_id $as_item_id] \
- || $item_type_info(object_type) ne "as_item_type_mc"} {
- # always set mc title to empty on new mc question
- # we ask for a title for the mc answer set separately if
- # required
+ || $item_type_info(object_type) ne "as_item_type_mc"} {
+ # always set mc title to empty on new mc question
+ # we ask for a title for the mc answer set separately if
+ # required
set mc_id [as::item_type_mc::new \
-title $title \
-increasing_p $increasing_p \
-allow_negative_p $allow_negative_p \
-num_correct_answers $num_correct_answers \
-num_answers $num_answers \
-allow_other_p $allow_other_p]
-
+
if {![info exists item_type_info(object_type)]} {
# first item type mapped
as::item_rels::new -item_rev_id $as_item_id -target_rev_id $mc_id -type as_item_type_rel
@@ -553,7 +553,7 @@
-allow_negative_p $allow_negative_p \
-num_correct_answers $num_correct_answers \
-num_answers $num_answers]
-
+
as::item::update_item_type -item_type_id $mc_id -as_item_id $as_item_id
}
@@ -593,7 +593,7 @@
}
ad_proc -private as::item_type_mc::add_existing_choices_to_edit_form {
- -form_id
+ -form_id
-existing_choices
-choice_array_name
-correct_choice_array_name
@@ -722,9 +722,9 @@
db_1row get_sort_order_to_be_removed {}
set choices [db_list get_choices {}]
foreach old_choice_id $choices {
- if {$old_choice_id != $choice_id} {
- set new_choice_id [as::item_choice::new_revision -choice_id $old_choice_id -mc_id $new_mc_id]
- }
+ if {$old_choice_id != $choice_id} {
+ set new_choice_id [as::item_choice::new_revision -choice_id $old_choice_id -mc_id $new_mc_id]
+ }
}
db_dml move_up_choices {}
}
Index: openacs-4/packages/assessment/tcl/as-list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-list-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/assessment/tcl/as-list-procs.tcl 26 Jul 2018 14:53:25 -0000 1.13
+++ openacs-4/packages/assessment/tcl/as-list-procs.tcl 26 Jul 2018 15:12:22 -0000 1.14
@@ -135,7 +135,7 @@
{-hide_p 0}
{-element_select 1}
{-element_from 1}
-} {
+} {
Build list template specs from assessment item information.
@return list of specs
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.84 -r1.85
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 26 Jul 2018 14:53:25 -0000 1.84
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 26 Jul 2018 15:12:22 -0000 1.85
@@ -33,38 +33,38 @@
ad_proc -public class_group_type_key {
} {
- Returns the group type key used for class groups
+ Returns the group type key used for class groups
} {
- return [dotlrn::parameter -name class_group_type_key]
+ return [dotlrn::parameter -name class_group_type_key]
}
ad_proc -public group_type_key {
} {
- Returns the group_type key that is being used for class management
+ Returns the group_type key that is being used for class management
} {
- return [dotlrn::parameter -name group_type_key]
+ return [dotlrn::parameter -name group_type_key]
}
ad_proc -public package_key {} {
- returns the package key
+ returns the package key
} {
- return dotlrn
+ return dotlrn
}
ad_proc -public get_url {} {
- returns the root URL for dotLRN
+ returns the root URL for dotLRN
} {
- return "/[package_key]"
+ return "/[package_key]"
}
ad_proc -public get_admin_url {} {
- returns the root URL for dotLRN
+ returns the root URL for dotLRN
} {
- return "[get_url]/admin"
+ return "[get_url]/admin"
}
ad_proc -public is_instantiated {} {
- returns 1 if dotlrn is instantiated, 0 otherwise
+ returns 1 if dotlrn is instantiated, 0 otherwise
} {
return [ad_decode [apm_num_instances [package_key]] 0 0 1]
}
@@ -89,11 +89,11 @@
dotlrn_community::set_type_package_id \
-community_type [community_type] \
-package_id [get_package_id]
-
+
dotlrn::new_type_portal \
-type user \
-pretty_name [dotlrn::parameter -name user_portal_pretty_name]
-
+
# do the same for subgroups (the dotlrn_community type)
dotlrn::new_type_portal \
-type dotlrn_community \
@@ -107,7 +107,7 @@
returns 1 if package is mounted under dotlrn, 0 otherwise
} {
set list [site_node::get_children -package_key $package_key \
- -node_id [get_node_id]]
+ -node_id [get_node_id]]
return [expr {[llength $list] > 0 ? 1 : 0}]
}
@@ -134,7 +134,7 @@
-package_key $package_key \
-package_name $pretty_name \
-context_id $parent_package_id \
- ]
+ ]
}
return $package_id
@@ -144,81 +144,81 @@
{-package_id:required}
} {
unmount a package previously mounted with dotlrn::mount_package.
- just a nice wrapper for the dotrn-*-procs so they don't have to
+ just a nice wrapper for the dotrn-*-procs so they don't have to
deal with site_nodes and apm directly.
} {
set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
db_transaction {
site_node::unmount -node_id $node_id
apm_package_instance_delete $package_id
} on_error {
- site_node::update_cache -node_id $node_id
+ site_node::update_cache -node_id $node_id
}
}
ad_proc -public get_node_id {} {
- return the root node id for dotLRN
+ return the root node id for dotLRN
} {
- return [site_node::get_node_id -url [get_url]]
+ return [site_node::get_node_id -url [get_url]]
}
ad_proc -public get_package_id {} {
- return the package ID for dotLRN
+ return the package ID for dotLRN
} {
return [site_node::get_object_id -node_id [get_node_id]]
}
ad_proc -public get_users_rel_segment_id {} {
- returns the rel_segment_id of the dotLRN users segment
+ returns the rel_segment_id of the dotLRN users segment
} {
- return [db_string select_user_rel_segment {}]
+ return [db_string select_user_rel_segment {}]
}
ad_proc -public get_user_theme {
- user_id
+ user_id
} {
- Return the user default theme
+ Return the user default theme
} {
- return [util_memoize "dotlrn::get_user_theme_not_cached $user_id"]
+ return [util_memoize "dotlrn::get_user_theme_not_cached $user_id"]
}
ad_proc -private get_user_theme_not_cached {
- user_id
+ user_id
} {
- helper
+ helper
} {
- return [db_string select_user_theme {} -default ""]
+ return [db_string select_user_theme {} -default ""]
}
ad_proc -public set_user_theme {
- user_id
- theme_id
+ user_id
+ theme_id
} {
- Set the user theme
+ Set the user theme
} {
- db_dml update_user_theme {}
+ db_dml update_user_theme {}
}
ad_proc -public get_portal_id {
- {-user_id:required}
+ {-user_id:required}
} {
- Get the portal_id for a particular user
+ Get the portal_id for a particular user
} {
return [util_memoize "dotlrn::get_portal_id_not_cached -user_id $user_id"]
}
ad_proc -private get_portal_id_not_cached {
- {-user_id:required}
+ {-user_id:required}
} {
- Get the portal_id for a particular user
+ Get the portal_id for a particular user
} {
- return [db_string select_user_portal_id {} -default ""]
+ return [db_string select_user_portal_id {} -default ""]
}
ad_proc -public -deprecated get_user_name {
- user_id
+ user_id
} {
- Get the names the user.
+ Get the names the user.
Deprecated. Use person::name instead.
@@ -232,49 +232,49 @@
}
ad_proc -public instantiate_and_mount {
- {-mount_point ""}
- community_id
- package_key
+ {-mount_point ""}
+ community_id
+ package_key
} {
- Mount an application under a particular community
+ Mount an application under a particular community
} {
- if {$mount_point eq ""} {
- set mount_point $package_key
- }
+ if {$mount_point eq ""} {
+ set mount_point $package_key
+ }
- # Get the parent node_id correctly
- set package_id [dotlrn_community::get_package_id $community_id]
+ # Get the parent node_id correctly
+ set package_id [dotlrn_community::get_package_id $community_id]
- # We only take the first node right now
- # FIXME: in case of multi-mounting, which is doubtful, but possible
- # we have a problem here.
- set parent_node_id [site_node::get_node_id -url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]]
+ # We only take the first node right now
+ # FIXME: in case of multi-mounting, which is doubtful, but possible
+ # we have a problem here.
+ set parent_node_id [site_node::get_node_id -url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]]
set new_package_id [site_node::instantiate_and_mount \
-node_name $mount_point \
-parent_node_id $parent_node_id \
-package_key $package_key \
-context_id $package_id \
- ]
+ ]
- # Return the newly created package_id
- return $new_package_id
+ # Return the newly created package_id
+ return $new_package_id
}
-
+
ad_proc -public render_page {
- {-workspace_p ""}
- {-hide_links_p f}
+ {-workspace_p ""}
+ {-hide_links_p f}
{-render_style individual}
{-page_num ""}
- portal_id
+ portal_id
} {
- render a page in a user's favorite style
+ render a page in a user's favorite style
} {
- return [portal::render \
- -page_num $page_num \
- -hide_links_p $hide_links_p \
- -render_style $render_style \
- $portal_id
+ return [portal::render \
+ -page_num $page_num \
+ -hide_links_p $hide_links_p \
+ -render_style $render_style \
+ $portal_id
]
}
@@ -299,7 +299,7 @@
{-name:required}
{-default ""}
} {
- wrap
+ wrap
} {
return [parameter::get -localize=$localize_p -package_id [get_package_id] -parameter $name -default $default]
}
@@ -324,17 +324,17 @@
ad_proc -public get_portal_id_from_type {
{-type:required}
} {
- What's this type's portal_id? If the type is not matched,
+ What's this type's portal_id? If the type is not matched,
return the id of dotlrn_class_instance by default
} {
set id [db_string select {} -default ""]
if {$id eq ""} {
set type dotlrn_class_instance
- # aks: this next line is necessary
- # for dotlrn_class_instances, don't remove it!
- set id [db_string select {} -default ""]
- }
+ # aks: this next line is necessary
+ # for dotlrn_class_instances, don't remove it!
+ set id [db_string select {} -default ""]
+ }
return $id
}
@@ -346,8 +346,8 @@
Create a portal for the given type. This is how "portal templates"
(actually just regular portals) are created for things like the
"user" portal, "communities", or "class instances". We can't just
- associate a portal_id with a dotlrn community_type since there's
- no community type for a "user" portal. So we use the
+ associate a portal_id with a dotlrn community_type since there's
+ no community type for a "user" portal. So we use the
dotlrn_portal_types_map table instead.
@param type
@@ -370,30 +370,30 @@
set csv_list [dotlrn::parameter -name class_instance_pages_csv]
set default_applets [dotlrn::parameter -name default_class_instance_applets]
}
-
- # FIXME - if there's a proc to get the admin user_id w/o
+
+ # FIXME - if there's a proc to get the admin user_id w/o
# a connection put it here. This needs to be a valid
# grantee for the perms
- set user_id -1
-
+ set user_id -1
+
set portal_id [portal::create \
-name "$pretty_name Portal" \
-csv_list $csv_list \
$user_id
]
-
+
# Associate this type with portal_id, must be before applet
# callbacks, since they use this info
set_type_portal_id \
-type $type \
-portal_id $portal_id
- # Add the default applets
+ # Add the default 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]} {
- if {[catch {dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]} errMsg]} {
+ if {[catch {dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]} errMsg]} {
ns_log warning "FAILED: dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]\n$errMsg"
}
}
@@ -405,13 +405,13 @@
{-site_template_id:required}
} {
Sets a given Site Template for a User
-
- @author Victor Guerra ( guerra@galileo.edu )
- @creation-date 2006-03-11
-
- @param user_id The id of the User that will change his Site Template
- @param site_template_id The id of the Site Template that will be used by the User
-
+
+ @author Victor Guerra ( guerra@galileo.edu )
+ @creation-date 2006-03-11
+
+ @param user_id The id of the User that will change his Site Template
+ @param site_template_id The id of the Site Template that will be used by the User
+
} {
set portal_id [dotlrn::get_portal_id -user_id $user_id]
set new_theme_id [db_string select_portal_theme {}]
@@ -425,99 +425,98 @@
{-user_id:required}
} {
Returns the master configured for a given User
-
- @author Victor Guerra ( guerra@galileo.edu )
- @creation-date 2006-03-11
-
- @param user_id The id of the User in order to obtain the master template configured for him
-
- @return The path of the master template that will be used.
+ @author Victor Guerra ( guerra@galileo.edu )
+ @creation-date 2006-03-11
+
+ @param user_id The id of the User in order to obtain the master template configured for him
+
+ @return The path of the master template that will be used.
+
} {
- set site_template_id [get_site_template_id -user_id $user_id]
+ set site_template_id [get_site_template_id -user_id $user_id]
return [get_master_from_site_template_id -site_template_id $site_template_id]
}
ad_proc -public get_site_template_id {
- {-user_id:required}
+ {-user_id:required}
} {
- Gets the id of a User's site template
-
- @author Victor Guerra ( guerra@galileo.edu )
- @creation-date 2006-03-11
-
- @param user_id The id of the User of whom we want to abtain the Site Template
-
- @return The id of the Site Template assigned to the User
+ Gets the id of a User's site template
+ @author Victor Guerra ( guerra@galileo.edu )
+ @creation-date 2006-03-11
+
+ @param user_id The id of the User of whom we want to abtain the Site Template
+
+ @return The id of the Site Template assigned to the User
+
} {
return [util_memoize [list dotlrn::get_site_template_id_not_cached -user_id $user_id] ]
}
ad_proc -private get_site_template_id_not_cached {
{-user_id:required}
} {
- Gets the id of the user's site template - not cached
+ Gets the id of the user's site template - not cached
} {
- set dotlrn_package_id [dotlrn::get_package_id]
- set user_site_template_id [db_string select_site_template_id {} -default "0"]
- if {[parameter::get -package_id $dotlrn_package_id -parameter UserChangeSiteTemplate_p]} {
- set site_template_id $user_site_template_id
- } else {
- set site_template_id [parameter::get -package_id $dotlrn_package_id -parameter UserDefaultSiteTemplate_p]
- if {$site_template_id != $user_site_template_id} {
- set_site_template_id -user_id $user_id -site_template_id $site_template_id
- }
- }
- return $site_template_id
+ set dotlrn_package_id [dotlrn::get_package_id]
+ set user_site_template_id [db_string select_site_template_id {} -default "0"]
+ if {[parameter::get -package_id $dotlrn_package_id -parameter UserChangeSiteTemplate_p]} {
+ set site_template_id $user_site_template_id
+ } else {
+ set site_template_id [parameter::get -package_id $dotlrn_package_id -parameter UserDefaultSiteTemplate_p]
+ if {$site_template_id != $user_site_template_id} {
+ set_site_template_id -user_id $user_id -site_template_id $site_template_id
+ }
+ }
+ return $site_template_id
}
-
-
+
+
ad_proc -public get_master_from_site_template_id {
- {-site_template_id:required}
+ {-site_template_id:required}
} {
- Returns the master template associated to a given Site Template
-
- @author Victor Guerra ( guerra@galileo.edu )
- @creation-date 2006-03-11
-
- @param site_template_id The id of The Site Template to obtain the master template
-
- @return The path of the master template associated to the Site Template
-
+ Returns the master template associated to a given Site Template
+
+ @author Victor Guerra ( guerra@galileo.edu )
+ @creation-date 2006-03-11
+
+ @param site_template_id The id of The Site Template to obtain the master template
+
+ @return The path of the master template associated to the Site Template
+
} {
- return [util_memoize [list dotlrn::get_master_from_site_template_id_not_cached -site_template_id $site_template_id]]
+ return [util_memoize [list dotlrn::get_master_from_site_template_id_not_cached -site_template_id $site_template_id]]
}
-
+
ad_proc -private get_master_from_site_template_id_not_cached {
- {-site_template_id:required}
+ {-site_template_id:required}
} {
- Returns the master template for a given site template
+ Returns the master template for a given site template
} {
- return [db_string select_site_template_master {} \
- -default [parameter::get -package_id [dotlrn::get_package_id] -parameter DefaultMaster_p]]
+ return [db_string select_site_template_master {} \
+ -default [parameter::get -package_id [dotlrn::get_package_id] -parameter DefaultMaster_p]]
}
-
+
ad_proc -public assign_default_sitetemplate {
- {-site_template_id:required}
+ {-site_template_id:required}
} {
- Assigns a portal theme associated to a Site Template
- to all users
-
- @author Victor Guerra ( guerra@galileo.edu )
- @creation-date 2006-03-11
-
- @param site_template_id The id of The Site Template to obtain the portal theme to be assigned
+ Assigns a portal theme associated to a Site Template
+ to all users
+ @author Victor Guerra ( guerra@galileo.edu )
+ @creation-date 2006-03-11
+
+ @param site_template_id The id of The Site Template to obtain the portal theme to be assigned
+
} {
-
- # We need to update the portal theme before the first hit!
- set new_theme_id [db_string select_portal_theme {}]
+
+ # We need to update the portal theme before the first hit!
+ set new_theme_id [db_string select_portal_theme {}]
db_dml update_portal_themes {update }
- util_memoize_flush_regexp "dotlrn::get_site_template_id_not_cached *"
+ util_memoize_flush_regexp "dotlrn::get_site_template_id_not_cached *"
}
-
}
# Local variables:
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.48 -r1.49
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 26 Jul 2018 14:53:26 -0000 1.48
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 26 Jul 2018 15:12:22 -0000 1.49
@@ -1,6 +1,6 @@
ad_library {
Procedures in the evaluation namespace.
-
+
@creation-date Feb 2004
@author jopez@galileo.edu and cesarhj@galileo.edu
@cvs-id $Id$
@@ -16,77 +16,77 @@
#
#####
-ad_proc -public evaluation::notification::get_url {
+ad_proc -public evaluation::notification::get_url {
{-task_id ""}
{-notif_type ""}
{-evaluation_id ""}
{object_id ""}
-} {
- Returns a full url to the object_id.
- Handles assignments and evaluations.
-} {
-
+} {
+ Returns a full url to the object_id.
+ Handles assignments and evaluations.
+} {
+
if {([info exists object_id] && $object_id ne "")} {
return "[ad_url][apm_package_url_from_id $object_id]"
}
- set base_url "[ad_url][ad_conn package_url]"
+ set base_url "[ad_url][ad_conn package_url]"
switch $notif_type {
- "one_assignment_notif" {
- db_1row get_grade_id { *SQL* }
- return [export_vars -base "${base_url}task-view" { task_id grade_id }]
- }
- "one_evaluation_notif" {
- set evaluation_mode display
- return [export_vars -base "${base_url}" { task_id evaluation_id evaluation_mode }]
- }
- default {
- error "[_ evaluation.lt_Unrecognized_value_fo]"
- ad_script_abort
- }
+ "one_assignment_notif" {
+ db_1row get_grade_id { *SQL* }
+ return [export_vars -base "${base_url}task-view" { task_id grade_id }]
+ }
+ "one_evaluation_notif" {
+ set evaluation_mode display
+ return [export_vars -base "${base_url}" { task_id evaluation_id evaluation_mode }]
+ }
+ default {
+ error "[_ evaluation.lt_Unrecognized_value_fo]"
+ ad_script_abort
+ }
}
-}
+}
-ad_proc -public evaluation::get_user_portrait {
+ad_proc -public evaluation::get_user_portrait {
-user_id:required
{-tag_attributes ""}
-} {
+} {
Returns the portrait for the given user or a default portrait if not found.
-} {
-
+} {
+
if { [db_0or1row user_portrait { *SQL* }] } {
- set output "<img src=\"/shared/portrait-bits.tcl?user_id=$user_id\" "
+ set output "<img src=\"/shared/portrait-bits.tcl?user_id=$user_id\" "
} else {
- set output "<img src=\"[lindex [site_node::get_url_from_object_id -object_id [ad_conn package_id]] 0]resources/photo_na.gif\" "
+ set output "<img src=\"[lindex [site_node::get_url_from_object_id -object_id [ad_conn package_id]] 0]resources/photo_na.gif\" "
}
if { $tag_attributes ne "" } {
- for {set i 0} { $i < [ns_set size $tag_attributes] } { incr i } {
- set attribute_name [ns_set key $tag_attributes $i]
- set attribute_value [ns_set value $tag_attributes $i]
-
- if {$attribute_name eq {}} {
- append output " $attribute_name"
- } else {
- append output " $attribute_name=\"$attribute_value\""
- }
- }
+ for {set i 0} { $i < [ns_set size $tag_attributes] } { incr i } {
+ set attribute_name [ns_set key $tag_attributes $i]
+ set attribute_value [ns_set value $tag_attributes $i]
+
+ if {$attribute_name eq {}} {
+ append output " $attribute_name"
+ } else {
+ append output " $attribute_name=\"$attribute_value\""
+ }
+ }
}
append output ">"
return $output
-}
+}
-ad_proc -public evaluation::safe_url_name {
+ad_proc -public evaluation::safe_url_name {
-name:required
-} {
+} {
Returns the filename replacing some characters.
-} {
+} {
regsub -all {[<>:\"|/@\\\#%&+\\ ,\?]} $name {_} name
return $name
-}
+}
ad_proc -public evaluation::delete_grade {
@@ -169,9 +169,9 @@
ad_proc -public evaluation::set_live_task {
-task_item_id:required
-} {
+} {
For this task and its related student evaluations, answers,
- solutions and grades, promote best revision to the live revision.
+ solutions and grades, promote best revision to the live revision.
} {
db_foreach evaluation_deleted_student_eval {
select evaluation_item_id
@@ -182,7 +182,7 @@
latest_revision = evaluation_id)
and evaluation_item_id = item_id
} {
- evaluation::set_live_item -item_id $evaluation_item_id
+ evaluation::set_live_item -item_id $evaluation_item_id
}
db_foreach evaluation_deleted_answer {
@@ -194,7 +194,7 @@
latest_revision = answer_id)
and answer_item_id = item_id
} {
- evaluation::set_live_item -item_id $answer_item_id
+ evaluation::set_live_item -item_id $answer_item_id
}
db_foreach evaluation_deleted_task_sol {
@@ -206,9 +206,9 @@
latest_revision = solution_id)
and solution_item_id = item_id
} {
- evaluation::set_live_item -item_id $solution_item_id
+ evaluation::set_live_item -item_id $solution_item_id
}
-
+
db_foreach evaluation_deleted_grades_sheet {
select grades_sheet_item_id
from evaluation_grades_sheets,
@@ -218,7 +218,7 @@
latest_revision = grades_sheet_id)
and grades_sheet_item_id = item_id
} {
- evaluation::set_live_item -item_id $grades_sheet_item_id
+ evaluation::set_live_item -item_id $grades_sheet_item_id
}
evaluation::set_live_item -item_id $task_item_id
@@ -231,16 +231,16 @@
} {
db_1row get_task_id { select task_item_id from evaluation_tasks where task_id = :task_id }
db_foreach evaluation_delete_student_eval { select evaluation_id from evaluation_student_evals where task_item_id = :task_item_id } {
- evaluation::revision_delete -revision_id $evaluation_id
+ evaluation::revision_delete -revision_id $evaluation_id
}
db_foreach evaluation_delete_answer { select answer_id from evaluation_answers where task_item_id = :task_item_id } {
- evaluation::revision_delete -revision_id $answer_id
+ evaluation::revision_delete -revision_id $answer_id
}
db_foreach evaluation_delete_task_sol { select solution_id from evaluation_tasks_sols where task_item_id = :task_item_id } {
- evaluation::revision_delete -revision_id $solution_id
+ evaluation::revision_delete -revision_id $solution_id
}
db_foreach evaluation_delete_grades_sheet { select grades_sheet_id from evaluation_grades_sheets where task_item_id = :task_item_id } {
- evaluation::revision_delete -revision_id $grades_sheet_id
+ evaluation::revision_delete -revision_id $grades_sheet_id
}
evaluation::revision_delete -revision_id $task_id
}
@@ -253,7 +253,7 @@
evaluation::revision_delete -revision_id $evaluation_id
}
-ad_proc -public evaluation::notification::do_notification {
+ad_proc -public evaluation::notification::do_notification {
-task_id:required
-package_id:required
-notif_type:required
@@ -264,16 +264,16 @@
Issues notifications.
} {
- db_1row select_names { *SQL* }
-
+ db_1row select_names { *SQL* }
+
set community_name ""
set community_id [dotlrn_community::get_community_id]
if { $community_id ne "" } {
set community_name [db_string get_community_name "select pretty_name from dotlrn_communities_all where community_id = :community_id"]
- }
+ }
switch $notif_type {
- "one_assignment_notif" {
+ "one_assignment_notif" {
if {$edit_p eq "0"} {
set notif_subject "[_ evaluation.lt_New_Assignment_grade_]"
set notif_text "[_ evaluation.lt_A_new_assignment_was_] \n"
@@ -283,7 +283,7 @@
}
append notif_text "[_ evaluation.click_on_this_link_] [evaluation::notification::get_url -task_id $task_id -notif_type one_assignment_notif] \n"
set response_id $task_id
-
+
}
"one_evaluation_notif" {
db_1row get_eval_info { *SQL* }
@@ -294,13 +294,13 @@
set response_id $evaluation_id
}
default {
- error "[_ evaluation.lt_Unrecognized_value_fo]"
+ error "[_ evaluation.lt_Unrecognized_value_fo]"
ad_script_abort
}
}
-
+
# Notifies the users that requested notification for the specific object
-
+
notification::new \
-type_id [notification::type::get_type_id -short_name $notif_type] \
-object_id $package_id \
@@ -309,7 +309,7 @@
-notif_text $notif_text \
-subset $subset \
-action_id $response_id
-}
+}
ad_proc -public evaluation::package_key {
} {
@@ -329,46 +329,46 @@
-name:required
-plural_name:required
{-package_id ""}
-} {
+} {
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
+ @param new_item_p If true make a new item using item_id
} {
if { $package_id eq "" } {
- set package_id [ad_conn package_id]
+ set package_id [ad_conn package_id]
}
set creation_user [ad_conn user_id]
set creation_ip [ad_conn peeraddr]
set creation_date [db_string get_date { *SQL* }]
set item_name "${content_type}_${item_id}"
-
+
set revision_id [db_nextval acs_object_id_seq]
set revision_name "${content_type}_${revision_id}"
set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index f]
if { $new_item_p && ![db_string double_click { *SQL* }] } {
set item_id [content::item::new -item_id $item_id -parent_id $folder_id -content_type $content_type -name $item_name -context_id $package_id -creation_date $creation_date]
}
set revision_id [content::revision::new \
- -item_id $item_id \
- -content_type $content_type \
- -description $description \
- -creation_date $creation_date \
- -attributes [list [list weight $weight] \
- [list grade_name $name] \
- [list grade_item_id $item_id] \
- [list grade_plural_name $plural_name]] ]
+ -item_id $item_id \
+ -content_type $content_type \
+ -description $description \
+ -creation_date $creation_date \
+ -attributes [list [list weight $weight] \
+ [list grade_name $name] \
+ [list grade_item_id $item_id] \
+ [list grade_plural_name $plural_name]] ]
return $revision_id
-}
+}
ad_proc -private evaluation::now_plus_days { -ndays } {
- Create a new Date object for the current date and time
+ Create a new Date object for the current date and time
plus the number of days given
with the default interval for minutes.
@@ -377,29 +377,29 @@
} {
set now [list]
foreach v [clock format [clock seconds] -format "%Y %m %d %H %M %S"] {
- lappend now [util::trim_leading_zeros $v]
+ lappend now [util::trim_leading_zeros $v]
}
-
+
set day [lindex $now 2]
set month [lindex $now 1]
set interval_def [template::util::date::defaultInterval day]
for { set i [lindex $interval_def 0] } { $i <= 15 } { incr i 1 } {
- incr day
- if { $day + $i >= [lindex $interval_def 1] } {
- incr month 1
- set day 1
- }
+ incr day
+ if { $day + $i >= [lindex $interval_def 1] } {
+ incr month 1
+ set day 1
+ }
}
-
+
# replace the hour and minute values in the now list with new values
set now [lreplace $now 2 2 $day]
set now [lreplace $now 1 1 $month]
-
+
# set default time
- set now [lreplace $now 3 3 23]
- set now [lreplace $now 4 4 59]
- set now [lreplace $now 5 5 59]
-
+ set now [lreplace $now 3 3 23]
+ set now [lreplace $now 4 4 59]
+ set now [lreplace $now 5 5 59]
+
return [eval template::util::date::create $now]
}
@@ -421,10 +421,10 @@
db_1row from_task_info { *SQL* }
if { $creation_user eq "" } {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
}
if { $creation_ip eq "" } {
- set creation_ip [ad_conn peeraddr]
+ set creation_ip [ad_conn peeraddr]
}
set item_name "${item_id}_${title}"
@@ -433,37 +433,37 @@
-resolve_index f]
set item_id [content::item::new -item_id $item_id \
- -parent_id $to_folder_id \
- -content_type evaluation_tasks \
- -creation_user $creation_user \
- -name $item_name \
- -context_id $to_package_id \
- -creation_ip $creation_ip \
- -mime_type $mime_type \
- -storage_type $storage_type]
-
+ -parent_id $to_folder_id \
+ -content_type evaluation_tasks \
+ -creation_user $creation_user \
+ -name $item_name \
+ -context_id $to_package_id \
+ -creation_ip $creation_ip \
+ -mime_type $mime_type \
+ -storage_type $storage_type]
+
set revision_id [content::revision::new \
- -item_id $item_id \
- -content_type evaluation_tasks \
- -mime_type $mime_type \
- -title $title \
- -description $description \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -attributes [list [list weight $weight] \
- [list task_name $task_name] \
- [list task_item_id $item_id] \
- [list number_of_members $number_of_members] \
- [list online_p $online_p] \
- [list grade_item_id $to_grade_item_id] \
- [list due_date $due_date] \
- [list late_submit_p $late_submit_p] \
- [list requires_grade_p $requires_grade_p] \
- [list estimated_time $estimated_time] \
- [list points $points] \
- [list perfect_score $perfect_score] \
- [list relative_weight $relative_weight] \
- [list forums_related_p $forums_related_p]]]
+ -item_id $item_id \
+ -content_type evaluation_tasks \
+ -mime_type $mime_type \
+ -title $title \
+ -description $description \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -attributes [list [list weight $weight] \
+ [list task_name $task_name] \
+ [list task_item_id $item_id] \
+ [list number_of_members $number_of_members] \
+ [list online_p $online_p] \
+ [list grade_item_id $to_grade_item_id] \
+ [list due_date $due_date] \
+ [list late_submit_p $late_submit_p] \
+ [list requires_grade_p $requires_grade_p] \
+ [list estimated_time $estimated_time] \
+ [list points $points] \
+ [list perfect_score $perfect_score] \
+ [list relative_weight $relative_weight] \
+ [list forums_related_p $forums_related_p]]]
db_exec_plsql clone_content { *SQL* }
@@ -512,52 +512,52 @@
@param storage_type File or text, depending on what are we going to store
} {
if { $creation_user eq "" } {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
}
if { $creation_ip eq "" } {
- set creation_ip [ad_conn peeraddr]
+ set creation_ip [ad_conn peeraddr]
}
if {$package_id eq ""} {
- set package_id [ad_conn package_id]
+ set package_id [ad_conn package_id]
}
set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index f]
if { $item_name eq "" } {
- set item_name "${item_id}_${title}"
+ set item_name "${item_id}_${title}"
}
if { $new_item_p && ![db_string double_click { *SQL* }] } {
- set item_id [content::item::new -item_id $item_id \
- -parent_id $folder_id \
- -content_type $content_type \
- -name $item_name \
- -context_id $package_id \
- -mime_type $mime_type \
- -storage_type $storage_type]
+ set item_id [content::item::new -item_id $item_id \
+ -parent_id $folder_id \
+ -content_type $content_type \
+ -name $item_name \
+ -context_id $package_id \
+ -mime_type $mime_type \
+ -storage_type $storage_type]
}
set revision_id [content::revision::new \
- -item_id $item_id \
- -content_type $content_type \
- -mime_type $mime_type \
- -title $title \
- -description $description \
- -attributes [list [list weight $weight] \
- [list task_name $name] \
- [list task_item_id $item_id] \
- [list online_p $online_p] \
- [list grade_item_id $grade_item_id] \
- [list due_date $due_date] \
- [list late_submit_p $late_submit_p] \
- [list requires_grade_p $requires_grade_p] \
- [list number_of_members $number_of_members]]]
+ -item_id $item_id \
+ -content_type $content_type \
+ -mime_type $mime_type \
+ -title $title \
+ -description $description \
+ -attributes [list [list weight $weight] \
+ [list task_name $name] \
+ [list task_item_id $item_id] \
+ [list online_p $online_p] \
+ [list grade_item_id $grade_item_id] \
+ [list due_date $due_date] \
+ [list late_submit_p $late_submit_p] \
+ [list requires_grade_p $requires_grade_p] \
+ [list number_of_members $number_of_members]]]
# in order to find the file we have to set the name in cr_items the same that in cr_revisions
db_dml update_item_name { *SQL* }
return $revision_id
-}
+}
ad_proc -public evaluation::new_solution {
-item_id:required
@@ -590,10 +590,10 @@
} {
if { $creation_user eq "" } {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
}
if { $creation_ip eq "" } {
- set creation_ip [ad_conn peeraddr]
+ set creation_ip [ad_conn peeraddr]
}
set package_id [ad_conn package_id]
@@ -603,41 +603,41 @@
set revision_id [db_nextval acs_object_id_seq]
if { $publish_date eq "" } {
- set publish_date [db_string get_date { *SQL* }]
+ set publish_date [db_string get_date { *SQL* }]
}
if { $creation_date eq "" } {
- set creation_date [db_string get_date { *SQL* }]
+ set creation_date [db_string get_date { *SQL* }]
}
if { $new_item_p && ![db_string double_click { *SQL* }] } {
set item_id [content::item::new -item_id $item_id \
- -parent_id $folder_id \
- -content_type $content_type \
- -name $item_name \
- -context_id $package_id \
- -mime_type $mime_type \
- -storage_type $storage_type \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -creation_date $creation_date]
+ -parent_id $folder_id \
+ -content_type $content_type \
+ -name $item_name \
+ -context_id $package_id \
+ -mime_type $mime_type \
+ -storage_type $storage_type \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -creation_date $creation_date]
}
set revision_id [content::revision::new \
- -item_id $item_id \
- -content_type $content_type \
- -mime_type $mime_type \
- -title $title \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -creation_date $creation_date \
- -attributes [list [list task_item_id $task_item_id] \
- [list solution_item_id $item_id]] ]
+ -item_id $item_id \
+ -content_type $content_type \
+ -mime_type $mime_type \
+ -title $title \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -creation_date $creation_date \
+ -attributes [list [list task_item_id $task_item_id] \
+ [list solution_item_id $item_id]] ]
# in order to find the file we have to set the name in cr_items the same that in cr_revisions
db_dml update_item_name { *SQL* }
return $revision_id
-}
+}
ad_proc -public evaluation::new_answer {
@@ -673,10 +673,10 @@
} {
if { $creation_user eq "" } {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
}
if { $creation_ip eq "" } {
- set creation_ip [ad_conn peeraddr]
+ set creation_ip [ad_conn peeraddr]
}
set package_id [ad_conn package_id]
@@ -686,41 +686,41 @@
set revision_id [db_nextval acs_object_id_seq]
if { $publish_date eq "" } {
- set publish_date [db_string get_date { *SQL* }]
+ set publish_date [db_string get_date { *SQL* }]
}
-
+
if { $creation_date eq "" } {
- set creation_date [db_string get_date { *SQL* }]
+ set creation_date [db_string get_date { *SQL* }]
}
if { $new_item_p && ![db_string double_click { *SQL* }] } {
set item_id [content::item::new \
- -item_id $item_id \
- -parent_id $folder_id \
- -content_type $content_type \
- -name $item_name \
- -context_id $package_id \
- -mime_type $mime_type \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -storage_type $storage_type \
- -creation_date $creation_date]
+ -item_id $item_id \
+ -parent_id $folder_id \
+ -content_type $content_type \
+ -name $item_name \
+ -context_id $package_id \
+ -mime_type $mime_type \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -storage_type $storage_type \
+ -creation_date $creation_date]
}
set revision_id [content::revision::new \
- -item_id $item_id \
- -content_type $content_type \
- -mime_type $mime_type \
- -title $title \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -creation_date $creation_date \
- -attributes [list [list answer_item_id $item_id] \
- [list party_id $party_id] \
- [list task_item_id $task_item_id]] ]
+ -item_id $item_id \
+ -content_type $content_type \
+ -mime_type $mime_type \
+ -title $title \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -creation_date $creation_date \
+ -attributes [list [list answer_item_id $item_id] \
+ [list party_id $party_id] \
+ [list task_item_id $task_item_id]] ]
# in order to find the file we have to set the name in cr_items the same that in cr_revisions
db_dml update_item_name { *SQL* }
return $revision_id
-}
+}
ad_proc -public evaluation::new_evaluation {
-item_id:required
@@ -741,7 +741,7 @@
{-publish_date ""}
{-creation_date ""}
} {
-
+
Build a new content revision of an evaluation. 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.
@@ -760,10 +760,10 @@
} {
if { $creation_user eq "" } {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
}
if { $creation_ip eq "" } {
- set creation_ip [ad_conn peeraddr]
+ set creation_ip [ad_conn peeraddr]
}
set package_id [ad_conn package_id]
@@ -773,42 +773,42 @@
set revision_id [db_nextval acs_object_id_seq]
if { $publish_date eq "" } {
- set publish_date [db_string get_date { *SQL* }]
+ set publish_date [db_string get_date { *SQL* }]
}
if { $creation_date eq "" } {
- set creation_date [db_string get_date { *SQL* }]
+ set creation_date [db_string get_date { *SQL* }]
}
if { $new_item_p && ![db_string double_click { *SQL* }] } {
set item_id [content::item::new -item_id $item_id \
- -parent_id $folder_id \
- -content_type $content_type \
- -name $item_name \
- -context_id $package_id \
- -mime_type $mime_type \
- -storage_type $storage_type \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -description $description \
- -creation_date $creation_date]
- }
+ -parent_id $folder_id \
+ -content_type $content_type \
+ -name $item_name \
+ -context_id $package_id \
+ -mime_type $mime_type \
+ -storage_type $storage_type \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -description $description \
+ -creation_date $creation_date]
+ }
set revision_id [content::revision::new \
- -item_id $item_id \
- -content_type $content_type \
- -mime_type $mime_type \
- -title $title\
- -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] \
- [list show_student_p $show_student_p] \
- [list task_item_id $task_item_id]]]
+ -item_id $item_id \
+ -content_type $content_type \
+ -mime_type $mime_type \
+ -title $title\
+ -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] \
+ [list show_student_p $show_student_p] \
+ [list task_item_id $task_item_id]]]
-}
+}
ad_proc -public evaluation::new_evaluation_group {
-group_id:required
@@ -831,23 +831,23 @@
} {
if { $creation_user eq "" } {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
}
if { $creation_ip eq "" } {
- set creation_ip [ad_conn peeraddr]
+ set creation_ip [ad_conn peeraddr]
}
if { $context eq "" } {
- set context [ad_conn package_id]
+ set context [ad_conn package_id]
}
if { $creation_date eq "" } {
- set creation_date [db_string get_date { *SQL* }]
+ set creation_date [db_string get_date { *SQL* }]
}
db_exec_plsql evaluation_group_new { *SQL* }
-
+
return $group_id
-}
+}
ad_proc -public evaluation::delete_evaluation_group {
-group_id:required
@@ -859,7 +859,7 @@
} {
db_exec_plsql delete_evaluation_group { *SQL* }
-}
+}
ad_proc -public evaluation::evaluation_group_name {
-group_id:required
@@ -869,7 +869,7 @@
} {
return [db_exec_plsql evaluation_group_name { *SQL* }]
-}
+}
ad_proc -public evaluation::new_grades_sheet {
-item_id:required
@@ -897,16 +897,16 @@
@param new_item_p If true make a new item using item_id
@param task_item_id Task which "owns" the grades sheet
@param title The name of the grades sheet
- @param storage_type lob or file
+ @param storage_type lob or file
@param mime_type Mime tipe of the grades sheet
} {
if { $creation_user eq "" } {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
}
if { $creation_ip eq "" } {
- set creation_ip [ad_conn peeraddr]
+ set creation_ip [ad_conn peeraddr]
}
set package_id [ad_conn package_id]
set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index f]
@@ -915,36 +915,36 @@
set revision_id [db_nextval acs_object_id_seq]
if { $publish_date eq "" } {
- set publish_date [db_string get_date { *SQL* }]
+ set publish_date [db_string get_date { *SQL* }]
}
if { $creation_date eq "" } {
- set creation_date [db_string get_date { *SQL* }]
+ set creation_date [db_string get_date { *SQL* }]
}
if { $new_item_p && ![db_string double_click { *SQL* }] } {
set item_id [content::item::new -item_id $item_id \
- -parent_id $folder_id \
- -content_type $content_type \
- -name $item_name \
- -context_id $package_id \
- -mime_type $mime_type \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -storage_type $storage_type]
+ -parent_id $folder_id \
+ -content_type $content_type \
+ -name $item_name \
+ -context_id $package_id \
+ -mime_type $mime_type \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -storage_type $storage_type]
- }
+ }
set revision_id [content::revision::new \
- -item_id $item_id \
- -content_type $content_type \
- -title $title \
- -mime_type $mime_type \
- -creation_user $creation_user \
- -creation_ip $creation_ip \
- -attributes [list [list grades_sheet_item_id $item_id] \
- [list task_item_id $task_item_id]] ]
+ -item_id $item_id \
+ -content_type $content_type \
+ -title $title \
+ -mime_type $mime_type \
+ -creation_user $creation_user \
+ -creation_ip $creation_ip \
+ -attributes [list [list grades_sheet_item_id $item_id] \
+ [list task_item_id $task_item_id]] ]
return $revision_id
-}
+}
ad_proc -public evaluation::generate_grades_sheet {
} {
@@ -953,63 +953,63 @@
@return text/csv to the client connection
} {
- # Get file_path from url
- set url [ns_conn url]
-
- regexp {/grades-sheet-csv-([^.]+).csv$} $url match task_id
-
- if { ![db_0or1row get_task_info { *SQL* }] } {
- # this should never happen
+ # Get file_path from url
+ set url [ns_conn url]
+
+ regexp {/grades-sheet-csv-([^.]+).csv$} $url match task_id
+
+ if { ![db_0or1row get_task_info { *SQL* }] } {
+ # this should never happen
ad_return_error "No information" "There has been an error, there is no infomraiton about the task $task_id"
- return
- }
-
- set csv_content [list]
- lappend csv_content "[_ evaluation.lt_Grades_sheet_for_assi]"
+ return
+ }
+ set csv_content [list]
+ lappend csv_content "[_ evaluation.lt_Grades_sheet_for_assi]"
+
lappend csv_content "\n[_ evaluation.Max_Grade_]"
lappend csv_content "100"
lappend csv_content "\n[_ evaluation.lt_Will_the_student_be_a]"
lappend csv_content "1"
- lappend csv_content "\n\n[_ evaluation.Id_]"
- lappend csv_content "[_ evaluation.Name_]"
- lappend csv_content "[_ evaluation.Grade_]"
+ lappend csv_content "\n\n[_ evaluation.Id_]"
+ lappend csv_content "[_ evaluation.Name_]"
+ lappend csv_content "[_ evaluation.Grade_]"
lappend csv_content "[_ evaluation.CommentsEdit_reason_]"
-
+
if { $number_of_members == 1 } {
- # the task is individual
+ # the task is individual
- set community_id [dotlrn_community::get_community_id]
- if { $community_id eq "" } {
- set sql_query [db_map sql_query_individual]
- } else {
- set sql_query [db_map sql_qyery_comm_ind]
- }
+ set community_id [dotlrn_community::get_community_id]
+ if { $community_id eq "" } {
+ set sql_query [db_map sql_query_individual]
+ } else {
+ set sql_query [db_map sql_qyery_comm_ind]
+ }
- } else {
- # the task is in groups
-
- set sql_query [db_map sql_query_groups]
+ } else {
+ # the task is in groups
+
+ set sql_query [db_map sql_query_groups]
}
-
+
db_foreach parties_with_to_grade { *SQL* } {
- if { $grade ne "" } {
- set grade [lc_numeric $grade]
- }
- lappend csv_content "\n$party_id"
- lappend csv_content "$party_name"
- lappend csv_content "$grade"
- lappend csv_content "$comments"
- } if_no_rows {
- ad_return_error "[_ evaluation.No_parties_to_grade_]" "[_ evaluation.lt_In_order_to_generate_]"
- return
- }
-
- set csv_formatted_content [join $csv_content ","]
-
- doc_return 200 text/csv "
- $csv_formatted_content"
+ if { $grade ne "" } {
+ set grade [lc_numeric $grade]
+ }
+ lappend csv_content "\n$party_id"
+ lappend csv_content "$party_name"
+ lappend csv_content "$grade"
+ lappend csv_content "$comments"
+ } if_no_rows {
+ ad_return_error "[_ evaluation.No_parties_to_grade_]" "[_ evaluation.lt_In_order_to_generate_]"
+ return
+ }
+
+ set csv_formatted_content [join $csv_content ","]
+
+ doc_return 200 text/csv "
+ $csv_formatted_content"
}
ad_proc -public evaluation::apm::delete_one_assignment_impl {} {
@@ -1030,31 +1030,31 @@
ad_proc -public evaluation::apm::create_one_assignment_impl {} {
Register the service contract implementation and return the impl_id.
- @return impl_id of the created implementation
+ @return impl_id of the created implementation
} {
return [acs_sc::impl::new_from_spec -spec {
- name one_assignment_notif_type
- contract_name NotificationType
- owner evaluation
- aliases {
- GetURL evaluation::notification::get_url
- ProcessReply evaluation::notification::process_reply
- }
+ name one_assignment_notif_type
+ contract_name NotificationType
+ owner evaluation
+ aliases {
+ GetURL evaluation::notification::get_url
+ ProcessReply evaluation::notification::process_reply
+ }
}]
}
ad_proc -public evaluation::apm::create_one_evaluation_impl {} {
Register the service contract implementation and return the impl_id.
- @return impl_id of the created implementation
+ @return impl_id of the created implementation
} {
return [acs_sc::impl::new_from_spec -spec {
- name one_evaluation_notif_type
- contract_name NotificationType
- owner evaluation
- aliases {
- GetURL evaluation::notification::get_url
- ProcessReply evaluation::notification::process_reply
- }
+ name one_evaluation_notif_type
+ contract_name NotificationType
+ owner evaluation
+ aliases {
+ GetURL evaluation::notification::get_url
+ ProcessReply evaluation::notification::process_reply
+ }
}]
}
@@ -1065,10 +1065,10 @@
@return the type_id of the created type
} {
return [notification::type::new \
- -sc_impl_id $impl_id \
- -short_name one_assignment_notif \
- -pretty_name "[_ evaluation.One_Assignment_]" \
- -description "[_ evaluation.lt_Notification_for_assi]"]
+ -sc_impl_id $impl_id \
+ -short_name one_assignment_notif \
+ -pretty_name "[_ evaluation.One_Assignment_]" \
+ -description "[_ evaluation.lt_Notification_for_assi]"]
}
ad_proc -public evaluation::apm::create_one_evaluation_type {
@@ -1078,10 +1078,10 @@
@return the type_id of the created type
} {
return [notification::type::new \
- -sc_impl_id $impl_id \
- -short_name one_evaluation_notif \
- -pretty_name "[_ evaluation.One_Evaluation_]" \
- -description "[_ evaluation.lt_Notification_for_eval]"]
+ -sc_impl_id $impl_id \
+ -short_name one_evaluation_notif \
+ -pretty_name "[_ evaluation.One_Evaluation_]" \
+ -description "[_ evaluation.lt_Notification_for_eval]"]
}
ad_proc -public evaluation::apm::enable_intervals_and_methods {
@@ -1091,21 +1091,21 @@
} {
# Enable the various intervals and delivery method
notification::type::interval_enable \
- -type_id $type_id \
- -interval_id [notification::interval::get_id_from_name -name instant]
-
+ -type_id $type_id \
+ -interval_id [notification::interval::get_id_from_name -name instant]
+
notification::type::interval_enable \
- -type_id $type_id \
- -interval_id [notification::interval::get_id_from_name -name hourly]
-
+ -type_id $type_id \
+ -interval_id [notification::interval::get_id_from_name -name hourly]
+
notification::type::interval_enable \
- -type_id $type_id \
- -interval_id [notification::interval::get_id_from_name -name daily]
-
+ -type_id $type_id \
+ -interval_id [notification::interval::get_id_from_name -name daily]
+
# Enable the delivery methods
notification::type::delivery_method_enable \
- -type_id $type_id \
- -delivery_method_id [notification::delivery::get_id -short_name email]
+ -type_id $type_id \
+ -delivery_method_id [notification::delivery::get_id -short_name email]
}
@@ -1117,18 +1117,18 @@
their respective values.
} {
set cmd [parameter::get -parameter ArchiveCommand -default "cat `find {in_file} -type f` > {out_file}"]
-
+
regsub -all {(\W)} $in_file {\\\1} in_file
regsub -all {\\/} $in_file {/} in_file
regsub -all {\\\.} $in_file {.} in_file
-
+
regsub -all {(\W)} $out_file {\\\1} out_file
regsub -all {\\/} $out_file {/} out_file
regsub -all {\\\.} $out_file {.} out_file
-
+
regsub -all {{in_file}} $cmd $in_file cmd
regsub -all {{out_file}} $cmd $out_file cmd
-
+
return $cmd
}
@@ -1144,37 +1144,37 @@
file mkdir $dir
db_foreach get_answers_for_task { *SQL* } {
- if { $storage_type eq "lob" || $storage_type eq "file" } {
- # it is a file
-
- regsub -all {[<>:\"|/@\\\#%&+\\ ,]} $party_name {_} file_name
- append file_name [file extension $answer_title]
-
- if {$storage_type eq "file"} {
- # its a file
-
- file copy -- "[cr_fs_path $cr_path]${cr_file_name}" [file join ${dir} ${file_name}]
- } else {
- # its a lob
- db_blob_get_file select_object_content { *SQL* } -file [file join ${dir} ${file_name}]
- }
-
- } else {
- # it is a url
+ if { $storage_type eq "lob" || $storage_type eq "file" } {
+ # it is a file
- set url [db_string url { *SQL* }]
+ regsub -all {[<>:\"|/@\\\#%&+\\ ,]} $party_name {_} file_name
+ append file_name [file extension $answer_title]
-
- set file_name "${party_name}.url"
-
- regsub -all {[<>:\"|/@\\\#%&+\\ ,]} $file_name {_} file_name
- set fp [open [file join ${dir} ${file_name}] w]
- puts $fp {[InternetShortcut]}
- puts $fp URL=$url
- close $fp
- }
+ if {$storage_type eq "file"} {
+ # its a file
+
+ file copy -- "[cr_fs_path $cr_path]${cr_file_name}" [file join ${dir} ${file_name}]
+ } else {
+ # its a lob
+ db_blob_get_file select_object_content { *SQL* } -file [file join ${dir} ${file_name}]
+ }
+
+ } else {
+ # it is a url
+
+ set url [db_string url { *SQL* }]
+
+
+ set file_name "${party_name}.url"
+
+ regsub -all {[<>:\"|/@\\\#%&+\\ ,]} $file_name {_} file_name
+ set fp [open [file join ${dir} ${file_name}] w]
+ puts $fp {[InternetShortcut]}
+ puts $fp URL=$url
+ close $fp
+ }
}
-
+
return $dir
db_foreach get_answers_for_task}
@@ -1190,21 +1190,21 @@
} {
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 {}
- }
+ 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 {}
+ }
}
}
@@ -1216,9 +1216,9 @@
# } {
# set enable_p 0
# set enable_p [db_string enable {} -default 1]
-
+
# if {$enable_p > 1} {
-# set enable_p 0
+# set enable_p 0
# }
# return $enable_p
# }
@@ -1227,16 +1227,16 @@
} {
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
db_transaction {
- foreach task_id $tasks {
- db_dml update_task {}
- }
- }
+ foreach task_id $tasks {
+ db_dml update_task {}
+ }
+ }
}
ad_proc -public evaluation::clone_grade {
@@ -1251,71 +1251,71 @@
-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_conn 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_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
db_transaction {
foreach task_id $tasks {
- db_dml update_task {}
- }
+ 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"
db_transaction {
foreach task_id $tasks {
- db_dml update_task {}
- }
+ db_dml update_task {}
+ }
}
}
-ad_register_proc GET /grades-sheet-csv* evaluation::generate_grades_sheet
+ad_register_proc GET /grades-sheet-csv* evaluation::generate_grades_sheet
ad_register_proc POST /grades-sheet-csv* evaluation::generate_grades_sheet
# Local variables:
Index: openacs-4/packages/views/tcl/views-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/views/tcl/views-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/views/tcl/views-procs.tcl 26 Jul 2018 14:53:26 -0000 1.10
+++ openacs-4/packages/views/tcl/views-procs.tcl 26 Jul 2018 15:12:22 -0000 1.11
@@ -16,7 +16,7 @@
} {
Record an object view by viewer_id
- @param object_id
+ @param object_id
@param viewer_id
@return the total view count for the user
@@ -25,22 +25,22 @@
@creation-date 2004-01-30
} {
if { $type ne "" } {
- if { $type in {views_count unique_views last_viewed} } {
- # if the type is on of the list it will conflict on the views::get procedure
- error "views::record_view type cannot be views_count, unique_views or last_viewed"
- }
- #TYPE is PL/SQL reserver word in ORACLE
- #set view_type $type
- set views_by_type [db_exec_plsql record_view_by_type {}]
+ if { $type in {views_count unique_views last_viewed} } {
+ # if the type is on of the list it will conflict on the views::get procedure
+ error "views::record_view type cannot be views_count, unique_views or last_viewed"
+ }
+ #TYPE is PL/SQL reserver word in ORACLE
+ #set view_type $type
+ set views_by_type [db_exec_plsql record_view_by_type {}]
}
if {[catch {set views [db_exec_plsql record_view {}]} views]} {
- set views 0
+ set views 0
}
return $views
}
-ad_proc -public views::get {
+ad_proc -public views::get {
-object_id
} {
@@ -50,20 +50,20 @@
<li>unique_views
<li>last_viewed
</ul>
-
+
@param object_id ID of the object for which you want to return the views
} {
if {[db_0or1row views { } -column_array ret] } {
db_foreach select_views_by_type { } {
- set ret($view_type) $views_count
- }
+ set ret($view_type) $views_count
+ }
return [array get ret]
}
return {views_count {} unique_views {} last_viewed {}}
}
-ad_proc -public views::viewed_p {
+ad_proc -public views::viewed_p {
-object_id
{-user_id 0}
{-type ""}